From 12c08b271aa85af438069b7659c417b0c77b829e Mon Sep 17 00:00:00 2001 From: ThatGamerBlue Date: Thu, 12 Sep 2019 14:00:01 +0100 Subject: [PATCH] update client to rev 183 --- .../src/main/java/net/runelite/api/Tile.java | 2 + .../net/runelite/mixins/RSClientMixin.java | 2 +- .../net/runelite/mixins/RSPlayerMixin.java | 2 + .../src/main/java/AbstractArchive.java | 230 +- .../main/java/AbstractByteArrayCopier.java | 219 +- .../src/main/java/AbstractFont.java | 152 +- .../src/main/java/AbstractRasterProvider.java | 24 +- .../src/main/java/AbstractSocket.java | 44 +- .../src/main/java/AbstractSound.java | 4 +- .../src/main/java/AbstractUserComparator.java | 35 +- .../src/main/java/AbstractWorldMapData.java | 317 +- .../src/main/java/AbstractWorldMapIcon.java | 182 +- .../src/main/java/AccessFile.java | 62 +- runescape-client/src/main/java/Actor.java | 582 +- runescape-client/src/main/java/Animation.java | 74 +- runescape-client/src/main/java/Archive.java | 214 +- .../src/main/java/ArchiveDisk.java | 121 +- .../src/main/java/ArchiveDiskAction.java | 83 +- .../main/java/ArchiveDiskActionHandler.java | 68 +- .../src/main/java/ArchiveLoader.java | 327 +- .../src/main/java/AttackOption.java | 136 +- .../src/main/java/AudioFilter.java | 116 +- .../src/main/java/BZip2Decompressor.java | 80 +- .../src/main/java/BZip2State.java | 142 +- .../src/main/java/BoundaryObject.java | 307 +- runescape-client/src/main/java/Bounds.java | 117 +- runescape-client/src/main/java/Buddy.java | 41 +- .../src/main/java/BuddyRankComparator.java | 152 +- runescape-client/src/main/java/Buffer.java | 557 +- .../src/main/java/BufferedFile.java | 116 +- .../src/main/java/BufferedNetSocket.java | 56 +- .../src/main/java/BufferedSink.java | 40 +- .../src/main/java/BufferedSource.java | 58 +- .../src/main/java/ByteArrayNode.java | 4 +- .../src/main/java/ByteArrayPool.java | 61 +- runescape-client/src/main/java/Calendar.java | 225 +- runescape-client/src/main/java/Canvas.java | 711 +- .../src/main/java/ChatChannel.java | 245 +- runescape-client/src/main/java/ClanChat.java | 152 +- runescape-client/src/main/java/ClanMate.java | 52 +- runescape-client/src/main/java/Client.java | 8253 ++++++++--------- .../src/main/java/ClientPacket.java | 1267 ++- .../src/main/java/ClientPreferences.java | 54 +- runescape-client/src/main/java/Clock.java | 172 +- .../src/main/java/CollisionMap.java | 114 +- runescape-client/src/main/java/Coord.java | 81 +- runescape-client/src/main/java/Decimator.java | 750 +- .../src/main/java/DefaultsGroup.java | 20 +- .../src/main/java/DemotingHashTable.java | 38 +- .../java/DesktopPlatformInfoProvider.java | 228 +- .../src/main/java/DevicePcmPlayer.java | 38 +- .../main/java/DevicePcmPlayerProvider.java | 172 +- .../src/main/java/DirectByteArrayCopier.java | 35 +- .../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 | 215 +- runescape-client/src/main/java/Entity.java | 276 +- .../src/main/java/EnumDefinition.java | 986 +- .../src/main/java/Enumerated.java | 8 +- .../main/java/EvictingDualNodeHashTable.java | 38 +- .../src/main/java/FaceNormal.java | 96 +- .../src/main/java/FileSystem.java | 102 +- runescape-client/src/main/java/FillMode.java | 51 +- .../src/main/java/FloorDecoration.java | 228 +- .../src/main/java/FloorOverlayDefinition.java | 121 +- .../main/java/FloorUnderlayDefinition.java | 121 +- runescape-client/src/main/java/Font.java | 6 +- runescape-client/src/main/java/FontName.java | 870 +- runescape-client/src/main/java/Fonts.java | 39 +- runescape-client/src/main/java/Frames.java | 63 +- runescape-client/src/main/java/Friend.java | 83 +- .../src/main/java/FriendLoginUpdate.java | 104 +- .../src/main/java/FriendSystem.java | 362 +- .../src/main/java/FriendsList.java | 137 +- .../src/main/java/GZipDecompressor.java | 53 +- .../src/main/java/GameObject.java | 189 +- runescape-client/src/main/java/GameShell.java | 1646 +++- .../src/main/java/GrandExchangeEvent.java | 726 +- .../src/main/java/GrandExchangeEvents.java | 132 +- .../src/main/java/GrandExchangeOffer.java | 497 +- .../java/GrandExchangeOfferAgeComparator.java | 147 +- .../GrandExchangeOfferNameComparator.java | 467 +- .../GrandExchangeOfferOwnWorldComparator.java | 183 +- ...dExchangeOfferTotalQuantityComparator.java | 572 +- ...GrandExchangeOfferUnitPriceComparator.java | 358 +- .../GrandExchangeOfferWorldComparator.java | 209 +- .../src/main/java/GraphicsDefaults.java | 167 +- .../src/main/java/GraphicsObject.java | 175 +- runescape-client/src/main/java/HealthBar.java | 241 +- .../src/main/java/HealthBarDefinition.java | 111 +- .../src/main/java/HealthBarUpdate.java | 84 +- .../src/main/java/HitSplatDefinition.java | 526 +- .../src/main/java/HorizontalAlignment.java | 32 +- runescape-client/src/main/java/Huffman.java | 66 +- .../src/main/java/IgnoreList.java | 50 +- runescape-client/src/main/java/Ignored.java | 89 +- .../src/main/java/IndexedSprite.java | 32 +- .../src/main/java/Instrument.java | 80 +- .../src/main/java/IntHashTable.java | 16 +- .../src/main/java/IntegerNode.java | 4 +- .../src/main/java/InterfaceParent.java | 925 +- .../src/main/java/Interpreter.java | 121 +- .../src/main/java/InvDefinition.java | 59 +- .../src/main/java/IsaacCipher.java | 58 +- .../src/main/java/ItemContainer.java | 840 +- .../src/main/java/ItemDefinition.java | 356 +- .../src/main/java/IterableDualNodeQueue.java | 36 +- .../java/IterableDualNodeQueueIterator.java | 42 +- .../src/main/java/IterableNodeDeque.java | 166 +- .../IterableNodeDequeDescendingIterator.java | 48 +- .../src/main/java/IterableNodeHashTable.java | 36 +- .../java/IterableNodeHashTableIterator.java | 28 +- .../src/main/java/JagexCache.java | 353 +- .../src/main/java/KeyHandler.java | 311 +- .../src/main/java/KitDefinition.java | 76 +- runescape-client/src/main/java/Language.java | 277 +- runescape-client/src/main/java/Link.java | 12 +- runescape-client/src/main/java/LinkDeque.java | 22 +- runescape-client/src/main/java/Login.java | 188 +- .../src/main/java/LoginPacket.java | 111 +- .../src/main/java/LoginScreenAnimation.java | 462 +- runescape-client/src/main/java/LoginType.java | 124 +- .../src/main/java/MenuAction.java | 280 +- runescape-client/src/main/java/Message.java | 819 +- runescape-client/src/main/java/Messages.java | 377 +- .../src/main/java/MidiFileReader.java | 96 +- .../src/main/java/MidiPcmStream.java | 1038 +-- .../src/main/java/MilliClock.java | 340 +- runescape-client/src/main/java/Model.java | 968 +- runescape-client/src/main/java/ModelData.java | 352 +- .../src/main/java/ModelData0.java | 509 +- .../src/main/java/MouseHandler.java | 414 +- .../src/main/java/MouseRecorder.java | 95 +- .../src/main/java/MouseWheel.java | 6 +- .../src/main/java/MouseWheelHandler.java | 16 +- .../src/main/java/MusicPatch.java | 188 +- .../src/main/java/MusicPatchNode.java | 295 +- .../src/main/java/MusicPatchNode2.java | 206 +- .../src/main/java/MusicPatchPcmStream.java | 808 +- .../src/main/java/MusicTrack.java | 22 +- runescape-client/src/main/java/NPC.java | 264 +- .../src/main/java/NPCDefinition.java | 229 +- runescape-client/src/main/java/NanoClock.java | 18 +- runescape-client/src/main/java/NetCache.java | 172 +- .../src/main/java/NetFileRequest.java | 138 +- runescape-client/src/main/java/NetSocket.java | 161 +- runescape-client/src/main/java/Node.java | 16 +- runescape-client/src/main/java/NodeDeque.java | 48 +- .../src/main/java/NodeHashTable.java | 32 +- .../src/main/java/ObjectDefinition.java | 314 +- .../src/main/java/ObjectNode.java | 4 +- .../src/main/java/ObjectSound.java | 1331 +-- runescape-client/src/main/java/Occluder.java | 679 +- .../src/main/java/PacketBuffer.java | 82 +- .../src/main/java/PacketBufferNode.java | 85 +- .../src/main/java/PacketWriter.java | 189 +- .../src/main/java/ParamDefinition.java | 99 +- runescape-client/src/main/java/PcmPlayer.java | 333 +- .../src/main/java/PcmPlayerProvider.java | 8 +- runescape-client/src/main/java/PcmStream.java | 38 +- .../src/main/java/PcmStreamMixer.java | 134 +- .../src/main/java/PcmStreamMixerListener.java | 10 +- .../src/main/java/PendingSpawn.java | 415 +- .../src/main/java/PlatformInfo.java | 286 +- .../src/main/java/PlatformInfoProvider.java | 8 +- runescape-client/src/main/java/Player.java | 1148 +-- .../src/main/java/PlayerAppearance.java | 304 +- .../src/main/java/PlayerType.java | 148 +- runescape-client/src/main/java/Players.java | 250 +- .../src/main/java/PrivateChatMode.java | 34 +- .../src/main/java/Projectile.java | 206 +- .../src/main/java/RasterProvider.java | 30 +- .../src/main/java/Rasterizer2D.java | 60 +- .../src/main/java/Rasterizer3D.java | 622 +- .../src/main/java/RawPcmStream.java | 1146 ++- runescape-client/src/main/java/RawSound.java | 20 +- .../src/main/java/ReflectionCheck.java | 153 +- .../src/main/java/RouteStrategy.java | 135 +- .../src/main/java/RunException.java | 15 +- runescape-client/src/main/java/Scene.java | 678 +- runescape-client/src/main/java/Script.java | 133 +- .../src/main/java/ScriptEvent.java | 487 +- .../src/main/java/ScriptFrame.java | 95 +- .../src/main/java/SecureRandomCallable.java | 70 +- .../src/main/java/SecureRandomFuture.java | 960 +- .../src/main/java/SequenceDefinition.java | 282 +- .../src/main/java/ServerBuild.java | 33 +- .../src/main/java/ServerPacket.java | 1095 ++- runescape-client/src/main/java/Skeleton.java | 95 +- runescape-client/src/main/java/Skills.java | 53 +- .../src/main/java/SoftWrapper.java | 8 +- .../src/main/java/SoundCache.java | 124 +- .../src/main/java/SoundEffect.java | 24 +- .../src/main/java/SoundEnvelope.java | 34 +- .../src/main/java/SoundSystem.java | 224 +- .../main/java/SpotAnimationDefinition.java | 167 +- runescape-client/src/main/java/Sprite.java | 116 +- .../src/main/java/SpriteMask.java | 30 +- runescape-client/src/main/java/Strings.java | 245 +- .../src/main/java/StructDefinition.java | 193 +- .../src/main/java/StudioGame.java | 400 +- runescape-client/src/main/java/Task.java | 18 +- .../src/main/java/TaskHandler.java | 172 +- runescape-client/src/main/java/Texture.java | 66 +- .../src/main/java/TextureLoader.java | 28 +- .../src/main/java/TextureProvider.java | 109 +- runescape-client/src/main/java/Tile.java | 601 +- runescape-client/src/main/java/TileItem.java | 236 +- .../src/main/java/TileItemPile.java | 268 +- runescape-client/src/main/java/TileModel.java | 72 +- runescape-client/src/main/java/TilePaint.java | 381 +- runescape-client/src/main/java/Tiles.java | 850 +- runescape-client/src/main/java/Timer.java | 246 +- runescape-client/src/main/java/TriBool.java | 136 +- .../src/main/java/UrlRequest.java | 158 +- .../src/main/java/UrlRequester.java | 56 +- runescape-client/src/main/java/User.java | 61 +- .../src/main/java/UserComparator1.java | 24 +- .../src/main/java/UserComparator10.java | 424 +- .../src/main/java/UserComparator2.java | 16 +- .../src/main/java/UserComparator3.java | 72 +- .../src/main/java/UserComparator4.java | 46 +- .../src/main/java/UserComparator5.java | 54 +- .../src/main/java/UserComparator6.java | 42 +- .../src/main/java/UserComparator7.java | 94 +- .../src/main/java/UserComparator8.java | 42 +- .../src/main/java/UserComparator9.java | 82 +- runescape-client/src/main/java/UserList.java | 178 +- runescape-client/src/main/java/Username.java | 225 +- runescape-client/src/main/java/Usernamed.java | 24 +- .../src/main/java/VarbitDefinition.java | 75 +- runescape-client/src/main/java/VarcInt.java | 68 +- runescape-client/src/main/java/Varcs.java | 316 +- .../src/main/java/VarpDefinition.java | 127 +- runescape-client/src/main/java/Varps.java | 66 +- .../src/main/java/VertexNormal.java | 112 +- .../src/main/java/VerticalAlignment.java | 790 +- .../src/main/java/ViewportMouse.java | 346 +- .../src/main/java/VorbisCodebook.java | 50 +- .../src/main/java/VorbisFloor.java | 142 +- .../src/main/java/VorbisMapping.java | 10 +- .../src/main/java/VorbisResidue.java | 26 +- .../src/main/java/VorbisSample.java | 248 +- .../src/main/java/WallDecoration.java | 874 +- runescape-client/src/main/java/Widget.java | 708 +- runescape-client/src/main/java/World.java | 143 +- runescape-client/src/main/java/WorldMap.java | 735 +- .../src/main/java/WorldMapArchiveLoader.java | 36 +- .../src/main/java/WorldMapArea.java | 357 +- .../src/main/java/WorldMapAreaData.java | 488 +- .../src/main/java/WorldMapCacheName.java | 174 +- .../src/main/java/WorldMapData_0.java | 214 +- .../src/main/java/WorldMapData_1.java | 794 +- .../src/main/java/WorldMapDecoration.java | 654 +- .../src/main/java/WorldMapDecorationType.java | 440 +- .../src/main/java/WorldMapElement.java | 619 +- .../src/main/java/WorldMapEvent.java | 64 +- .../src/main/java/WorldMapID.java | 233 +- .../src/main/java/WorldMapIcon_0.java | 555 +- .../src/main/java/WorldMapIcon_1.java | 589 +- .../src/main/java/WorldMapLabel.java | 49 +- .../src/main/java/WorldMapLabelSize.java | 282 +- .../src/main/java/WorldMapManager.java | 271 +- .../src/main/java/WorldMapRectangle.java | 131 +- .../src/main/java/WorldMapRegion.java | 1021 +- .../src/main/java/WorldMapSection.java | 32 +- .../src/main/java/WorldMapSection0.java | 511 +- .../src/main/java/WorldMapSection1.java | 194 +- .../src/main/java/WorldMapSection2.java | 323 +- .../src/main/java/WorldMapSectionType.java | 794 +- .../src/main/java/WorldMapSprite.java | 199 +- runescape-client/src/main/java/Wrapper.java | 8 +- runescape-client/src/main/java/class0.java | 18 +- runescape-client/src/main/java/class1.java | 462 +- runescape-client/src/main/java/class13.java | 66 +- runescape-client/src/main/java/class14.java | 156 +- runescape-client/src/main/java/class146.java | 6 +- runescape-client/src/main/java/class16.java | 182 +- runescape-client/src/main/java/class160.java | 110 +- runescape-client/src/main/java/class161.java | 2 +- runescape-client/src/main/java/class162.java | 32 +- runescape-client/src/main/java/class173.java | 124 +- runescape-client/src/main/java/class181.java | 2 +- runescape-client/src/main/java/class185.java | 525 +- runescape-client/src/main/java/class186.java | 27 +- runescape-client/src/main/java/class188.java | 144 +- runescape-client/src/main/java/class189.java | 312 +- runescape-client/src/main/java/class191.java | 73 +- runescape-client/src/main/java/class192.java | 863 +- runescape-client/src/main/java/class195.java | 159 +- runescape-client/src/main/java/class197.java | 92 +- runescape-client/src/main/java/class2.java | 135 +- runescape-client/src/main/java/class208.java | 54 +- runescape-client/src/main/java/class210.java | 92 +- runescape-client/src/main/java/class215.java | 61 +- runescape-client/src/main/java/class216.java | 125 + runescape-client/src/main/java/class218.java | 305 +- runescape-client/src/main/java/class219.java | 77 +- runescape-client/src/main/java/class222.java | 33 +- runescape-client/src/main/java/class223.java | 65 +- runescape-client/src/main/java/class225.java | 119 +- runescape-client/src/main/java/class226.java | 226 + runescape-client/src/main/java/class227.java | 52 +- runescape-client/src/main/java/class237.java | 170 +- runescape-client/src/main/java/class247.java | 27 +- runescape-client/src/main/java/class266.java | 40 - runescape-client/src/main/java/class267.java | 11 + runescape-client/src/main/java/class268.java | 75 +- runescape-client/src/main/java/class269.java | 60 - runescape-client/src/main/java/class270.java | 22 +- runescape-client/src/main/java/class286.java | 247 +- runescape-client/src/main/java/class287.java | 11 +- runescape-client/src/main/java/class288.java | 16 +- runescape-client/src/main/java/class289.java | 80 +- runescape-client/src/main/java/class290.java | 27 - runescape-client/src/main/java/class293.java | 19 +- runescape-client/src/main/java/class296.java | 41 +- runescape-client/src/main/java/class297.java | 20 +- runescape-client/src/main/java/class3.java | 250 +- runescape-client/src/main/java/class30.java | 471 +- runescape-client/src/main/java/class300.java | 6 +- runescape-client/src/main/java/class312.java | 195 +- runescape-client/src/main/java/class319.java | 8 +- runescape-client/src/main/java/class32.java | 504 +- runescape-client/src/main/java/class325.java | 53 +- runescape-client/src/main/java/class336.java | 26 +- runescape-client/src/main/java/class338.java | 14 +- runescape-client/src/main/java/class339.java | 13 - runescape-client/src/main/java/class4.java | 222 +- runescape-client/src/main/java/class40.java | 208 +- runescape-client/src/main/java/class42.java | 259 +- runescape-client/src/main/java/class43.java | 136 +- runescape-client/src/main/java/class47.java | 21 +- runescape-client/src/main/java/class49.java | 368 +- runescape-client/src/main/java/class51.java | 304 +- runescape-client/src/main/java/class60.java | 89 +- runescape-client/src/main/java/class65.java | 417 +- runescape-client/src/main/java/class80.java | 113 +- runescape-client/src/main/java/class81.java | 21 +- runescape-client/src/main/java/class83.java | 136 +- runescape-client/src/main/java/class96.java | 57 +- 342 files changed, 41159 insertions(+), 41468 deletions(-) create mode 100644 runescape-client/src/main/java/class216.java create mode 100644 runescape-client/src/main/java/class226.java delete mode 100644 runescape-client/src/main/java/class266.java create mode 100644 runescape-client/src/main/java/class267.java delete mode 100644 runescape-client/src/main/java/class269.java delete mode 100644 runescape-client/src/main/java/class290.java delete mode 100644 runescape-client/src/main/java/class339.java diff --git a/runelite-api/src/main/java/net/runelite/api/Tile.java b/runelite-api/src/main/java/net/runelite/api/Tile.java index 691e3b5f87..ca1b46a146 100644 --- a/runelite-api/src/main/java/net/runelite/api/Tile.java +++ b/runelite-api/src/main/java/net/runelite/api/Tile.java @@ -117,6 +117,8 @@ public interface Tile */ int getRenderLevel(); + int getY(); + /** * Computes and returns whether this tile has line of sight to another. * diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java index c30b8c76aa..9bf5f07eca 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -1726,7 +1726,7 @@ public abstract class RSClientMixin implements RSClient } @Inject - BigInteger modulus = new BigInteger("83ff79a3e258b99ead1a70e1049883e78e513c4cdec538d8da9483879a9f81689c0c7d146d7b82b52d05cf26132b1cda5930eeef894e4ccf3d41eebc3aabe54598c4ca48eb5a31d736bfeea17875a35558b9e3fcd4aebe2a9cc970312a477771b36e173dc2ece6001ab895c553e2770de40073ea278026f36961c94428d8d7db", 16); + BigInteger modulus = new BigInteger("f8a2c48a898ebf7a2a5069193f0c6798757879d298af09a6fa94e569d45b09f67aeef8e6bb8a61650d597c743104fdef7d07b24af92df6be995877e9a7dd6a630d3e62c14e70427b959ff70735f96135d73434e73aabbd6aa8cf0b97dae7e2b6b70e646ff550b0ad8a4d8d18675714e5228b026d85e8f2f24607ba69d7404571", 16); @Inject @Override diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java index e3e7920472..c500884e73 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java @@ -166,6 +166,8 @@ public abstract class RSPlayerMixin implements RSPlayer Vertex vy = triangle.getB(); Vertex vz = triangle.getC(); + System.err.println("vx: " + vx.getX() + " localX: " + localX); + Point x = Perspective.localToCanvas(client, localX - vx.getX(), localY - vx.getZ(), diff --git a/runescape-client/src/main/java/AbstractArchive.java b/runescape-client/src/main/java/AbstractArchive.java index 071f642bff..19792f7f5a 100644 --- a/runescape-client/src/main/java/AbstractArchive.java +++ b/runescape-client/src/main/java/AbstractArchive.java @@ -7,72 +7,72 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("hz") @Implements("AbstractArchive") public abstract class AbstractArchive { - @ObfuscatedName("y") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Llc;" + signature = "Llu;" ) @Export("gzipDecompressor") static GZipDecompressor gzipDecompressor; - @ObfuscatedName("e") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -894464741 + intValue = 1302035663 ) static int field3120; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1986402315 + intValue = -163352815 ) @Export("groupCount") int groupCount; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("groupIds") int[] groupIds; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("groupNameHashes") int[] groupNameHashes; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Lly;" + signature = "Llv;" ) @Export("groupNameHashTable") IntHashTable groupNameHashTable; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("groupCrcs") int[] groupCrcs; - @ObfuscatedName("t") + @ObfuscatedName("j") @Export("groupVersions") int[] groupVersions; - @ObfuscatedName("q") + @ObfuscatedName("v") @Export("fileCounts") int[] fileCounts; - @ObfuscatedName("x") + @ObfuscatedName("d") @Export("fileIds") int[][] fileIds; - @ObfuscatedName("d") + @ObfuscatedName("z") @Export("fileNameHashes") int[][] fileNameHashes; - @ObfuscatedName("f") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "[Lly;" + signature = "[Llv;" ) @Export("fileNameHashTables") IntHashTable[] fileNameHashTables; - @ObfuscatedName("c") + @ObfuscatedName("h") @Export("groups") Object[] groups; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("files") Object[][] files; @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 2098544055 + intValue = -1161826923 ) @Export("hash") public int hash; - @ObfuscatedName("b") + @ObfuscatedName("e") @Export("releaseGroups") boolean releaseGroups; - @ObfuscatedName("g") + @ObfuscatedName("i") @Export("shallowFiles") boolean shallowFiles; @@ -86,10 +86,10 @@ public abstract class AbstractArchive { this.shallowFiles = var2; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "([BB)V", - garbageValue = "64" + signature = "([BI)V", + garbageValue = "-1572277747" ) @Export("decodeIndex") void decodeIndex(byte[] var1) { @@ -103,7 +103,7 @@ public abstract class AbstractArchive { var5 = ~var5; this.hash = var5; - Buffer var15 = new Buffer(Player.decompressBytes(var1)); + Buffer var15 = new Buffer(TaskHandler.decompressBytes(var1)); var5 = var15.readUnsignedByte(); if (var5 >= 5 && var5 <= 7) { if (var5 >= 6) { @@ -112,7 +112,7 @@ public abstract class AbstractArchive { var6 = var15.readUnsignedByte(); if (var5 >= 7) { - this.groupCount = var15.method5423(); + this.groupCount = var15.method5481(); } else { this.groupCount = var15.readUnsignedShort(); } @@ -123,7 +123,7 @@ public abstract class AbstractArchive { int var9; if (var5 >= 7) { for (var9 = 0; var9 < this.groupCount; ++var9) { - this.groupIds[var9] = var7 += var15.method5423(); + this.groupIds[var9] = var7 += var15.method5481(); if (this.groupIds[var9] > var8) { var8 = this.groupIds[var9]; } @@ -179,7 +179,7 @@ public abstract class AbstractArchive { this.fileIds[var10] = new int[var11]; for (var13 = 0; var13 < var11; ++var13) { - var14 = this.fileIds[var10][var13] = var7 += var15.method5423(); + var14 = this.fileIds[var10][var13] = var7 += var15.method5481(); if (var14 > var12) { var12 = var14; } @@ -228,29 +228,29 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "502266240" + garbageValue = "-2104600002" ) @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IIB)[B", - garbageValue = "127" + signature = "(III)[B", + garbageValue = "-852709847" ) @Export("takeFile") public byte[] takeFile(int var1, int var2) { return this.takeFileEncrypted(var1, var2, (int[])null); } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(II[II)[B", - garbageValue = "-1621987750" + garbageValue = "1856075294" ) @Export("takeFileEncrypted") public byte[] takeFileEncrypted(int var1, int var2, int[] var3) { @@ -266,7 +266,7 @@ public abstract class AbstractArchive { } } - byte[] var5 = class43.serialize(this.files[var1][var2], false); + byte[] var5 = MilliClock.serialize(this.files[var1][var2], false); if (this.shallowFiles) { this.files[var1][var2] = null; } @@ -277,10 +277,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(III)Z", - garbageValue = "187861364" + signature = "(IIB)Z", + garbageValue = "0" ) @Export("tryLoadFile") public boolean tryLoadFile(int var1, int var2) { @@ -298,12 +298,12 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "1284781911" + signature = "(IB)Z", + garbageValue = "-49" ) - public boolean method4066(int var1) { + public boolean method4142(int var1) { if (this.files.length == 1) { return this.tryLoadFile(0, var1); } else if (this.files[var1].length == 1) { @@ -313,10 +313,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IS)Z", - garbageValue = "-29246" + signature = "(II)Z", + garbageValue = "1935370160" ) @Export("tryLoadGroup") public boolean tryLoadGroup(int var1) { @@ -328,10 +328,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-855102923" + signature = "(B)Z", + garbageValue = "8" ) @Export("isFullyLoaded") public boolean isFullyLoaded() { @@ -350,20 +350,20 @@ public abstract class AbstractArchive { return var1; } - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(II)I", - garbageValue = "-1902634670" + garbageValue = "780456172" ) @Export("groupLoadPercent") int groupLoadPercent(int var1) { return this.groups[var1] != null ? 100 : 0; } - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(II)[B", - garbageValue = "-108401953" + garbageValue = "-455222981" ) @Export("takeFileFlat") public byte[] takeFileFlat(int var1) { @@ -376,10 +376,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(IIB)[B", - garbageValue = "99" + signature = "(III)[B", + garbageValue = "-518164691" ) @Export("getFile") public byte[] getFile(int var1, int var2) { @@ -395,17 +395,17 @@ public abstract class AbstractArchive { } } - byte[] var4 = class43.serialize(this.files[var1][var2], false); + byte[] var4 = MilliClock.serialize(this.files[var1][var2], false); return var4; } else { return null; } } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(II)[B", - garbageValue = "-1767422605" + garbageValue = "-465347237" ) @Export("getFileFlat") public byte[] getFileFlat(int var1) { @@ -418,49 +418,49 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("r") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1800831619" + garbageValue = "2123503233" ) @Export("loadGroup") void loadGroup(int var1) { } - @ObfuscatedName("y") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(II)[I", - garbageValue = "1605042893" + signature = "(IB)[I", + garbageValue = "20" ) @Export("getGroupFileIds") public int[] getGroupFileIds(int var1) { return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; } - @ObfuscatedName("p") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(II)I", - garbageValue = "-1967727419" + garbageValue = "1117618578" ) @Export("getGroupFileCount") public int getGroupFileCount(int var1) { return this.files[var1].length; } - @ObfuscatedName("g") + @ObfuscatedName("r") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "-2" + garbageValue = "-57" ) @Export("getGroupCount") public int getGroupCount() { return this.files.length; } - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "663" + signature = "(I)V", + garbageValue = "-460868159" ) @Export("clearGroups") public void clearGroups() { @@ -470,10 +470,10 @@ public abstract class AbstractArchive { } - @ObfuscatedName("z") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(IB)V", - garbageValue = "41" + garbageValue = "1" ) @Export("clearFilesGroup") public void clearFilesGroup(int var1) { @@ -483,10 +483,10 @@ public abstract class AbstractArchive { } - @ObfuscatedName("w") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-454602481" + garbageValue = "232551112" ) @Export("clearFiles") public void clearFiles() { @@ -500,10 +500,10 @@ public abstract class AbstractArchive { } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I[II)Z", - garbageValue = "-1201461238" + garbageValue = "-1481397744" ) @Export("buildFiles") boolean buildFiles(int var1, int[] var2) { @@ -527,14 +527,14 @@ public abstract class AbstractArchive { } else { byte[] var18; if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { - var18 = class43.serialize(this.groups[var1], false); + var18 = MilliClock.serialize(this.groups[var1], false); } else { - var18 = class43.serialize(this.groups[var1], true); + var18 = MilliClock.serialize(this.groups[var1], true); Buffer var8 = new Buffer(var18); var8.xteaDecrypt(var2, 5, var8.array.length); } - byte[] var20 = Player.decompressBytes(var18); + byte[] var20 = TaskHandler.decompressBytes(var18); if (this.releaseGroups) { this.groups[var1] = null; } @@ -543,7 +543,7 @@ public abstract class AbstractArchive { int var9 = var20.length; --var9; int var10 = var20[var9] & 255; - var9 -= var3 * var10 * 4; + var9 -= var10 * var3 * 4; Buffer var11 = new Buffer(var20); int[] var12 = new int[var3]; var11.offset = var9; @@ -582,13 +582,13 @@ public abstract class AbstractArchive { for (var15 = 0; var15 < var3; ++var15) { if (!this.shallowFiles) { - var5[var4[var15]] = Entity.method3209(var19[var15], false); + var5[var4[var15]] = UserComparator8.method3365(var19[var15], false); } else { var5[var4[var15]] = var19[var15]; } } } else if (!this.shallowFiles) { - var5[var4[0]] = Entity.method3209(var20, false); + var5[var4[0]] = UserComparator8.method3365(var20, false); } else { var5[var4[0]] = var20; } @@ -598,109 +598,109 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("h") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)I", - garbageValue = "1" + signature = "(Ljava/lang/String;I)I", + garbageValue = "-1601715751" ) @Export("getGroupId") public int getGroupId(String var1) { var1 = var1.toLowerCase(); - return this.groupNameHashTable.get(ReflectionCheck.hashString(var1)); + return this.groupNameHashTable.get(Archive.hashString(var1)); } - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedSignature( signature = "(ILjava/lang/String;I)I", - garbageValue = "-1503814186" + garbageValue = "-1748128959" ) @Export("getFileId") public int getFileId(int var1, String var2) { var2 = var2.toLowerCase(); - return this.fileNameHashTables[var1].get(ReflectionCheck.hashString(var2)); + return this.fileNameHashTables[var1].get(Archive.hashString(var2)); } - @ObfuscatedName("m") + @ObfuscatedName("ag") @ObfuscatedSignature( signature = "(Ljava/lang/String;Ljava/lang/String;I)Z", - garbageValue = "1589930218" + garbageValue = "632147771" ) @Export("isValidFileName") public boolean isValidFileName(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(ReflectionCheck.hashString(var1)); + int var3 = this.groupNameHashTable.get(Archive.hashString(var1)); if (var3 < 0) { return false; } else { - int var4 = this.fileNameHashTables[var3].get(ReflectionCheck.hashString(var2)); + int var4 = this.fileNameHashTables[var3].get(Archive.hashString(var2)); return var4 >= 0; } } - @ObfuscatedName("o") + @ObfuscatedName("at") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;B)[B", - garbageValue = "34" + signature = "(Ljava/lang/String;Ljava/lang/String;I)[B", + garbageValue = "-977549436" ) @Export("takeFileByNames") public byte[] takeFileByNames(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(ReflectionCheck.hashString(var1)); - int var4 = this.fileNameHashTables[var3].get(ReflectionCheck.hashString(var2)); + int var3 = this.groupNameHashTable.get(Archive.hashString(var1)); + int var4 = this.fileNameHashTables[var3].get(Archive.hashString(var2)); return this.takeFile(var3, var4); } - @ObfuscatedName("av") + @ObfuscatedName("ao") @ObfuscatedSignature( signature = "(Ljava/lang/String;Ljava/lang/String;I)Z", - garbageValue = "-823557765" + garbageValue = "1445366174" ) @Export("tryLoadFileByNames") public boolean tryLoadFileByNames(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(ReflectionCheck.hashString(var1)); - int var4 = this.fileNameHashTables[var3].get(ReflectionCheck.hashString(var2)); + int var3 = this.groupNameHashTable.get(Archive.hashString(var1)); + int var4 = this.fileNameHashTables[var3].get(Archive.hashString(var2)); return this.tryLoadFile(var3, var4); } - @ObfuscatedName("am") + @ObfuscatedName("av") @ObfuscatedSignature( signature = "(Ljava/lang/String;B)Z", - garbageValue = "11" + garbageValue = "-63" ) @Export("tryLoadGroupByName") public boolean tryLoadGroupByName(String var1) { var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(ReflectionCheck.hashString(var1)); + int var2 = this.groupNameHashTable.get(Archive.hashString(var1)); return this.tryLoadGroup(var2); } - @ObfuscatedName("ai") + @ObfuscatedName("an") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "1" + signature = "(Ljava/lang/String;I)V", + garbageValue = "-1117702662" ) @Export("loadRegionFromName") public void loadRegionFromName(String var1) { var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(ReflectionCheck.hashString(var1)); + int var2 = this.groupNameHashTable.get(Archive.hashString(var1)); if (var2 >= 0) { this.loadRegionFromGroup(var2); } } - @ObfuscatedName("af") + @ObfuscatedName("al") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)I", - garbageValue = "-43" + signature = "(Ljava/lang/String;I)I", + garbageValue = "-1439788030" ) @Export("groupLoadPercentByName") public int groupLoadPercentByName(String var1) { var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(ReflectionCheck.hashString(var1)); + int var2 = this.groupNameHashTable.get(Archive.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 a8efb57e49..594bc333e4 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java @@ -1,225 +1,48 @@ import 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("gl") +@ObfuscatedName("gb") @Implements("AbstractByteArrayCopier") public abstract class AbstractByteArrayCopier { + @ObfuscatedName("hw") + @ObfuscatedGetter( + intValue = -996347373 + ) + @Export("oculusOrbFocalPointY") + static int oculusOrbFocalPointY; + AbstractByteArrayCopier() { } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)[B", - garbageValue = "-1040345200" + signature = "(B)[B", + garbageValue = "49" ) @Export("get") abstract byte[] get(); - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "([BI)V", - garbageValue = "38240743" + garbageValue = "-1981176877" ) @Export("set") abstract void set(byte[] var1); - @ObfuscatedName("gq") + @ObfuscatedName("fj") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "53" + signature = "(I)V", + garbageValue = "-1334289648" ) - static void method3878() { - if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { - class80.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); + static void method3922() { + if (GrandExchangeOfferUnitPriceComparator.worldMap != null) { + GrandExchangeOfferUnitPriceComparator.worldMap.method6275(MouseRecorder.plane, class4.baseX * 64 + (Varps.localPlayer.x * -78439701 >> 7), (Varps.localPlayer.y >> 7) + ScriptEvent.baseY, false); + GrandExchangeOfferUnitPriceComparator.worldMap.loadCache(); } } - - @ObfuscatedName("jf") - @ObfuscatedSignature( - signature = "(Lhp;II)I", - garbageValue = "-706781687" - ) - static final int method3868(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 = WorldMapElement.getWidget(var9); - var11 = var2[var4++]; - if (var11 != -1 && (!WorldMapData_0.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 = WorldMapIcon_1.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 = WorldMapElement.getWidget(var9); - var11 = var2[var4++]; - if (var11 != -1 && (!WorldMapData_0.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 = class208.getVarbit(var9); - } - - if (var6 == 15) { - var8 = 1; - } - - if (var6 == 16) { - var8 = 2; - } - - if (var6 == 17) { - var8 = 3; - } - - if (var6 == 18) { - var7 = PacketWriter.baseX * 64 + (WorldMapIcon_1.localPlayer.x >> 7); - } - - if (var6 == 19) { - var7 = RouteStrategy.baseY * 64 + (WorldMapIcon_1.localPlayer.y >> 7); - } - - 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; - } - } - - @ObfuscatedName("ky") - @ObfuscatedSignature( - signature = "(Lhp;I)Lhp;", - garbageValue = "-1890509802" - ) - static Widget method3871(Widget var0) { - int var2 = ParamDefinition.getWidgetClickMask(var0); - int var1 = var2 >> 17 & 7; - int var3 = var1; - if (var1 == 0) { - return null; - } else { - for (int var4 = 0; var4 < var3; ++var4) { - var0 = WorldMapElement.getWidget(var0.parentId); - if (var0 == null) { - return null; - } - } - - return var0; - } - } } diff --git a/runescape-client/src/main/java/AbstractFont.java b/runescape-client/src/main/java/AbstractFont.java index df6bbca23e..54d4bdb1aa 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("kl") +@ObfuscatedName("ko") @Implements("AbstractFont") public abstract class AbstractFont extends Rasterizer2D { - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "[Llq;" + signature = "[Llt;" ) @Export("AbstractFont_modIconSprites") public static IndexedSprite[] AbstractFont_modIconSprites; - @ObfuscatedName("c") + @ObfuscatedName("h") @Export("AbstractFont_strike") static int AbstractFont_strike; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("AbstractFont_underline") static int AbstractFont_underline; - @ObfuscatedName("y") + @ObfuscatedName("s") @Export("AbstractFont_previousShadow") static int AbstractFont_previousShadow; @ObfuscatedName("p") @Export("AbstractFont_shadow") static int AbstractFont_shadow; - @ObfuscatedName("b") + @ObfuscatedName("e") @Export("AbstractFont_previousColor") static int AbstractFont_previousColor; - @ObfuscatedName("g") + @ObfuscatedName("i") @Export("AbstractFont_color") static int AbstractFont_color; - @ObfuscatedName("e") + @ObfuscatedName("q") @Export("AbstractFont_alpha") static int AbstractFont_alpha; - @ObfuscatedName("z") + @ObfuscatedName("y") @Export("AbstractFont_justificationTotal") static int AbstractFont_justificationTotal; - @ObfuscatedName("a") + @ObfuscatedName("r") @Export("AbstractFont_justificationCurrent") static int AbstractFont_justificationCurrent; - @ObfuscatedName("w") + @ObfuscatedName("k") @Export("AbstractFont_random") static Random AbstractFont_random; - @ObfuscatedName("l") + @ObfuscatedName("w") @Export("AbstractFont_lines") static String[] AbstractFont_lines; - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("pixels") byte[][] pixels; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("advances") int[] advances; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("widths") int[] widths; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("heights") int[] heights; - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("leftBearings") int[] leftBearings; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("topBearings") int[] topBearings; - @ObfuscatedName("t") + @ObfuscatedName("j") @Export("ascent") public int ascent; - @ObfuscatedName("q") + @ObfuscatedName("v") @Export("maxAscent") public int maxAscent; - @ObfuscatedName("x") + @ObfuscatedName("d") @Export("maxDescent") public int maxDescent; - @ObfuscatedName("f") + @ObfuscatedName("n") @Export("kerning") byte[] kerning; @@ -91,6 +91,12 @@ public abstract class AbstractFont extends Rasterizer2D { AbstractFont_lines = new String[100]; } + AbstractFont(byte[] var1) { + this.pixels = new byte[256][]; + this.ascent = 0; + this.readMetrics(var1); + } + AbstractFont(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) { this.pixels = new byte[256][]; this.ascent = 0; @@ -117,21 +123,15 @@ public abstract class AbstractFont extends Rasterizer2D { this.maxDescent = var9 - this.ascent; } - AbstractFont(byte[] var1) { - this.pixels = new byte[256][]; - this.ascent = 0; - this.readMetrics(var1); - } - - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("drawGlyph") abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6); - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("drawGlyphAlpha") abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7); - @ObfuscatedName("x") + @ObfuscatedName("u") @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)method5255(var11, var12, var4, this.advances, var10, var13, var8); + this.kerning[var8 + (var13 << 8)] = (byte)method5336(var11, var12, var4, this.advances, var10, var13, var8); } } } @@ -204,17 +204,17 @@ public abstract class AbstractFont extends Rasterizer2D { } - @ObfuscatedName("f") + @ObfuscatedName("v") @Export("charWidth") int charWidth(char var1) { if (var1 == 160) { var1 = ' '; } - return this.advances[class14.charToByteCp1252(var1) & 255]; + return this.advances[MenuAction.charToByteCp1252(var1) & 255]; } - @ObfuscatedName("c") + @ObfuscatedName("d") @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 = WallDecoration.parseInt(var7.substring(4)); + int var8 = IgnoreList.parseInt(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)(class14.charToByteCp1252(var6) & 255)]; + var4 += this.advances[(char)(MenuAction.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("r") + @ObfuscatedName("z") @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 = WallDecoration.parseInt(var16.substring(4)); + int var17 = IgnoreList.parseInt(var16.substring(4)); var4 += AbstractFont_modIconSprites[var17].width; var11 = 0; } catch (Exception var20) { @@ -375,7 +375,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("y") + @ObfuscatedName("s") @Export("lineWidth") public int lineWidth(String var1, int var2) { int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines); @@ -397,7 +397,7 @@ public abstract class AbstractFont extends Rasterizer2D { return this.breakLines(var1, new int[]{var2}, AbstractFont_lines); } - @ObfuscatedName("e") + @ObfuscatedName("i") @Export("draw") public void draw(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { @@ -406,7 +406,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("z") + @ObfuscatedName("q") @Export("drawAlpha") public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { @@ -416,7 +416,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("w") + @ObfuscatedName("r") @Export("drawRightAligned") public void drawRightAligned(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { @@ -425,7 +425,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("l") + @ObfuscatedName("k") @Export("drawCentered") public void drawCentered(String var1, int var2, int var3, int var4, int var5) { if (var1 != null) { @@ -434,7 +434,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("h") + @ObfuscatedName("w") @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 +495,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("v") + @ObfuscatedName("m") @Export("drawCenteredWave") public void drawCenteredWave(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { @@ -510,7 +510,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("drawCenteredWave2") public void drawCenteredWave2(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { @@ -527,7 +527,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("o") + @ObfuscatedName("a") @Export("drawCenteredShake") public void drawCenteredShake(String var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (var1 != null) { @@ -547,7 +547,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("av") + @ObfuscatedName("b") @Export("drawRandomAlphaAndSpacing") public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, int var5, int var6) { if (var1 != null) { @@ -568,7 +568,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("am") + @ObfuscatedName("ag") @Export("reset") void reset(int var1, int var2) { AbstractFont_strike = -1; @@ -582,38 +582,28 @@ public abstract class AbstractFont extends Rasterizer2D { AbstractFont_justificationCurrent = 0; } - @ObfuscatedName("ai") + @ObfuscatedName("at") @Export("decodeTag") void decodeTag(String var1) { try { - int var2; - String var3; if (var1.startsWith("col=")) { - var3 = var1.substring(4); - var2 = Ignored.parseIntCustomRadix(var3, 16, true); - AbstractFont_color = var2; + AbstractFont_color = GrandExchangeEvent.method74(var1.substring(4), 16); } else if (var1.equals("/col")) { AbstractFont_color = AbstractFont_previousColor; } else if (var1.startsWith("str=")) { - var3 = var1.substring(4); - var2 = Ignored.parseIntCustomRadix(var3, 16, true); - AbstractFont_strike = var2; + AbstractFont_strike = GrandExchangeEvent.method74(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=")) { - var3 = var1.substring(2); - var2 = Ignored.parseIntCustomRadix(var3, 16, true); - AbstractFont_underline = var2; + AbstractFont_underline = GrandExchangeEvent.method74(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 = Ignored.parseIntCustomRadix(var3, 16, true); - AbstractFont_shadow = var2; + AbstractFont_shadow = GrandExchangeEvent.method74(var1.substring(5), 16); } else if (var1.equals("shad")) { AbstractFont_shadow = 0; } else if (var1.equals("/shad")) { @@ -621,12 +611,12 @@ public abstract class AbstractFont extends Rasterizer2D { } else if (var1.equals("br")) { this.reset(AbstractFont_previousColor, AbstractFont_previousShadow); } - } catch (Exception var5) { + } catch (Exception var3) { } } - @ObfuscatedName("af") + @ObfuscatedName("ao") @Export("calculateLineJustification") void calculateLineJustification(String var1, int var2) { int var3 = 0; @@ -649,7 +639,7 @@ public abstract class AbstractFont extends Rasterizer2D { } - @ObfuscatedName("az") + @ObfuscatedName("av") @Export("draw0") void draw0(String var1, int var2, int var3) { var3 -= this.ascent; @@ -658,7 +648,7 @@ public abstract class AbstractFont extends Rasterizer2D { for (int var6 = 0; var6 < var1.length(); ++var6) { if (var1.charAt(var6) != 0) { - char var7 = (char)(class14.charToByteCp1252(var1.charAt(var6)) & 255); + char var7 = (char)(MenuAction.charToByteCp1252(var1.charAt(var6)) & 255); if (var7 == '<') { var4 = var6; } else { @@ -672,7 +662,7 @@ public abstract class AbstractFont extends Rasterizer2D { if (!var8.equals("gt")) { if (var8.startsWith("img=")) { try { - var9 = WallDecoration.parseInt(var8.substring(4)); + var9 = IgnoreList.parseInt(var8.substring(4)); IndexedSprite var10 = AbstractFont_modIconSprites[var9]; var10.drawAt(var2, var3 + this.ascent - var10.height); var2 += var10.width; @@ -738,7 +728,7 @@ public abstract class AbstractFont extends Rasterizer2D { } - @ObfuscatedName("aj") + @ObfuscatedName("an") @Export("drawWithOffsets0") void drawWithOffsets0(String var1, int var2, int var3, int[] var4, int[] var5) { var3 -= this.ascent; @@ -748,7 +738,7 @@ public abstract class AbstractFont extends Rasterizer2D { for (int var9 = 0; var9 < var1.length(); ++var9) { if (var1.charAt(var9) != 0) { - char var10 = (char)(class14.charToByteCp1252(var1.charAt(var9)) & 255); + char var10 = (char)(MenuAction.charToByteCp1252(var1.charAt(var9)) & 255); if (var10 == '<') { var6 = var9; } else { @@ -777,7 +767,7 @@ public abstract class AbstractFont extends Rasterizer2D { } ++var8; - var14 = WallDecoration.parseInt(var11.substring(4)); + var14 = IgnoreList.parseInt(var11.substring(4)); IndexedSprite var15 = AbstractFont_modIconSprites[var14]; var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height)); var2 += var15.width; @@ -856,8 +846,8 @@ public abstract class AbstractFont extends Rasterizer2D { } - @ObfuscatedName("d") - static int method5255(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) { + @ObfuscatedName("j") + static int method5336(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]; @@ -892,7 +882,7 @@ public abstract class AbstractFont extends Rasterizer2D { return -var13; } - @ObfuscatedName("g") + @ObfuscatedName("e") @Export("escapeBrackets") public static String escapeBrackets(String var0) { int var1 = var0.length(); @@ -921,7 +911,7 @@ public abstract class AbstractFont extends Rasterizer2D { return var6.toString(); } - @ObfuscatedName("an") + @ObfuscatedName("al") @Export("AbstractFont_drawGlyph") static void AbstractFont_drawGlyph(byte[] var0, int var1, int var2, int var3, int var4, int var5) { int var6 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; @@ -963,7 +953,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("at") + @ObfuscatedName("as") @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); @@ -1011,7 +1001,7 @@ public abstract class AbstractFont extends Rasterizer2D { } - @ObfuscatedName("as") + @ObfuscatedName("ad") @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; @@ -1053,7 +1043,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("ak") + @ObfuscatedName("ap") @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 220d334dfa..c10917b242 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("lg") +@ObfuscatedName("lf") @Implements("AbstractRasterProvider") public abstract class AbstractRasterProvider { - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("pixels") public int[] pixels; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -436554829 + intValue = 1812732741 ) @Export("width") public int width; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1168028289 + intValue = -828006161 ) @Export("height") public int height; @@ -26,26 +26,26 @@ public abstract class AbstractRasterProvider { protected AbstractRasterProvider() { } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "314023161" + garbageValue = "-978411495" ) @Export("drawFull") public abstract void drawFull(int var1, int var2); - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(IIIII)V", - garbageValue = "333545527" + garbageValue = "-2009002566" ) @Export("draw") public abstract void draw(int var1, int var2, int var3, int var4); - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1451326676" + garbageValue = "-934160158" ) @Export("apply") public final void apply() { diff --git a/runescape-client/src/main/java/AbstractSocket.java b/runescape-client/src/main/java/AbstractSocket.java index 838af9feb1..653dc6bd2e 100644 --- a/runescape-client/src/main/java/AbstractSocket.java +++ b/runescape-client/src/main/java/AbstractSocket.java @@ -4,67 +4,57 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kg") +@ObfuscatedName("ks") @Implements("AbstractSocket") public abstract class AbstractSocket { protected AbstractSocket() { } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1798752769" + signature = "(B)V", + garbageValue = "-75" ) @Export("close") public abstract void close(); - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "547465689" + garbageValue = "1827163357" ) @Export("readUnsignedByte") public abstract int readUnsignedByte() throws IOException; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "83" + signature = "(I)I", + garbageValue = "-1354053248" ) @Export("available") public abstract int available() throws IOException; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "156087109" + garbageValue = "-377412375" ) @Export("isAvailable") public abstract boolean isAvailable(int var1) throws IOException; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "([BIIB)I", - garbageValue = "100" + signature = "([BIII)I", + garbageValue = "2063129771" ) @Export("read") public abstract int read(byte[] var1, int var2, int var3) throws IOException; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "([BIII)V", - garbageValue = "638463675" + signature = "([BIIB)V", + garbageValue = "9" ) @Export("write") public abstract void write(byte[] var1, int var2, int var3) throws IOException; - - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "(I)[Lkk;", - garbageValue = "2143260840" - ) - @Export("ChatMode_values") - static PrivateChatMode[] ChatMode_values() { - return new PrivateChatMode[]{PrivateChatMode.field3790, PrivateChatMode.field3788, PrivateChatMode.field3793}; - } } diff --git a/runescape-client/src/main/java/AbstractSound.java b/runescape-client/src/main/java/AbstractSound.java index 0a176d81f0..4a55a07fb3 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("ds") +@ObfuscatedName("di") @Implements("AbstractSound") public abstract class AbstractSound extends Node { - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("position") int position; diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java index 72bdbbf7d4..1e77b4268a 100644 --- a/runescape-client/src/main/java/AbstractUserComparator.java +++ b/runescape-client/src/main/java/AbstractUserComparator.java @@ -4,20 +4,20 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("je") +@ObfuscatedName("jq") @Implements("AbstractUserComparator") public abstract class AbstractUserComparator implements Comparator { - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("nextComparator") Comparator nextComparator; protected AbstractUserComparator() { } - @ObfuscatedName("t") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Ljava/util/Comparator;B)V", - garbageValue = "102" + signature = "(Ljava/util/Comparator;I)V", + garbageValue = "-821671314" ) @Export("addComparator") final void addComparator(Comparator var1) { @@ -29,10 +29,10 @@ public abstract class AbstractUserComparator implements Comparator { } - @ObfuscatedName("q") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(Lju;Lju;I)I", - garbageValue = "760812985" + signature = "(Ljw;Ljw;B)I", + garbageValue = "-62" ) @Export("compareUser") protected final int compareUser(User var1, User var2) { @@ -42,4 +42,23 @@ public abstract class AbstractUserComparator implements Comparator { public boolean equals(Object var1) { return super.equals(var1); } + + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "(B)Z", + garbageValue = "0" + ) + @Export("isKeyDown") + public static final boolean isKeyDown() { + synchronized(KeyHandler.KeyHandler_instance) { + if (KeyHandler.field383 == KeyHandler.field381) { + return false; + } else { + class43.field361 = KeyHandler.field378[KeyHandler.field381]; + WorldMapIcon_0.field126 = KeyHandler.field377[KeyHandler.field381]; + KeyHandler.field381 = KeyHandler.field381 + 1 & 127; + return true; + } + } + } } diff --git a/runescape-client/src/main/java/AbstractWorldMapData.java b/runescape-client/src/main/java/AbstractWorldMapData.java index f7416629a7..b46ea7b7ef 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("l") +@ObfuscatedName("w") @Implements("AbstractWorldMapData") public abstract class AbstractWorldMapData { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -136523776 + intValue = 1748127744 ) @Export("regionXLow") int regionXLow; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1537560576 + intValue = 1366642688 ) @Export("regionYLow") int regionYLow; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -756440995 + intValue = -59240115 ) @Export("regionX") int regionX; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 2087702297 + intValue = 1519130577 ) @Export("regionY") int regionY; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -489051341 + intValue = -101530507 ) @Export("minPlane") int minPlane; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1972038717 + intValue = -1450874669 ) @Export("planes") int planes; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 156978213 + intValue = 460144759 ) @Export("groupId") int groupId; - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1797648451 + intValue = 977185489 ) @Export("fileId") int fileId; - @ObfuscatedName("x") + @ObfuscatedName("d") @Export("floorUnderlayIds") short[][][] floorUnderlayIds; - @ObfuscatedName("d") + @ObfuscatedName("z") @Export("floorOverlayIds") short[][][] floorOverlayIds; + @ObfuscatedName("n") + byte[][][] field163; + @ObfuscatedName("h") + byte[][][] field159; @ObfuscatedName("f") - byte[][][] field145; - @ObfuscatedName("c") - byte[][][] field156; - @ObfuscatedName("r") @ObfuscatedSignature( - signature = "[[[[Lo;" + signature = "[[[[Lb;" ) @Export("decorations") WorldMapDecoration[][][][] decorations; - @ObfuscatedName("y") - boolean field158; + @ObfuscatedName("s") + boolean field166; @ObfuscatedName("p") - boolean field159; + boolean field167; AbstractWorldMapData() { this.groupId = -1; this.fileId = -1; new LinkedList(); - this.field158 = false; - this.field159 = false; + this.field166 = false; + this.field167 = false; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lky;B)V", - garbageValue = "120" + signature = "(Lkz;I)V", + garbageValue = "-1969615810" ) @Export("readGeography") abstract void readGeography(Buffer var1); - @ObfuscatedName("n") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "-103" + signature = "(S)Z", + garbageValue = "2950" ) @Export("isFullyLoaded") boolean isFullyLoaded() { - return this.field158 && this.field159; + return this.field166 && this.field167; } - @ObfuscatedName("t") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lhz;I)V", - garbageValue = "-1580621275" + signature = "(Lhz;B)V", + garbageValue = "20" ) @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.field158 = true; - this.field159 = true; + this.field166 = true; + this.field167 = true; } } } - @ObfuscatedName("q") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "2145144649" + garbageValue = "-266968977" ) @Export("reset") void reset() { this.floorUnderlayIds = null; this.floorOverlayIds = null; - this.field145 = null; - this.field156 = null; + this.field163 = null; + this.field159 = null; this.decorations = null; - this.field158 = false; - this.field159 = false; + this.field166 = false; + this.field167 = false; } - @ObfuscatedName("x") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(IILky;I)V", - garbageValue = "1320309065" + signature = "(IILkz;I)V", + garbageValue = "1782766503" ) @Export("readTile") void readTile(int var1, int var2, Buffer var3) { int var4 = var3.readUnsignedByte(); if (var4 != 0) { if ((var4 & 1) != 0) { - this.method247(var1, var2, var3, var4); + this.method245(var1, var2, var3, var4); } else { - this.method259(var1, var2, var3, var4); + this.method240(var1, var2, var3, var4); } } } - @ObfuscatedName("d") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IILky;IB)V", - garbageValue = "85" + signature = "(IILkz;II)V", + garbageValue = "-1638058411" ) - void method247(int var1, int var2, Buffer var3, int var4) { + void method245(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("f") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IILky;IS)V", - garbageValue = "320" + signature = "(IILkz;II)V", + garbageValue = "-1194656986" ) - void method259(int var1, int var2, Buffer var3, int var4) { + void method240(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 (var10 != 0) { this.floorOverlayIds[var9][var1][var2] = (short)var10; var11 = var3.readUnsignedByte(); - this.field145[var9][var1][var2] = (byte)(var11 >> 2); - this.field156[var9][var1][var2] = (byte)(var11 & 3); + this.field163[var9][var1][var2] = (byte)(var11 >> 2); + this.field159[var9][var1][var2] = (byte)(var11 & 3); } } } @@ -203,7 +203,7 @@ public abstract class AbstractWorldMapData { WorldMapDecoration[] var14 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9]; for (var11 = 0; var11 < var9; ++var11) { - int var12 = var3.method5602(); + int var12 = var3.method5623(); int var13 = var3.readUnsignedByte(); var14[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); } @@ -213,111 +213,156 @@ public abstract class AbstractWorldMapData { } - @ObfuscatedName("c") + @ObfuscatedName("r") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "-88" + garbageValue = "35" ) @Export("getRegionX") int getRegionX() { return this.regionX; } - @ObfuscatedName("r") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "-79" + garbageValue = "-13" ) @Export("getRegionY") int getRegionY() { return this.regionY; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IS)Ljava/lang/String;", - garbageValue = "30202" + signature = "(B)V", + garbageValue = "79" ) - static String method278(int var0) { - return ""; + static void method254() { + Tiles.Tiles_minPlane = 99; + Tiles.field476 = new byte[4][104][104]; + class30.field257 = new byte[4][104][104]; + Tiles.field477 = new byte[4][104][104]; + HealthBar.field1089 = new byte[4][104][104]; + UserComparator3.field1961 = new int[4][105][105]; + Tiles.field473 = new byte[4][105][105]; + class160.field1977 = new int[105][105]; + UserComparator7.Tiles_hue = new int[104]; + TileItem.Tiles_saturation = new int[104]; + class1.Tiles_lightness = new int[104]; + class42.Tiles_hueMultiplier = new int[104]; + Tiles.field488 = new int[104]; } - @ObfuscatedName("gb") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1514757872" + signature = "([Lbb;II[I[IB)V", + garbageValue = "-40" ) - static final void method264(int var0) { - int[] var1 = ParamDefinition.sceneMinimapSprite.pixels; - int var2 = var1.length; + @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; - int var3; - for (var3 = 0; var3 < var2; ++var3) { - var1[var3] = 0; - } + while (var5 < var6) { + boolean var9 = true; - int var4; - int var5; - for (var3 = 1; var3 < 103; ++var3) { - var4 = (103 - var3) * 2048 + 24628; + int var10; + int var11; + int var12; + do { + --var6; - for (var5 = 1; var5 < 103; ++var5) { - if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { - Player.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3); - } + 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 (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { - Player.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3); - } + 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; + } - var4 += 4; - } - } + if (var11 != var12) { + if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { + var9 = false; + } + break; + } - var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); - var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; - ParamDefinition.sceneMinimapSprite.setRaster(); - - int var6; - for (var5 = 1; var5 < 103; ++var5) { - for (var6 = 1; var6 < 103; ++var6) { - if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { - UserComparator10.drawObject(var0, var6, var5, var3, var4); - } - - if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { - UserComparator10.drawObject(var0 + 1, var6, var5, var3, var4); - } - } - } - - Client.mapIconCount = 0; - - for (var5 = 0; var5 < 104; ++var5) { - for (var6 = 0; var6 < 104; ++var6) { - long var7 = Player.scene.getFloorDecorationTag(ItemContainer.plane, var5, var6); - if (var7 != 0L) { - int var9 = BoundaryObject.Entity_unpackID(var7); - int var10 = class215.getObjectDefinition(var9).mapIconId; - if (var10 >= 0) { - Client.mapIcons[Client.mapIconCount] = WorldMapData_0.WorldMapElement_get(var10).getSpriteBool(false); - Client.mapIconXs[Client.mapIconCount] = var5; - Client.mapIconYs[Client.mapIconCount] = var6; - ++Client.mapIconCount; + 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); } - SpotAnimationDefinition.rasterProvider.apply(); - } - - @ObfuscatedName("kp") - @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "-61" - ) - static void method272(int var0) { - Client.oculusOrbState = var0; } } diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index c239979887..7311729de1 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -3,85 +3,85 @@ 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("as") +@ObfuscatedName("ap") @Implements("AbstractWorldMapIcon") public abstract class AbstractWorldMapIcon { - @ObfuscatedName("bi") + @ObfuscatedName("la") @ObfuscatedSignature( - signature = "Llq;" + signature = "Lhy;" ) - @Export("worldSelectLeftSprite") - static IndexedSprite worldSelectLeftSprite; - @ObfuscatedName("t") + static Widget field292; + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lhd;" + signature = "Lhj;" ) @Export("coord2") public final Coord coord2; - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lhd;" + signature = "Lhj;" ) @Export("coord1") public final Coord coord1; - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 318036895 + intValue = 870912939 ) @Export("screenX") int screenX; - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1985838427 + intValue = -1786217753 ) @Export("screenY") int screenY; @ObfuscatedSignature( - signature = "(Lhd;Lhd;)V" + signature = "(Lhj;Lhj;)V" ) AbstractWorldMapIcon(Coord var1, Coord var2) { this.coord1 = var1; this.coord2 = var2; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "78" + signature = "(I)I", + garbageValue = "861849893" ) @Export("getElement") public abstract int getElement(); - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(B)Lai;", - garbageValue = "1" + signature = "(I)Lao;", + garbageValue = "1066707711" ) @Export("getLabel") abstract WorldMapLabel getLabel(); - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1930584854" + garbageValue = "-1386026878" ) @Export("getSubWidth") abstract int getSubWidth(); - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-56" + signature = "(I)I", + garbageValue = "174908718" ) @Export("getSubHeight") abstract int getSubHeight(); - @ObfuscatedName("g") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(III)Z", - garbageValue = "505598061" + signature = "(IIB)Z", + garbageValue = "1" ) @Export("fitsScreen") boolean fitsScreen(int var1, int var2) { @@ -92,36 +92,35 @@ public abstract class AbstractWorldMapIcon { } } - @ObfuscatedName("e") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(S)Z", - garbageValue = "256" + signature = "(I)Z", + garbageValue = "1217113364" ) @Export("hasValidElement") boolean hasValidElement() { return this.getElement() >= 0; } - @ObfuscatedName("z") + @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "(IIS)Z", - garbageValue = "-26498" + signature = "(III)Z", + garbageValue = "682818721" ) @Export("elementFitsScreen") boolean elementFitsScreen(int var1, int var2) { if (!this.hasValidElement()) { return false; } else { - WorldMapElement var3 = WorldMapData_0.WorldMapElement_get(this.getElement()); + WorldMapElement var3 = WorldMapSection1.WorldMapElement_get(this.getElement()); int var4 = this.getSubWidth(); int var5 = this.getSubHeight(); switch(var3.horizontalAlignment.value) { case 0: - if (var1 >= this.screenX && var1 < var4 + this.screenX) { - break; + if (var1 < this.screenX || var1 >= var4 + this.screenX) { + return false; } - - return false; + break; case 1: if (var1 >= this.screenX - var4 / 2 && var1 <= var4 / 2 + this.screenX) { break; @@ -136,18 +135,17 @@ public abstract class AbstractWorldMapIcon { switch(var3.verticalAlignment.value) { case 0: - if (var2 >= this.screenY - var5 / 2 && var2 <= var5 / 2 + this.screenY) { - break; + if (var2 < this.screenY || var2 >= var5 + this.screenY) { + return false; } - - return false; + break; case 1: if (var2 <= this.screenY - var5 || var2 > this.screenY) { return false; } break; case 2: - if (var2 < this.screenY || var2 >= var5 + this.screenY) { + if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) { return false; } } @@ -156,10 +154,10 @@ public abstract class AbstractWorldMapIcon { } } - @ObfuscatedName("w") + @ObfuscatedName("at") @ObfuscatedSignature( - signature = "(IIB)Z", - garbageValue = "66" + signature = "(IIS)Z", + garbageValue = "3172" ) @Export("labelFitsScreen") boolean labelFitsScreen(int var1, int var2) { @@ -173,15 +171,91 @@ public abstract class AbstractWorldMapIcon { } } + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(B)I", + garbageValue = "6" + ) + static int method587() { + return 11; + } + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "261353448" + signature = "(ILcu;ZI)I", + garbageValue = "131093374" ) - static final void method591(String var0) { - StringBuilder var10000 = (new StringBuilder()).append(var0); - Object var10001 = null; - String var1 = var10000.append(" is already on your ignore list").toString(); - DirectByteArrayCopier.addGameMessage(30, "", var1); + static int method576(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? UserComparator9.field1941 : MidiPcmStream.field2410; + if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = WorldMapElement.method4390(class60.getWidgetClickMask(var3)); + return 1; + } else if (var0 != ScriptOpcodes.CC_GETOP) { + if (var0 == ScriptOpcodes.CC_GETOPBASE) { + if (var3.dataText == null) { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3.dataText; + } + + return 1; + } else { + return 2; + } + } else { + int var4 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + --var4; + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3.actions[var4]; + } else { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } + } + + @ObfuscatedName("he") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "-1120874637" + ) + static final void method572(int var0) { + if (var0 >= 0) { + int var1 = Client.menuArguments1[var0]; + int var2 = Client.menuArguments2[var0]; + int var3 = Client.menuOpcodes[var0]; + int var4 = Client.menuIdentifiers[var0]; + String var5 = Client.menuActions[var0]; + String var6 = Client.menuTargets[var0]; + EnumDefinition.menuAction(var1, var2, var3, var4, var5, var6, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); + } + } + + @ObfuscatedName("ii") + @ObfuscatedSignature( + signature = "(IIIIIIIIB)V", + garbageValue = "-109" + ) + @Export("drawWidgets") + static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + if (TaskHandler.loadInterface(var0)) { + SoundCache.field1410 = null; + MusicPatchPcmStream.drawInterface(class289.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); + if (SoundCache.field1410 != null) { + MusicPatchPcmStream.drawInterface(SoundCache.field1410, -1412584499, var1, var2, var3, var4, WorldMapSection0.field138, GrandExchangeOfferNameComparator.field79, var7); + SoundCache.field1410 = null; + } + + } else { + if (var7 != -1) { + Client.field827[var7] = true; + } else { + for (int var8 = 0; var8 < 100; ++var8) { + Client.field827[var8] = true; + } + } + + } } } diff --git a/runescape-client/src/main/java/AccessFile.java b/runescape-client/src/main/java/AccessFile.java index e397cd4d9b..96ab09718e 100644 --- a/runescape-client/src/main/java/AccessFile.java +++ b/runescape-client/src/main/java/AccessFile.java @@ -9,23 +9,21 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mm") +@ObfuscatedName("mr") @Implements("AccessFile") public final class AccessFile { - @ObfuscatedName("u") - static byte[][][] field4061; - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("file") RandomAccessFile file; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - longValue = 6204556434071022947L + longValue = -7378543884552627951L ) @Export("maxSize") final long maxSize; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - longValue = 5275749299961116233L + longValue = 8243536028903450769L ) @Export("offset") long offset; @@ -51,17 +49,17 @@ public final class AccessFile { this.file.seek(0L); } - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("seek") final void seek(long var1) throws IOException { this.file.seek(var1); this.offset = var1; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "160189816" + garbageValue = "1256704695" ) @Export("write") public final void write(byte[] var1, int var2, int var3) throws IOException { @@ -75,20 +73,20 @@ public final class AccessFile { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "18" + garbageValue = "-69" ) @Export("close") public final void close() throws IOException { this.closeSync(false); } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(ZI)V", - garbageValue = "1818151820" + garbageValue = "2108341373" ) @Export("closeSync") public final void closeSync(boolean var1) throws IOException { @@ -106,20 +104,20 @@ public final class AccessFile { } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(I)J", - garbageValue = "2071750719" + signature = "(S)J", + garbageValue = "-3662" ) @Export("length") public final long length() throws IOException { return this.file.length(); } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "([BIII)I", - garbageValue = "1749187322" + garbageValue = "-2055107083" ) @Export("read") public final int read(byte[] var1, int var2, int var3) throws IOException { @@ -131,22 +129,6 @@ public final class AccessFile { return var4; } - protected void abi() throws Throwable { - if (this.file != null) { - System.out.println(""); - this.close(); - } - - } - - protected void abt() throws Throwable { - if (this.file != null) { - System.out.println(""); - this.close(); - } - - } - protected void finalize() throws Throwable { if (this.file != null) { System.out.println(""); @@ -154,4 +136,12 @@ public final class AccessFile { } } + + protected void aaj() throws Throwable { + if (this.file != null) { + System.out.println(""); + this.close(); + } + + } } diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index a44342df20..71a9f0bd7a 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -4,327 +4,328 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bu") +@ObfuscatedName("be") @Implements("Actor") public abstract class Actor extends Entity { - @ObfuscatedName("jm") + @ObfuscatedName("sy") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lbz;" ) - static Widget field978; - @ObfuscatedName("af") + @Export("clientPreferences") + static ClientPreferences clientPreferences; + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 1884598383 + intValue = -78439701 ) @Export("x") int x; - @ObfuscatedName("az") - @ObfuscatedGetter( - intValue = -1632465489 - ) - @Export("y") - int y; - @ObfuscatedName("aj") - @ObfuscatedGetter( - intValue = -1372261855 - ) - @Export("rotation") - int rotation; @ObfuscatedName("an") @Export("isWalking") boolean isWalking; - @ObfuscatedName("at") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -1570594880 + intValue = 2024233319 + ) + @Export("y") + int y; + @ObfuscatedName("as") + @ObfuscatedGetter( + intValue = -1344698339 + ) + @Export("rotation") + int rotation; + @ObfuscatedName("ad") + @ObfuscatedGetter( + intValue = 326208199 ) @Export("size") int size; - @ObfuscatedName("as") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 608219797 + intValue = 1320061547 ) @Export("playerCycle") int playerCycle; - @ObfuscatedName("ak") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -1134168353 + intValue = 1628814929 ) @Export("readySequence") int readySequence; - @ObfuscatedName("ao") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -1794207509 + intValue = -1587131503 ) @Export("turnLeftSequence") int turnLeftSequence; - @ObfuscatedName("ac") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 1807906031 + intValue = 38036755 ) @Export("turnRightSequence") int turnRightSequence; - @ObfuscatedName("ar") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 821150937 + intValue = 195654645 ) @Export("walkSequence") int walkSequence; - @ObfuscatedName("au") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -346334565 + intValue = 654548911 ) @Export("walkBackSequence") int walkBackSequence; - @ObfuscatedName("ax") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 2122224863 + intValue = 2066786939 ) @Export("walkLeftSequence") int walkLeftSequence; - @ObfuscatedName("ag") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -1158599439 + intValue = 1924266197 ) @Export("walkRightSequence") int walkRightSequence; - @ObfuscatedName("aa") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = 1650224251 + intValue = 146870157 ) @Export("runSequence") int runSequence; - @ObfuscatedName("ap") + @ObfuscatedName("aa") @Export("overheadText") String overheadText; @ObfuscatedName("aq") @Export("isAutoChatting") boolean isAutoChatting; - @ObfuscatedName("ay") - boolean field926; - @ObfuscatedName("ad") + @ObfuscatedName("ar") + boolean field956; + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 319208211 + intValue = -1539638005 ) @Export("overheadTextCyclesRemaining") int overheadTextCyclesRemaining; - @ObfuscatedName("al") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -1527605305 + intValue = 291511261 ) @Export("overheadTextColor") int overheadTextColor; - @ObfuscatedName("ah") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = 611459225 + intValue = -2008458145 ) @Export("overheadTextEffect") int overheadTextEffect; @ObfuscatedName("aw") @Export("hitSplatCount") byte hitSplatCount; - @ObfuscatedName("ae") + @ObfuscatedName("au") @Export("hitSplatTypes") int[] hitSplatTypes; - @ObfuscatedName("bk") + @ObfuscatedName("bg") @Export("hitSplatValues") int[] hitSplatValues; - @ObfuscatedName("bw") + @ObfuscatedName("bn") @Export("hitSplatCycles") int[] hitSplatCycles; - @ObfuscatedName("bo") + @ObfuscatedName("bk") @Export("hitSplatTypes2") int[] hitSplatTypes2; - @ObfuscatedName("bn") + @ObfuscatedName("bp") @Export("hitSplatValues2") int[] hitSplatValues2; - @ObfuscatedName("bp") + @ObfuscatedName("bu") @ObfuscatedSignature( - signature = "Ljp;" + signature = "Ljd;" ) @Export("healthBars") IterableNodeDeque healthBars; - @ObfuscatedName("bz") + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = -666406559 + intValue = 366180583 ) @Export("targetIndex") int targetIndex; - @ObfuscatedName("bh") + @ObfuscatedName("bv") @Export("false0") boolean false0; - @ObfuscatedName("bv") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = 1338126615 + intValue = 1358121837 ) - int field946; - @ObfuscatedName("bj") + int field945; + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = 221299857 + intValue = 566824475 ) @Export("movementSequence") int movementSequence; - @ObfuscatedName("bq") + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = 669631645 + intValue = 1646709317 ) @Export("movementFrame") int movementFrame; - @ObfuscatedName("by") + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = 1550152873 + intValue = -2010447121 ) @Export("movementFrameCycle") int movementFrameCycle; - @ObfuscatedName("bs") + @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = 236934275 + intValue = -836151055 ) @Export("sequence") int sequence; - @ObfuscatedName("bi") + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = 1446546153 + intValue = -1593302173 ) @Export("sequenceFrame") int sequenceFrame; - @ObfuscatedName("bf") + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = 1633380255 + intValue = -1376532773 ) @Export("sequenceFrameCycle") int sequenceFrameCycle; - @ObfuscatedName("bd") + @ObfuscatedName("by") @ObfuscatedGetter( - intValue = -159449897 + intValue = -63500945 ) @Export("sequenceDelay") int sequenceDelay; - @ObfuscatedName("br") + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = 1360808075 + intValue = -303610771 ) - int field964; - @ObfuscatedName("bm") + int field924; + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = -1209932375 + intValue = -244355827 ) @Export("spotAnimation") int spotAnimation; - @ObfuscatedName("bu") + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = 1531272561 + intValue = -1682160085 ) @Export("spotAnimationFrame") int spotAnimationFrame; - @ObfuscatedName("bb") + @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = 1785825301 + intValue = 377223135 ) @Export("spotAnimationFrameCycle") int spotAnimationFrameCycle; - @ObfuscatedName("bl") + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = -63871325 + intValue = 249618635 ) - int field958; - @ObfuscatedName("bt") + int field957; + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = 130403319 + intValue = -324063411 ) @Export("heightOffset") int heightOffset; - @ObfuscatedName("bx") + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = -446723661 + intValue = -1424150703 ) - int field960; - @ObfuscatedName("ba") - @ObfuscatedGetter( - intValue = 1274756773 - ) - int field961; - @ObfuscatedName("bg") - @ObfuscatedGetter( - intValue = 1683717067 - ) - int field954; - @ObfuscatedName("be") - @ObfuscatedGetter( - intValue = -1907051737 - ) - int field963; + int field959; @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = -356117007 + intValue = 1789167897 ) - int field941; - @ObfuscatedName("ce") + int field960; + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = -1458171567 + intValue = 1809872347 + ) + int field961; + @ObfuscatedName("bx") + @ObfuscatedGetter( + intValue = -196012985 + ) + int field962; + @ObfuscatedName("bq") + @ObfuscatedGetter( + intValue = -854056355 + ) + int field963; + @ObfuscatedName("cb") + @ObfuscatedGetter( + intValue = 1429248265 + ) + int field964; + @ObfuscatedName("ct") + @ObfuscatedGetter( + intValue = 152429931 ) int field965; - @ObfuscatedName("ci") + @ObfuscatedName("ch") @ObfuscatedGetter( - intValue = 716061265 - ) - int field966; - @ObfuscatedName("ck") - @ObfuscatedGetter( - intValue = -1132398517 + intValue = 766274575 ) @Export("npcCycle") int npcCycle; @ObfuscatedName("cc") @ObfuscatedGetter( - intValue = -2023452361 + intValue = -1552779633 ) @Export("defaultHeight") int defaultHeight; - @ObfuscatedName("cd") + @ObfuscatedName("cv") @ObfuscatedGetter( - intValue = 1438228269 + intValue = -565463509 ) @Export("orientation") int orientation; - @ObfuscatedName("cf") + @ObfuscatedName("cr") @ObfuscatedGetter( - intValue = 1512808789 + intValue = 715669973 ) - int field970; - @ObfuscatedName("cw") + int field976; + @ObfuscatedName("cl") @ObfuscatedGetter( - intValue = -1629005053 + intValue = -1597126945 ) - int field971; - @ObfuscatedName("cj") + int field953; + @ObfuscatedName("ca") @ObfuscatedGetter( - intValue = -1777881517 + intValue = 12984639 ) @Export("pathLength") int pathLength; - @ObfuscatedName("cp") + @ObfuscatedName("ck") @Export("pathX") int[] pathX; - @ObfuscatedName("cu") + @ObfuscatedName("cm") @Export("pathY") int[] pathY; - @ObfuscatedName("cm") + @ObfuscatedName("ce") @Export("pathTraversed") byte[] pathTraversed; - @ObfuscatedName("cb") + @ObfuscatedName("cn") @ObfuscatedGetter( - intValue = -1405217673 + intValue = 1459296501 ) - int field976; - @ObfuscatedName("ch") + int field975; + @ObfuscatedName("cj") @ObfuscatedGetter( - intValue = -1913917699 + intValue = 1855180457 ) - int field947; + int field969; Actor() { this.isWalking = false; - this.size = 64; + this.size = 1; this.readySequence = -1; this.turnLeftSequence = -1; this.turnRightSequence = -1; @@ -334,7 +335,7 @@ public abstract class Actor extends Entity { this.walkRightSequence = -1; this.runSequence = -1; this.overheadText = null; - this.field926 = false; + this.field956 = false; this.overheadTextCyclesRemaining = 100; this.overheadTextColor = 0; this.overheadTextEffect = 0; @@ -347,7 +348,7 @@ public abstract class Actor extends Entity { this.healthBars = new IterableNodeDeque(); this.targetIndex = -1; this.false0 = false; - this.field946 = -1; + this.field945 = -1; this.movementSequence = -1; this.movementFrame = 0; this.movementFrameCycle = 0; @@ -355,46 +356,46 @@ public abstract class Actor extends Entity { this.sequenceFrame = 0; this.sequenceFrameCycle = 0; this.sequenceDelay = 0; - this.field964 = 0; + this.field924 = 0; this.spotAnimation = -1; this.spotAnimationFrame = 0; this.spotAnimationFrameCycle = 0; this.npcCycle = 0; this.defaultHeight = 200; - this.field970 = 0; - this.field971 = 32; + this.field976 = 0; + this.field953 = 32; this.pathLength = 0; this.pathX = new int[10]; this.pathY = new int[10]; this.pathTraversed = new byte[10]; - this.field976 = 0; - this.field947 = 0; + this.field975 = 0; + this.field969 = 0; } - @ObfuscatedName("r") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(B)Z", - garbageValue = "-110" + garbageValue = "93" ) @Export("isVisible") boolean isVisible() { return false; } - @ObfuscatedName("aa") + @ObfuscatedName("au") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1059295249" + garbageValue = "845208492" ) - final void method1671() { + final void method1699() { this.pathLength = 0; - this.field947 = 0; + this.field969 = 0; } - @ObfuscatedName("ap") + @ObfuscatedName("bg") @ObfuscatedSignature( signature = "(IIIIIII)V", - garbageValue = "888431256" + garbageValue = "-2027410563" ) @Export("addHitSplat") final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) { @@ -414,9 +415,9 @@ public abstract class Actor extends Entity { int var10 = -1; int var11 = 0; if (var1 >= 0) { - HitSplatDefinition var12 = StructDefinition.HitSplatDefinition_get(var1); - var10 = var12.field3323; - var11 = var12.field3314; + HitSplatDefinition var12 = Interpreter.HitSplatDefinition_get(var1); + var10 = var12.field3315; + var11 = var12.field3306; } int var14; @@ -472,90 +473,267 @@ public abstract class Actor extends Entity { } } - @ObfuscatedName("aq") + @ObfuscatedName("bn") @ObfuscatedSignature( signature = "(IIIIIIS)V", - garbageValue = "-25412" + garbageValue = "199" ) @Export("addHealthBar") final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) { - HealthBarDefinition var7 = GrandExchangeOfferUnitPriceComparator.HealthBarDefinition_get(var1); - HealthBar var8 = null; - HealthBar var9 = null; - int var10 = var7.int2; - int var11 = 0; + HealthBarDefinition var8 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1); + HealthBarDefinition var7; + if (var8 != null) { + var7 = var8; + } else { + byte[] var9 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var1); + var8 = new HealthBarDefinition(); + if (var9 != null) { + var8.decode(new Buffer(var9)); + } - HealthBar var12; - for (var12 = (HealthBar)this.healthBars.last(); var12 != null; var12 = (HealthBar)this.healthBars.previous()) { - ++var11; - if (var12.definition.field3264 == var7.field3264) { - var12.put(var2 + var4, var5, var6, var3); + HealthBarDefinition.HealthBarDefinition_cached.put(var8, (long)var1); + var7 = var8; + } + + var8 = var7; + HealthBar var14 = null; + HealthBar var10 = null; + int var11 = var7.int2; + int var12 = 0; + + HealthBar var13; + for (var13 = (HealthBar)this.healthBars.last(); var13 != null; var13 = (HealthBar)this.healthBars.previous()) { + ++var12; + if (var13.definition.field3253 == var8.field3253) { + var13.put(var2 + var4, var5, var6, var3); return; } - if (var12.definition.int1 <= var7.int1) { - var8 = var12; + if (var13.definition.int1 <= var8.int1) { + var14 = var13; } - if (var12.definition.int2 > var10) { - var9 = var12; - var10 = var12.definition.int2; + if (var13.definition.int2 > var11) { + var10 = var13; + var11 = var13.definition.int2; } } - if (var9 != null || var11 < 4) { - var12 = new HealthBar(var7); - if (var8 == null) { - this.healthBars.addLast(var12); + if (var10 != null || var12 < 4) { + var13 = new HealthBar(var8); + if (var14 == null) { + this.healthBars.addLast(var13); } else { - IterableNodeDeque.IterableNodeDeque_addBefore(var12, var8); + IterableNodeDeque.IterableNodeDeque_addBefore(var13, var14); } - var12.put(var2 + var4, var5, var6, var3); - if (var11 >= 4) { - var9.remove(); + var13.put(var2 + var4, var5, var6, var3); + if (var12 >= 4) { + var10.remove(); } } } - @ObfuscatedName("ay") + @ObfuscatedName("bk") @ObfuscatedSignature( signature = "(IB)V", - garbageValue = "1" + garbageValue = "99" ) @Export("removeHealthBar") final void removeHealthBar(int var1) { - HealthBarDefinition var2 = GrandExchangeOfferUnitPriceComparator.HealthBarDefinition_get(var1); + HealthBarDefinition var3 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1); + HealthBarDefinition var2; + if (var3 != null) { + var2 = var3; + } else { + byte[] var4 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var1); + var3 = new HealthBarDefinition(); + if (var4 != null) { + var3.decode(new Buffer(var4)); + } - for (HealthBar var3 = (HealthBar)this.healthBars.last(); var3 != null; var3 = (HealthBar)this.healthBars.previous()) { - if (var2 == var3.definition) { - var3.remove(); + HealthBarDefinition.HealthBarDefinition_cached.put(var3, (long)var1); + var2 = var3; + } + + var3 = var2; + + for (HealthBar var5 = (HealthBar)this.healthBars.last(); var5 != null; var5 = (HealthBar)this.healthBars.previous()) { + if (var3 == var5.definition) { + var5.remove(); return; } } } - @ObfuscatedName("j") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(II)Liz;", - garbageValue = "505249630" + signature = "(CI)Z", + garbageValue = "-599596211" ) - @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)); + @Export("isDigit") + public static boolean isDigit(char var0) { + return var0 >= '0' && var0 <= '9'; + } + + @ObfuscatedName("gk") + @ObfuscatedSignature( + signature = "(IIIII)V", + garbageValue = "1542615577" + ) + static final void method1704(int var0, int var1, int var2, int var3) { + Client.overheadTextCount = 0; + boolean var4 = false; + int var5 = -1; + int var6 = -1; + int var7 = Players.Players_count; + int[] var8 = Players.Players_indices; + + int var9; + for (var9 = 0; var9 < var7 + Client.npcCount; ++var9) { + Object var10; + if (var9 < var7) { + var10 = Client.players[var8[var9]]; + if (var8[var9] == Client.combatTargetPlayerIndex) { + var4 = true; + var5 = var9; + continue; + } + + if (var10 == Varps.localPlayer) { + var6 = var9; + continue; + } + } else { + var10 = Client.npcs[Client.npcIndices[var9 - var7]]; } - InvDefinition.InvDefinition_cached.put(var1, (long)var0); - return var1; + VerticalAlignment.drawActor2d((Actor)var10, var9, var0, var1, var2, var3); } + + if (Client.renderSelf && var6 != -1) { + VerticalAlignment.drawActor2d(Varps.localPlayer, var6, var0, var1, var2, var3); + } + + if (var4) { + VerticalAlignment.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var5, var0, var1, var2, var3); + } + + for (var9 = 0; var9 < Client.overheadTextCount; ++var9) { + int var19 = Client.overheadTextXs[var9]; + int var11 = Client.overheadTextYs[var9]; + int var12 = Client.overheadTextXOffsets[var9]; + int var13 = Client.overheadTextAscents[var9]; + boolean var14 = true; + + while (var14) { + var14 = false; + + for (int var15 = 0; var15 < var9; ++var15) { + if (var11 + 2 > Client.overheadTextYs[var15] - Client.overheadTextAscents[var15] && var11 - var13 < Client.overheadTextYs[var15] + 2 && var19 - var12 < Client.overheadTextXs[var15] + Client.overheadTextXOffsets[var15] && var12 + var19 > Client.overheadTextXs[var15] - Client.overheadTextXOffsets[var15] && Client.overheadTextYs[var15] - Client.overheadTextAscents[var15] < var11) { + var11 = Client.overheadTextYs[var15] - Client.overheadTextAscents[var15]; + var14 = true; + } + } + } + + Client.viewportTempX = Client.overheadTextXs[var9]; + Client.viewportTempY = Client.overheadTextYs[var9] = var11; + String var20 = Client.overheadText[var9]; + if (Client.chatEffects == 0) { + int var16 = 16776960; + if (Client.overheadTextColors[var9] < 6) { + var16 = Client.field838[Client.overheadTextColors[var9]]; + } + + if (Client.overheadTextColors[var9] == 6) { + var16 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; + } + + if (Client.overheadTextColors[var9] == 7) { + var16 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; + } + + if (Client.overheadTextColors[var9] == 8) { + var16 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016; + } + + int var17; + if (Client.overheadTextColors[var9] == 9) { + var17 = 150 - Client.overheadTextCyclesRemaining[var9]; + if (var17 < 50) { + var16 = var17 * 1280 + 16711680; + } else if (var17 < 100) { + var16 = 16776960 - (var17 - 50) * 327680; + } else if (var17 < 150) { + var16 = (var17 - 100) * 5 + 65280; + } + } + + if (Client.overheadTextColors[var9] == 10) { + var17 = 150 - Client.overheadTextCyclesRemaining[var9]; + if (var17 < 50) { + var16 = var17 * 5 + 16711680; + } else if (var17 < 100) { + var16 = 16711935 - (var17 - 50) * 327680; + } else if (var17 < 150) { + var16 = (var17 - 100) * 327680 + 255 - (var17 - 100) * 5; + } + } + + if (Client.overheadTextColors[var9] == 11) { + var17 = 150 - Client.overheadTextCyclesRemaining[var9]; + if (var17 < 50) { + var16 = 16777215 - var17 * 327685; + } else if (var17 < 100) { + var16 = (var17 - 50) * 327685 + 65280; + } else if (var17 < 150) { + var16 = 16777215 - (var17 - 100) * 327680; + } + } + + if (Client.overheadTextEffects[var9] == 0) { + HealthBar.fontBold12.drawCentered(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0); + } + + if (Client.overheadTextEffects[var9] == 1) { + HealthBar.fontBold12.drawCenteredWave(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var9] == 2) { + HealthBar.fontBold12.drawCenteredWave2(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var9] == 3) { + HealthBar.fontBold12.drawCenteredShake(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var9]); + } + + if (Client.overheadTextEffects[var9] == 4) { + var17 = (150 - Client.overheadTextCyclesRemaining[var9]) * (HealthBar.fontBold12.stringWidth(var20) + 100) / 150; + Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); + HealthBar.fontBold12.draw(var20, var0 + Client.viewportTempX + 50 - var17, Client.viewportTempY + var1, var16, 0); + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); + } + + if (Client.overheadTextEffects[var9] == 5) { + var17 = 150 - Client.overheadTextCyclesRemaining[var9]; + int var18 = 0; + if (var17 < 25) { + var18 = var17 - 25; + } else if (var17 > 125) { + var18 = var17 - 125; + } + + Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - HealthBar.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); + HealthBar.fontBold12.drawCentered(var20, var0 + Client.viewportTempX, var18 + Client.viewportTempY + var1, var16, 0); + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); + } + } else { + HealthBar.fontBold12.drawCentered(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); + } + } + } } diff --git a/runescape-client/src/main/java/Animation.java b/runescape-client/src/main/java/Animation.java index 2f5a6106ea..8daba36e3f 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("di") +@ObfuscatedName("dx") @Implements("Animation") public class Animation { - @ObfuscatedName("s") - static int[] field1619; - @ObfuscatedName("j") - static int[] field1615; - @ObfuscatedName("i") - static int[] field1624; - @ObfuscatedName("k") - static int[] field1617; - @ObfuscatedName("u") + @ObfuscatedName("c") + static int[] field1603; + @ObfuscatedName("x") + static int[] field1612; + @ObfuscatedName("t") + static int[] field1604; + @ObfuscatedName("g") + static int[] field1602; + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Lex;" + signature = "Len;" ) @Export("skeleton") Skeleton skeleton; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("transformCount") int transformCount; - @ObfuscatedName("t") + @ObfuscatedName("j") @Export("transformSkeletonLabels") int[] transformSkeletonLabels; - @ObfuscatedName("q") + @ObfuscatedName("v") @Export("transformXs") int[] transformXs; - @ObfuscatedName("x") + @ObfuscatedName("d") @Export("transformYs") int[] transformYs; - @ObfuscatedName("d") + @ObfuscatedName("z") @Export("transformZs") int[] transformZs; - @ObfuscatedName("f") + @ObfuscatedName("n") @Export("hasAlphaTransform") boolean hasAlphaTransform; static { - field1619 = new int[500]; - field1615 = new int[500]; - field1624 = new int[500]; - field1617 = new int[500]; + field1603 = new int[500]; + field1612 = new int[500]; + field1604 = new int[500]; + field1602 = new int[500]; } @ObfuscatedSignature( - signature = "([BLex;)V" + signature = "([BLen;)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) { - field1619[var7] = var10; - field1615[var7] = 0; - field1624[var7] = 0; - field1617[var7] = 0; + field1603[var7] = var10; + field1612[var7] = 0; + field1604[var7] = 0; + field1602[var7] = 0; ++var7; break; } } } - field1619[var7] = var8; + field1603[var7] = var8; short var11 = 0; if (this.skeleton.transformTypes[var8] == 3) { var11 = 128; } if ((var9 & 1) != 0) { - field1615[var7] = var4.readShortSmart(); + field1612[var7] = var4.readShortSmart(); } else { - field1615[var7] = var11; + field1612[var7] = var11; } if ((var9 & 2) != 0) { - field1624[var7] = var4.readShortSmart(); + field1604[var7] = var4.readShortSmart(); } else { - field1624[var7] = var11; + field1604[var7] = var11; } if ((var9 & 4) != 0) { - field1617[var7] = var4.readShortSmart(); + field1602[var7] = var4.readShortSmart(); } else { - field1617[var7] = var11; + field1602[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] = field1619[var8]; - this.transformXs[var8] = field1615[var8]; - this.transformYs[var8] = field1624[var8]; - this.transformZs[var8] = field1617[var8]; + this.transformSkeletonLabels[var8] = field1603[var8]; + this.transformXs[var8] = field1612[var8]; + this.transformYs[var8] = field1604[var8]; + this.transformZs[var8] = field1602[var8]; } } diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java index 7eac00d61a..3ebb1e913a 100644 --- a/runescape-client/src/main/java/Archive.java +++ b/runescape-client/src/main/java/Archive.java @@ -5,88 +5,88 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("id") +@ObfuscatedName("io") @Implements("Archive") public class Archive extends AbstractArchive { - @ObfuscatedName("ai") + @ObfuscatedName("ao") @Export("Archive_crc") static CRC32 Archive_crc; - @ObfuscatedName("h") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lkv;" + signature = "Lkx;" ) @Export("archiveDisk") ArchiveDisk archiveDisk; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lkv;" + signature = "Lkx;" ) @Export("masterDisk") ArchiveDisk masterDisk; - @ObfuscatedName("m") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1228227843 + intValue = 1156949557 ) @Export("index") int index; - @ObfuscatedName("o") - volatile boolean field3132; - @ObfuscatedName("av") - boolean field3133; - @ObfuscatedName("am") + @ObfuscatedName("b") + volatile boolean field3128; + @ObfuscatedName("ag") + boolean field3132; + @ObfuscatedName("at") @Export("validGroups") volatile boolean[] validGroups; - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 1456312337 + intValue = -1676614799 ) @Export("indexCrc") int indexCrc; - @ObfuscatedName("az") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -1798815125 + intValue = 1205835049 ) @Export("indexVersion") int indexVersion; - @ObfuscatedName("aj") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -1710593501 + intValue = 668240441 ) - int field3131; + int field3137; static { Archive_crc = new CRC32(); } @ObfuscatedSignature( - signature = "(Lkv;Lkv;IZZZ)V" + signature = "(Lkx;Lkx;IZZZ)V" ) public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) { super(var4, var5); + this.field3128 = false; this.field3132 = false; - this.field3133 = false; - this.field3131 = -1; + this.field3137 = -1; this.archiveDisk = var1; this.masterDisk = var2; this.index = var3; - this.field3133 = var6; + this.field3132 = var6; int var8 = this.index; - if (Decimator.NetCache_reference != null) { - Decimator.NetCache_reference.offset = var8 * 8 + 5; - int var9 = Decimator.NetCache_reference.readInt(); - int var10 = Decimator.NetCache_reference.readInt(); + if (DevicePcmPlayerProvider.NetCache_reference != null) { + DevicePcmPlayerProvider.NetCache_reference.offset = var8 * 8 + 5; + int var9 = DevicePcmPlayerProvider.NetCache_reference.readInt(); + int var10 = DevicePcmPlayerProvider.NetCache_reference.readInt(); this.loadIndex(var9, var10); } else { - BuddyRankComparator.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); + Varps.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); NetCache.NetCache_archives[var8] = this; } } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "502266240" + garbageValue = "-2104600002" ) @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { @@ -99,10 +99,10 @@ public class Archive extends AbstractArchive { } - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(II)I", - garbageValue = "-1902634670" + garbageValue = "780456172" ) @Export("groupLoadPercent") int groupLoadPercent(int var1) { @@ -114,8 +114,8 @@ public class Archive extends AbstractArchive { int var3 = this.index; long var4 = (long)((var3 << 16) + var1); int var2; - if (NetCache.NetCache_currentResponse != null && var4 == NetCache.NetCache_currentResponse.key) { - var2 = NetCache.NetCache_responseArchiveBuffer.offset * 99 / (NetCache.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding) + 1; + if (NetCache.NetCache_currentResponse != null && NetCache.NetCache_currentResponse.key == var4) { + var2 = class336.NetCache_responseArchiveBuffer.offset * 99 / (class336.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding) + 1; } else { var2 = 0; } @@ -124,82 +124,91 @@ public class Archive extends AbstractArchive { } } - @ObfuscatedName("r") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1800831619" + garbageValue = "2123503233" ) @Export("loadGroup") void loadGroup(int var1) { if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { - WorldMapIcon_0.method191(var1, this.archiveDisk, this); + PlayerType.method4120(var1, this.archiveDisk, this); } else { - BuddyRankComparator.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); + Varps.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); } } - @ObfuscatedName("cs") + @ObfuscatedName("dh") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "581718104" + garbageValue = "1760954432" ) - public boolean method4177() { - return this.field3132; + public boolean method4265() { + return this.field3128; } - @ObfuscatedName("co") + @ObfuscatedName("do") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-35" + signature = "(I)I", + garbageValue = "-185115723" ) @Export("percentage") public int percentage() { - if (this.field3132) { + if (this.field3128) { return 100; } else if (super.groups != null) { return 99; } else { - int var1 = class160.method3383(255, this.index); - if (var1 >= 100) { - var1 = 99; + int var2 = this.index; + long var3 = (long)(var2 + 16711680); + int var1; + if (NetCache.NetCache_currentResponse != null && var3 == NetCache.NetCache_currentResponse.key) { + var1 = class336.NetCache_responseArchiveBuffer.offset * 99 / (class336.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding) + 1; + } else { + var1 = 0; } - return var1; + int var5 = var1; + if (var1 >= 100) { + var5 = 99; + } + + return var5; } } - @ObfuscatedName("dr") + @ObfuscatedName("dm") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "-1" + signature = "(III)V", + garbageValue = "-288401160" ) @Export("loadIndex") void loadIndex(int var1, int var2) { this.indexCrc = var1; this.indexVersion = var2; if (this.masterDisk != null) { - WorldMapIcon_0.method191(this.index, this.masterDisk, this); + PlayerType.method4120(this.index, this.masterDisk, this); } else { - BuddyRankComparator.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); + Varps.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); } } - @ObfuscatedName("dd") + @ObfuscatedName("dy") @ObfuscatedSignature( signature = "(I[BZZB)V", - garbageValue = "-44" + garbageValue = "-101" ) @Export("write") void write(int var1, byte[] var2, boolean var3, boolean var4) { if (var3) { - if (this.field3132) { + if (this.field3128) { throw new RuntimeException(); } if (this.masterDisk != null) { - GameShell.method1005(this.index, var2, this.masterDisk); + class96.method2259(this.index, var2, this.masterDisk); } this.decodeIndex(var2); @@ -208,38 +217,38 @@ 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) { - GameShell.method1005(var1, var2, this.archiveDisk); + class96.method2259(var1, var2, this.archiveDisk); this.validGroups[var1] = true; } if (var4) { - super.groups[var1] = Entity.method3209(var2, false); + super.groups[var1] = UserComparator8.method3365(var2, false); } } } - @ObfuscatedName("dv") + @ObfuscatedName("dd") @ObfuscatedSignature( - signature = "(Lkv;I[BZI)V", - garbageValue = "54929376" + signature = "(Lkx;I[BZI)V", + garbageValue = "-1896487213" ) @Export("load") void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { int var5; if (var1 == this.masterDisk) { - if (this.field3132) { + if (this.field3128) { throw new RuntimeException(); } else if (var3 == null) { - BuddyRankComparator.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); + Varps.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); } else { Archive_crc.reset(); Archive_crc.update(var3, 0, var3.length); var5 = (int)Archive_crc.getValue(); if (var5 != this.indexCrc) { - BuddyRankComparator.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); + Varps.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); } else { - Buffer var9 = new Buffer(Player.decompressBytes(var3)); + Buffer var9 = new Buffer(TaskHandler.decompressBytes(var3)); int var7 = var9.readUnsignedByte(); if (var7 != 5 && var7 != 6) { throw new RuntimeException(var7 + "," + this.index + "," + var2); @@ -250,7 +259,7 @@ public class Archive extends AbstractArchive { } if (var8 != this.indexVersion) { - BuddyRankComparator.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); + Varps.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); } else { this.decodeIndex(var3); this.loadAllLocal(); @@ -259,8 +268,8 @@ public class Archive extends AbstractArchive { } } } else { - if (!var4 && var2 == this.field3131) { - this.field3132 = true; + if (!var4 && var2 == this.field3137) { + this.field3128 = true; } if (var3 != null && var3.length > 2) { @@ -271,30 +280,30 @@ public class Archive extends AbstractArchive { if (var5 == super.groupCrcs[var2] && var6 == super.groupVersions[var2]) { this.validGroups[var2] = true; if (var4) { - super.groups[var2] = Entity.method3209(var3, false); + super.groups[var2] = UserComparator8.method3365(var3, false); } } else { this.validGroups[var2] = false; - if (this.field3133 || var4) { - BuddyRankComparator.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + if (this.field3132 || var4) { + Varps.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } } } else { this.validGroups[var2] = false; - if (this.field3133 || var4) { - BuddyRankComparator.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + if (this.field3132 || var4) { + Varps.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } } } } - @ObfuscatedName("da") + @ObfuscatedName("dp") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1518016463" + garbageValue = "-1002718108" ) @Export("loadAllLocal") void loadAllLocal() { @@ -306,46 +315,46 @@ public class Archive extends AbstractArchive { } if (this.archiveDisk == null) { - this.field3132 = true; + this.field3128 = true; } else { - this.field3131 = -1; + this.field3137 = -1; for (var1 = 0; var1 < this.validGroups.length; ++var1) { if (super.fileCounts[var1] > 0) { - BuddyRankComparator.method3376(var1, this.archiveDisk, this); - this.field3131 = var1; + Friend.method5190(var1, this.archiveDisk, this); + this.field3137 = var1; } } - if (this.field3131 == -1) { - this.field3132 = true; + if (this.field3137 == -1) { + this.field3128 = true; } } } - @ObfuscatedName("dh") + @ObfuscatedName("dn") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "512289174" + garbageValue = "305356325" ) - public boolean method4185(int var1) { + public boolean method4283(int var1) { return this.validGroups[var1]; } - @ObfuscatedName("dm") + @ObfuscatedName("de") @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "-5" + signature = "(II)Z", + garbageValue = "-1930544538" ) - public boolean method4199(int var1) { + public boolean method4261(int var1) { return this.getGroupFileIds(var1) != null; } - @ObfuscatedName("dj") + @ObfuscatedName("da") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "119" + garbageValue = "64" ) @Export("loadPercent") public int loadPercent() { @@ -367,4 +376,21 @@ public class Archive extends AbstractArchive { return var3; } } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(Ljava/lang/CharSequence;I)I", + garbageValue = "1683994137" + ) + @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 + MenuAction.charToByteCp1252(var0.charAt(var3)); + } + + return var2; + } } diff --git a/runescape-client/src/main/java/ArchiveDisk.java b/runescape-client/src/main/java/ArchiveDisk.java index 32655613cb..4e2221cb2e 100644 --- a/runescape-client/src/main/java/ArchiveDisk.java +++ b/runescape-client/src/main/java/ArchiveDisk.java @@ -1,40 +1,44 @@ import java.io.EOFException; import java.io.IOException; -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("kv") +@ObfuscatedName("kx") @Implements("ArchiveDisk") public final class ArchiveDisk { - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("ArchiveDisk_buffer") static byte[] ArchiveDisk_buffer; - @ObfuscatedName("j") + @ObfuscatedName("db") + @ObfuscatedSignature( + signature = "Lio;" + ) + @Export("archive11") + static Archive archive11; + @ObfuscatedName("x") @ObfuscatedSignature( signature = "Lmw;" ) @Export("datFile") BufferedFile datFile; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -1905715445 - ) - @Export("archive") - int archive; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "Lmw;" ) @Export("idxFile") BufferedFile idxFile; - @ObfuscatedName("u") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1039930471 + intValue = -1914299203 + ) + @Export("archive") + int archive; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1407150141 ) @Export("maxEntrySize") int maxEntrySize; @@ -56,10 +60,10 @@ public final class ArchiveDisk { this.maxEntrySize = var4; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IB)[B", - garbageValue = "93" + signature = "(II)[B", + garbageValue = "-1665977739" ) @Export("read") public byte[] read(int var1) { @@ -90,7 +94,7 @@ public final class ArchiveDisk { return (byte[])var10000; } - this.datFile.seek(520L * (long)var4); + this.datFile.seek((long)var4 * 520L); int var8 = var3 - var6; int var9; int var10; @@ -121,7 +125,7 @@ public final class ArchiveDisk { var12 = ArchiveDisk_buffer[7] & 255; } - if (var9 != var1 || var7 != var10 || var12 != this.archive) { + if (var9 != var1 || var10 != var7 || var12 != this.archive) { var10000 = null; return (byte[])var10000; } @@ -150,10 +154,10 @@ public final class ArchiveDisk { } } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I[BII)Z", - garbageValue = "1937661421" + signature = "(I[BIB)Z", + garbageValue = "73" ) @Export("write") public boolean write(int var1, byte[] var2, int var3) { @@ -171,10 +175,10 @@ public final class ArchiveDisk { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I[BIZB)Z", - garbageValue = "16" + signature = "(I[BIZI)Z", + garbageValue = "1934021549" ) @Export("write0") boolean write0(int var1, byte[] var2, int var3, boolean var4) { @@ -215,18 +219,18 @@ public final class ArchiveDisk { while (true) { if (var7 < var3) { - label171: { + label170: { int var9 = 0; int var10; if (var4) { - this.datFile.seek(520L * (long)var6); + this.datFile.seek((long)var6 * 520L); int var11; int var12; if (var1 > 65535) { try { this.datFile.read(ArchiveDisk_buffer, 0, 10); } catch (EOFException var17) { - break label171; + break label170; } var10 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); @@ -237,7 +241,7 @@ public final class ArchiveDisk { try { this.datFile.read(ArchiveDisk_buffer, 0, 8); } catch (EOFException var16) { - break label171; + break label170; } var10 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); @@ -246,7 +250,7 @@ public final class ArchiveDisk { var12 = ArchiveDisk_buffer[7] & 255; } - if (var10 != var1 || var11 != var8 || var12 != this.archive) { + if (var10 != var1 || var8 != var11 || var12 != this.archive) { var10000 = false; return var10000; } @@ -284,7 +288,7 @@ public final class ArchiveDisk { ArchiveDisk_buffer[7] = (byte)(var9 >> 8); ArchiveDisk_buffer[8] = (byte)var9; ArchiveDisk_buffer[9] = (byte)this.archive; - this.datFile.seek(520L * (long)var6); + this.datFile.seek((long)var6 * 520L); this.datFile.write(ArchiveDisk_buffer, 0, 10); var10 = var3 - var7; if (var10 > 510) { @@ -306,7 +310,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) { @@ -332,62 +336,19 @@ public final class ArchiveDisk { } } - public String abd() { + public String aai() { return "" + this.archive; } - public String abb() { - return "" + this.archive * 1098163870; + public String aan() { + return "" + this.archive; } public String toString() { return "" + this.archive; } - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "(Lfu;III)Ldd;", - garbageValue = "670296930" - ) - public static final PcmPlayer method5757(TaskHandler var0, int var1, int var2) { - if (PcmPlayer.PcmPlayer_sampleRate == 0) { - throw new IllegalStateException(); - } else if (var1 >= 0 && var1 < 2) { - if (var2 < 256) { - var2 = 256; - } - - try { - PcmPlayer var3 = SecureRandomCallable.pcmPlayerProvider.player(); - var3.samples = new int[(PcmPlayer.PcmPlayer_stereo ? 2 : 1) * 256]; - var3.field1399 = var2; - var3.init(); - var3.capacity = (var2 & -1024) + 1024; - if (var3.capacity > 16384) { - var3.capacity = 16384; - } - - var3.open(var3.capacity); - if (FloorDecoration.PcmPlayer_count > 0 && PacketBufferNode.soundSystem == null) { - PacketBufferNode.soundSystem = new SoundSystem(); - GrandExchangeOfferWorldComparator.soundSystemExecutor = Executors.newScheduledThreadPool(1); - GrandExchangeOfferWorldComparator.soundSystemExecutor.scheduleAtFixedRate(PacketBufferNode.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); - } - - if (PacketBufferNode.soundSystem != null) { - if (PacketBufferNode.soundSystem.players[var1] != null) { - throw new IllegalArgumentException(); - } - - PacketBufferNode.soundSystem.players[var1] = var3; - } - - return var3; - } catch (Throwable var4) { - return new PcmPlayer(); - } - } else { - throw new IllegalArgumentException(); - } + public String aar() { + return "" + this.archive * 1578141934; } } diff --git a/runescape-client/src/main/java/ArchiveDiskAction.java b/runescape-client/src/main/java/ArchiveDiskAction.java index a276737a6c..099e2fa283 100644 --- a/runescape-client/src/main/java/ArchiveDiskAction.java +++ b/runescape-client/src/main/java/ArchiveDiskAction.java @@ -4,31 +4,98 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hn") +@ObfuscatedName("hw") @Implements("ArchiveDiskAction") public class ArchiveDiskAction extends Node { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1794438743 + intValue = -1482898201 ) @Export("type") int type; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("data") byte[] data; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lkv;" + signature = "Lkx;" ) @Export("archiveDisk") ArchiveDisk archiveDisk; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lid;" + signature = "Lio;" ) @Export("archive") Archive archive; ArchiveDiskAction() { } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(II)Ljava/lang/String;", + garbageValue = "-1111446859" + ) + static String method4133(int var0) { + return ""; + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "([BIII)Ljava/lang/String;", + garbageValue = "-90955785" + ) + public static String method4132(byte[] var0, int var1, int var2) { + char[] var3 = new char[var2]; + int var4 = 0; + int var5 = var1; + + 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; + } + } + + return new String(var3, 0, var4); + } } diff --git a/runescape-client/src/main/java/ArchiveDiskActionHandler.java b/runescape-client/src/main/java/ArchiveDiskActionHandler.java index 9728746cf1..cd0a25b81e 100644 --- a/runescape-client/src/main/java/ArchiveDiskActionHandler.java +++ b/runescape-client/src/main/java/ArchiveDiskActionHandler.java @@ -4,34 +4,43 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iw") +@ObfuscatedName("ib") @Implements("ArchiveDiskActionHandler") public class ArchiveDiskActionHandler implements Runnable { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Ljc;" + signature = "Ljv;" ) @Export("ArchiveDiskActionHandler_requestQueue") static NodeDeque ArchiveDiskActionHandler_requestQueue; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Ljc;" + signature = "Ljv;" ) @Export("ArchiveDiskActionHandler_responseQueue") static NodeDeque ArchiveDiskActionHandler_responseQueue; - @ObfuscatedName("i") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 587142169 + intValue = 1435645163 ) - static int field3124; - @ObfuscatedName("k") + public static int field3126; + @ObfuscatedName("l") @Export("ArchiveDiskActionHandler_lock") - static Object ArchiveDiskActionHandler_lock; + public static Object ArchiveDiskActionHandler_lock; + @ObfuscatedName("u") + @Export("ArchiveDiskActionHandler_thread") + static Thread ArchiveDiskActionHandler_thread; + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "Lhz;" + ) + @Export("Widget_archive") + static AbstractArchive Widget_archive; static { ArchiveDiskActionHandler_requestQueue = new NodeDeque(); ArchiveDiskActionHandler_responseQueue = new NodeDeque(); - field3124 = 0; + field3126 = 0; ArchiveDiskActionHandler_lock = new Object(); } @@ -60,45 +69,46 @@ public class ArchiveDiskActionHandler implements Runnable { } synchronized(ArchiveDiskActionHandler_lock) { - if (field3124 <= 1) { - field3124 = 0; + if (field3126 <= 1) { + field3126 = 0; ArchiveDiskActionHandler_lock.notifyAll(); return; } - field3124 = 600; + field3126 = 600; } } else { - UserList.sleepMillis(100L); + FriendsList.sleepMillis(100L); synchronized(ArchiveDiskActionHandler_lock) { - if (field3124 <= 1) { - field3124 = 0; + if (field3126 <= 1) { + field3126 = 0; ArchiveDiskActionHandler_lock.notifyAll(); return; } - --field3124; + --field3126; } } } } catch (Exception var13) { - class3.RunException_sendStackTrace((String)null, var13); + class188.RunException_sendStackTrace((String)null, var13); } } - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(CB)Z", - garbageValue = "-108" + signature = "(Ljava/lang/Throwable;Ljava/lang/String;)Lma;" ) - @Export("isCharPrintable") - public static boolean isCharPrintable(char var0) { - if (var0 >= ' ' && var0 <= '~') { - return true; - } else if (var0 >= 160 && var0 <= 255) { - return true; + @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 { - return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; + var2 = new RunException(var0, var1); } + + return var2; } } diff --git a/runescape-client/src/main/java/ArchiveLoader.java b/runescape-client/src/main/java/ArchiveLoader.java index 87afa5d2ff..2f8e99e56c 100644 --- a/runescape-client/src/main/java/ArchiveLoader.java +++ b/runescape-client/src/main/java/ArchiveLoader.java @@ -3,37 +3,62 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bh") +@ObfuscatedName("bv") @Implements("ArchiveLoader") public class ArchiveLoader { - @ObfuscatedName("r") - @ObfuscatedSignature( - signature = "Lkb;" - ) - @Export("ItemDefinition_fontPlain11") - static Font ItemDefinition_fontPlain11; - @ObfuscatedName("j") + @ObfuscatedName("nd") @ObfuscatedGetter( - intValue = -1407926591 + intValue = -1623387895 ) - @Export("groupCount") - final int groupCount; - @ObfuscatedName("i") + @Export("widgetDragDuration") + static int widgetDragDuration; + @ObfuscatedName("sx") + @ObfuscatedGetter( + intValue = -1229165351 + ) + @Export("foundItemIndex") + static int foundItemIndex; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -1875812039 + ) + static int field510; + @ObfuscatedName("eg") + @Export("worldHost") + static String worldHost; + @ObfuscatedName("fe") @ObfuscatedSignature( - signature = "Lid;" + signature = "Lks;" + ) + static AbstractSocket field512; + @ObfuscatedName("go") + @ObfuscatedGetter( + intValue = -652150827 + ) + static int field508; + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "Lio;" ) @Export("archive") final Archive archive; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 2082038361 + intValue = -1519742751 + ) + @Export("groupCount") + final int groupCount; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 1438963135 ) @Export("loadedCount") int loadedCount; @ObfuscatedSignature( - signature = "(Lid;Ljava/lang/String;)V" + signature = "(Lio;Ljava/lang/String;)V" ) ArchiveLoader(Archive var1, String var2) { this.loadedCount = 0; @@ -41,17 +66,17 @@ public class ArchiveLoader { this.groupCount = var1.getGroupCount(); } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "273857318" + garbageValue = "-856910986" ) @Export("isLoaded") boolean isLoaded() { this.loadedCount = 0; for (int var1 = 0; var1 < this.groupCount; ++var1) { - if (!this.archive.method4199(var1) || this.archive.method4185(var1)) { + if (!this.archive.method4261(var1) || this.archive.method4283(var1)) { ++this.loadedCount; } } @@ -59,53 +84,251 @@ public class ArchiveLoader { return this.loadedCount >= this.groupCount; } - @ObfuscatedName("s") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(II)Lcr;", - garbageValue = "-332369983" + signature = "(Lkt;II)V", + garbageValue = "593682033" ) - @Export("getScript") - static Script getScript(int var0) { - Script var1 = (Script)Script.Script_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = GameShell.archive12.takeFile(var0, 0); - if (var2 == null) { - return null; + @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.field607 = false; + } else if (Client.localPlayerIndex == var1) { + throw new RuntimeException(); } else { - var1 = DesktopPlatformInfoProvider.newScript(var2); - Script.Script_cached.put(var1, (long)var0); - return var1; + Players.Players_regions[var1] = (var4.plane << 28) + (class4.baseX * 64 + var4.pathX[0] >> 13 << 14) + (ScriptEvent.baseY + var4.pathY[0] >> 13); + if (var4.field945 != -1) { + Players.Players_orientations[var1] = var4.field945; + } else { + Players.Players_orientations[var1] = var4.orientation; + } + + Players.Players_targetIndices[var1] = var4.targetIndex; + Client.players[var1] = null; + if (var0.readBits(1) != 0) { + Message.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 * -78439701 < 1536 || var4.y < 1536 || var4.x * -78439701 >= 11776 || var4.y >= 11776)) { + var4.resetPath(var6, var7); + var4.field607 = false; + } else if (var2) { + var4.field607 = true; + var4.tileX = var6; + var4.tileY = var7; + } else { + var4.field607 = false; + var4.method1189(var6, var7, Players.field1220[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 * -78439701 < 1536 || var4.y < 1536 || var4.x * -78439701 >= 11776 || var4.y >= 11776)) { + var4.resetPath(var6, var7); + var4.field607 = false; + } else if (var2) { + var4.field607 = true; + var4.tileX = var6; + var4.tileY = var7; + } else { + var4.field607 = false; + var4.method1189(var6, var7, Players.field1220[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 * -78439701 < 1536 || var4.y < 1536 || var4.x * -78439701 >= 11776 || var4.y >= 11776)) { + var4.resetPath(var10, var11); + var4.field607 = false; + } else if (var2) { + var4.field607 = true; + var4.tileX = var10; + var4.tileY = var11; + } else { + var4.field607 = false; + var4.method1189(var10, var11, Players.field1220[var1]); + } + + var4.plane = (byte)(var7 + var4.plane & 3); + if (Client.localPlayerIndex == var1) { + MouseRecorder.plane = var4.plane; + } + + } else { + var6 = var0.readBits(30); + var7 = var6 >> 28; + var8 = var6 >> 14 & 16383; + var9 = var6 & 16383; + var10 = (class4.baseX * 64 + var8 + var4.pathX[0] & 16383) - class4.baseX * 64; + var11 = (var9 + ScriptEvent.baseY + var4.pathY[0] & 16383) - ScriptEvent.baseY; + if (Client.localPlayerIndex != var1 || var4.x * -78439701 >= 1536 && var4.y >= 1536 && var4.x * -78439701 < 11776 && var4.y < 11776) { + if (var2) { + var4.field607 = true; + var4.tileX = var10; + var4.tileY = var11; + } else { + var4.field607 = false; + var4.method1189(var10, var11, Players.field1220[var1]); + } + } else { + var4.resetPath(var10, var11); + var4.field607 = false; + } + + var4.plane = (byte)(var7 + var4.plane & 3); + if (Client.localPlayerIndex == var1) { + MouseRecorder.plane = var4.plane; + } + + } } } } - @ObfuscatedName("c") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "114" + signature = "(I)Z", + garbageValue = "-1052068547" ) - @Export("NpcDefinition_clearCached") - public static void NpcDefinition_clearCached() { - NPCDefinition.NpcDefinition_cached.clear(); - NPCDefinition.NpcDefinition_cachedModels.clear(); + static final boolean method1099() { + return ViewportMouse.ViewportMouse_isInViewport; } - @ObfuscatedName("gh") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "1464962568" + signature = "(ILcu;ZB)I", + garbageValue = "1" ) - static int method1100(int var0, int var1) { - int var2 = var1 - 334; - if (var2 < 0) { - var2 = 0; - } else if (var2 > 100) { - var2 = 100; + static int method1096(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var3 = Player.getWidget(Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]); + } else { + var3 = var2 ? UserComparator9.field1941 : MidiPcmStream.field2410; } - int var3 = (Client.zoomWidth - Client.zoomHeight) * var2 / 100 + Client.zoomHeight; - return var0 * var3 / 256; + if (var0 == ScriptOpcodes.CC_CALLONRESIZE) { + if (Interpreter.field1066 >= 10) { + throw new RuntimeException(); + } else if (var3.onResize == null) { + return 0; + } else { + ScriptEvent var4 = new ScriptEvent(); + var4.widget = var3; + var4.args = var3.onResize; + var4.field550 = Interpreter.field1066 + 1; + Client.scriptEvents.addFirst(var4); + return 1; + } + } else { + return 2; + } } } diff --git a/runescape-client/src/main/java/AttackOption.java b/runescape-client/src/main/java/AttackOption.java index 03926b0cc9..dfc414314b 100644 --- a/runescape-client/src/main/java/AttackOption.java +++ b/runescape-client/src/main/java/AttackOption.java @@ -4,37 +4,37 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cw") +@ObfuscatedName("cl") @Implements("AttackOption") public enum AttackOption implements Enumerated { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lcw;" + signature = "Lcl;" ) @Export("AttackOption_dependsOnCombatLevels") AttackOption_dependsOnCombatLevels(0), - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lcw;" + signature = "Lcl;" ) @Export("AttackOption_alwaysRightClick") AttackOption_alwaysRightClick(1), - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lcw;" + signature = "Lcl;" ) @Export("AttackOption_leftClickWhereAvailable") AttackOption_leftClickWhereAvailable(2), - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lcw;" + signature = "Lcl;" ) @Export("AttackOption_hidden") AttackOption_hidden(3); - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -2103853983 + intValue = 1962411245 ) @Export("id") final int id; @@ -43,13 +43,121 @@ public enum AttackOption implements Enumerated { this.id = var3; } - @ObfuscatedName("j") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-32" + signature = "(I)I", + garbageValue = "-1410702910" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } + + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "([BI)Lcu;", + garbageValue = "447128018" + ) + @Export("newScript") + static Script newScript(byte[] var0) { + Script var1 = new Script(); + Buffer var2 = new Buffer(var0); + var2.offset = var2.array.length - 2; + int var3 = var2.readUnsignedShort(); + int var4 = var2.array.length - 2 - var3 - 12; + var2.offset = var4; + int var5 = var2.readInt(); + var1.localIntCount = var2.readUnsignedShort(); + var1.localStringCount = var2.readUnsignedShort(); + var1.intArgumentCount = var2.readUnsignedShort(); + var1.stringArgumentCount = var2.readUnsignedShort(); + int var6 = var2.readUnsignedByte(); + int var7; + int var8; + if (var6 > 0) { + var1.switches = var1.newIterableNodeHashTable(var6); + + for (var7 = 0; var7 < var6; ++var7) { + var8 = var2.readUnsignedShort(); + int var9; + int var11; + if (var8 > 0) { + var11 = var8 - 1; + var11 |= var11 >>> 1; + var11 |= var11 >>> 2; + var11 |= var11 >>> 4; + var11 |= var11 >>> 8; + var11 |= var11 >>> 16; + int var10 = var11 + 1; + var9 = var10; + } else { + var9 = 1; + } + + IterableNodeHashTable var13 = new IterableNodeHashTable(var9); + var1.switches[var7] = var13; + + while (var8-- > 0) { + var11 = var2.readInt(); + int var12 = var2.readInt(); + var13.put(new IntegerNode(var12), (long)var11); + } + } + } + + var2.offset = 0; + 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("gg") + @ObfuscatedSignature( + signature = "(Lbe;IB)V", + garbageValue = "8" + ) + @Export("getActorScreenLocation") + static final void getActorScreenLocation(Actor var0, int var1) { + NPC.worldToScreen(var0.x * -78439701, var0.y, var1); + } + + @ObfuscatedName("jb") + @ObfuscatedSignature( + signature = "(IIIILli;Lhi;I)V", + garbageValue = "-1905138972" + ) + @Export("worldToMinimap") + static final void worldToMinimap(int var0, int var1, int var2, int var3, Sprite 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 = var3 * var8 + var9 * var2 >> 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; + FontName.redHintArrowSprite.method6104(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); + } else { + ChatChannel.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); + } + + } } diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java index de3c1489b3..4a27ae0042 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("dp") +@ObfuscatedName("dl") @Implements("AudioFilter") public class AudioFilter { - @ObfuscatedName("n") - static float[][] field1475; - @ObfuscatedName("t") + @ObfuscatedName("u") + static float[][] field1447; + @ObfuscatedName("j") @Export("coefficients") static int[][] coefficients; - @ObfuscatedName("q") - static float field1468; - @ObfuscatedName("x") + @ObfuscatedName("v") + static float field1454; + @ObfuscatedName("d") @Export("forwardMultiplier") static int forwardMultiplier; - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("pairs") int[] pairs; - @ObfuscatedName("i") - int[][][] field1467; - @ObfuscatedName("k") - int[][][] field1470; - @ObfuscatedName("u") - int[] field1469; + @ObfuscatedName("t") + int[][][] field1458; + @ObfuscatedName("g") + int[][][] field1450; + @ObfuscatedName("l") + int[] field1451; static { - field1475 = new float[2][8]; + field1447 = new float[2][8]; coefficients = new int[2][8]; } AudioFilter() { this.pairs = new int[2]; - this.field1467 = new int[2][2][4]; - this.field1470 = new int[2][2][4]; - this.field1469 = new int[2]; + this.field1458 = new int[2][2][4]; + this.field1450 = new int[2][2][4]; + this.field1451 = new int[2]; } - @ObfuscatedName("s") - float method2622(int var1, int var2, float var3) { - float var4 = (float)this.field1470[var1][0][var2] + var3 * (float)(this.field1470[var1][1][var2] - this.field1470[var1][0][var2]); + @ObfuscatedName("c") + float method2655(int var1, int var2, float var3) { + float var4 = (float)this.field1450[var1][0][var2] + var3 * (float)(this.field1450[var1][1][var2] - this.field1450[var1][0][var2]); var4 *= 0.0015258789F; return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F)); } - @ObfuscatedName("i") - float method2629(int var1, int var2, float var3) { - float var4 = (float)this.field1467[var1][0][var2] + var3 * (float)(this.field1467[var1][1][var2] - this.field1467[var1][0][var2]); + @ObfuscatedName("t") + float method2657(int var1, int var2, float var3) { + float var4 = (float)this.field1458[var1][0][var2] + var3 * (float)(this.field1458[var1][1][var2] - this.field1458[var1][0][var2]); var4 *= 1.2207031E-4F; return normalize(var4); } - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("compute") int compute(int var1, float var2) { float var3; if (var1 == 0) { - var3 = (float)this.field1469[0] + (float)(this.field1469[1] - this.field1469[0]) * var2; + var3 = (float)this.field1451[0] + (float)(this.field1451[1] - this.field1451[0]) * var2; var3 *= 0.0030517578F; - field1468 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); - forwardMultiplier = (int)(field1468 * 65536.0F); + field1454 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); + forwardMultiplier = (int)(field1454 * 65536.0F); } if (this.pairs[var1] == 0) { return 0; } else { - var3 = this.method2622(var1, 0, var2); - field1475[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2629(var1, 0, var2)); - field1475[var1][1] = var3 * var3; + var3 = this.method2655(var1, 0, var2); + field1447[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2657(var1, 0, var2)); + field1447[var1][1] = var3 * var3; float[] var10000; int var4; for (var4 = 1; var4 < this.pairs[var1]; ++var4) { - var3 = this.method2622(var1, var4, var2); - float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2629(var1, var4, var2)); + var3 = this.method2655(var1, var4, var2); + float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2657(var1, var4, var2)); float var6 = var3 * var3; - field1475[var1][var4 * 2 + 1] = field1475[var1][var4 * 2 - 1] * var6; - field1475[var1][var4 * 2] = field1475[var1][var4 * 2 - 1] * var5 + field1475[var1][var4 * 2 - 2] * var6; + field1447[var1][var4 * 2 + 1] = field1447[var1][var4 * 2 - 1] * var6; + field1447[var1][var4 * 2] = field1447[var1][var4 * 2 - 1] * var5 + field1447[var1][var4 * 2 - 2] * var6; for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { - var10000 = field1475[var1]; - var10000[var7] += field1475[var1][var7 - 1] * var5 + field1475[var1][var7 - 2] * var6; + var10000 = field1447[var1]; + var10000[var7] += field1447[var1][var7 - 1] * var5 + field1447[var1][var7 - 2] * var6; } - var10000 = field1475[var1]; - var10000[1] += field1475[var1][0] * var5 + var6; - var10000 = field1475[var1]; + var10000 = field1447[var1]; + var10000[1] += field1447[var1][0] * var5 + var6; + var10000 = field1447[var1]; var10000[0] += var5; } if (var1 == 0) { for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) { - var10000 = field1475[0]; - var10000[var4] *= field1468; + var10000 = field1447[0]; + var10000[var4] *= field1454; } } for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { - coefficients[var1][var4] = (int)(field1475[var1][var4] * 65536.0F); + coefficients[var1][var4] = (int)(field1447[var1][var4] * 65536.0F); } return this.pairs[var1] * 2; } } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(Lky;Ldv;)V" + signature = "(Lkz;Ldo;)V" ) - final void method2637(Buffer var1, SoundEnvelope var2) { + final void method2666(Buffer var1, SoundEnvelope var2) { int var3 = var1.readUnsignedByte(); this.pairs[0] = var3 >> 4; this.pairs[1] = var3 & 15; if (var3 != 0) { - this.field1469[0] = var1.readUnsignedShort(); - this.field1469[1] = var1.readUnsignedShort(); + this.field1451[0] = var1.readUnsignedShort(); + this.field1451[1] = var1.readUnsignedShort(); int var4 = var1.readUnsignedByte(); int var5; int var6; for (var5 = 0; var5 < 2; ++var5) { for (var6 = 0; var6 < this.pairs[var5]; ++var6) { - this.field1467[var5][0][var6] = var1.readUnsignedShort(); - this.field1470[var5][0][var6] = var1.readUnsignedShort(); + this.field1458[var5][0][var6] = var1.readUnsignedShort(); + this.field1450[var5][0][var6] = var1.readUnsignedShort(); } } for (var5 = 0; var5 < 2; ++var5) { for (var6 = 0; var6 < this.pairs[var5]; ++var6) { if ((var4 & 1 << var5 * 4 << var6) != 0) { - this.field1467[var5][1][var6] = var1.readUnsignedShort(); - this.field1470[var5][1][var6] = var1.readUnsignedShort(); + this.field1458[var5][1][var6] = var1.readUnsignedShort(); + this.field1450[var5][1][var6] = var1.readUnsignedShort(); } else { - this.field1467[var5][1][var6] = this.field1467[var5][0][var6]; - this.field1470[var5][1][var6] = this.field1470[var5][0][var6]; + this.field1458[var5][1][var6] = this.field1458[var5][0][var6]; + this.field1450[var5][1][var6] = this.field1450[var5][0][var6]; } } } - if (var4 != 0 || this.field1469[1] != this.field1469[0]) { + if (var4 != 0 || this.field1451[1] != this.field1451[0]) { var2.decodeSegments(var1); } } else { - int[] var7 = this.field1469; - this.field1469[1] = 0; + int[] var7 = this.field1451; + this.field1451[1] = 0; var7[0] = 0; } } - @ObfuscatedName("j") + @ObfuscatedName("x") @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 01334d7bea..e40b637154 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("ku") +@ObfuscatedName("kw") @Implements("BZip2Decompressor") public final class BZip2Decompressor { - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lkw;" + signature = "Lki;" ) @Export("BZip2Decompressor_state") static BZip2State BZip2Decompressor_state; @@ -17,7 +17,7 @@ public final class BZip2Decompressor { BZip2Decompressor_state = new BZip2State(); } - @ObfuscatedName("s") + @ObfuscatedName("c") @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.field3721 = 0; + BZip2Decompressor_state.field3740 = 0; BZip2Decompressor_decompress(BZip2Decompressor_state); var1 -= BZip2Decompressor_state.outputLength; BZip2Decompressor_state.inputArray = null; @@ -38,21 +38,21 @@ public final class BZip2Decompressor { } } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lkw;)V" + signature = "(Lki;)V" ) - static void method5667(BZip2State var0) { + static void method5753(BZip2State var0) { byte var2 = var0.out_char; int var3 = var0.su_rNToGo; int var4 = var0.nblocks_used; int var5 = var0.su_ch2; - int[] var6 = Coord.BZip2Decompressor_block; - int var7 = var0.field3736; + int[] var6 = VarbitDefinition.BZip2Decompressor_block; + int var7 = var0.field3725; byte[] var8 = var0.outputArray; int var9 = var0.next_out; int var10 = var0.outputLength; - int var12 = var0.field3754 + 1; + int var12 = var0.field3710 + 1; label61: while (true) { @@ -148,25 +148,25 @@ public final class BZip2Decompressor { break; } - int var13 = var0.field3721; - var0.field3721 += var10 - var10; - if (var0.field3721 < var13) { + int var13 = var0.field3740; + var0.field3740 += var10 - var10; + if (var0.field3740 < var13) { } var0.out_char = var2; var0.su_rNToGo = var3; var0.nblocks_used = var4; var0.su_ch2 = var5; - Coord.BZip2Decompressor_block = var6; - var0.field3736 = var7; + VarbitDefinition.BZip2Decompressor_block = var6; + var0.field3725 = var7; var0.outputArray = var8; var0.next_out = var9; var0.outputLength = var10; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lkw;)V" + signature = "(Lki;)V" ) @Export("BZip2Decompressor_decompress") static void BZip2Decompressor_decompress(BZip2State var0) { @@ -193,8 +193,8 @@ public final class BZip2Decompressor { int[] var24 = null; int[] var25 = null; var0.blockSize100k = 1410065408; - if (Coord.BZip2Decompressor_block == null) { - Coord.BZip2Decompressor_block = new int[var0.blockSize100k * 100000]; + if (VarbitDefinition.BZip2Decompressor_block == null) { + VarbitDefinition.BZip2Decompressor_block = new int[var0.blockSize100k * 100000]; } boolean var26 = true; @@ -430,7 +430,7 @@ public final class BZip2Decompressor { } var10002 = var0.unzftab[var0.seqToUnseq[var1 & 255] & 255]++; - Coord.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; + VarbitDefinition.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) { - Coord.BZip2Decompressor_block[var47] = var1 & 255; + VarbitDefinition.BZip2Decompressor_block[var47] = var1 & 255; ++var47; } } @@ -509,22 +509,22 @@ public final class BZip2Decompressor { } for (var36 = 0; var36 < var47; ++var36) { - var1 = (byte)(Coord.BZip2Decompressor_block[var36] & 255); - var10000 = Coord.BZip2Decompressor_block; + var1 = (byte)(VarbitDefinition.BZip2Decompressor_block[var36] & 255); + var10000 = VarbitDefinition.BZip2Decompressor_block; int var10001 = var0.cftab[var1 & 255]; var10000[var10001] |= var36 << 8; var10002 = var0.cftab[var1 & 255]++; } - var0.field3736 = Coord.BZip2Decompressor_block[var0.originalPointer] >> 8; + var0.field3725 = VarbitDefinition.BZip2Decompressor_block[var0.originalPointer] >> 8; var0.nblocks_used = 0; - var0.field3736 = Coord.BZip2Decompressor_block[var0.field3736]; - var0.su_ch2 = (byte)(var0.field3736 & 255); - var0.field3736 >>= 8; + var0.field3725 = VarbitDefinition.BZip2Decompressor_block[var0.field3725]; + var0.su_ch2 = (byte)(var0.field3725 & 255); + var0.field3725 >>= 8; ++var0.nblocks_used; - var0.field3754 = var47; - method5667(var0); - if (var0.field3754 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { + var0.field3710 = var47; + method5753(var0); + if (var0.field3710 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { var26 = true; break; } @@ -538,27 +538,27 @@ public final class BZip2Decompressor { } } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lkw;)B" + signature = "(Lki;)B" ) @Export("BZip2Decompressor_readNextByte") static byte BZip2Decompressor_readNextByte(BZip2State var0) { return (byte)BZip2Decompressor_readBits(8, var0); } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(Lkw;)B" + signature = "(Lki;)B" ) @Export("BZip2Decompressor_readNextBit") static byte BZip2Decompressor_readNextBit(BZip2State var0) { return (byte)BZip2Decompressor_readBits(1, var0); } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(ILkw;)I" + signature = "(ILki;)I" ) @Export("BZip2Decompressor_readBits") static int BZip2Decompressor_readBits(int var0, BZip2State var1) { @@ -576,9 +576,9 @@ public final class BZip2Decompressor { return var2; } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkw;)V" + signature = "(Lki;)V" ) @Export("makeMaps") static void makeMaps(BZip2State var0) { @@ -593,7 +593,7 @@ public final class BZip2Decompressor { } - @ObfuscatedName("q") + @ObfuscatedName("v") @Export("BZip2Decompressor_createHuffmanTables") static void BZip2Decompressor_createHuffmanTables(int[] var0, int[] var1, int[] var2, byte[] var3, int var4, int var5, int var6) { int var7 = 0; diff --git a/runescape-client/src/main/java/BZip2State.java b/runescape-client/src/main/java/BZip2State.java index 48c71ab71f..648d247bea 100644 --- a/runescape-client/src/main/java/BZip2State.java +++ b/runescape-client/src/main/java/BZip2State.java @@ -2,169 +2,168 @@ import 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("kw") +@ObfuscatedName("ki") @Implements("BZip2State") public final class BZip2State { - @ObfuscatedName("s") - final int field3737; - @ObfuscatedName("j") - final int field3745; - @ObfuscatedName("i") - final int field3746; - @ObfuscatedName("k") - final int field3722; - @ObfuscatedName("u") - final int field3735; - @ObfuscatedName("n") + @ObfuscatedName("c") final int field3717; + @ObfuscatedName("x") + final int field3709; @ObfuscatedName("t") + final int field3715; + @ObfuscatedName("g") + final int field3712; + @ObfuscatedName("l") + final int field3737; + @ObfuscatedName("u") + final int field3731; + @ObfuscatedName("j") @Export("inputArray") byte[] inputArray; - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1249128023 + intValue = 1785442725 ) @Export("nextByte") int nextByte; - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -423174679 + intValue = 1327133653 ) @Export("nextBit_unused") int nextBit_unused; - @ObfuscatedName("d") + @ObfuscatedName("z") @Export("outputArray") byte[] outputArray; - @ObfuscatedName("f") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1450954735 + intValue = 1502043783 ) @Export("next_out") int next_out; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 875649401 + intValue = 1076780583 ) @Export("outputLength") int outputLength; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1562015159 + intValue = -2062863895 ) - int field3721; - @ObfuscatedName("y") + int field3740; + @ObfuscatedName("s") @Export("out_char") byte out_char; @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1013295897 + intValue = -424992051 ) @Export("su_rNToGo") int su_rNToGo; - @ObfuscatedName("b") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 2065373853 + intValue = 2124513987 ) @Export("bsBuff") int bsBuff; - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -322433333 + intValue = 225690987 ) @Export("bsLive") int bsLive; - @ObfuscatedName("e") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1084513280 + intValue = 813800448 ) @Export("blockSize100k") int blockSize100k; - @ObfuscatedName("z") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1304598549 + intValue = 1074633139 ) @Export("originalPointer") int originalPointer; - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 293823581 + intValue = 1279441131 ) - int field3736; - @ObfuscatedName("w") + int field3725; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -545729875 + intValue = 1234783121 ) @Export("su_ch2") int su_ch2; - @ObfuscatedName("l") + @ObfuscatedName("w") @Export("unzftab") int[] unzftab; - @ObfuscatedName("h") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1751111105 + intValue = -147337203 ) @Export("nblocks_used") int nblocks_used; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("cftab") int[] cftab; - @ObfuscatedName("o") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 463275141 + intValue = 1493034079 ) @Export("nInUse") int nInUse; - @ObfuscatedName("av") + @ObfuscatedName("ag") @Export("inUse") boolean[] inUse; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("inUse16") boolean[] inUse16; - @ObfuscatedName("ai") + @ObfuscatedName("ao") @Export("seqToUnseq") byte[] seqToUnseq; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("ll8") byte[] ll8; - @ObfuscatedName("az") + @ObfuscatedName("an") @Export("getAndMoveToFrontDecode_yy") int[] getAndMoveToFrontDecode_yy; - @ObfuscatedName("aj") + @ObfuscatedName("al") @Export("selector") byte[] selector; - @ObfuscatedName("an") + @ObfuscatedName("as") @Export("selectorMtf") byte[] selectorMtf; - @ObfuscatedName("at") + @ObfuscatedName("ad") @Export("temp_charArray2d") byte[][] temp_charArray2d; - @ObfuscatedName("as") + @ObfuscatedName("ap") @Export("limit") int[][] limit; - @ObfuscatedName("ak") + @ObfuscatedName("ax") @Export("base") int[][] base; - @ObfuscatedName("ao") + @ObfuscatedName("aj") @Export("perm") int[][] perm; - @ObfuscatedName("ac") + @ObfuscatedName("ab") @Export("minLens") int[] minLens; - @ObfuscatedName("ar") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -716853171 + intValue = -864562359 ) - int field3754; + int field3710; BZip2State() { - this.field3737 = 4096; - this.field3745 = 16; - this.field3746 = 258; - this.field3722 = 6; - this.field3735 = 50; - this.field3717 = 18002; + this.field3717 = 4096; + this.field3709 = 16; + this.field3715 = 258; + this.field3712 = 6; + this.field3737 = 50; + this.field3731 = 18002; this.nextByte = 0; this.next_out = 0; this.unzftab = new int[256]; @@ -182,13 +181,4 @@ public final class BZip2State { this.perm = new int[6][258]; this.minLens = new int[6]; } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-3321312" - ) - static int method5664(int var0) { - return (int)Math.pow(2.0D, (double)(7.0F + (float)var0 / 256.0F)); - } } diff --git a/runescape-client/src/main/java/BoundaryObject.java b/runescape-client/src/main/java/BoundaryObject.java index ea51a2d0e6..e625dab203 100644 --- a/runescape-client/src/main/java/BoundaryObject.java +++ b/runescape-client/src/main/java/BoundaryObject.java @@ -4,66 +4,69 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ey") +@ObfuscatedName("ea") @Implements("BoundaryObject") public final class BoundaryObject { - @ObfuscatedName("d") + @ObfuscatedName("ok") @ObfuscatedSignature( - signature = "[Llq;" + signature = "Lcj;" ) - @Export("title_muteSprite") - static IndexedSprite[] title_muteSprite; - @ObfuscatedName("s") + @Export("varcs") + static Varcs varcs; + @ObfuscatedName("sm") + @Export("foundItemIds") + static short[] foundItemIds; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -557020941 + intValue = -2123632967 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -308845337 - ) - @Export("x") - int x; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -808193817 + intValue = 1852557733 ) @Export("y") int y; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1993098605 + intValue = 728809035 + ) + @Export("x") + int x; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 848853075 ) @Export("orientationA") int orientationA; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1270638241 + intValue = -1849497569 ) @Export("orientationB") int orientationB; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Len;" + signature = "Lel;" ) @Export("entity1") public Entity entity1; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Len;" + signature = "Lel;" ) @Export("entity2") public Entity entity2; - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedGetter( - longValue = 1081854748204039869L + longValue = -720242261539970297L ) @Export("tag") public long tag; - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1627431525 + intValue = -1272619537 ) @Export("flags") int flags; @@ -73,252 +76,16 @@ public final class BoundaryObject { this.flags = 0; } - @ObfuscatedName("i") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Lhz;Lhz;ZII)V", - garbageValue = "1558921351" + signature = "(IB)Ljava/lang/String;", + garbageValue = "-17" ) - static void method3213(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { - if (Login.field1146) { - if (var3 == 4) { - Login.loginIndex = 4; - } - + static final String method3230(int var0) { + if (var0 < 100000) { + return "" + var0 + ""; } else { - Login.loginIndex = var3; - Rasterizer2D.Rasterizer2D_clear(); - byte[] var4 = var0.takeFileByNames("title.jpg", ""); - Login.leftTitleSprite = WorldMapIcon_0.convertJpgToSprite(var4); - Login.rightTitleSprite = Login.leftTitleSprite.mirrorHorizontally(); - if ((Client.worldProperties & 536870912) != 0) { - class51.logoSprite = VertexNormal.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); - } else { - class51.logoSprite = VertexNormal.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); - } - - Login.titleboxSprite = VertexNormal.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); - Login.titlebuttonSprite = VertexNormal.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); - int var6 = var1.getGroupId("runes"); - int var7 = var1.getFileId(var6, ""); - IndexedSprite[] var8; - if (!World.SpriteBuffer_bufferFile(var1, var6, var7)) { - var8 = null; - } else { - IndexedSprite[] var10 = new IndexedSprite[class325.SpriteBuffer_spriteCount]; - - for (int var11 = 0; var11 < class325.SpriteBuffer_spriteCount; ++var11) { - IndexedSprite var12 = var10[var11] = new IndexedSprite(); - var12.width = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth; - var12.height = class325.SpriteBuffer_spriteHeight; - var12.xOffset = class325.SpriteBuffer_xOffsets[var11]; - var12.yOffset = class325.SpriteBuffer_yOffsets[var11]; - var12.subWidth = class325.SpriteBuffer_spriteWidths[var11]; - var12.subHeight = class225.SpriteBuffer_spriteHeights[var11]; - var12.palette = class325.SpriteBuffer_spritePalette; - var12.pixels = WorldMapSection1.SpriteBuffer_pixels[var11]; - } - - UserComparator7.SpriteBuffer_clear(); - var8 = var10; - } - - ItemDefinition.runesSprite = var8; - var7 = var1.getGroupId("title_mute"); - int var14 = var1.getFileId(var7, ""); - IndexedSprite[] var9; - if (!World.SpriteBuffer_bufferFile(var1, var7, var14)) { - var9 = null; - } else { - IndexedSprite[] var18 = new IndexedSprite[class325.SpriteBuffer_spriteCount]; - - for (int var19 = 0; var19 < class325.SpriteBuffer_spriteCount; ++var19) { - IndexedSprite var13 = var18[var19] = new IndexedSprite(); - var13.width = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth; - var13.height = class325.SpriteBuffer_spriteHeight; - var13.xOffset = class325.SpriteBuffer_xOffsets[var19]; - var13.yOffset = class325.SpriteBuffer_yOffsets[var19]; - var13.subWidth = class325.SpriteBuffer_spriteWidths[var19]; - var13.subHeight = class225.SpriteBuffer_spriteHeights[var19]; - var13.palette = class325.SpriteBuffer_spritePalette; - var13.pixels = WorldMapSection1.SpriteBuffer_pixels[var19]; - } - - UserComparator7.SpriteBuffer_clear(); - var9 = var18; - } - - title_muteSprite = var9; - Login.options_buttons_0Sprite = VertexNormal.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); - class83.field1136 = VertexNormal.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); - Login.options_buttons_2Sprite = VertexNormal.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); - class96.field1303 = VertexNormal.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); - UserComparator8.field1957 = Login.options_buttons_0Sprite.subWidth; - class173.field2079 = Login.options_buttons_0Sprite.subHeight; - Bounds.loginScreenRunesAnimation = new LoginScreenAnimation(ItemDefinition.runesSprite); - if (var2) { - Login.Login_username = ""; - Login.Login_password = ""; - } - - SecureRandomCallable.field500 = 0; - WorldMapSection1.otp = ""; - Login.field1171 = true; - Login.worldSelectOpen = false; - if (!GrandExchangeOffer.clientPreferences.titleMusicDisabled) { - Archive var16 = GrandExchangeEvent.archive6; - var14 = var16.getGroupId("scape main"); - int var17 = var16.getFileId(var14, ""); - Projectile.method2040(2, var16, var14, var17, 255, false); - } else { - DevicePcmPlayerProvider.method793(2); - } - - NPC.method1977(false); - Login.field1146 = true; - Login.xPadding = (KitDefinition.canvasWidth - 765) / 2; - Login.loginBoxX = Login.xPadding + 202; - Login.loginBoxCenter = Login.loginBoxX + 180; - Login.leftTitleSprite.drawAt(Login.xPadding, 0); - Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - class51.logoSprite.drawAt(Login.xPadding + 382 - class51.logoSprite.subWidth / 2, 18); + return var0 < 10000000 ? "" + var0 / 1000 + "K" + "" : "" + var0 / 1000000 + "M" + ""; } } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "1412728541" - ) - @Export("Messages_getHistorySize") - static int Messages_getHistorySize(int var0) { - ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); - return var1 == null ? 0 : var1.size(); - } - - @ObfuscatedName("t") - @Export("Entity_unpackID") - public static int Entity_unpackID(long var0) { - return (int)(var0 >>> 17 & 4294967295L); - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "(IIIB)I", - garbageValue = "64" - ) - @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("hk") - @ObfuscatedSignature( - signature = "(ZLkx;B)V", - garbageValue = "-77" - ) - static final void method3216(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 var5; - if (var0) { - var5 = var1.readBits(8); - if (var5 > 127) { - var5 -= 256; - } - } else { - var5 = var1.readBits(5); - if (var5 > 15) { - var5 -= 32; - } - } - - int var6 = var1.readBits(1); - int var7 = Client.defaultRotations[var1.readBits(3)]; - if (var3) { - var4.orientation = var4.rotation = var7; - } - - int var8 = var1.readBits(1); - if (var8 == 1) { - Client.field669[++Client.field861 - 1] = var2; - } - - int var9; - if (var0) { - var9 = var1.readBits(8); - if (var9 > 127) { - var9 -= 256; - } - } else { - var9 = var1.readBits(5); - if (var9 > 15) { - var9 -= 32; - } - } - - var4.definition = ViewportMouse.getNpcDefinition(var1.readBits(14)); - var4.size = var4.definition.size * 64; - var4.field971 = var4.definition.rotation; - if (var4.field971 == 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.readySequence = var4.definition.readySequence; - var4.turnLeftSequence = var4.definition.turnLeftSequence; - var4.turnRightSequence = var4.definition.turnRightSequence; - var4.method1970(WorldMapIcon_1.localPlayer.pathX[0] + var5, WorldMapIcon_1.localPlayer.pathY[0] + var9, var6 == 1); - continue; - } - } - - var1.exportIndex(); - return; - } - } - - @ObfuscatedName("ka") - @ObfuscatedSignature( - signature = "(IIIZI)V", - garbageValue = "-1395440174" - ) - public static void method3215(int var0, int var1, int var2, boolean var3) { - PacketBufferNode var4 = MenuAction.getPacketBufferNode(ClientPacket.field2255, Client.packetWriter.isaacCipher); - var4.packetBuffer.writeIntME(var3 ? Client.field705 : 0); - var4.packetBuffer.writeShortLE(var1); - var4.packetBuffer.method5545(var2); - var4.packetBuffer.writeShort(var0); - Client.packetWriter.addNode(var4); - } } diff --git a/runescape-client/src/main/java/Bounds.java b/runescape-client/src/main/java/Bounds.java index 046cf370b5..a7c05359e2 100644 --- a/runescape-client/src/main/java/Bounds.java +++ b/runescape-client/src/main/java/Bounds.java @@ -4,41 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lh") +@ObfuscatedName("lr") @Implements("Bounds") public class Bounds { - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lbt;" - ) - @Export("loginScreenRunesAnimation") - static LoginScreenAnimation loginScreenRunesAnimation; - @ObfuscatedName("fv") - @ObfuscatedSignature( - signature = "Lkg;" - ) - static AbstractSocket field3845; - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 927119221 + intValue = -242928427 ) @Export("lowX") public int lowX; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1883471895 + intValue = -1412221703 ) @Export("lowY") public int lowY; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 482662949 + intValue = -1383178295 ) @Export("highX") public int highX; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1342895921 + intValue = -647845267 ) @Export("highY") public int highY; @@ -52,10 +41,10 @@ public class Bounds { this(0, 0, var1, var2); } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "-92" + signature = "(IIS)V", + garbageValue = "23378" ) @Export("setLow") public void setLow(int var1, int var2) { @@ -63,10 +52,10 @@ public class Bounds { this.lowY = var2; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "638104028" + garbageValue = "-361054840" ) @Export("setHigh") public void setHigh(int var1, int var2) { @@ -74,22 +63,22 @@ public class Bounds { this.highY = var2; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Llh;Llh;B)V", - garbageValue = "15" + signature = "(Llr;Llr;S)V", + garbageValue = "3042" ) - public void method5846(Bounds var1, Bounds var2) { - this.method5867(var1, var2); - this.method5848(var1, var2); + public void method5948(Bounds var1, Bounds var2) { + this.method5936(var1, var2); + this.method5938(var1, var2); } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Llh;Llh;I)V", - garbageValue = "-157171607" + signature = "(Llr;Llr;I)V", + garbageValue = "1943311297" ) - void method5867(Bounds var1, Bounds var2) { + void method5936(Bounds var1, Bounds var2) { var2.lowX = this.lowX; var2.highX = this.highX; if (this.lowX < var1.lowX) { @@ -97,8 +86,8 @@ public class Bounds { var2.lowX = var1.lowX; } - if (var2.method5847() > var1.method5847()) { - var2.highX -= var2.method5847() - var1.method5847(); + if (var2.method5947() > var1.method5947()) { + var2.highX -= var2.method5947() - var1.method5947(); } if (var2.highX < 0) { @@ -107,12 +96,12 @@ public class Bounds { } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(Llh;Llh;I)V", - garbageValue = "-2140694621" + signature = "(Llr;Llr;B)V", + garbageValue = "0" ) - void method5848(Bounds var1, Bounds var2) { + void method5938(Bounds var1, Bounds var2) { var2.lowY = this.lowY; var2.highY = this.highY; if (this.lowY < var1.lowY) { @@ -120,8 +109,8 @@ public class Bounds { var2.lowY = var1.lowY; } - if (var2.method5842() > var1.method5842()) { - var2.highY -= var2.method5842() - var1.method5842(); + if (var2.method5940() > var1.method5940()) { + var2.highY -= var2.method5940() - var1.method5940(); } if (var2.highY < 0) { @@ -130,47 +119,37 @@ public class Bounds { } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "134601683" + garbageValue = "-241231712" ) - int method5847() { + int method5947() { return this.highX + this.lowX; } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-901412341" + garbageValue = "-1659278045" ) - int method5842() { + int method5940() { return this.highY + this.lowY; } - public String abb() { - return null; - } - - public String abd() { - return null; - } - public String toString() { return null; } - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(I)Lfs;", - garbageValue = "-2037238373" - ) - @Export("newClock") - public static Clock newClock() { - try { - return new NanoClock(); - } catch (Throwable var1) { - return new MilliClock(); - } + public String aan() { + return null; + } + + public String aai() { + return null; + } + + public String aar() { + return null; } } diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java index 9b2b5730f5..f2c32b150e 100644 --- a/runescape-client/src/main/java/Buddy.java +++ b/runescape-client/src/main/java/Buddy.java @@ -4,27 +4,24 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jt") +@ObfuscatedName("je") @Implements("Buddy") public class Buddy extends User { - @ObfuscatedName("c") - @Export("Tiles_lightness") - static int[] Tiles_lightness; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 453016847 + intValue = -359902741 ) @Export("world") public int world; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1487463363 + intValue = 725247471 ) @Export("int2") public int int2; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -838100941 + intValue = -846387241 ) @Export("rank") public int rank; @@ -33,10 +30,10 @@ public class Buddy extends User { this.world = -1; } - @ObfuscatedName("aq") + @ObfuscatedName("ae") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-1748427179" + garbageValue = "-741499831" ) @Export("set") void set(int var1, int var2) { @@ -44,33 +41,23 @@ public class Buddy extends User { this.int2 = var2; } - @ObfuscatedName("ay") + @ObfuscatedName("ah") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1469335924" + garbageValue = "293368620" ) @Export("getWorld") public int getWorld() { return this.world; } - @ObfuscatedName("ad") + @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-1595892037" + signature = "(S)Z", + garbageValue = "-12107" ) @Export("hasWorld") public boolean hasWorld() { return this.world > 0; } - - @ObfuscatedName("bk") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)I", - garbageValue = "1544989297" - ) - @Export("stringCp1252NullTerminatedByteSize") - public static int stringCp1252NullTerminatedByteSize(String var0) { - return var0.length() + 1; - } } diff --git a/runescape-client/src/main/java/BuddyRankComparator.java b/runescape-client/src/main/java/BuddyRankComparator.java index 94630b6f0b..548a90451d 100644 --- a/runescape-client/src/main/java/BuddyRankComparator.java +++ b/runescape-client/src/main/java/BuddyRankComparator.java @@ -1,12 +1,19 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fi") +@ObfuscatedName("fh") @Implements("BuddyRankComparator") public class BuddyRankComparator extends AbstractUserComparator { - @ObfuscatedName("s") + @ObfuscatedName("my") + @ObfuscatedGetter( + intValue = 30724641 + ) + @Export("selectedSpellFlags") + static int selectedSpellFlags; + @ObfuscatedName("c") @Export("reversed") final boolean reversed; @@ -14,10 +21,10 @@ public class BuddyRankComparator extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljt;Ljt;I)I", - garbageValue = "1327154519" + signature = "(Lje;Lje;S)I", + garbageValue = "28982" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -31,139 +38,4 @@ public class BuddyRankComparator extends AbstractUserComparator { public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "(ILkv;Lid;I)V", - garbageValue = "1244891024" - ) - static void method3376(int var0, ArchiveDisk var1, Archive var2) { - ArchiveDiskAction var3 = new ArchiveDiskAction(); - var3.type = 1; - var3.key = (long)var0; - var3.archiveDisk = var1; - var3.archive = var2; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); - } - - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { - if (ArchiveDiskActionHandler.field3124 == 0) { - class13.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); - class13.ArchiveDiskActionHandler_thread.setDaemon(true); - class13.ArchiveDiskActionHandler_thread.start(); - class13.ArchiveDiskActionHandler_thread.setPriority(5); - } - - ArchiveDiskActionHandler.field3124 = 600; - } - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "(Lid;IIIBZI)V", - garbageValue = "-800902094" - ) - @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; - } - - } - } - } - } - - @ObfuscatedName("fs") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "124595109" - ) - @Export("doCheat") - static final void doCheat(String var0) { - if (var0.equalsIgnoreCase("toggleroof")) { - GrandExchangeOffer.clientPreferences.roofsHidden = !GrandExchangeOffer.clientPreferences.roofsHidden; - GrandExchangeOfferAgeComparator.savePreferences(); - if (GrandExchangeOffer.clientPreferences.roofsHidden) { - DirectByteArrayCopier.addGameMessage(99, "", "Roofs are now all hidden"); - } else { - DirectByteArrayCopier.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")) { - WorldMapCacheName.worldMap.showCoord = !WorldMapCacheName.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")) { - class2.method31(); - } - } - - PacketBufferNode var1 = MenuAction.getPacketBufferNode(ClientPacket.field2238, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(var0.length() + 1); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); - } } diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java index d370a57f4c..b13f9a203c 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("ky") +@ObfuscatedName("kz") @Implements("Buffer") public class Buffer extends Node { - @ObfuscatedName("q") + @ObfuscatedName("v") @Export("crc32Table") public static int[] crc32Table; - @ObfuscatedName("d") + @ObfuscatedName("z") @Export("crc64Table") static long[] crc64Table; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("array") public byte[] array; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -823557765 + intValue = -1189972175 ) @Export("offset") public int offset; @@ -48,7 +48,7 @@ public class Buffer extends Node { long var4 = (long)var2; for (int var3 = 0; var3 < 8; ++var3) { - if (1L == (var4 & 1L)) { + if ((var4 & 1L) == 1L) { var4 = var4 >>> 1 ^ -3932672073523589310L; } else { var4 >>>= 1; @@ -61,7 +61,7 @@ public class Buffer extends Node { } public Buffer(int var1) { - this.array = class60.ByteArrayPool_getArray(var1); + this.array = class30.ByteArrayPool_getArray(var1); this.offset = 0; } @@ -70,34 +70,34 @@ public class Buffer extends Node { this.offset = 0; } - @ObfuscatedName("aq") + @ObfuscatedName("ay") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "1" + garbageValue = "38" ) @Export("releaseArray") public void releaseArray() { if (this.array != null) { - WorldMapElement.ByteArrayPool_release(this.array); + UserComparator5.ByteArrayPool_release(this.array); } this.array = null; } - @ObfuscatedName("ay") + @ObfuscatedName("ae") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "26222460" + garbageValue = "-1260587251" ) @Export("writeByte") public void writeByte(int var1) { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("ad") + @ObfuscatedName("ah") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1309375768" + garbageValue = "618943248" ) @Export("writeShort") public void writeShort(int var1) { @@ -105,10 +105,10 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("al") + @ObfuscatedName("aa") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1866078389" + garbageValue = "-1756344108" ) @Export("writeMedium") public void writeMedium(int var1) { @@ -117,10 +117,10 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("ah") + @ObfuscatedName("aq") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1393781479" + garbageValue = "2107422926" ) @Export("writeInt") public void writeInt(int var1) { @@ -130,7 +130,7 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("ab") + @ObfuscatedName("ar") @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("aw") + @ObfuscatedName("ac") @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("ae") + @ObfuscatedName("az") @ObfuscatedSignature( - signature = "(ZB)V", - garbageValue = "15" + signature = "(ZS)V", + garbageValue = "1337" ) @Export("writeBoolean") public void writeBoolean(boolean var1) { this.writeByte(var1 ? 1 : 0); } - @ObfuscatedName("bw") + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "-97" + signature = "(Ljava/lang/String;I)V", + garbageValue = "-838686798" ) @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 += ChatChannel.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); + this.offset += class210.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); this.array[++this.offset - 1] = 0; } } - @ObfuscatedName("bn") + @ObfuscatedName("au") @ObfuscatedSignature( signature = "(Ljava/lang/String;I)V", - garbageValue = "1644174948" + garbageValue = "-103316861" ) @Export("writeStringCp1252NullCircumfixed") public void writeStringCp1252NullCircumfixed(String var1) { @@ -192,23 +192,22 @@ public class Buffer extends Node { throw new IllegalArgumentException(""); } else { this.array[++this.offset - 1] = 0; - this.offset += ChatChannel.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); + this.offset += class210.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); this.array[++this.offset - 1] = 0; } } - @ObfuscatedName("bp") + @ObfuscatedName("bg") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;S)V", - garbageValue = "6886" + signature = "(Ljava/lang/CharSequence;B)V", + garbageValue = "-64" ) @Export("writeCESU8") public void writeCESU8(CharSequence var1) { int var3 = var1.length(); int var4 = 0; - int var5; - for (var5 = 0; var5 < var3; ++var5) { + for (int var5 = 0; var5 < var3; ++var5) { char var6 = var1.charAt(var5); if (var6 <= 127) { ++var4; @@ -221,34 +220,13 @@ public class Buffer extends Node { this.array[++this.offset - 1] = 0; this.writeVarInt(var4); - var4 = this.offset; - byte[] var12 = this.array; - int var7 = this.offset; - int var8 = var1.length(); - int var9 = var7; - - for (int var10 = 0; var10 < var8; ++var10) { - char var11 = var1.charAt(var10); - if (var11 <= 127) { - var12[var9++] = (byte)var11; - } else if (var11 <= 2047) { - var12[var9++] = (byte)(192 | var11 >> 6); - var12[var9++] = (byte)(128 | var11 & '?'); - } else { - var12[var9++] = (byte)(224 | var11 >> '\f'); - var12[var9++] = (byte)(128 | var11 >> 6 & 63); - var12[var9++] = (byte)(128 | var11 & '?'); - } - } - - var5 = var9 - var7; - this.offset = var5 + var4; + this.offset += ViewportMouse.method2956(this.array, this.offset, var1); } - @ObfuscatedName("bz") + @ObfuscatedName("bn") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "-2063630322" + garbageValue = "99753612" ) @Export("writeBytes") public void writeBytes(byte[] var1, int var2, int var3) { @@ -258,10 +236,10 @@ public class Buffer extends Node { } - @ObfuscatedName("bh") + @ObfuscatedName("bk") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1257286815" + garbageValue = "-557514726" ) @Export("writeLengthInt") public void writeLengthInt(int var1) { @@ -275,10 +253,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("bv") + @ObfuscatedName("bp") @ObfuscatedSignature( signature = "(IB)V", - garbageValue = "50" + garbageValue = "72" ) @Export("writeLengthShort") public void writeLengthShort(int var1) { @@ -290,10 +268,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("bj") + @ObfuscatedName("bu") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "380591196" + signature = "(IB)V", + garbageValue = "44" ) @Export("writeLengthByte") public void writeLengthByte(int var1) { @@ -304,10 +282,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("bq") + @ObfuscatedName("bi") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-2115031789" + garbageValue = "970899408" ) @Export("writeSmartByteShort") public void writeSmartByteShort(int var1) { @@ -320,10 +298,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("by") + @ObfuscatedName("bv") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "2105291599" + garbageValue = "1902392454" ) @Export("writeVarInt") public void writeVarInt(int var1) { @@ -346,30 +324,30 @@ public class Buffer extends Node { this.writeByte(var1 & 127); } - @ObfuscatedName("bs") + @ObfuscatedName("bf") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1804591207" + garbageValue = "1728300707" ) @Export("readUnsignedByte") public int readUnsignedByte() { return this.array[++this.offset - 1] & 255; } - @ObfuscatedName("bi") + @ObfuscatedName("bm") @ObfuscatedSignature( - signature = "(I)B", - garbageValue = "2067539630" + signature = "(B)B", + garbageValue = "114" ) @Export("readByte") public byte readByte() { return this.array[++this.offset - 1]; } - @ObfuscatedName("bf") + @ObfuscatedName("bw") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "15" + signature = "(I)I", + garbageValue = "-1980740859" ) @Export("readUnsignedShort") public int readUnsignedShort() { @@ -377,10 +355,10 @@ public class Buffer extends Node { return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); } - @ObfuscatedName("bd") + @ObfuscatedName("bs") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-861597845" + garbageValue = "1980960820" ) @Export("readShort") public int readShort() { @@ -393,10 +371,10 @@ public class Buffer extends Node { return var1; } - @ObfuscatedName("br") + @ObfuscatedName("bt") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-598726421" + garbageValue = "1938085544" ) @Export("readMedium") public int readMedium() { @@ -404,10 +382,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("bm") + @ObfuscatedName("bj") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "3" + garbageValue = "98" ) @Export("readInt") public int readInt() { @@ -415,10 +393,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) + ((this.array[this.offset - 4] & 255) << 24); } - @ObfuscatedName("bu") + @ObfuscatedName("bd") @ObfuscatedSignature( signature = "(I)J", - garbageValue = "1115582555" + garbageValue = "2079336469" ) @Export("readLong") public long readLong() { @@ -427,20 +405,20 @@ public class Buffer extends Node { return (var1 << 32) + var3; } - @ObfuscatedName("bb") + @ObfuscatedName("by") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "2141139990" + garbageValue = "-1896103883" ) @Export("readBoolean") public boolean readBoolean() { return (this.readUnsignedByte() & 1) == 1; } - @ObfuscatedName("bl") + @ObfuscatedName("bh") @ObfuscatedSignature( signature = "(I)Ljava/lang/String;", - garbageValue = "-373862586" + garbageValue = "425843067" ) @Export("readStringCp1252NullTerminatedOrNull") public String readStringCp1252NullTerminatedOrNull() { @@ -452,10 +430,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("bt") + @ObfuscatedName("bo") @ObfuscatedSignature( - signature = "(S)Ljava/lang/String;", - garbageValue = "-25708" + signature = "(I)Ljava/lang/String;", + garbageValue = "-1577831456" ) @Export("readStringCp1252NullTerminated") public String readStringCp1252NullTerminated() { @@ -465,13 +443,13 @@ public class Buffer extends Node { } int var2 = this.offset - var1 - 1; - return var2 == 0 ? "" : ViewportMouse.decodeStringCp1252(this.array, var1, var2); + return var2 == 0 ? "" : class51.decodeStringCp1252(this.array, var1, var2); } - @ObfuscatedName("bx") + @ObfuscatedName("be") @ObfuscatedSignature( - signature = "(I)Ljava/lang/String;", - garbageValue = "1244023154" + signature = "(B)Ljava/lang/String;", + garbageValue = "65" ) @Export("readStringCp1252NullCircumfixed") public String readStringCp1252NullCircumfixed() { @@ -485,14 +463,14 @@ public class Buffer extends Node { } int var3 = this.offset - var2 - 1; - return var3 == 0 ? "" : ViewportMouse.decodeStringCp1252(this.array, var2, var3); + return var3 == 0 ? "" : class51.decodeStringCp1252(this.array, var2, var3); } } - @ObfuscatedName("ba") + @ObfuscatedName("bl") @ObfuscatedSignature( signature = "(I)Ljava/lang/String;", - garbageValue = "812121562" + garbageValue = "-161524074" ) @Export("readCESU8") public String readCESU8() { @@ -504,17 +482,17 @@ public class Buffer extends Node { if (var2 + this.offset > this.array.length) { throw new IllegalStateException(""); } else { - String var3 = KeyHandler.method786(this.array, this.offset, var2); + String var3 = ArchiveDiskAction.method4132(this.array, this.offset, var2); this.offset += var2; return var3; } } } - @ObfuscatedName("bg") + @ObfuscatedName("bb") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "1127647987" + garbageValue = "-190296870" ) @Export("readBytes") public void readBytes(byte[] var1, int var2, int var3) { @@ -524,10 +502,10 @@ public class Buffer extends Node { } - @ObfuscatedName("be") + @ObfuscatedName("ba") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "8" + signature = "(I)I", + garbageValue = "912699635" ) @Export("readShortSmart") public int readShortSmart() { @@ -535,10 +513,10 @@ public class Buffer extends Node { return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; } - @ObfuscatedName("bc") + @ObfuscatedName("bz") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-1325782569" + signature = "(B)I", + garbageValue = "109" ) @Export("readUShortSmart") public int readUShortSmart() { @@ -546,12 +524,12 @@ public class Buffer extends Node { return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; } - @ObfuscatedName("ce") + @ObfuscatedName("bc") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-121" + signature = "(I)I", + garbageValue = "-389889422" ) - public int method5565() { + public int method5480() { int var1 = 0; int var2; @@ -563,21 +541,21 @@ public class Buffer extends Node { return var1; } - @ObfuscatedName("ci") + @ObfuscatedName("br") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-572319792" + garbageValue = "-1759456747" ) - public int method5423() { + public int method5481() { return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); } - @ObfuscatedName("ck") + @ObfuscatedName("bx") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-551220605" + garbageValue = "1828581894" ) - public int method5602() { + public int method5623() { if (this.array[this.offset] < 0) { return this.readInt() & Integer.MAX_VALUE; } else { @@ -586,10 +564,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("cc") + @ObfuscatedName("bq") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1421419631" + garbageValue = "-322424913" ) @Export("readVarInt") public int readVarInt() { @@ -603,10 +581,10 @@ public class Buffer extends Node { return var2 | var1; } - @ObfuscatedName("cd") + @ObfuscatedName("cb") @ObfuscatedSignature( - signature = "([II)V", - garbageValue = "-1793126662" + signature = "([IB)V", + garbageValue = "36" ) @Export("xteaEncryptAll") public void xteaEncryptAll(int[] var1) { @@ -631,10 +609,10 @@ public class Buffer extends Node { } - @ObfuscatedName("cf") + @ObfuscatedName("ct") @ObfuscatedSignature( - signature = "([IB)V", - garbageValue = "-13" + signature = "([II)V", + garbageValue = "-2128070091" ) @Export("xteaDecryptAll") public void xteaDecryptAll(int[] var1) { @@ -659,10 +637,10 @@ public class Buffer extends Node { } - @ObfuscatedName("cw") + @ObfuscatedName("ch") @ObfuscatedSignature( signature = "([IIII)V", - garbageValue = "-364788606" + garbageValue = "1296681906" ) @Export("xteaEncrypt") public void xteaEncrypt(int[] var1, int var2, int var3) { @@ -689,10 +667,10 @@ public class Buffer extends Node { this.offset = var4; } - @ObfuscatedName("cj") + @ObfuscatedName("cc") @ObfuscatedSignature( - signature = "([IIII)V", - garbageValue = "1445467920" + signature = "([IIIB)V", + garbageValue = "25" ) @Export("xteaDecrypt") public void xteaDecrypt(int[] var1, int var2, int var3) { @@ -719,10 +697,10 @@ public class Buffer extends Node { this.offset = var4; } - @ObfuscatedName("cp") + @ObfuscatedName("cv") @ObfuscatedSignature( signature = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V", - garbageValue = "-1886495382" + garbageValue = "1840777170" ) @Export("encryptRsa") public void encryptRsa(BigInteger var1, BigInteger var2) { @@ -738,10 +716,10 @@ public class Buffer extends Node { this.writeBytes(var7, 0, var7.length); } - @ObfuscatedName("cu") + @ObfuscatedName("cr") @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "6" + signature = "(II)I", + garbageValue = "-1830139064" ) @Export("writeCrc") public int writeCrc(int var1) { @@ -758,10 +736,10 @@ public class Buffer extends Node { return var5; } - @ObfuscatedName("cm") + @ObfuscatedName("cl") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-11685633" + garbageValue = "-829786051" ) @Export("checkCrc") public boolean checkCrc() { @@ -780,155 +758,155 @@ public class Buffer extends Node { return var5 == var4; } - @ObfuscatedName("cb") + @ObfuscatedName("ca") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "12" + signature = "(II)V", + garbageValue = "-2063150013" ) - public void method5433(int var1) { + public void method5491(int var1) { this.array[++this.offset - 1] = (byte)(var1 + 128); } - @ObfuscatedName("ch") + @ObfuscatedName("ck") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-1332263426" + garbageValue = "1477946417" ) - public void method5545(int var1) { + public void method5566(int var1) { this.array[++this.offset - 1] = (byte)(0 - var1); } + @ObfuscatedName("cm") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "2116757158" + ) + public void method5493(int var1) { + this.array[++this.offset - 1] = (byte)(128 - var1); + } + + @ObfuscatedName("ce") + @ObfuscatedSignature( + signature = "(B)I", + garbageValue = "1" + ) + public int method5494() { + return this.array[++this.offset - 1] - 128 & 255; + } + @ObfuscatedName("cn") - @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "10" - ) - public void method5435(int var1) { - this.array[++this.offset - 1] = (byte)(128 - var1); - } - - @ObfuscatedName("cr") - @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-34" - ) - public int method5436() { - return this.array[++this.offset - 1] - 128 & 255; - } - - @ObfuscatedName("cl") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1565223364" + garbageValue = "-331739438" ) - @Export("readUnsignedByteNegate") - public int readUnsignedByteNegate() { + public int method5547() { return 0 - this.array[++this.offset - 1] & 255; } - @ObfuscatedName("cg") + @ObfuscatedName("cj") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-121" + signature = "(I)I", + garbageValue = "1776957173" ) - public int method5438() { + @Export("readUnsignedByteNegate") + public int readUnsignedByteNegate() { return 128 - this.array[++this.offset - 1] & 255; } - @ObfuscatedName("cy") + @ObfuscatedName("cw") @ObfuscatedSignature( signature = "(I)B", - garbageValue = "-1467076143" + garbageValue = "-2103641384" ) - public byte method5616() { + public byte method5497() { return (byte)(this.array[++this.offset - 1] - 128); } - @ObfuscatedName("cz") + @ObfuscatedName("cu") @ObfuscatedSignature( signature = "(I)B", - garbageValue = "1466744800" + garbageValue = "-753316852" ) - public byte method5421() { + public byte method5498() { return (byte)(0 - this.array[++this.offset - 1]); } - @ObfuscatedName("cv") + @ObfuscatedName("cd") @ObfuscatedSignature( signature = "(I)B", - garbageValue = "-1597148556" + garbageValue = "2121675336" ) - public byte method5441() { + public byte method5634() { return (byte)(128 - this.array[++this.offset - 1]); } - @ObfuscatedName("cq") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-785731883" - ) - @Export("writeShortLE") - public void writeShortLE(int var1) { - this.array[++this.offset - 1] = (byte)var1; - this.array[++this.offset - 1] = (byte)(var1 >> 8); - } - - @ObfuscatedName("ct") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1047736204" - ) - public void method5443(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); - this.array[++this.offset - 1] = (byte)(var1 + 128); - } - - @ObfuscatedName("cx") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1307961550" - ) - public void method5432(int var1) { - this.array[++this.offset - 1] = (byte)(var1 + 128); - this.array[++this.offset - 1] = (byte)(var1 >> 8); - } - - @ObfuscatedName("ca") - @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "34" - ) - public int method5445() { - this.offset += 2; - return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); - } - @ObfuscatedName("cs") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "52" + signature = "(IB)V", + garbageValue = "-6" ) - public int method5446() { + public void method5500(int var1) { + this.array[++this.offset - 1] = (byte)var1; + this.array[++this.offset - 1] = (byte)(var1 >> 8); + } + + @ObfuscatedName("cx") + @ObfuscatedSignature( + signature = "(IB)V", + garbageValue = "-2" + ) + @Export("writeIntME") + public void writeIntME(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); + this.array[++this.offset - 1] = (byte)(var1 + 128); + } + + @ObfuscatedName("ci") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "-1695551709" + ) + public void method5502(int var1) { + this.array[++this.offset - 1] = (byte)(var1 + 128); + this.array[++this.offset - 1] = (byte)(var1 >> 8); + } + + @ObfuscatedName("cf") + @ObfuscatedSignature( + signature = "(B)I", + garbageValue = "-64" + ) + public int method5503() { + this.offset += 2; + return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); + } + + @ObfuscatedName("cq") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "2105428724" + ) + public int method5459() { this.offset += 2; return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); } @ObfuscatedName("co") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "203510338" + signature = "(S)I", + garbageValue = "7305" ) - public int method5447() { + public int method5514() { this.offset += 2; return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); } - @ObfuscatedName("dr") + @ObfuscatedName("cz") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-823557765" + signature = "(S)I", + garbageValue = "18379" ) - public int method5448() { + public int method5506() { this.offset += 2; int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); if (var1 > 32767) { @@ -938,14 +916,14 @@ public class Buffer extends Node { return var1; } - @ObfuscatedName("dd") + @ObfuscatedName("cp") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1479368922" + garbageValue = "-1861264070" ) - public int method5434() { + public int method5584() { this.offset += 2; - int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); + int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); if (var1 > 32767) { var1 -= 65536; } @@ -953,20 +931,31 @@ public class Buffer extends Node { return var1; } - @ObfuscatedName("dv") + @ObfuscatedName("cy") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-1804428572" + signature = "(IB)V", + garbageValue = "-32" ) - public int method5449() { - this.offset += 3; - return (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 1] & 255) << 16); + public void method5466(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("da") + @ObfuscatedName("cg") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "997752481" + signature = "(I)I", + garbageValue = "-1460382327" + ) + public int method5508() { + 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("dj") + @ObfuscatedSignature( + signature = "(IB)V", + garbageValue = "-45" ) @Export("writeIntLE") public void writeIntLE(int var1) { @@ -978,78 +967,68 @@ public class Buffer extends Node { @ObfuscatedName("dh") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "94" + signature = "(II)V", + garbageValue = "1216853295" ) - @Export("writeIntME") - public void writeIntME(int var1) { + @Export("writeIntLE16") + public void writeIntLE16(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("do") + @ObfuscatedSignature( + signature = "(IS)V", + garbageValue = "-10712" + ) + @Export("writeShortLE") + public void writeShortLE(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("dm") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "742164705" + signature = "(B)I", + garbageValue = "101" ) - @Export("writeIntLE16") - public void writeIntLE16(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("dj") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-1937988665" - ) - public int method5505() { + public int method5587() { 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("dc") + @ObfuscatedName("dy") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "98" + garbageValue = "-121" ) - public int method5455() { + public int method5580() { 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("db") + @ObfuscatedName("dd") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-33" + signature = "(I)I", + garbageValue = "-1549007830" ) - public int method5414() { + public int method5515() { 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("dx") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "([BIII)V", - garbageValue = "1071281288" + signature = "(Lli;IIIB)V", + garbageValue = "15" ) - public void method5457(byte[] var1, int var2, int var3) { - for (int var4 = var2; var4 < var3 + var2; ++var4) { - var1[var4] = (byte)(this.array[++this.offset - 1] - 128); - } - - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "(I)Lgq;", - garbageValue = "-1208544567" - ) - static PacketBufferNode method5567() { - return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; + static void method5703(Sprite var0, int var1, int var2, int var3) { + DemotingHashTable var4 = WorldMapRegion.WorldMapRegion_cachedSprites; + long var6 = (long)(var3 << 16 | var1 << 8 | var2); + var4.put(var0, var6, var0.pixels.length * 4); } } diff --git a/runescape-client/src/main/java/BufferedFile.java b/runescape-client/src/main/java/BufferedFile.java index 66bb02ae18..6f78b65251 100644 --- a/runescape-client/src/main/java/BufferedFile.java +++ b/runescape-client/src/main/java/BufferedFile.java @@ -9,69 +9,69 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("mw") @Implements("BufferedFile") public class BufferedFile { - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lmm;" + signature = "Lmr;" ) @Export("accessFile") AccessFile accessFile; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("readBuffer") byte[] readBuffer; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - longValue = 6930797311862622501L + longValue = 3832537233495769245L ) @Export("readBufferOffset") long readBufferOffset; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 324861765 + intValue = 327772987 ) @Export("readBufferLength") int readBufferLength; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("writeBuffer") byte[] writeBuffer; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedGetter( - longValue = 2678508088338929319L + longValue = -7089347366618851565L ) @Export("writeBufferOffset") long writeBufferOffset; - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1286336757 + intValue = 1970592505 ) @Export("writeBufferLength") int writeBufferLength; - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedGetter( - longValue = -1907180336926601455L + longValue = -5326533979176937991L ) @Export("offset") long offset; - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedGetter( - longValue = 4723760243484879195L + longValue = -2696097310497379977L ) @Export("fileLength") long fileLength; - @ObfuscatedName("f") + @ObfuscatedName("n") @ObfuscatedGetter( - longValue = 2095185296289778233L + longValue = 7888031407881302655L ) @Export("length") long length; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedGetter( - longValue = -4232607220009999679L + longValue = -3322791226298163907L ) @Export("fileOffset") long fileOffset; @ObfuscatedSignature( - signature = "(Lmm;II)V" + signature = "(Lmr;II)V" ) public BufferedFile(AccessFile var1, int var2, int var3) throws IOException { this.readBufferOffset = -1L; @@ -84,10 +84,10 @@ public class BufferedFile { this.offset = 0L; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-2018301044" + garbageValue = "806301306" ) @Export("close") public void close() throws IOException { @@ -95,7 +95,7 @@ public class BufferedFile { this.accessFile.close(); } - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("seek") public void seek(long var1) throws IOException { if (var1 < 0L) { @@ -105,30 +105,30 @@ public class BufferedFile { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(B)J", - garbageValue = "54" + signature = "(I)J", + garbageValue = "-1810414752" ) @Export("length") public long length() { return this.length; } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "([BI)V", - garbageValue = "-1442283725" + garbageValue = "318329174" ) @Export("readFully") public void readFully(byte[] var1) throws IOException { this.read(var1, 0, var1.length); } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "([BIII)V", - garbageValue = "-481612055" + signature = "([BIIS)V", + garbageValue = "-2545" ) @Export("read") public void read(byte[] var1, int var2, int var3) throws IOException { @@ -137,7 +137,7 @@ public class BufferedFile { throw new ArrayIndexOutOfBoundsException(var3 + var2 - var1.length); } - if (-1L != this.writeBufferOffset && this.offset >= this.writeBufferOffset && (long)var3 + this.offset <= this.writeBufferOffset + (long)this.writeBufferLength) { + if (-1L != this.writeBufferOffset && this.offset >= this.writeBufferOffset && this.offset + (long)var3 <= (long)this.writeBufferLength + this.writeBufferOffset) { System.arraycopy(this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var1, var2, var3); this.offset += (long)var3; return; @@ -146,7 +146,7 @@ public class BufferedFile { long var4 = this.offset; int var7 = var3; int var8; - if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { + if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) { var8 = (int)((long)this.readBufferLength - (this.offset - this.readBufferOffset)); if (var8 > var3) { var8 = var3; @@ -184,7 +184,7 @@ public class BufferedFile { this.offset += (long)var8; } - if (this.writeBufferOffset != -1L) { + if (-1L != this.writeBufferOffset) { if (this.writeBufferOffset > this.offset && var3 > 0) { var8 = var2 + (int)(this.writeBufferOffset - this.offset); if (var8 > var3 + var2) { @@ -200,15 +200,15 @@ public class BufferedFile { long var13 = -1L; long var10 = -1L; - if (this.writeBufferOffset >= var4 && this.writeBufferOffset < (long)var7 + var4) { + if (this.writeBufferOffset >= var4 && this.writeBufferOffset < var4 + (long)var7) { var13 = this.writeBufferOffset; - } else if (var4 >= this.writeBufferOffset && var4 < this.writeBufferOffset + (long)this.writeBufferLength) { + } else if (var4 >= this.writeBufferOffset && var4 < (long)this.writeBufferLength + this.writeBufferOffset) { var13 = var4; } if (this.writeBufferOffset + (long)this.writeBufferLength > var4 && (long)this.writeBufferLength + this.writeBufferOffset <= var4 + (long)var7) { - var10 = this.writeBufferOffset + (long)this.writeBufferLength; - } else if ((long)var7 + var4 > this.writeBufferOffset && (long)var7 + var4 <= this.writeBufferOffset + (long)this.writeBufferLength) { + var10 = (long)this.writeBufferLength + this.writeBufferOffset; + } else if (var4 + (long)var7 > this.writeBufferOffset && (long)var7 + var4 <= this.writeBufferOffset + (long)this.writeBufferLength) { var10 = var4 + (long)var7; } @@ -231,15 +231,15 @@ public class BufferedFile { } } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-263792175" + garbageValue = "1455247160" ) @Export("load") void load() throws IOException { this.readBufferLength = 0; - if (this.offset != this.fileOffset) { + if (this.fileOffset != this.offset) { this.accessFile.seek(this.offset); this.fileOffset = this.offset; } @@ -261,10 +261,10 @@ public class BufferedFile { } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "-516860317" + garbageValue = "-2110413759" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { @@ -273,11 +273,11 @@ public class BufferedFile { this.length = (long)var3 + this.offset; } - if (-1L != this.writeBufferOffset && (this.offset < this.writeBufferOffset || this.offset > (long)this.writeBufferLength + this.writeBufferOffset)) { + if (this.writeBufferOffset != -1L && (this.offset < this.writeBufferOffset || this.offset > (long)this.writeBufferLength + this.writeBufferOffset)) { this.flush(); } - if (-1L != this.writeBufferOffset && (long)var3 + this.offset > (long)this.writeBuffer.length + this.writeBufferOffset) { + if (-1L != this.writeBufferOffset && this.offset + (long)var3 > this.writeBufferOffset + (long)this.writeBuffer.length) { int var4 = (int)((long)this.writeBuffer.length - (this.offset - this.writeBufferOffset)); System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var4); this.offset += (long)var4; @@ -314,16 +314,16 @@ public class BufferedFile { long var9 = -1L; long var6 = -1L; - if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) { + if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { var9 = this.offset; } else if (this.readBufferOffset >= this.offset && this.readBufferOffset < (long)var3 + this.offset) { var9 = this.readBufferOffset; } - if (this.offset + (long)var3 > this.readBufferOffset && (long)var3 + this.offset <= (long)this.readBufferLength + this.readBufferOffset) { - var6 = this.offset + (long)var3; - } else if (this.readBufferOffset + (long)this.readBufferLength > this.offset && (long)this.readBufferLength + this.readBufferOffset <= this.offset + (long)var3) { - var6 = (long)this.readBufferLength + this.readBufferOffset; + if (this.offset + (long)var3 > this.readBufferOffset && this.offset + (long)var3 <= this.readBufferOffset + (long)this.readBufferLength) { + var6 = (long)var3 + this.offset; + } else if (this.readBufferOffset + (long)this.readBufferLength > this.offset && this.readBufferOffset + (long)this.readBufferLength <= this.offset + (long)var3) { + var6 = this.readBufferOffset + (long)this.readBufferLength; } if (var9 > -1L && var6 > var9) { @@ -339,21 +339,21 @@ public class BufferedFile { } } - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "2123212638" + garbageValue = "-753348835" ) @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 * 1940047011) * -1286336757L; + this.fileOffset += 1970592505L * (long)(this.writeBufferLength * -1633237175); if (this.fileOffset > this.fileLength) { this.fileLength = this.fileOffset; } @@ -362,14 +362,14 @@ public class BufferedFile { long var3 = -1L; if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < (long)this.readBufferLength + this.readBufferOffset) { var1 = this.writeBufferOffset; - } else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < this.writeBufferOffset + (long)this.writeBufferLength) { + } else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < (long)this.writeBufferLength + this.writeBufferOffset) { var1 = this.readBufferOffset; } - if (this.writeBufferOffset + (long)this.writeBufferLength > this.readBufferOffset && this.writeBufferOffset + (long)this.writeBufferLength <= (long)this.readBufferLength + this.readBufferOffset) { + if (this.writeBufferOffset + (long)this.writeBufferLength > this.readBufferOffset && (long)this.writeBufferLength + this.writeBufferOffset <= this.readBufferOffset + (long)this.readBufferLength) { var3 = (long)this.writeBufferLength + this.writeBufferOffset; } else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && this.readBufferOffset + (long)this.readBufferLength <= (long)this.writeBufferLength + this.writeBufferOffset) { - var3 = (long)this.readBufferLength + this.readBufferOffset; + var3 = this.readBufferOffset + (long)this.readBufferLength; } if (var1 > -1L && var3 > var1) { diff --git a/runescape-client/src/main/java/BufferedNetSocket.java b/runescape-client/src/main/java/BufferedNetSocket.java index 5e0ff43323..67cb9537c4 100644 --- a/runescape-client/src/main/java/BufferedNetSocket.java +++ b/runescape-client/src/main/java/BufferedNetSocket.java @@ -5,26 +5,26 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ko") +@ObfuscatedName("ka") @Implements("BufferedNetSocket") public class BufferedNetSocket extends AbstractSocket { - @ObfuscatedName("s") + @ObfuscatedName("c") + @Export("socket") + Socket socket; + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lkh;" + signature = "Lkl;" ) @Export("source") BufferedSource source; - @ObfuscatedName("j") - @Export("socket") - Socket socket; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lki;" + signature = "Lkq;" ) @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); @@ -34,10 +34,10 @@ public class BufferedNetSocket extends AbstractSocket { this.sink = new BufferedSink(this.socket.getOutputStream(), var3); } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1798752769" + signature = "(B)V", + garbageValue = "-75" ) @Export("close") public void close() { @@ -51,65 +51,61 @@ public class BufferedNetSocket extends AbstractSocket { this.source.close(); } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "547465689" + garbageValue = "1827163357" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { return this.source.readUnsignedByte(); } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "83" + signature = "(I)I", + garbageValue = "-1354053248" ) @Export("available") public int available() throws IOException { return this.source.available(); } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "156087109" + garbageValue = "-377412375" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { return this.source.isAvailable(var1); } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "([BIIB)I", - garbageValue = "100" + signature = "([BIII)I", + garbageValue = "2063129771" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { return this.source.read(var1, var2, var3); } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "([BIII)V", - garbageValue = "638463675" + signature = "([BIIB)V", + garbageValue = "9" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { this.sink.write(var1, var2, var3); } - protected void abt() { - this.close(); - } - protected void finalize() { this.close(); } - protected void abi() { + protected void aaj() { this.close(); } } diff --git a/runescape-client/src/main/java/BufferedSink.java b/runescape-client/src/main/java/BufferedSink.java index 159d834849..8792a43d6b 100644 --- a/runescape-client/src/main/java/BufferedSink.java +++ b/runescape-client/src/main/java/BufferedSink.java @@ -6,40 +6,40 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ki") +@ObfuscatedName("kq") @Implements("BufferedSink") public class BufferedSink implements Runnable { - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("thread") Thread thread; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("outputStream") OutputStream outputStream; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -2122061045 + intValue = -416558403 ) @Export("capacity") int capacity; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("buffer") byte[] buffer; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -786239105 + intValue = -1582745375 ) @Export("position") int position; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -225046667 + intValue = -1128021535 ) @Export("limit") int limit; - @ObfuscatedName("t") + @ObfuscatedName("j") @Export("exception") IOException exception; - @ObfuscatedName("q") + @ObfuscatedName("v") @Export("closed") boolean closed; @@ -54,10 +54,10 @@ public class BufferedSink implements Runnable { this.thread.start(); } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "-52" + signature = "(S)Z", + garbageValue = "2879" ) @Export("isClosed") boolean isClosed() { @@ -79,10 +79,10 @@ public class BufferedSink implements Runnable { } } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "([BIIB)V", - garbageValue = "22" + signature = "([BIII)V", + garbageValue = "2082682209" ) @Export("write") void write(byte[] var1, int var2, int var3) throws IOException { @@ -119,10 +119,10 @@ public class BufferedSink implements Runnable { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "4" + garbageValue = "0" ) @Export("close") void close() { diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java index 8313c968d0..b854c6f7ef 100644 --- a/runescape-client/src/main/java/BufferedSource.java +++ b/runescape-client/src/main/java/BufferedSource.java @@ -7,37 +7,43 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kh") +@ObfuscatedName("kl") @Implements("BufferedSource") public class BufferedSource implements Runnable { - @ObfuscatedName("s") + @ObfuscatedName("dr") + @ObfuscatedSignature( + signature = "Lio;" + ) + @Export("archive15") + static Archive archive15; + @ObfuscatedName("c") @Export("thread") Thread thread; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("inputStream") InputStream inputStream; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -219567751 + intValue = -957972311 ) @Export("capacity") int capacity; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("buffer") byte[] buffer; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 779012297 + intValue = -499111829 ) @Export("position") int position; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1500766173 + intValue = -1421427639 ) @Export("limit") int limit; - @ObfuscatedName("t") + @ObfuscatedName("j") @Export("exception") IOException exception; @@ -52,10 +58,10 @@ public class BufferedSource implements Runnable { this.thread.start(); } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "188903163" + signature = "(IB)Z", + garbageValue = "-46" ) @Export("isAvailable") boolean isAvailable(int var1) throws IOException { @@ -86,10 +92,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-85" + signature = "(I)I", + garbageValue = "-266051829" ) @Export("available") int available() throws IOException { @@ -110,15 +116,15 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1102638305" + garbageValue = "842069737" ) @Export("readUnsignedByte") int readUnsignedByte() throws IOException { synchronized(this) { - if (this.limit == this.position) { + if (this.position == this.limit) { if (this.exception != null) { throw new IOException(this.exception.toString()); } else { @@ -133,10 +139,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "([BIIS)I", - garbageValue = "128" + signature = "([BIII)I", + garbageValue = "372085290" ) @Export("read") int read(byte[] var1, int var2, int var3) throws IOException { @@ -174,10 +180,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "6608" + signature = "(I)V", + garbageValue = "-122132580" ) @Export("close") void close() { diff --git a/runescape-client/src/main/java/ByteArrayNode.java b/runescape-client/src/main/java/ByteArrayNode.java index 56230b8679..9f4543862f 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("fl") +@ObfuscatedName("fg") @Implements("ByteArrayNode") public class ByteArrayNode extends Node { - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("byteArray") public byte[] byteArray; diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java index 6eece2fdd0..7f739daa64 100644 --- a/runescape-client/src/main/java/ByteArrayPool.java +++ b/runescape-client/src/main/java/ByteArrayPool.java @@ -4,41 +4,39 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("km") +@ObfuscatedName("ky") @Implements("ByteArrayPool") public class ByteArrayPool { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -2023224885 + intValue = 1827163357 ) @Export("ByteArrayPool_smallCount") static int ByteArrayPool_smallCount; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -770015567 + intValue = -1136755957 ) @Export("ByteArrayPool_mediumCount") static int ByteArrayPool_mediumCount; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -155376471 + intValue = 871575803 ) @Export("ByteArrayPool_largeCount") static int ByteArrayPool_largeCount; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("ByteArrayPool_small") static byte[][] ByteArrayPool_small; - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("ByteArrayPool_medium") static byte[][] ByteArrayPool_medium; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("ByteArrayPool_large") static byte[][] ByteArrayPool_large; - @ObfuscatedName("q") - @Export("ByteArrayPool_altSizeArrayCounts") - public static int[] ByteArrayPool_altSizeArrayCounts; - @ObfuscatedName("w") - public static String field3708; + @ObfuscatedName("j") + @Export("ByteArrayPool_alternativeSizes") + static int[] ByteArrayPool_alternativeSizes; static { ByteArrayPool_smallCount = 0; @@ -49,10 +47,10 @@ public class ByteArrayPool { ByteArrayPool_large = new byte[50][]; } - @ObfuscatedName("s") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IZB)[B", - garbageValue = "82" + signature = "(IZI)[B", + garbageValue = "-2146041378" ) @Export("ByteArrayPool_getArrayBool") static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) { @@ -84,14 +82,14 @@ public class ByteArrayPool { return var2; } - if (FaceNormal.ByteArrayPool_arrays != null) { - for (int var4 = 0; var4 < UserComparator4.ByteArrayPool_alternativeSizes.length; ++var4) { - if (UserComparator4.ByteArrayPool_alternativeSizes[var4] != var0) { - if (var0 < UserComparator4.ByteArrayPool_alternativeSizes[var4]) { + if (WorldMapEvent.ByteArrayPool_arrays != null) { + for (int var4 = 0; var4 < ByteArrayPool_alternativeSizes.length; ++var4) { + if (ByteArrayPool_alternativeSizes[var4] != var0) { + if (var0 < ByteArrayPool_alternativeSizes[var4]) { } - } else if (ByteArrayPool_altSizeArrayCounts[var4] > 0) { - byte[] var3 = FaceNormal.ByteArrayPool_arrays[var4][--ByteArrayPool_altSizeArrayCounts[var4]]; - FaceNormal.ByteArrayPool_arrays[var4][ByteArrayPool_altSizeArrayCounts[var4]] = null; + } else if (Login.ByteArrayPool_altSizeArrayCounts[var4] > 0) { + byte[] var3 = WorldMapEvent.ByteArrayPool_arrays[var4][--Login.ByteArrayPool_altSizeArrayCounts[var4]]; + WorldMapEvent.ByteArrayPool_arrays[var4][Login.ByteArrayPool_altSizeArrayCounts[var4]] = null; return var3; } } @@ -99,4 +97,17 @@ public class ByteArrayPool { return new byte[var0]; } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;II)V", + garbageValue = "651984351" + ) + static final void method5750(String var0, int var1) { + PacketBufferNode var2 = MenuAction.getPacketBufferNode(ClientPacket.field2193, Client.packetWriter.isaacCipher); + var2.packetBuffer.writeByte(Varcs.stringCp1252NullTerminatedByteSize(var0) + 1); + var2.packetBuffer.writeStringCp1252NullTerminated(var0); + var2.packetBuffer.method5493(var1); + Client.packetWriter.addNode(var2); + } } diff --git a/runescape-client/src/main/java/Calendar.java b/runescape-client/src/main/java/Calendar.java index 67a169dbfd..819e604169 100644 --- a/runescape-client/src/main/java/Calendar.java +++ b/runescape-client/src/main/java/Calendar.java @@ -4,16 +4,16 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gz") +@ObfuscatedName("gm") @Implements("Calendar") public class Calendar { - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("MONTH_NAMES_ENGLISH_GERMAN") static final String[][] MONTH_NAMES_ENGLISH_GERMAN; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("DAYS_OF_THE_WEEK") static final String[] DAYS_OF_THE_WEEK; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("Calendar_calendar") static java.util.Calendar Calendar_calendar; @@ -24,211 +24,22 @@ public class Calendar { Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT")); } - @ObfuscatedName("ip") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "516952450" + signature = "(II)Z", + garbageValue = "-283445433" ) - @Export("addSceneMenuOptions") - static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { - if (Client.isItemSelected == 0 && !Client.isSpellSelected) { - WorldMapData_0.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); - } + @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; + } - long var4 = -1L; - long var6 = -1L; - int var8 = 0; - - while (true) { - int var10 = ViewportMouse.ViewportMouse_entityCount; - if (var8 >= var10) { - if (-1L != var4) { - var8 = (int)(var4 >>> 0 & 127L); - var10 = (int)(var4 >>> 7 & 127L); - Player var12 = Client.players[Client.combatTargetPlayerIndex]; - class51.addPlayerToMenu(var12, Client.combatTargetPlayerIndex, var8, var10); - } - - return; - } - - long var27 = ViewportMouse.ViewportMouse_entityTags[var8]; - if (var27 != var6) { - label319: { - var6 = var27; - int var15 = class218.ViewportMouse_unpackX(var8); - int var16 = GameObject.ViewportMouse_unpackY(var8); - int var17 = class40.method729(ViewportMouse.ViewportMouse_entityTags[var8]); - int var19 = BoundaryObject.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var8]); - int var20 = var19; - if (var17 == 2 && Player.scene.getObjectFlags(ItemContainer.plane, var15, var16, var27) >= 0) { - ObjectDefinition var21 = class215.getObjectDefinition(var19); - if (var21.transforms != null) { - var21 = var21.transform(); - } - - if (var21 == null) { - break label319; - } - - if (Client.isItemSelected == 1) { - WorldMapData_0.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class16.colorStartTag(65535) + var21.name, 1, var19, var15, var16); - } else if (Client.isSpellSelected) { - if ((WorldMapSectionType.selectedSpellFlags & 4) == 4) { - WorldMapData_0.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class16.colorStartTag(65535) + var21.name, 2, var19, var15, var16); - } - } else { - String[] var29 = var21.actions; - if (var29 != null) { - for (int var32 = 4; var32 >= 0; --var32) { - if (var29[var32] != null) { - short var24 = 0; - if (var32 == 0) { - var24 = 3; - } - - if (var32 == 1) { - var24 = 4; - } - - if (var32 == 2) { - var24 = 5; - } - - if (var32 == 3) { - var24 = 6; - } - - if (var32 == 4) { - var24 = 1001; - } - - WorldMapData_0.insertMenuItemNoShift(var29[var32], class16.colorStartTag(65535) + var21.name, var24, var20, var15, var16); - } - } - } - - WorldMapData_0.insertMenuItemNoShift("Examine", class16.colorStartTag(65535) + var21.name, 1002, var21.id, var15, var16); - } - } - - int var22; - NPC var23; - Player var25; - int[] var36; - int var38; - if (var17 == 1) { - NPC var33 = Client.npcs[var20]; - if (var33 == null) { - break label319; - } - - if (var33.definition.size == 1 && (var33.x & 127) == 64 && (var33.y & 127) == 64) { - for (var22 = 0; var22 < Client.npcCount; ++var22) { - var23 = Client.npcs[Client.npcIndices[var22]]; - if (var23 != null && var33 != var23 && var23.definition.size == 1 && var23.x == var33.x && var23.y == var33.y) { - class65.addNpcToMenu(var23.definition, Client.npcIndices[var22], var15, var16); - } - } - - var22 = Players.Players_count; - var36 = Players.Players_indices; - - for (var38 = 0; var38 < var22; ++var38) { - var25 = Client.players[var36[var38]]; - if (var25 != null && var33.x == var25.x && var25.y == var33.y) { - class51.addPlayerToMenu(var25, var36[var38], var15, var16); - } - } - } - - class65.addNpcToMenu(var33.definition, var20, var15, var16); - } - - if (var17 == 0) { - Player var34 = Client.players[var20]; - if (var34 == null) { - break label319; - } - - if ((var34.x & 127) == 64 && (var34.y & 127) == 64) { - for (var22 = 0; var22 < Client.npcCount; ++var22) { - var23 = Client.npcs[Client.npcIndices[var22]]; - if (var23 != null && var23.definition.size == 1 && var34.x == var23.x && var34.y == var23.y) { - class65.addNpcToMenu(var23.definition, Client.npcIndices[var22], var15, var16); - } - } - - var22 = Players.Players_count; - var36 = Players.Players_indices; - - for (var38 = 0; var38 < var22; ++var38) { - var25 = Client.players[var36[var38]]; - if (var25 != null && var25 != var34 && var25.x == var34.x && var34.y == var25.y) { - class51.addPlayerToMenu(var25, var36[var38], var15, var16); - } - } - } - - if (var20 != Client.combatTargetPlayerIndex) { - class51.addPlayerToMenu(var34, var20, var15, var16); - } else { - var4 = var27; - } - } - - if (var17 == 3) { - NodeDeque var35 = Client.groundItems[ItemContainer.plane][var15][var16]; - if (var35 != null) { - for (TileItem var39 = (TileItem)var35.first(); var39 != null; var39 = (TileItem)var35.next()) { - ItemDefinition var37 = WorldMapData_0.ItemDefinition_get(var39.id); - if (Client.isItemSelected == 1) { - WorldMapData_0.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class16.colorStartTag(16748608) + var37.name, 16, var39.id, var15, var16); - } else if (Client.isSpellSelected) { - if ((WorldMapSectionType.selectedSpellFlags & 1) == 1) { - WorldMapData_0.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class16.colorStartTag(16748608) + var37.name, 17, var39.id, var15, var16); - } - } else { - String[] var30 = var37.groundActions; - - for (int var31 = 4; var31 >= 0; --var31) { - if (var30 != null && var30[var31] != null) { - byte var26 = 0; - if (var31 == 0) { - var26 = 18; - } - - if (var31 == 1) { - var26 = 19; - } - - if (var31 == 2) { - var26 = 20; - } - - if (var31 == 3) { - var26 = 21; - } - - if (var31 == 4) { - var26 = 22; - } - - WorldMapData_0.insertMenuItemNoShift(var30[var31], class16.colorStartTag(16748608) + var37.name, var26, var39.id, var15, var16); - } else if (var31 == 2) { - WorldMapData_0.insertMenuItemNoShift("Take", class16.colorStartTag(16748608) + var37.name, 20, var39.id, var15, var16); - } - } - - WorldMapData_0.insertMenuItemNoShift("Examine", class16.colorStartTag(16748608) + var37.name, 1004, var39.id, var15, var16); - } - } - } - } - } - } - - ++var8; - } + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;B)V", + garbageValue = "121" + ) + static final void method3933(String var0) { + WorldMapSection2.method283(var0 + " is already on your friend list"); } } diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java index 6e784825bd..0b363de93d 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -1,27 +1,23 @@ import java.awt.Component; import java.awt.Graphics; +import java.lang.management.GarbageCollectorMXBean; +import java.lang.management.ManagementFactory; +import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ah") +@ObfuscatedName("ai") @Implements("Canvas") public final class Canvas extends java.awt.Canvas { - @ObfuscatedName("ob") - @ObfuscatedSignature( - signature = "Lfo;" - ) - @Export("mouseWheel") - static MouseWheel mouseWheel; - @ObfuscatedName("c") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1288652121 + intValue = 1291773237 ) - static int field389; - @ObfuscatedName("s") + public static int field395; + @ObfuscatedName("c") @Export("component") Component component; @@ -29,234 +25,515 @@ 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("k") - @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "260955923" - ) - @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]; - } - - 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; + public final void paint(Graphics var1) { + this.component.paint(var1); } - @ObfuscatedName("n") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(ILcr;ZI)I", - garbageValue = "65535" + signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "1869082478" ) - static int method806(int var0, Script var1, boolean var2) { - int var4 = -1; - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var3 = WorldMapElement.getWidget(var4); - } else { - var3 = var2 ? class286.field3623 : class297.field3693; + @Export("setLoginResponseString") + static void setLoginResponseString(String var0, String var1, String var2) { + Login.Login_response1 = var0; + Login.Login_response2 = var1; + Login.Login_response3 = var2; + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "-87" + ) + @Export("WorldMapElement_clearCached") + public static void WorldMapElement_clearCached() { + WorldMapElement.WorldMapElement_cachedSprites.clear(); + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "1591612905" + ) + @Export("getGcDuration") + protected static int getGcDuration() { + int var0 = 0; + if (GrandExchangeOfferTotalQuantityComparator.garbageCollector == null || !GrandExchangeOfferTotalQuantityComparator.garbageCollector.isValid()) { + try { + Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); + + while (var1.hasNext()) { + GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); + if (var2.isValid()) { + GrandExchangeOfferTotalQuantityComparator.garbageCollector = var2; + GameShell.garbageCollectorLastCheckTimeMs = -1L; + GameShell.garbageCollectorLastCollectionTime = -1L; + } + } + } catch (Throwable var11) { + } } - 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 (GrandExchangeOfferTotalQuantityComparator.garbageCollector != null) { + long var9 = SoundCache.method2480(); + long var3 = GrandExchangeOfferTotalQuantityComparator.garbageCollector.getCollectionTime(); + if (GameShell.garbageCollectorLastCollectionTime != -1L) { + long var5 = var3 - GameShell.garbageCollectorLastCollectionTime; + long var7 = var9 - GameShell.garbageCollectorLastCheckTimeMs; + if (var7 != 0L) { + var0 = (int)(100L * var5 / var7); + } } - if (var3.scrollX < 0) { - var3.scrollX = 0; + GameShell.garbageCollectorLastCollectionTime = var3; + GameShell.garbageCollectorLastCheckTimeMs = var9; + } + + return var0; + } + + @ObfuscatedName("gs") + @ObfuscatedSignature( + signature = "(ZLkt;B)V", + garbageValue = "-109" + ) + @Export("loadRegions") + static final void loadRegions(boolean var0, PacketBuffer var1) { + Client.isInInstance = var0; + int var3; + int var4; + int var5; + int var6; + int var7; + int var8; + if (!Client.isInInstance) { + int var2 = var1.method5514(); + var3 = var1.method5514(); + var4 = var1.readUnsignedShort(); + GrandExchangeOfferAgeComparator.xteaKeys = new int[var4][4]; + + for (var5 = 0; var5 < var4; ++var5) { + for (var6 = 0; var6 < 4; ++var6) { + GrandExchangeOfferAgeComparator.xteaKeys[var5][var6] = var1.readInt(); + } } - var3.scrollY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - if (var3.scrollY > var3.scrollHeight - var3.height) { - var3.scrollY = var3.scrollHeight - var3.height; + class197.regions = new int[var4]; + WorldMapEvent.regionMapArchiveIds = new int[var4]; + SequenceDefinition.regionLandArchiveIds = new int[var4]; + MusicPatchPcmStream.regionLandArchives = new byte[var4][]; + Client.regionMapArchives = new byte[var4][]; + boolean var16 = false; + if ((var2 / 8 == 48 || var2 / 8 == 49) && var3 / 8 == 48) { + var16 = true; } - if (var3.scrollY < 0) { - var3.scrollY = 0; + if (var2 / 8 == 48 && var3 / 8 == 148) { + var16 = true; } - FriendSystem.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { - var3.color = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - FriendSystem.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETFILL) { - var3.fill = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - FriendSystem.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTRANS) { - var3.transparencyTop = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - FriendSystem.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { - var3.lineWid = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - FriendSystem.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { - var3.spriteId2 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - FriendSystem.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { - var3.spriteAngle = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - FriendSystem.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTILING) { - var3.spriteTiling = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - FriendSystem.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODEL) { - var3.modelType = 1; - var3.modelId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - FriendSystem.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]; - FriendSystem.invalidateWidget(var3); - return 1; + var4 = 0; + + for (var6 = (var2 - 6) / 8; var6 <= (var2 + 6) / 8; ++var6) { + for (var7 = (var3 - 6) / 8; var7 <= (var3 + 6) / 8; ++var7) { + var8 = var7 + (var6 << 8); + if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { + class197.regions[var4] = var8; + WorldMapEvent.regionMapArchiveIds[var4] = Timer.archive5.getGroupId("m" + var6 + "_" + var7); + SequenceDefinition.regionLandArchiveIds[var4] = Timer.archive5.getGroupId("l" + var6 + "_" + var7); + ++var4; + } + } + } + + WorldMapSection2.method301(var2, var3, true); } 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; - FriendSystem.invalidateWidget(var3); + boolean var15 = var1.method5494() == 1; + var3 = var1.readUnsignedShort(); + var4 = var1.method5459(); + 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(); + GrandExchangeOfferAgeComparator.xteaKeys = new int[var5][4]; + + for (var6 = 0; var6 < var5; ++var6) { + for (var7 = 0; var7 < 4; ++var7) { + GrandExchangeOfferAgeComparator.xteaKeys[var6][var7] = var1.readInt(); + } + } + + class197.regions = new int[var5]; + WorldMapEvent.regionMapArchiveIds = new int[var5]; + SequenceDefinition.regionLandArchiveIds = new int[var5]; + MusicPatchPcmStream.regionLandArchives = new byte[var5][]; + Client.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 (class197.regions[var13] == var12) { + var12 = -1; + break; + } + } + + if (var12 != -1) { + class197.regions[var5] = var12; + var13 = var12 >> 8 & 255; + int var14 = var12 & 255; + WorldMapEvent.regionMapArchiveIds[var5] = Timer.archive5.getGroupId("m" + var13 + "_" + var14); + SequenceDefinition.regionLandArchiveIds[var5] = Timer.archive5.getGroupId("l" + var13 + "_" + var14); + ++var5; + } + } + } + } + } + + WorldMapSection2.method301(var3, var4, !var15); + } + + } + + @ObfuscatedName("gb") + @ObfuscatedSignature( + signature = "(Lgn;I)V", + garbageValue = "1871694401" + ) + static final void method815(class185 var0) { + PacketBuffer var1 = Client.packetWriter.packetBuffer; + int var3; + int var6; + int var37; + int var38; + int var39; + int var40; + if (class185.field2299 == var0) { + var37 = var1.readUnsignedShort(); + var3 = var1.readUnsignedByteNegate(); + var38 = (var3 >> 4 & 7) + WorldMapSection1.field286; + var39 = (var3 & 7) + ArchiveLoader.field508; + var6 = var1.method5459(); + var40 = var1.readUnsignedByteNegate(); + if (var38 >= 0 && var39 >= 0 && var38 < 104 && var39 < 104) { + var38 = var38 * 128 + 64; + var39 = var39 * 128 + 64; + GraphicsObject var41 = new GraphicsObject(var37, MouseRecorder.plane, var38, var39, WorldMapAreaData.getTileHeight(var38, var39, MouseRecorder.plane) - var40, var6, Client.cycle); + Client.graphicsObjects.addFirst(var41); + } + + } else { + int var31; + if (class185.field2303 == var0) { + var37 = var1.readUnsignedByte(); + var3 = (var37 >> 4 & 7) + WorldMapSection1.field286; + var38 = (var37 & 7) + ArchiveLoader.field508; + var39 = var1.method5494(); + var6 = var39 >> 2; + var40 = var39 & 3; + var31 = Client.field682[var6]; + if (var3 >= 0 && var38 >= 0 && var3 < 104 && var38 < 104) { + Tiles.updatePendingSpawn(MouseRecorder.plane, var3, var38, var31, -1, var6, var40, 0, -1); } - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { - var3.modelOrthog = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - FriendSystem.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; - FriendSystem.invalidateWidget(var3); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { - var3.fontId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - FriendSystem.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]; - FriendSystem.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { - var3.textShadowed = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - FriendSystem.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { - var3.outline = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - FriendSystem.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { - var3.spriteShadow = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - FriendSystem.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { - var3.spriteFlipV = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - FriendSystem.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { - var3.spriteFlipH = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - FriendSystem.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]; - FriendSystem.invalidateWidget(var3); - if (var4 != -1 && var3.type == 0) { - WorldMapAreaData.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var4 >> 16], var3, false); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { - GameShell.resumePauseWidget(var3.id, var3.childIndex); - Client.meslayerContinueWidget = var3; - FriendSystem.invalidateWidget(var3); - return 1; - } else if (var0 == 1122) { - var3.spriteId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - FriendSystem.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { - var3.color2 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - FriendSystem.invalidateWidget(var3); - return 1; - } else if (var0 == 1124) { - var3.transparencyBot = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - FriendSystem.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETFILLMODE) { - var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - FillMode var6 = (FillMode)FriendSystem.findEnumerated(SequenceDefinition.FillMode_values(), var8); - if (var6 != null) { - var3.fillMode = var6; - FriendSystem.invalidateWidget(var3); - } - - return 1; } else { - boolean var5; - if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { - var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - var3.field2601 = var5; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { - var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - var3.modelTransparency = var5; - return 1; + byte var4; + byte var5; + int var9; + int var10; + int var11; + int var12; + int var13; + int var14; + if (class185.field2296 == var0) { + var37 = var1.readUnsignedByteNegate(); + var3 = var1.method5506(); + var4 = var1.method5634(); + var5 = var1.method5634(); + var6 = var1.method5494(); + var40 = (var6 >> 4 & 7) + WorldMapSection1.field286; + var31 = (var6 & 7) + ArchiveLoader.field508; + var9 = var1.readUnsignedByteNegate() * 4; + var10 = var1.method5514(); + var11 = var1.method5459(); + var12 = var1.readUnsignedByte() * 4; + var13 = var1.method5514(); + var14 = var1.readUnsignedByte(); + var39 = var5 + var40; + var38 = var4 + var31; + if (var40 >= 0 && var31 >= 0 && var40 < 104 && var31 < 104 && var39 >= 0 && var38 >= 0 && var39 < 104 && var38 < 104 && var10 != 65535) { + var40 = var40 * 128 + 64; + var31 = var31 * 128 + 64; + var39 = var39 * 128 + 64; + var38 = var38 * 128 + 64; + Projectile var15 = new Projectile(var10, MouseRecorder.plane, var40, var31, WorldMapAreaData.getTileHeight(var40, var31, MouseRecorder.plane) - var12, var13 + Client.cycle, var11 + Client.cycle, var14, var37, var3, var9); + var15.setDestination(var39, var38, WorldMapAreaData.getTileHeight(var39, var38, MouseRecorder.plane) - var9, var13 + Client.cycle); + Client.projectiles.addFirst(var15); + } + + } else if (class185.field2301 == var0) { + var37 = var1.method5514(); + var3 = var1.method5547(); + var38 = (var3 >> 4 & 7) + WorldMapSection1.field286; + var39 = (var3 & 7) + ArchiveLoader.field508; + var6 = var1.readUnsignedByteNegate(); + var40 = var6 >> 2; + var31 = var6 & 3; + var9 = Client.field682[var40]; + if (var38 >= 0 && var39 >= 0 && var38 < 104 && var39 < 104) { + Tiles.updatePendingSpawn(MouseRecorder.plane, var38, var39, var9, var37, var40, var31, 0, -1); + } + + } else if (class185.field2304 == var0) { + var37 = var1.method5514(); + var3 = var1.method5494(); + var38 = (var3 >> 4 & 7) + WorldMapSection1.field286; + var39 = (var3 & 7) + ArchiveLoader.field508; + var6 = var1.method5494(); + var40 = var6 >> 2; + var31 = var6 & 3; + var9 = Client.field682[var40]; + if (var38 >= 0 && var39 >= 0 && var38 < 103 && var39 < 103) { + if (var9 == 0) { + BoundaryObject var32 = WorldMapIcon_1.scene.method3063(MouseRecorder.plane, var38, var39); + if (var32 != null) { + var11 = SecureRandomFuture.Entity_unpackID(var32.tag); + if (var40 == 2) { + var32.entity1 = new DynamicObject(var11, 2, var31 + 4, MouseRecorder.plane, var38, var39, var37, false, var32.entity1); + var32.entity2 = new DynamicObject(var11, 2, var31 + 1 & 3, MouseRecorder.plane, var38, var39, var37, false, var32.entity2); + } else { + var32.entity1 = new DynamicObject(var11, var40, var31, MouseRecorder.plane, var38, var39, var37, false, var32.entity1); + } + } + } + + if (var9 == 1) { + WallDecoration var42 = WorldMapIcon_1.scene.method3189(MouseRecorder.plane, var38, var39); + if (var42 != null) { + var11 = SecureRandomFuture.Entity_unpackID(var42.tag); + if (var40 != 4 && var40 != 5) { + if (var40 == 6) { + var42.entity1 = new DynamicObject(var11, 4, var31 + 4, MouseRecorder.plane, var38, var39, var37, false, var42.entity1); + } else if (var40 == 7) { + var42.entity1 = new DynamicObject(var11, 4, (var31 + 2 & 3) + 4, MouseRecorder.plane, var38, var39, var37, false, var42.entity1); + } else if (var40 == 8) { + var42.entity1 = new DynamicObject(var11, 4, var31 + 4, MouseRecorder.plane, var38, var39, var37, false, var42.entity1); + var42.entity2 = new DynamicObject(var11, 4, (var31 + 2 & 3) + 4, MouseRecorder.plane, var38, var39, var37, false, var42.entity2); + } + } else { + var42.entity1 = new DynamicObject(var11, 4, var31, MouseRecorder.plane, var38, var39, var37, false, var42.entity1); + } + } + } + + if (var9 == 2) { + GameObject var43 = WorldMapIcon_1.scene.method3065(MouseRecorder.plane, var38, var39); + if (var40 == 11) { + var40 = 10; + } + + if (var43 != null) { + var43.entity = new DynamicObject(SecureRandomFuture.Entity_unpackID(var43.tag), var40, var31, MouseRecorder.plane, var38, var39, var37, false, var43.entity); + } + } + + if (var9 == 3) { + FloorDecoration var44 = WorldMapIcon_1.scene.getFloorDecoration(MouseRecorder.plane, var38, var39); + if (var44 != null) { + var44.entity = new DynamicObject(SecureRandomFuture.Entity_unpackID(var44.tag), 22, var31, MouseRecorder.plane, var38, var39, var37, false, var44.entity); + } + } + } + } else { - return 2; + if (class185.field2297 == var0) { + byte var2 = var1.method5634(); + var3 = var1.readUnsignedShort(); + var4 = var1.method5497(); + var5 = var1.method5634(); + var6 = var1.method5514(); + byte var7 = var1.method5498(); + var31 = var1.method5503(); + var9 = var1.method5514(); + var10 = var1.readUnsignedByte(); + var11 = (var10 >> 4 & 7) + WorldMapSection1.field286; + var12 = (var10 & 7) + ArchiveLoader.field508; + var13 = var1.readUnsignedByte(); + var14 = var13 >> 2; + int var33 = var13 & 3; + int var16 = Client.field682[var14]; + Player var17; + if (var9 == Client.localPlayerIndex) { + var17 = Varps.localPlayer; + } else { + var17 = Client.players[var9]; + } + + if (var17 != null) { + ObjectDefinition var18 = WallDecoration.getObjectDefinition(var31); + int var19; + int var20; + if (var33 != 1 && var33 != 3) { + var19 = var18.sizeX; + var20 = var18.sizeY; + } else { + var19 = var18.sizeY; + var20 = var18.sizeX; + } + + int var21 = var11 + (var19 >> 1); + int var22 = var11 + (var19 + 1 >> 1); + int var23 = var12 + (var20 >> 1); + int var24 = var12 + (var20 + 1 >> 1); + int[][] var25 = Tiles.Tiles_heights[MouseRecorder.plane]; + int var26 = var25[var22][var24] + var25[var21][var24] + var25[var21][var23] + var25[var22][var23] >> 2; + int var27 = (var11 << 7) + (var19 << 6); + int var28 = (var12 << 7) + (var20 << 6); + Model var29 = var18.getModel(var14, var33, var25, var27, var26, var28); + if (var29 != null) { + Tiles.updatePendingSpawn(MouseRecorder.plane, var11, var12, var16, -1, 0, 0, var6 + 1, var3 + 1); + var17.animationCycleStart = var6 + Client.cycle; + var17.animationCycleEnd = var3 + Client.cycle; + var17.model0 = var29; + var17.field597 = var11 * 128 + var19 * 64; + var17.field599 = var12 * 128 + var20 * 64; + var17.tileHeight2 = var26; + byte var30; + if (var4 > var2) { + var30 = var4; + var4 = var2; + var2 = var30; + } + + if (var7 > var5) { + var30 = var7; + var7 = var5; + var5 = var30; + } + + var17.field601 = var4 + var11; + var17.field609 = var11 + var2; + var17.field602 = var7 + var12; + var17.field604 = var5 + var12; + } + } + } + + if (class185.field2305 == var0) { + var37 = var1.method5547(); + var3 = (var37 >> 4 & 7) + WorldMapSection1.field286; + var38 = (var37 & 7) + ArchiveLoader.field508; + var39 = var1.method5547(); + var6 = var39 >> 4 & 15; + var40 = var39 & 7; + var31 = var1.readUnsignedShort(); + var9 = var1.method5547(); + if (var3 >= 0 && var38 >= 0 && var3 < 104 && var38 < 104) { + var10 = var6 + 1; + if (Varps.localPlayer.pathX[0] >= var3 - var10 && Varps.localPlayer.pathX[0] <= var3 + var10 && Varps.localPlayer.pathY[0] >= var38 - var10 && Varps.localPlayer.pathY[0] <= var38 + var10 && Client.field860 != 0 && var40 > 0 && Client.soundEffectCount < 50) { + Client.soundEffectIds[Client.soundEffectCount] = var31; + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var40; + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var9; + Client.soundEffects[Client.soundEffectCount] = null; + Client.soundLocations[Client.soundEffectCount] = var6 + (var38 << 8) + (var3 << 16); + ++Client.soundEffectCount; + } + } + } + + TileItem var35; + if (class185.field2298 == var0) { + var37 = var1.readUnsignedByte(); + var3 = (var37 >> 4 & 7) + WorldMapSection1.field286; + var38 = (var37 & 7) + ArchiveLoader.field508; + var39 = var1.method5514(); + if (var3 >= 0 && var38 >= 0 && var3 < 104 && var38 < 104) { + NodeDeque var34 = Client.groundItems[MouseRecorder.plane][var3][var38]; + if (var34 != null) { + for (var35 = (TileItem)var34.last(); var35 != null; var35 = (TileItem)var34.previous()) { + if ((var39 & 32767) == var35.id) { + var35.remove(); + break; + } + } + + if (var34.last() == null) { + Client.groundItems[MouseRecorder.plane][var3][var38] = null; + } + + WorldMapCacheName.updateItemPile(var3, var38); + } + } + + } else if (class185.field2302 == var0) { + var37 = var1.method5514(); + var3 = var1.method5503(); + var38 = var1.method5547(); + var39 = (var38 >> 4 & 7) + WorldMapSection1.field286; + var6 = (var38 & 7) + ArchiveLoader.field508; + if (var39 >= 0 && var6 >= 0 && var39 < 104 && var6 < 104) { + var35 = new TileItem(); + var35.id = var37; + var35.quantity = var3; + if (Client.groundItems[MouseRecorder.plane][var39][var6] == null) { + Client.groundItems[MouseRecorder.plane][var39][var6] = new NodeDeque(); + } + + Client.groundItems[MouseRecorder.plane][var39][var6].addFirst(var35); + WorldMapCacheName.updateItemPile(var39, var6); + } + + } else if (class185.field2300 == var0) { + var37 = var1.readUnsignedShort(); + var3 = var1.readUnsignedShort(); + var38 = var1.method5547(); + var39 = (var38 >> 4 & 7) + WorldMapSection1.field286; + var6 = (var38 & 7) + ArchiveLoader.field508; + var40 = var1.method5459(); + if (var39 >= 0 && var6 >= 0 && var39 < 104 && var6 < 104) { + NodeDeque var8 = Client.groundItems[MouseRecorder.plane][var39][var6]; + if (var8 != null) { + for (TileItem var36 = (TileItem)var8.last(); var36 != null; var36 = (TileItem)var8.previous()) { + if ((var37 & 32767) == var36.id && var3 == var36.quantity) { + var36.quantity = var40; + break; + } + } + + WorldMapCacheName.updateItemPile(var39, var6); + } + } + + } } } } diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java index c3d0f43ff4..e1253fc05f 100644 --- a/runescape-client/src/main/java/ChatChannel.java +++ b/runescape-client/src/main/java/ChatChannel.java @@ -4,24 +4,18 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cg") +@ObfuscatedName("cs") @Implements("ChatChannel") public class ChatChannel { - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "[Lbl;" - ) - @Export("World_worlds") - static World[] World_worlds; - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "[Lbi;" + signature = "[Lbj;" ) @Export("messages") Message[] messages; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 532462751 + intValue = 26719133 ) @Export("count") int count; @@ -30,10 +24,10 @@ public class ChatChannel { this.messages = new Message[100]; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbi;", - garbageValue = "125041712" + signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)Lbj;", + garbageValue = "2" ) @Export("addMessage") Message addMessage(int var1, String var2, String var3, String var4) { @@ -61,138 +55,159 @@ public class ChatChannel { return var5; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(II)Lbi;", - garbageValue = "673075059" + signature = "(II)Lbj;", + garbageValue = "-1600519730" ) @Export("getMessage") Message getMessage(int var1) { return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "76" + signature = "(S)I", + garbageValue = "255" ) @Export("size") int size() { return this.count; } - @ObfuscatedName("i") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "1" + signature = "(Lhz;Lhz;Lhz;B)V", + garbageValue = "-105" ) - public static void method2163(int var0) { - if (class197.field2378 != 0) { - WorldMapSprite.field222 = var0; - } else { - class197.midiPcmStream.method3670(var0); - } - + public static void method2220(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { + HitSplatDefinition.HitSplatDefinition_archive = var0; + HitSplatDefinition.field3300 = var1; + class189.HitSplatDefinition_fontsArchive = var2; } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;II[BII)I", - garbageValue = "-1719820728" + signature = "(Ljava/lang/CharSequence;I)[B", + garbageValue = "1945232856" ) - @Export("encodeStringCp1252") - public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { - int var5 = var2 - var1; + public static byte[] method2212(CharSequence var0) { + int var1 = var0.length(); + byte[] var2 = new byte[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; + 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 { - var3[var6 + var4] = 63; + var2[var3] = 63; } } - return var5; + return var2; } - @ObfuscatedName("ac") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "1934933433" + signature = "(I)Lli;", + garbageValue = "1800491151" ) - static int method2165(int var0) { - return (int)((Math.log((double)var0) / Interpreter.field1078 - 7.0D) * 256.0D); - } + static Sprite method2218() { + Sprite var0 = new Sprite(); + var0.width = class325.SpriteBuffer_spriteWidth; + var0.height = class325.SpriteBuffer_spriteHeight; + var0.xOffset = class325.SpriteBuffer_xOffsets[0]; + var0.yOffset = SecureRandomCallable.SpriteBuffer_yOffsets[0]; + var0.subWidth = class325.SpriteBuffer_spriteWidths[0]; + var0.subHeight = SoundSystem.SpriteBuffer_spriteHeights[0]; + int var1 = var0.subWidth * var0.subHeight; + byte[] var2 = InvDefinition.SpriteBuffer_pixels[0]; + var0.pixels = new int[var1]; - @ObfuscatedName("hg") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-595413655" - ) - static final void method2161() { - for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { - if (var0.hitpoints == -1) { - var0.delay = 0; - WorldMapManager.method607(var0); - } else { - var0.remove(); - } + for (int var3 = 0; var3 < var1; ++var3) { + var0.pixels[var3] = class325.SpriteBuffer_spritePalette[var2[var3] & 255]; } + class192.SpriteBuffer_clear(); + return var0; + } + + @ObfuscatedName("jx") + @ObfuscatedSignature( + signature = "(IIIILli;Lhi;I)V", + garbageValue = "219480869" + ) + @Export("drawSpriteOnMinimap") + static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, Sprite 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.method6102(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/ClanChat.java b/runescape-client/src/main/java/ClanChat.java index 61f25f052e..79007b10b6 100644 --- a/runescape-client/src/main/java/ClanChat.java +++ b/runescape-client/src/main/java/ClanChat.java @@ -4,163 +4,137 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jl") +@ObfuscatedName("jz") @Implements("ClanChat") public class ClanChat extends UserList { - @ObfuscatedName("bf") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Llq;" - ) - @Export("worldSelectRightSprite") - static IndexedSprite worldSelectRightSprite; - @ObfuscatedName("go") - @Export("regionLandArchiveIds") - static int[] regionLandArchiveIds; - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "Llu;" + signature = "Lll;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Ljs;" + signature = "Ljj;" ) @Export("localUser") final Usernamed localUser; - @ObfuscatedName("d") + @ObfuscatedName("z") @Export("name") public String name; - @ObfuscatedName("f") + @ObfuscatedName("n") @Export("owner") public String owner; - @ObfuscatedName("c") + @ObfuscatedName("h") @Export("minKick") public byte minKick; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1566602861 + intValue = 591472141 ) @Export("rank") public int rank; - @ObfuscatedName("y") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 984476847 + intValue = -1862278063 ) - int field3616; + int field3609; @ObfuscatedSignature( - signature = "(Llu;Ljs;)V" + signature = "(Lll;Ljj;)V" ) public ClanChat(LoginType var1, Usernamed var2) { super(100); this.name = null; this.owner = null; - this.field3616 = 1; + this.field3609 = 1; this.loginType = var1; this.localUser = var2; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)Lju;", - garbageValue = "-192021045" + signature = "(I)Ljw;", + garbageValue = "-734254876" ) @Export("newInstance") User newInstance() { return new ClanMate(); } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(II)[Lju;", - garbageValue = "518998026" + signature = "(II)[Ljw;", + garbageValue = "1353779565" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new ClanMate[var1]; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "-16" + signature = "(Ljava/lang/String;I)V", + garbageValue = "682747367" ) @Export("readName") final void readName(String var1) { - this.name = FaceNormal.base37Decode(var1); + String var3 = StudioGame.base37DecodeLong(MouseHandler.method1041(var1)); + if (var3 == null) { + var3 = ""; + } + + this.name = var3; } - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "(Ljava/lang/String;B)V", - garbageValue = "1" + garbageValue = "-7" ) @Export("setOwner") final void setOwner(String var1) { - this.owner = FaceNormal.base37Decode(var1); + String var3 = StudioGame.base37DecodeLong(MouseHandler.method1041(var1)); + if (var3 == null) { + var3 = ""; + } + + this.owner = var3; } - @ObfuscatedName("ck") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lky;B)V", - garbageValue = "8" + signature = "(Lkz;I)V", + garbageValue = "110384625" ) @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 (var2 % 37L == 0L) { - var4 = null; - } else { - var7 = 0; - - for (long var13 = var2; var13 != 0L; var13 /= 37L) { - ++var7; - } - - StringBuilder var15 = new StringBuilder(var7); - - while (0L != var5) { - long var11 = var5; - var5 /= 37L; - var15.append(class288.base37Table[(int)(var11 - 37L * var5)]); - } - - var4 = var15.reverse().toString(); - } - } else { - var4 = null; - } - - this.readName(var4); + this.readName(GameObject.method3262(var2)); this.minKick = var1.readByte(); - var7 = var1.readUnsignedByte(); - if (var7 != 255) { + int var4 = var1.readUnsignedByte(); + if (var4 != 255) { this.clear(); - for (int var8 = 0; var8 < var7; ++var8) { - ClanMate var9 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); - int var10 = var1.readUnsignedShort(); - var9.set(var10, ++this.field3616 - 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.field3609 - 1); + var6.rank = var1.readByte(); var1.readStringCp1252NullTerminated(); - this.isLocalPlayer(var9); + this.isLocalPlayer(var6); } } } - @ObfuscatedName("cc") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(Lky;I)V", - garbageValue = "-1757818732" + signature = "(Lkz;I)V", + garbageValue = "1536132448" ) - public final void method5135(Buffer var1) { + public final void method5217(Buffer var1) { Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); int var3 = var1.readUnsignedShort(); byte var4 = var1.readByte(); @@ -190,17 +164,17 @@ public class ClanChat extends UserList { var6 = (ClanMate)this.addLastNoPreviousUsername(var2); } - var6.set(var3, ++this.field3616 - 1); + var6.set(var3, ++this.field3609 - 1); var6.rank = var4; this.isLocalPlayer(var6); } } - @ObfuscatedName("cd") + @ObfuscatedName("cl") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1788817000" + signature = "(B)V", + garbageValue = "-116" ) @Export("clearFriends") public final void clearFriends() { @@ -210,10 +184,10 @@ public class ClanChat extends UserList { } - @ObfuscatedName("cf") + @ObfuscatedName("ca") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-109825958" + garbageValue = "1536312249" ) @Export("invalidateIgnoreds") public final void invalidateIgnoreds() { @@ -223,10 +197,10 @@ public class ClanChat extends UserList { } - @ObfuscatedName("cw") + @ObfuscatedName("ck") @ObfuscatedSignature( - signature = "(Ljr;I)V", - garbageValue = "-54614880" + signature = "(Ljl;I)V", + garbageValue = "1986230893" ) @Export("isLocalPlayer") final void isLocalPlayer(ClanMate var1) { diff --git a/runescape-client/src/main/java/ClanMate.java b/runescape-client/src/main/java/ClanMate.java index 9f806bd4e7..ac61058bdb 100644 --- a/runescape-client/src/main/java/ClanMate.java +++ b/runescape-client/src/main/java/ClanMate.java @@ -3,18 +3,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jr") +@ObfuscatedName("jl") @Implements("ClanMate") public class ClanMate extends Buddy { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Ljj;" + signature = "Ljb;" ) @Export("friend") TriBool friend; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Ljj;" + signature = "Ljb;" ) @Export("ignored") TriBool ignored; @@ -24,20 +24,20 @@ public class ClanMate extends Buddy { this.ignored = TriBool.TriBool_unknown; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1629200475" + signature = "(B)V", + garbageValue = "36" ) @Export("clearIsFriend") void clearIsFriend() { this.friend = TriBool.TriBool_unknown; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-431370449" + garbageValue = "23475902" ) @Export("isFriend") public final boolean isFriend() { @@ -48,30 +48,30 @@ public class ClanMate extends Buddy { return this.friend == TriBool.TriBool_true; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-2053877048" + garbageValue = "1435568825" ) @Export("fillIsFriend") void fillIsFriend() { - this.friend = class32.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.friend = class218.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-72" + signature = "(I)V", + garbageValue = "-1913743784" ) @Export("clearIsIgnored") void clearIsIgnored() { this.ignored = TriBool.TriBool_unknown; } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "1045653770" + garbageValue = "2009413985" ) @Export("isIgnored") public final boolean isIgnored() { @@ -82,23 +82,13 @@ public class ClanMate extends Buddy { return this.ignored == TriBool.TriBool_true; } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1531975898" + garbageValue = "83457319" ) @Export("fillIsIgnored") void fillIsIgnored() { - this.ignored = class32.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(CB)Z", - garbageValue = "96" - ) - @Export("isCharAlphabetic") - public static boolean isCharAlphabetic(char var0) { - return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; + this.ignored = class218.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } } diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 5cd11074ac..03cbb28a3a 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -1,4 +1,3 @@ -import java.io.File; import java.io.IOException; import java.net.Socket; import java.util.ArrayList; @@ -15,1267 +14,1249 @@ import netscape.javascript.JSObject; @Implements("Client") @ObfuscatedName("client") public final class Client extends GameShell implements Usernamed { - @ObfuscatedName("oj") - @ObfuscatedSignature( - signature = "Llm;" + @ObfuscatedName("mk") + @ObfuscatedGetter( + intValue = 1799877643 ) - @Export("widgetClickMasks") - static NodeHashTable widgetClickMasks; - @ObfuscatedName("ps") + @Export("staffModLevel") + static int staffModLevel; + @ObfuscatedName("mn") @ObfuscatedSignature( - signature = "Ljl;" - ) - @Export("clanChat") - static ClanChat clanChat; - @ObfuscatedName("mh") - @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhy;" ) @Export("clickedWidget") static Widget clickedWidget; - @ObfuscatedName("ol") + @ObfuscatedName("of") @ObfuscatedGetter( - intValue = 1199265875 + intValue = 2143275649 + ) + static int field826; + @ObfuscatedName("oh") + @ObfuscatedGetter( + intValue = -1410459607 ) @Export("rootWidgetCount") static int rootWidgetCount; @ObfuscatedName("oo") @ObfuscatedGetter( - intValue = -1904808037 + longValue = -3812106139059310753L ) - static int field752; - @ObfuscatedName("oq") + static long field835; + @ObfuscatedName("so") @ObfuscatedGetter( - longValue = 3836241446737313129L - ) - static long field836; - @ObfuscatedName("sk") - @ObfuscatedGetter( - intValue = 2060318015 + intValue = -777339019 ) public static int field892; - @ObfuscatedName("ow") - static boolean[] field703; - @ObfuscatedName("oa") - static boolean[] field830; - @ObfuscatedName("oy") - static boolean[] field829; - @ObfuscatedName("nd") - static boolean field804; - @ObfuscatedName("nc") - static boolean field641; - @ObfuscatedName("oc") + @ObfuscatedName("og") + static boolean[] field827; + @ObfuscatedName("oj") + static boolean[] field647; + @ObfuscatedName("ov") + static boolean[] field828; + @ObfuscatedName("nt") + static boolean field803; + @ObfuscatedName("ox") @Export("isResizable") static boolean isResizable; - @ObfuscatedName("ns") + @ObfuscatedName("nj") @ObfuscatedGetter( - intValue = 612002381 + intValue = 2118102189 ) @Export("cycleCntr") static int cycleCntr; - @ObfuscatedName("no") + @ObfuscatedName("nc") @ObfuscatedGetter( - intValue = 686779073 + intValue = 514283597 ) - static int field629; - @ObfuscatedName("qb") - static boolean field858; - @ObfuscatedName("mp") + static int field815; + @ObfuscatedName("na") + static boolean field800; + @ObfuscatedName("qn") + static boolean field746; + @ObfuscatedName("mj") @ObfuscatedGetter( - intValue = -772624841 + intValue = -1352520531 ) @Export("widgetClickX") static int widgetClickX; - @ObfuscatedName("mx") + @ObfuscatedName("mm") @ObfuscatedGetter( - intValue = 324303259 + intValue = 1096027871 ) @Export("widgetClickY") static int widgetClickY; - @ObfuscatedName("nm") + @ObfuscatedName("ny") @ObfuscatedGetter( - intValue = 1015270749 + intValue = 1655580139 ) - static int field802; - @ObfuscatedName("ms") + static int field801; + @ObfuscatedName("ob") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Llm;" + ) + @Export("widgetClickMasks") + static NodeHashTable widgetClickMasks; + @ObfuscatedName("mo") + @ObfuscatedSignature( + signature = "Lhy;" ) @Export("clickedWidgetParent") static Widget clickedWidgetParent; - @ObfuscatedName("mi") + @ObfuscatedName("ot") + @Export("rootWidgetXs") + static int[] rootWidgetXs; + @ObfuscatedName("ms") @ObfuscatedSignature( signature = "Llm;" ) @Export("interfaceParents") static NodeHashTable interfaceParents; - @ObfuscatedName("on") - @Export("rootWidgetXs") - static int[] rootWidgetXs; - @ObfuscatedName("ou") + @ObfuscatedName("ow") @Export("rootWidgetWidths") static int[] rootWidgetWidths; - @ObfuscatedName("nf") + @ObfuscatedName("nu") @ObfuscatedGetter( - intValue = -958579239 + intValue = 738583497 ) - static int field803; - @ObfuscatedName("mo") - @ObfuscatedSignature( - signature = "Lhp;" - ) - @Export("viewportWidget") - static Widget viewportWidget; - @ObfuscatedName("ox") - @ObfuscatedGetter( - intValue = 1767414743 - ) - @Export("gameDrawingMode") - static int gameDrawingMode; - @ObfuscatedName("ov") - @Export("rootWidgetHeights") - static int[] rootWidgetHeights; - @ObfuscatedName("my") - @ObfuscatedGetter( - intValue = 2067641259 - ) - @Export("staffModLevel") - public static int staffModLevel; - @ObfuscatedName("ot") - @Export("rootWidgetYs") - static int[] rootWidgetYs; - @ObfuscatedName("tz") - static int[] field697; - @ObfuscatedName("tk") - static int[] field898; - @ObfuscatedName("tr") - @ObfuscatedSignature( - signature = "Lbf;" - ) - static final class65 field684; - @ObfuscatedName("og") - @ObfuscatedSignature( - signature = "Ljc;" - ) - @Export("scriptEvents") - static NodeDeque scriptEvents; - @ObfuscatedName("nl") - @ObfuscatedGetter( - intValue = 438883805 - ) - static int field805; - @ObfuscatedName("nr") - @ObfuscatedGetter( - intValue = -179501637 - ) - static int field806; - @ObfuscatedName("qi") - @ObfuscatedGetter( - intValue = -290458443 - ) - static int field857; - @ObfuscatedName("ne") - @Export("isDraggingWidget") - static boolean isDraggingWidget; - @ObfuscatedName("pt") - @ObfuscatedGetter( - intValue = -216729541 - ) - @Export("tradeChatMode") - static int tradeChatMode; - @ObfuscatedName("mk") - @ObfuscatedGetter( - intValue = 904442413 - ) - @Export("runEnergy") - static int runEnergy; - @ObfuscatedName("mb") - @ObfuscatedGetter( - intValue = -1945437307 - ) - @Export("weight") - static int weight; - @ObfuscatedName("pz") - @ObfuscatedGetter( - intValue = 1231685339 - ) - @Export("publicChatMode") - static int publicChatMode; - @ObfuscatedName("py") - @ObfuscatedGetter( - intValue = -1551675657 - ) - @Export("destinationX") - static int destinationX; - @ObfuscatedName("pp") - @ObfuscatedGetter( - intValue = 799266575 - ) - @Export("destinationY") - static int destinationY; - @ObfuscatedName("na") - @ObfuscatedGetter( - intValue = 109681511 - ) - static int field819; - @ObfuscatedName("mc") - @ObfuscatedSignature( - signature = "Lhp;" - ) - @Export("meslayerContinueWidget") - static Widget meslayerContinueWidget; - @ObfuscatedName("so") - @ObfuscatedGetter( - intValue = 410840719 - ) - static int field733; - @ObfuscatedName("qa") - @ObfuscatedGetter( - intValue = -1271857437 - ) - static int field856; - @ObfuscatedName("rs") + static int field706; + @ObfuscatedName("mi") @ObfuscatedSignature( signature = "Lhy;" ) - @Export("playerAppearance") - static PlayerAppearance playerAppearance; - @ObfuscatedName("qj") + @Export("viewportWidget") + static Widget viewportWidget; + @ObfuscatedName("oi") @ObfuscatedGetter( - intValue = 300836983 + intValue = 589790743 ) - static int field860; - @ObfuscatedName("sv") - @ObfuscatedGetter( - intValue = -1054213827 - ) - static int field888; - @ObfuscatedName("om") - @ObfuscatedGetter( - intValue = 963636473 - ) - @Export("mouseWheelRotation") - static int mouseWheelRotation; - @ObfuscatedName("mt") + @Export("gameDrawingMode") + static int gameDrawingMode; + @ObfuscatedName("ou") + @Export("rootWidgetYs") + static int[] rootWidgetYs; + @ObfuscatedName("oq") + @Export("rootWidgetHeights") + static int[] rootWidgetHeights; + @ObfuscatedName("th") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lbd;" ) - @Export("draggedOnWidget") - static Widget draggedOnWidget; - @ObfuscatedName("qr") + static final class65 field896; + @ObfuscatedName("pi") @ObfuscatedGetter( - intValue = -1057223309 + intValue = 1219958761 ) - @Export("soundEffectCount") - static int soundEffectCount; - @ObfuscatedName("qn") - @Export("soundEffectIds") - static int[] soundEffectIds; - @ObfuscatedName("qq") - @Export("queuedSoundEffectLoops") - static int[] queuedSoundEffectLoops; - @ObfuscatedName("qx") - @ObfuscatedGetter( - intValue = 1818057855 - ) - @Export("minimapState") - static int minimapState; - @ObfuscatedName("qm") - @Export("queuedSoundEffectDelays") - static int[] queuedSoundEffectDelays; - @ObfuscatedName("qg") + @Export("destinationX") + static int destinationX; + @ObfuscatedName("oc") @ObfuscatedSignature( - signature = "[Lca;" + signature = "Ljv;" ) - @Export("soundEffects") - static SoundEffect[] soundEffects; + @Export("scriptEvents") + static NodeDeque scriptEvents; + @ObfuscatedName("pm") + @ObfuscatedGetter( + intValue = 134057745 + ) + @Export("destinationY") + static int destinationY; @ObfuscatedName("nh") @ObfuscatedGetter( - intValue = -28645539 + intValue = -1671536207 ) - static int field820; - @ObfuscatedName("qh") - @Export("soundLocations") - static int[] soundLocations; - @ObfuscatedName("si") - @Export("archiveLoaders") - static ArrayList archiveLoaders; - @ObfuscatedName("sp") + static int field804; + @ObfuscatedName("ns") @ObfuscatedGetter( - intValue = -234202221 + intValue = -2015110765 ) - @Export("archiveLoaderArchive") - static int archiveLoaderArchive; - @ObfuscatedName("ni") - static int[] field811; - @ObfuscatedName("ny") + static int field699; + @ObfuscatedName("np") @ObfuscatedGetter( - intValue = 1453639439 + intValue = -144627573 ) - static int field812; - @ObfuscatedName("pq") - @ObfuscatedGetter( - longValue = -7134048785617706275L - ) - static long field847; - @ObfuscatedName("rv") - @ObfuscatedGetter( - intValue = -1113546575 - ) - @Export("viewportOffsetX") - static int viewportOffsetX; - @ObfuscatedName("rt") - @ObfuscatedGetter( - intValue = -413974869 - ) - @Export("viewportOffsetY") - static int viewportOffsetY; - @ObfuscatedName("rw") - @ObfuscatedGetter( - intValue = -784086909 - ) - @Export("viewportWidth") - static int viewportWidth; - @ObfuscatedName("rq") - @ObfuscatedGetter( - intValue = -1159342953 - ) - @Export("viewportHeight") - static int viewportHeight; - @ObfuscatedName("pl") - @ObfuscatedGetter( - intValue = -657852683 - ) - static int field651; - @ObfuscatedName("rl") - static boolean[] field897; - @ObfuscatedName("sb") + static int field670; + @ObfuscatedName("tc") + static int[] field897; + @ObfuscatedName("tu") + static int[] field622; + @ObfuscatedName("sd") @ObfuscatedSignature( - signature = "[Ld;" + signature = "[Lz;" ) @Export("grandExchangeOffers") static GrandExchangeOffer[] grandExchangeOffers; - @ObfuscatedName("rk") - static int[] field869; - @ObfuscatedName("qu") - @Export("isCameraLocked") - static boolean isCameraLocked; - @ObfuscatedName("rd") - static int[] field694; - @ObfuscatedName("rc") - static int[] field758; - @ObfuscatedName("ro") - static int[] field872; - @ObfuscatedName("nx") + @ObfuscatedName("nl") + @Export("isDraggingWidget") + static boolean isDraggingWidget; + @ObfuscatedName("oy") @ObfuscatedGetter( - intValue = -1845844437 + intValue = 751171339 ) - static int field818; - @ObfuscatedName("sa") + @Export("mouseWheelRotation") + static int mouseWheelRotation; + @ObfuscatedName("mh") + @ObfuscatedGetter( + intValue = 577539247 + ) + @Export("runEnergy") + static int runEnergy; + @ObfuscatedName("nr") + @ObfuscatedGetter( + intValue = -482003575 + ) + static int field866; + @ObfuscatedName("mx") + @ObfuscatedGetter( + intValue = 1475119709 + ) + @Export("weight") + static int weight; + @ObfuscatedName("rt") + static boolean[] field749; + @ObfuscatedName("qr") + @ObfuscatedGetter( + intValue = 1115728247 + ) + static int field860; + @ObfuscatedName("ry") + static int[] field779; + @ObfuscatedName("ri") + static int[] field887; + @ObfuscatedName("se") + @ObfuscatedGetter( + intValue = -129549365 + ) + static int field703; + @ObfuscatedName("rw") + static int[] field871; + @ObfuscatedName("rf") @ObfuscatedSignature( - signature = "Llw;" + signature = "Lhl;" + ) + @Export("playerAppearance") + static PlayerAppearance playerAppearance; + @ObfuscatedName("ro") + static int[] field799; + @ObfuscatedName("sq") + @Export("archiveLoaders") + static ArrayList archiveLoaders; + @ObfuscatedName("si") + @ObfuscatedGetter( + intValue = 1522732833 + ) + static int field888; + @ObfuscatedName("mp") + @ObfuscatedSignature( + signature = "Lhy;" + ) + @Export("draggedOnWidget") + static Widget draggedOnWidget; + @ObfuscatedName("sw") + @ObfuscatedGetter( + intValue = -503876483 + ) + @Export("archiveLoaderArchive") + static int archiveLoaderArchive; + @ObfuscatedName("mq") + @ObfuscatedSignature( + signature = "Lhy;" + ) + @Export("meslayerContinueWidget") + static Widget meslayerContinueWidget; + @ObfuscatedName("qy") + @ObfuscatedGetter( + intValue = 448315021 + ) + @Export("soundEffectVolume") + static int soundEffectVolume; + @ObfuscatedName("pt") + @ObfuscatedGetter( + intValue = 1563403409 + ) + @Export("publicChatMode") + static int publicChatMode; + @ObfuscatedName("qs") + @ObfuscatedGetter( + intValue = -1332887045 + ) + @Export("soundEffectCount") + static int soundEffectCount; + @ObfuscatedName("qx") + @Export("soundEffectIds") + static int[] soundEffectIds; + @ObfuscatedName("pj") + @ObfuscatedGetter( + intValue = 1654974071 + ) + @Export("tradeChatMode") + static int tradeChatMode; + @ObfuscatedName("qo") + @Export("queuedSoundEffectLoops") + static int[] queuedSoundEffectLoops; + @ObfuscatedName("qm") + @ObfuscatedGetter( + intValue = -617256985 + ) + @Export("minimapState") + static int minimapState; + @ObfuscatedName("qk") + @Export("queuedSoundEffectDelays") + static int[] queuedSoundEffectDelays; + @ObfuscatedName("qw") + @ObfuscatedSignature( + signature = "[Lcp;" + ) + @Export("soundEffects") + static SoundEffect[] soundEffects; + @ObfuscatedName("qi") + @Export("soundLocations") + static int[] soundLocations; + @ObfuscatedName("pp") + @ObfuscatedGetter( + intValue = 1213166395 + ) + static int field848; + @ObfuscatedName("sj") + @ObfuscatedSignature( + signature = "Llb;" ) @Export("platformInfoProvider") static PlatformInfoProvider platformInfoProvider; @ObfuscatedName("pb") @ObfuscatedGetter( - intValue = 116545085 + longValue = 4732015069802034625L + ) + static long field750; + @ObfuscatedName("qj") + @ObfuscatedGetter( + intValue = -310868887 + ) + static int field857; + @ObfuscatedName("qe") + @ObfuscatedGetter( + intValue = -105655659 + ) + static int field638; + @ObfuscatedName("nm") + static int[] field808; + @ObfuscatedName("nw") + @ObfuscatedGetter( + intValue = 1990399739 + ) + static int field809; + @ObfuscatedName("ps") + @ObfuscatedGetter( + intValue = -284240639 ) @Export("mapIconCount") static int mapIconCount; - @ObfuscatedName("pu") + @ObfuscatedName("rj") + static short field873; + @ObfuscatedName("rz") + static short field752; + @ObfuscatedName("rh") + static short field879; + @ObfuscatedName("qt") + @Export("isCameraLocked") + static boolean isCameraLocked; + @ObfuscatedName("pc") @Export("mapIconXs") static int[] mapIconXs; - @ObfuscatedName("px") - @Export("mapIconYs") - static int[] mapIconYs; - @ObfuscatedName("rf") - static short field873; + @ObfuscatedName("rg") + static short field717; + @ObfuscatedName("rd") + static short field878; @ObfuscatedName("rx") - static short field822; - @ObfuscatedName("ru") - static short field652; - @ObfuscatedName("ri") - static short field791; - @ObfuscatedName("pc") - @ObfuscatedSignature( - signature = "[Lls;" - ) - @Export("mapIcons") - static Sprite[] mapIcons; - @ObfuscatedName("rz") - static short field661; - @ObfuscatedName("ry") @ObfuscatedGetter( - intValue = -769323395 + intValue = 800808315 ) @Export("viewportZoom") static int viewportZoom; - @ObfuscatedName("re") - static short field795; - @ObfuscatedName("qd") + @ObfuscatedName("rs") + static short field877; + @ObfuscatedName("ru") @ObfuscatedGetter( - intValue = 45254171 + intValue = 2115221335 ) - @Export("soundEffectVolume") - static int soundEffectVolume; - @ObfuscatedName("np") - static int[] field809; - @ObfuscatedName("rg") - @Export("zoomHeight") - static short zoomHeight; - @ObfuscatedName("nt") + @Export("viewportWidth") + static int viewportWidth; + @ObfuscatedName("pu") + @Export("mapIconYs") + static int[] mapIconYs; + @ObfuscatedName("rq") @ObfuscatedGetter( - intValue = -1478120285 + intValue = -1883093259 ) - static int field800; - @ObfuscatedName("rn") + @Export("viewportHeight") + static int viewportHeight; + @ObfuscatedName("ph") + @ObfuscatedSignature( + signature = "[Lli;" + ) + @Export("mapIcons") + static Sprite[] mapIcons; + @ObfuscatedName("nz") + @ObfuscatedGetter( + intValue = -43756245 + ) + static int field816; + @ObfuscatedName("rv") @Export("zoomWidth") static short zoomWidth; - @ObfuscatedName("mf") - @Export("playerMod") - static boolean playerMod; - @ObfuscatedName("pg") + @ObfuscatedName("rk") + @Export("zoomHeight") + static short zoomHeight; + @ObfuscatedName("pk") @ObfuscatedGetter( - intValue = 1836754959 + intValue = -145873327 ) - static int field677; - @ObfuscatedName("sw") + static int field844; + @ObfuscatedName("rp") @ObfuscatedGetter( - intValue = -1082381649 + intValue = -2105667825 + ) + @Export("viewportOffsetX") + static int viewportOffsetX; + @ObfuscatedName("rb") + @ObfuscatedGetter( + intValue = -1006224971 + ) + @Export("viewportOffsetY") + static int viewportOffsetY; + @ObfuscatedName("sr") + @ObfuscatedGetter( + intValue = -508225451 ) static int field895; - @ObfuscatedName("nv") + @ObfuscatedName("mz") @ObfuscatedGetter( - intValue = -884673245 - ) - static int field817; - @ObfuscatedName("pr") - static int[] field815; - @ObfuscatedName("ok") - @ObfuscatedSignature( - signature = "Ljc;" - ) - static NodeDeque field633; - @ObfuscatedName("pi") - static int[] field845; - @ObfuscatedName("nq") - @Export("changedSkills") - static int[] changedSkills; - @ObfuscatedName("nu") - @ObfuscatedGetter( - intValue = -1859324819 - ) - @Export("changedSkillsCount") - static int changedSkillsCount; - @ObfuscatedName("od") - @ObfuscatedSignature( - signature = "Ljc;" - ) - static NodeDeque field824; - @ObfuscatedName("mr") - @ObfuscatedGetter( - intValue = -2146322835 + intValue = -929837777 ) @Export("chatEffects") static int chatEffects; - @ObfuscatedName("mu") + @ObfuscatedName("pf") + static int[] field846; + @ObfuscatedName("nf") + @Export("changedSkills") + static int[] changedSkills; + @ObfuscatedName("md") @ObfuscatedGetter( - intValue = 1488851157 + intValue = -599630459 ) - static int field788; - @ObfuscatedName("ml") + static int field787; + @ObfuscatedName("nn") @ObfuscatedGetter( - intValue = -764637271 + intValue = 1578967305 ) - static int field638; - @ObfuscatedName("mn") - @ObfuscatedGetter( - intValue = 471173501 + @Export("changedSkillsCount") + static int changedSkillsCount; + @ObfuscatedName("pl") + static int[] field845; + @ObfuscatedName("om") + @ObfuscatedSignature( + signature = "Ljv;" ) - static int field786; - @ObfuscatedName("mg") + static NodeDeque field822; + @ObfuscatedName("oa") + @ObfuscatedSignature( + signature = "Ljv;" + ) + static NodeDeque field823; + @ObfuscatedName("mc") @ObfuscatedGetter( - intValue = 1069095505 + intValue = -1532518557 ) @Export("followerIndex") static int followerIndex; - @ObfuscatedName("pv") + @ObfuscatedName("me") + @Export("playerMod") + static boolean playerMod; + @ObfuscatedName("pw") static long[] field842; - @ObfuscatedName("pj") - static int[] field643; - @ObfuscatedName("pm") + @ObfuscatedName("mf") @ObfuscatedGetter( - intValue = 1799961229 + intValue = 291908247 + ) + static int field784; + @ObfuscatedName("mu") + @ObfuscatedGetter( + intValue = 1692346051 + ) + static int field785; + @ObfuscatedName("nq") + static int[] field810; + @ObfuscatedName("nx") + @ObfuscatedGetter( + intValue = -417024903 + ) + static int field811; + @ObfuscatedName("py") + @ObfuscatedGetter( + intValue = -357817807 ) static int field843; - @ObfuscatedName("pd") - static String field668; - @ObfuscatedName("sh") - @ObfuscatedSignature( - signature = "Lbr;" - ) - @Export("GrandExchangeEvents_worldComparator") - static GrandExchangeOfferOwnWorldComparator GrandExchangeEvents_worldComparator; @ObfuscatedName("nb") @ObfuscatedGetter( - intValue = 887611573 + intValue = 1490528893 + ) + static int field818; + @ObfuscatedName("nv") + @ObfuscatedGetter( + intValue = -969012153 ) @Export("chatCycle") static int chatCycle; + @ObfuscatedName("pr") + static int[] field838; + @ObfuscatedName("pv") + static String field778; + @ObfuscatedName("su") + @ObfuscatedSignature( + signature = "Lbh;" + ) + @Export("GrandExchangeEvents_worldComparator") + static GrandExchangeOfferOwnWorldComparator GrandExchangeEvents_worldComparator; @ObfuscatedName("w") @ObfuscatedSignature( - signature = "[Lfm;" + signature = "[Lfj;" ) @Export("collisionMaps") static CollisionMap[] collisionMaps; - @ObfuscatedName("ae") - static boolean field783; - @ObfuscatedName("bk") + @ObfuscatedName("au") + static boolean field859; + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = -99475413 + intValue = -1601715751 ) @Export("worldId") public static int worldId; - @ObfuscatedName("bw") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = -196512875 + intValue = -336941817 ) @Export("worldProperties") static int worldProperties; - @ObfuscatedName("bn") + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = -507352025 + intValue = -21053855 ) @Export("gameBuild") static int gameBuild; - @ObfuscatedName("bh") + @ObfuscatedName("bv") @Export("isMembersWorld") public static boolean isMembersWorld; - @ObfuscatedName("bv") + @ObfuscatedName("bf") @Export("isLowDetail") static boolean isLowDetail; - @ObfuscatedName("bi") + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = 580705437 + intValue = -619085493 ) @Export("clientType") static int clientType; - @ObfuscatedName("bf") + @ObfuscatedName("bd") @Export("onMobile") static boolean onMobile; - @ObfuscatedName("bd") + @ObfuscatedName("by") @ObfuscatedGetter( - intValue = 600567601 + intValue = 979578981 ) @Export("gameState") static int gameState; - @ObfuscatedName("cw") + @ObfuscatedName("cl") @Export("isLoading") static boolean isLoading; - @ObfuscatedName("cj") + @ObfuscatedName("ca") @ObfuscatedGetter( - intValue = -462561221 + intValue = -421753635 ) @Export("cycle") static int cycle; - @ObfuscatedName("cp") + @ObfuscatedName("ck") @ObfuscatedGetter( - longValue = -3264456649992457541L + longValue = -2177862012232032419L ) @Export("mouseLastLastPressedTimeMillis") static long mouseLastLastPressedTimeMillis; - @ObfuscatedName("cm") + @ObfuscatedName("ce") @ObfuscatedGetter( - intValue = 1567709733 + intValue = -885585199 ) - static int field838; - @ObfuscatedName("cb") - @ObfuscatedGetter( - intValue = 519692055 - ) - static int field637; - @ObfuscatedName("ch") - @ObfuscatedGetter( - longValue = -2755527832911265383L - ) - static long field889; + static int field635; @ObfuscatedName("cn") + @ObfuscatedGetter( + intValue = -777137731 + ) + static int field667; + @ObfuscatedName("cj") + @ObfuscatedGetter( + longValue = 7724193620298551405L + ) + static long field637; + @ObfuscatedName("cw") @Export("hadFocus") static boolean hadFocus; - @ObfuscatedName("cr") + @ObfuscatedName("cu") @Export("displayFps") static boolean displayFps; - @ObfuscatedName("cl") + @ObfuscatedName("cd") @ObfuscatedGetter( - intValue = 275974395 + intValue = 1698015517 ) @Export("rebootTimer") static int rebootTimer; - @ObfuscatedName("cg") + @ObfuscatedName("cs") @ObfuscatedGetter( - intValue = -271547777 + intValue = -1598349441 ) @Export("hintArrowType") static int hintArrowType; - @ObfuscatedName("cy") + @ObfuscatedName("cx") @ObfuscatedGetter( - intValue = -262489269 + intValue = -472115629 ) @Export("hintArrowNpcIndex") static int hintArrowNpcIndex; - @ObfuscatedName("cz") + @ObfuscatedName("ci") @ObfuscatedGetter( - intValue = 1310447751 + intValue = -1186478901 ) @Export("hintArrowPlayerIndex") static int hintArrowPlayerIndex; - @ObfuscatedName("cv") + @ObfuscatedName("cf") @ObfuscatedGetter( - intValue = -1091650667 + intValue = -2024539797 ) @Export("hintArrowX") static int hintArrowX; @ObfuscatedName("cq") @ObfuscatedGetter( - intValue = -133934205 + intValue = -441319329 ) @Export("hintArrowY") static int hintArrowY; - @ObfuscatedName("ct") + @ObfuscatedName("co") @ObfuscatedGetter( - intValue = -709011140 + intValue = 2122782524 ) @Export("hintArrowHeight") static int hintArrowHeight; - @ObfuscatedName("cx") + @ObfuscatedName("cz") @ObfuscatedGetter( - intValue = 154264000 + intValue = -762662848 ) @Export("hintArrowSubX") static int hintArrowSubX; - @ObfuscatedName("ca") + @ObfuscatedName("cp") @ObfuscatedGetter( - intValue = -2027343753 + intValue = 2006872512 ) @Export("hintArrowSubY") static int hintArrowSubY; - @ObfuscatedName("co") + @ObfuscatedName("cg") @ObfuscatedSignature( - signature = "Lcw;" + signature = "Lcl;" ) @Export("playerAttackOption") static AttackOption playerAttackOption; - @ObfuscatedName("dr") + @ObfuscatedName("dj") @ObfuscatedSignature( - signature = "Lcw;" + signature = "Lcl;" ) @Export("npcAttackOption") static AttackOption npcAttackOption; - @ObfuscatedName("dv") + @ObfuscatedName("do") @ObfuscatedGetter( - intValue = -2076451089 + intValue = -1724817993 ) @Export("titleLoadingStage") static int titleLoadingStage; - @ObfuscatedName("dh") - @ObfuscatedSignature( - signature = "Lkg;" - ) - @Export("js5Socket") - static AbstractSocket js5Socket; - @ObfuscatedName("dm") + @ObfuscatedName("dd") @ObfuscatedGetter( - intValue = 80587017 + intValue = -1719889523 ) @Export("js5ConnectState") static int js5ConnectState; - @ObfuscatedName("dj") + @ObfuscatedName("dp") @ObfuscatedGetter( - intValue = -1829390107 + intValue = 1027381769 ) - static int field681; - @ObfuscatedName("db") - @ObfuscatedSignature( - signature = "Lid;" - ) - @Export("archive0") - static Archive archive0; - @ObfuscatedName("ex") + static int field653; + @ObfuscatedName("en") @ObfuscatedGetter( - intValue = -353333359 + intValue = -196326053 ) @Export("js5Errors") static int js5Errors; - @ObfuscatedName("em") + @ObfuscatedName("eo") @ObfuscatedGetter( - intValue = 1287215825 + intValue = 626628081 ) @Export("loginState") static int loginState; - @ObfuscatedName("en") + @ObfuscatedName("el") @ObfuscatedGetter( - intValue = -611023551 + intValue = 6099821 ) - static int field658; - @ObfuscatedName("ey") + static int field656; + @ObfuscatedName("ea") @ObfuscatedGetter( - intValue = 1589887601 + intValue = 2105698063 ) - static int field659; - @ObfuscatedName("ei") + static int field841; + @ObfuscatedName("em") @ObfuscatedGetter( - intValue = -95830179 + intValue = -1207133761 ) - static int field660; - @ObfuscatedName("ee") + static int field821; + @ObfuscatedName("ev") @ObfuscatedSignature( - signature = "Lfn;" + signature = "Lfr;" ) - static class160 field870; - @ObfuscatedName("ek") + static class160 field659; + @ObfuscatedName("eb") @Export("Login_isUsernameRemembered") static boolean Login_isUsernameRemembered; - @ObfuscatedName("et") + @ObfuscatedName("ei") @ObfuscatedSignature( - signature = "Lcm;" + signature = "Lce;" ) @Export("secureRandomFuture") static SecureRandomFuture secureRandomFuture; - @ObfuscatedName("ez") + @ObfuscatedName("ee") @Export("randomDatData") static byte[] randomDatData; @ObfuscatedName("ew") @ObfuscatedSignature( - signature = "[Lci;" + signature = "[Lct;" ) @Export("npcs") static NPC[] npcs; - @ObfuscatedName("ev") + @ObfuscatedName("ex") @ObfuscatedGetter( - intValue = 134647317 + intValue = 2015808657 ) @Export("npcCount") static int npcCount; - @ObfuscatedName("fz") + @ObfuscatedName("ft") @Export("npcIndices") static int[] npcIndices; - @ObfuscatedName("fd") + @ObfuscatedName("ff") @ObfuscatedGetter( - intValue = 1857623211 + intValue = -2130035923 ) - static int field861; - @ObfuscatedName("fi") - static int[] field669; - @ObfuscatedName("fc") + static int field666; + @ObfuscatedName("fh") + static int[] field881; + @ObfuscatedName("fd") @ObfuscatedSignature( - signature = "Lcy;" + signature = "Lcx;" ) @Export("packetWriter") public static final PacketWriter packetWriter; - @ObfuscatedName("fy") + @ObfuscatedName("fz") @ObfuscatedGetter( - intValue = 664871625 + intValue = 857108449 ) @Export("logoutTimer") static int logoutTimer; - @ObfuscatedName("fg") - static boolean field672; - @ObfuscatedName("ft") + @ObfuscatedName("fs") + static boolean field772; + @ObfuscatedName("fc") @Export("useBufferedSocket") static boolean useBufferedSocket; - @ObfuscatedName("fu") + @ObfuscatedName("fq") @ObfuscatedSignature( - signature = "Ljd;" + signature = "Ljg;" ) @Export("timer") static Timer timer; - @ObfuscatedName("fm") + @ObfuscatedName("fj") @Export("fontsMap") static HashMap fontsMap; - @ObfuscatedName("fr") - @ObfuscatedGetter( - intValue = -899956101 - ) - static int field676; @ObfuscatedName("fb") @ObfuscatedGetter( - intValue = -736504201 + intValue = -435264727 ) - static int field886; - @ObfuscatedName("fw") + static int field674; + @ObfuscatedName("fn") @ObfuscatedGetter( - intValue = -1345680285 + intValue = -999239425 + ) + static int field851; + @ObfuscatedName("fo") + @ObfuscatedGetter( + intValue = 966695411 + ) + static int field676; + @ObfuscatedName("ga") + @ObfuscatedGetter( + intValue = -315742403 + ) + static int field872; + @ObfuscatedName("gw") + @ObfuscatedGetter( + intValue = 917555973 ) static int field678; - @ObfuscatedName("gj") - @ObfuscatedGetter( - intValue = 2003337393 - ) - static int field718; - @ObfuscatedName("gv") - @ObfuscatedGetter( - intValue = 417524189 - ) - static int field719; @ObfuscatedName("gr") + @Export("regionMapArchives") + static byte[][] regionMapArchives; + @ObfuscatedName("ge") @Export("isInInstance") static boolean isInInstance; - @ObfuscatedName("gm") + @ObfuscatedName("gh") @Export("instanceChunkTemplates") static int[][][] instanceChunkTemplates; - @ObfuscatedName("gu") - static final int[] field665; - @ObfuscatedName("gf") + @ObfuscatedName("gq") + static final int[] field682; + @ObfuscatedName("gg") @ObfuscatedGetter( - intValue = -1005084219 + intValue = -827918895 ) - static int field879; - @ObfuscatedName("hc") + static int field683; + @ObfuscatedName("hh") @ObfuscatedGetter( - intValue = 676975455 + intValue = 2087511617 ) - static int field702; - @ObfuscatedName("hr") + static int field684; + @ObfuscatedName("hq") @ObfuscatedGetter( - intValue = 1917879357 + intValue = 1637234425 ) - static int field687; - @ObfuscatedName("he") - @ObfuscatedGetter( - intValue = 1550854211 - ) - static int field688; - @ObfuscatedName("hg") - @ObfuscatedGetter( - intValue = -1131531425 - ) - static int field689; - @ObfuscatedName("hi") - static boolean field725; + static int field745; @ObfuscatedName("hd") @ObfuscatedGetter( - intValue = -240458459 + intValue = -1929516521 + ) + static int field686; + @ObfuscatedName("hi") + @ObfuscatedGetter( + intValue = 669795741 + ) + static int field817; + @ObfuscatedName("hc") + static boolean field712; + @ObfuscatedName("hj") + @ObfuscatedGetter( + intValue = -267408535 ) @Export("alternativeScrollbarWidth") static int alternativeScrollbarWidth; - @ObfuscatedName("hx") + @ObfuscatedName("hu") @ObfuscatedGetter( - intValue = 933386243 + intValue = -950947723 ) @Export("camAngleX") static int camAngleX; - @ObfuscatedName("hm") + @ObfuscatedName("hk") @ObfuscatedGetter( - intValue = -1970714441 + intValue = -1326038309 ) @Export("camAngleY") static int camAngleY; - @ObfuscatedName("hq") + @ObfuscatedName("hr") @ObfuscatedGetter( - intValue = -1869718523 + intValue = -872269345 ) @Export("camAngleDY") static int camAngleDY; - @ObfuscatedName("ht") + @ObfuscatedName("he") @ObfuscatedGetter( - intValue = 1514258351 + intValue = -164832567 ) @Export("camAngleDX") static int camAngleDX; - @ObfuscatedName("ho") + @ObfuscatedName("hb") @ObfuscatedGetter( - intValue = -515756443 + intValue = 2064310305 ) @Export("mouseCamClickedX") static int mouseCamClickedX; - @ObfuscatedName("hf") + @ObfuscatedName("hv") @ObfuscatedGetter( - intValue = 1600800987 + intValue = -2006290321 ) @Export("mouseCamClickedY") static int mouseCamClickedY; - @ObfuscatedName("hu") + @ObfuscatedName("hn") @ObfuscatedGetter( - intValue = -123122863 + intValue = 1652098085 ) @Export("oculusOrbState") static int oculusOrbState; - @ObfuscatedName("hh") - @ObfuscatedGetter( - intValue = 1491883569 - ) + @ObfuscatedName("hx") @Export("camFollowHeight") static int camFollowHeight; - @ObfuscatedName("hl") + @ObfuscatedName("hg") @ObfuscatedGetter( - intValue = 189377225 + intValue = 2081108025 ) - static int field700; + static int field698; @ObfuscatedName("hz") @ObfuscatedGetter( - intValue = -407641659 + intValue = 1839311001 ) - static int field701; - @ObfuscatedName("iw") + static int field802; + @ObfuscatedName("ib") @ObfuscatedGetter( - intValue = 1308112361 + intValue = 273401701 ) - static int field680; - @ObfuscatedName("iy") + static int field700; + @ObfuscatedName("in") @ObfuscatedGetter( - intValue = -259522237 + intValue = 102668235 ) @Export("oculusOrbNormalSpeed") static int oculusOrbNormalSpeed; - @ObfuscatedName("ic") + @ObfuscatedName("ir") @ObfuscatedGetter( - intValue = -117213855 + intValue = -647084875 ) @Export("oculusOrbSlowedSpeed") static int oculusOrbSlowedSpeed; - @ObfuscatedName("ia") + @ObfuscatedName("ii") @ObfuscatedGetter( - intValue = 1865864529 + intValue = 765307009 ) - static int field705; - @ObfuscatedName("in") - static boolean field706; - @ObfuscatedName("iq") + public static int field688; + @ObfuscatedName("ik") + static boolean field824; + @ObfuscatedName("is") @ObfuscatedGetter( - intValue = 1190550561 + intValue = -480860359 ) - static int field712; - @ObfuscatedName("ip") - static boolean field708; - @ObfuscatedName("il") + static int field883; + @ObfuscatedName("iu") + static boolean field858; + @ObfuscatedName("ih") @ObfuscatedGetter( - intValue = -1101305947 + intValue = 483214157 ) - static int field635; - @ObfuscatedName("ie") + static int field707; + @ObfuscatedName("im") @ObfuscatedGetter( - intValue = -589346943 + intValue = -907822963 ) @Export("overheadTextCount") static int overheadTextCount; - @ObfuscatedName("if") + @ObfuscatedName("il") @ObfuscatedGetter( - intValue = -1255115843 + intValue = -955046711 ) @Export("overheadTextLimit") static int overheadTextLimit; - @ObfuscatedName("ig") + @ObfuscatedName("iq") @Export("overheadTextXs") static int[] overheadTextXs; + @ObfuscatedName("if") + @Export("overheadTextYs") + static int[] overheadTextYs; @ObfuscatedName("it") @Export("selectedItemName") static String selectedItemName; - @ObfuscatedName("im") - @Export("overheadTextYs") - static int[] overheadTextYs; - @ObfuscatedName("is") + @ObfuscatedName("ij") @Export("overheadTextAscents") static int[] overheadTextAscents; - @ObfuscatedName("ir") + @ObfuscatedName("iv") @Export("overheadTextXOffsets") static int[] overheadTextXOffsets; - @ObfuscatedName("io") + @ObfuscatedName("ic") @Export("overheadTextColors") static int[] overheadTextColors; - @ObfuscatedName("ik") + @ObfuscatedName("iy") @Export("overheadTextEffects") static int[] overheadTextEffects; - @ObfuscatedName("iu") + @ObfuscatedName("id") @Export("overheadTextCyclesRemaining") static int[] overheadTextCyclesRemaining; - @ObfuscatedName("ib") + @ObfuscatedName("ie") @Export("overheadText") static String[] overheadText; - @ObfuscatedName("ii") + @ObfuscatedName("ia") @Export("tileLastDrawnActor") static int[][] tileLastDrawnActor; - @ObfuscatedName("iv") + @ObfuscatedName("ip") @ObfuscatedGetter( - intValue = -573447391 + intValue = -455282343 ) @Export("viewportDrawCount") static int viewportDrawCount; - @ObfuscatedName("ij") + @ObfuscatedName("iw") @ObfuscatedGetter( - intValue = 257969471 + intValue = -1484250283 ) @Export("viewportTempX") static int viewportTempX; - @ObfuscatedName("ih") + @ObfuscatedName("ig") @ObfuscatedGetter( - intValue = -983509355 + intValue = 1892863881 ) @Export("viewportTempY") static int viewportTempY; - @ObfuscatedName("jp") + @ObfuscatedName("jd") @ObfuscatedGetter( - intValue = 2019424665 + intValue = -710610133 ) @Export("mouseCrossX") static int mouseCrossX; - @ObfuscatedName("jc") + @ObfuscatedName("jv") @ObfuscatedGetter( - intValue = -1900152601 + intValue = -784793429 ) @Export("mouseCrossY") static int mouseCrossY; - @ObfuscatedName("jf") + @ObfuscatedName("jo") @ObfuscatedGetter( - intValue = -579281601 + intValue = 1934089213 ) @Export("mouseCrossState") static int mouseCrossState; - @ObfuscatedName("jz") + @ObfuscatedName("jf") @ObfuscatedGetter( - intValue = 1535156455 + intValue = -1311379791 ) @Export("mouseCrossColor") static int mouseCrossColor; - @ObfuscatedName("jn") + @ObfuscatedName("jh") @Export("showMouseCross") static boolean showMouseCross; - @ObfuscatedName("jh") + @ObfuscatedName("jk") @ObfuscatedGetter( - intValue = 121716981 + intValue = -366431001 ) - static int field729; - @ObfuscatedName("jq") + static int field727; + @ObfuscatedName("js") @ObfuscatedGetter( - intValue = -236430235 + intValue = -1998265721 ) - static int field730; - @ObfuscatedName("ji") + static int field728; + @ObfuscatedName("jc") @ObfuscatedGetter( - intValue = 2086457457 + intValue = 982214939 ) @Export("dragItemSlotSource") static int dragItemSlotSource; - @ObfuscatedName("jd") + @ObfuscatedName("jg") @ObfuscatedGetter( - intValue = 1027711881 + intValue = 510687779 ) - static int field732; - @ObfuscatedName("jr") + static int field730; + @ObfuscatedName("jl") @ObfuscatedGetter( - intValue = 879520429 + intValue = 1673443473 ) - static int field744; - @ObfuscatedName("ju") + static int field870; + @ObfuscatedName("jw") @ObfuscatedGetter( - intValue = 505726403 + intValue = 1696900929 ) @Export("dragItemSlotDestination") static int dragItemSlotDestination; - @ObfuscatedName("je") - static boolean field867; - @ObfuscatedName("jk") + @ObfuscatedName("jq") + static boolean field733; + @ObfuscatedName("ji") @ObfuscatedGetter( - intValue = 952757877 + intValue = -1288025075 ) @Export("itemDragDuration") static int itemDragDuration; - @ObfuscatedName("jw") + @ObfuscatedName("jm") @ObfuscatedGetter( - intValue = 1710791043 + intValue = 1089693987 ) - static int field737; - @ObfuscatedName("jt") + static int field735; + @ObfuscatedName("je") @Export("showLoadingMessages") static boolean showLoadingMessages; - @ObfuscatedName("jj") + @ObfuscatedName("jb") @ObfuscatedSignature( - signature = "[Lbd;" + signature = "[Lby;" ) @Export("players") static Player[] players; - @ObfuscatedName("jx") + @ObfuscatedName("jt") @ObfuscatedGetter( - intValue = 108652351 + intValue = 946713101 ) @Export("localPlayerIndex") static int localPlayerIndex; - @ObfuscatedName("ja") + @ObfuscatedName("jy") @ObfuscatedGetter( - intValue = -534802235 + intValue = -2053869901 ) - static int field741; - @ObfuscatedName("jv") + static int field739; + @ObfuscatedName("jp") @Export("renderSelf") static boolean renderSelf; - @ObfuscatedName("kq") + @ObfuscatedName("kb") @ObfuscatedGetter( - intValue = -1853655733 + intValue = 1018003901 ) @Export("drawPlayerNames") static int drawPlayerNames; - @ObfuscatedName("kz") + @ObfuscatedName("kn") @ObfuscatedGetter( - intValue = 935391775 + intValue = -1864645893 ) - static int field899; - @ObfuscatedName("kr") - static int[] field655; - @ObfuscatedName("kb") + static int field742; + @ObfuscatedName("ku") + static int[] field731; + @ObfuscatedName("kf") @Export("playerMenuOpcodes") static final int[] playerMenuOpcodes; - @ObfuscatedName("kl") + @ObfuscatedName("ko") @Export("playerMenuActions") static String[] playerMenuActions; - @ObfuscatedName("kn") + @ObfuscatedName("km") @Export("playerOptionsPriorities") static boolean[] playerOptionsPriorities; - @ObfuscatedName("ke") + @ObfuscatedName("kv") @Export("defaultRotations") static int[] defaultRotations; - @ObfuscatedName("kx") + @ObfuscatedName("kt") @ObfuscatedGetter( - intValue = -1785392333 + intValue = 14237999 ) @Export("combatTargetPlayerIndex") static int combatTargetPlayerIndex; - @ObfuscatedName("ky") + @ObfuscatedName("kz") @ObfuscatedSignature( - signature = "[[[Ljc;" + signature = "[[[Ljv;" ) @Export("groundItems") static NodeDeque[][][] groundItems; - @ObfuscatedName("kd") + @ObfuscatedName("kp") @ObfuscatedSignature( - signature = "Ljc;" + signature = "Ljv;" ) @Export("pendingSpawns") static NodeDeque pendingSpawns; - @ObfuscatedName("km") + @ObfuscatedName("ky") @ObfuscatedSignature( - signature = "Ljc;" + signature = "Ljv;" ) @Export("projectiles") static NodeDeque projectiles; - @ObfuscatedName("kw") + @ObfuscatedName("ki") @ObfuscatedSignature( - signature = "Ljc;" + signature = "Ljv;" ) @Export("graphicsObjects") static NodeDeque graphicsObjects; - @ObfuscatedName("ku") + @ObfuscatedName("kw") @Export("currentLevels") static int[] currentLevels; - @ObfuscatedName("kg") + @ObfuscatedName("ks") @Export("levels") static int[] levels; - @ObfuscatedName("ko") + @ObfuscatedName("ka") @Export("experience") static int[] experience; - @ObfuscatedName("ki") + @ObfuscatedName("kq") @ObfuscatedGetter( - intValue = 280970801 + intValue = -1919852667 ) @Export("leftClickOpensMenu") static int leftClickOpensMenu; - @ObfuscatedName("kv") + @ObfuscatedName("kx") @Export("isMenuOpen") static boolean isMenuOpen; - @ObfuscatedName("lf") + @ObfuscatedName("lx") @ObfuscatedGetter( - intValue = 670271749 + intValue = -1574159447 ) @Export("menuOptionsCount") static int menuOptionsCount; - @ObfuscatedName("li") + @ObfuscatedName("le") @Export("menuArguments1") static int[] menuArguments1; - @ObfuscatedName("ln") + @ObfuscatedName("lj") @Export("menuArguments2") static int[] menuArguments2; - @ObfuscatedName("lo") + @ObfuscatedName("ls") @Export("menuOpcodes") static int[] menuOpcodes; @ObfuscatedName("lm") @Export("menuIdentifiers") static int[] menuIdentifiers; - @ObfuscatedName("lh") + @ObfuscatedName("lr") @Export("menuActions") static String[] menuActions; @ObfuscatedName("lp") @Export("menuTargets") static String[] menuTargets; - @ObfuscatedName("lj") + @ObfuscatedName("lw") @Export("menuShiftClick") static boolean[] menuShiftClick; - @ObfuscatedName("lg") + @ObfuscatedName("lf") @Export("followerOpsLowPriority") static boolean followerOpsLowPriority; - @ObfuscatedName("lq") + @ObfuscatedName("lt") @Export("shiftClickDrop") static boolean shiftClickDrop; - @ObfuscatedName("ls") + @ObfuscatedName("li") @Export("tapToDrop") static boolean tapToDrop; - @ObfuscatedName("ld") + @ObfuscatedName("lg") @Export("showMouseOverText") static boolean showMouseOverText; - @ObfuscatedName("lt") + @ObfuscatedName("lz") @ObfuscatedGetter( - intValue = -519368399 + intValue = -702365679 ) @Export("viewportX") static int viewportX; - @ObfuscatedName("le") + @ObfuscatedName("ld") @ObfuscatedGetter( - intValue = 731762713 + intValue = 1651328511 ) @Export("viewportY") static int viewportY; - @ObfuscatedName("la") + @ObfuscatedName("ly") @ObfuscatedGetter( - intValue = -296280915 + intValue = -1857574121 ) - static int field774; - @ObfuscatedName("lv") + static int field773; + @ObfuscatedName("ln") @ObfuscatedGetter( - intValue = 904105341 + intValue = 1950322865 ) - static int field848; - @ObfuscatedName("lc") + static int field738; + @ObfuscatedName("lu") @ObfuscatedGetter( - intValue = 474967141 + intValue = 159235159 ) @Export("isItemSelected") static int isItemSelected; - @ObfuscatedName("ll") + @ObfuscatedName("lh") @Export("isSpellSelected") static boolean isSpellSelected; - @ObfuscatedName("lu") + @ObfuscatedName("ll") @ObfuscatedGetter( - intValue = -636405785 + intValue = -465859219 ) - static int field816; - @ObfuscatedName("mj") + static int field687; + @ObfuscatedName("ml") @ObfuscatedGetter( - intValue = 1298304865 + intValue = -1436921851 ) - static int field736; - @ObfuscatedName("mv") + static int field648; + @ObfuscatedName("ma") @Export("selectedSpellActionName") static String selectedSpellActionName; @ObfuscatedName("mw") @Export("selectedSpellName") static String selectedSpellName; - @ObfuscatedName("mm") + @ObfuscatedName("mr") @ObfuscatedGetter( - intValue = 452430417 + intValue = 173733075 ) @Export("rootInterface") static int rootInterface; static { - field783 = true; + field859 = true; worldId = 1; worldProperties = 0; gameBuild = 0; @@ -1287,9 +1268,9 @@ public final class Client extends GameShell implements Usernamed { isLoading = true; cycle = 0; mouseLastLastPressedTimeMillis = 1L; - field838 = -1; - field637 = -1; - field889 = -1L; + field635 = -1; + field667 = -1; + field637 = -1L; hadFocus = true; displayFps = false; rebootTimer = 0; @@ -1305,42 +1286,42 @@ public final class Client extends GameShell implements Usernamed { npcAttackOption = AttackOption.AttackOption_hidden; titleLoadingStage = 0; js5ConnectState = 0; - field681 = 0; + field653 = 0; js5Errors = 0; loginState = 0; - field658 = 0; - field659 = 0; - field660 = 0; - field870 = class160.field1984; + field656 = 0; + field841 = 0; + field821 = 0; + field659 = class160.field1973; Login_isUsernameRemembered = false; secureRandomFuture = new SecureRandomFuture(); randomDatData = null; npcs = new NPC[32768]; npcCount = 0; npcIndices = new int[32768]; - field861 = 0; - field669 = new int[250]; + field666 = 0; + field881 = new int[250]; packetWriter = new PacketWriter(); logoutTimer = 0; - field672 = false; + field772 = false; useBufferedSocket = true; timer = new Timer(); fontsMap = new HashMap(); + field674 = 0; + field851 = 1; field676 = 0; - field886 = 1; + field872 = 1; field678 = 0; - field718 = 1; - field719 = 0; collisionMaps = new CollisionMap[4]; isInInstance = false; instanceChunkTemplates = new int[4][13][13]; - field665 = 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}; - field879 = 0; - field702 = 2301979; - field687 = 5063219; - field688 = 3353893; - field689 = 7759444; - field725 = false; + field682 = new int[]{0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3}; + field683 = 0; + field684 = 2301979; + field745 = 5063219; + field686 = 3353893; + field817 = 7759444; + field712 = false; alternativeScrollbarWidth = 0; camAngleX = 128; camAngleY = 0; @@ -1349,17 +1330,17 @@ public final class Client extends GameShell implements Usernamed { mouseCamClickedX = 0; mouseCamClickedY = 0; oculusOrbState = 0; - camFollowHeight = 50; + camFollowHeight = -1937934274; + field698 = 0; + field802 = 0; field700 = 0; - field701 = 0; - field680 = 0; oculusOrbNormalSpeed = 12; oculusOrbSlowedSpeed = 6; - field705 = 0; - field706 = false; - field712 = 0; - field708 = false; - field635 = 0; + field688 = 0; + field824 = false; + field883 = 0; + field858 = false; + field707 = 0; overheadTextCount = 0; overheadTextLimit = 50; overheadTextXs = new int[overheadTextLimit]; @@ -1379,23 +1360,23 @@ public final class Client extends GameShell implements Usernamed { mouseCrossState = 0; mouseCrossColor = 0; showMouseCross = true; - field729 = 0; - field730 = 0; + field727 = 0; + field728 = 0; dragItemSlotSource = 0; - field732 = 0; - field744 = 0; + field730 = 0; + field870 = 0; dragItemSlotDestination = 0; - field867 = false; + field733 = false; itemDragDuration = 0; - field737 = 0; + field735 = 0; showLoadingMessages = true; players = new Player[2048]; localPlayerIndex = -1; - field741 = 0; + field739 = 0; renderSelf = true; drawPlayerNames = 0; - field899 = 0; - field655 = new int[1000]; + field742 = 0; + field731 = new int[1000]; playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; playerMenuActions = new String[8]; playerOptionsPriorities = new boolean[8]; @@ -1424,21 +1405,21 @@ public final class Client extends GameShell implements Usernamed { showMouseOverText = true; viewportX = -1; viewportY = -1; - field774 = 0; - field848 = 50; + field773 = 0; + field738 = 50; isItemSelected = 0; selectedItemName = null; isSpellSelected = false; - field816 = -1; - field736 = -1; + field687 = -1; + field648 = -1; selectedSpellActionName = null; selectedSpellName = null; rootInterface = -1; interfaceParents = new NodeHashTable(8); - field638 = 0; - field786 = -1; + field784 = 0; + field785 = -1; chatEffects = 0; - field788 = 0; + field787 = 0; meslayerContinueWidget = null; runEnergy = 0; weight = 0; @@ -1451,54 +1432,54 @@ public final class Client extends GameShell implements Usernamed { widgetClickX = 0; widgetClickY = 0; draggedOnWidget = null; - field641 = false; - field802 = -1; - field803 = -1; - field804 = false; - field805 = -1; - field806 = -1; + field800 = false; + field801 = -1; + field706 = -1; + field803 = false; + field804 = -1; + field699 = -1; isDraggingWidget = false; cycleCntr = 1; - field809 = new int[32]; - field800 = 0; - field811 = new int[32]; - field812 = 0; + field808 = new int[32]; + field809 = 0; + field810 = new int[32]; + field811 = 0; changedSkills = new int[32]; changedSkillsCount = 0; chatCycle = 0; - field629 = 0; - field817 = 0; + field815 = 0; + field816 = 0; + field866 = 0; field818 = 0; - field819 = 0; - field820 = 0; + field670 = 0; mouseWheelRotation = 0; scriptEvents = new NodeDeque(); - field633 = new NodeDeque(); - field824 = new NodeDeque(); + field822 = new NodeDeque(); + field823 = new NodeDeque(); widgetClickMasks = new NodeHashTable(512); rootWidgetCount = 0; - field752 = -2; - field703 = new boolean[100]; - field829 = new boolean[100]; - field830 = new boolean[100]; + field826 = -2; + field827 = new boolean[100]; + field828 = new boolean[100]; + field647 = new boolean[100]; rootWidgetXs = new int[100]; rootWidgetYs = new int[100]; rootWidgetWidths = new int[100]; rootWidgetHeights = new int[100]; gameDrawingMode = 0; - field836 = 0L; + field835 = 0L; isResizable = true; - field643 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; + field838 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; publicChatMode = 0; tradeChatMode = 0; - field668 = ""; + field778 = ""; field842 = new long[100]; field843 = 0; - field677 = 0; + field844 = 0; field845 = new int[128]; - field815 = new int[128]; - field847 = -1L; - field651 = -1; + field846 = new int[128]; + field750 = -1L; + field848 = -1; mapIconCount = 0; mapIconXs = new int[1000]; mapIconYs = new int[1000]; @@ -1506,9 +1487,9 @@ public final class Client extends GameShell implements Usernamed { destinationX = 0; destinationY = 0; minimapState = 0; - field856 = 255; + field638 = 255; field857 = -1; - field858 = false; + field746 = false; soundEffectVolume = 127; field860 = 127; soundEffectCount = 0; @@ -1518,26 +1499,26 @@ public final class Client extends GameShell implements Usernamed { soundLocations = new int[50]; soundEffects = new SoundEffect[50]; isCameraLocked = false; - field897 = new boolean[5]; - field869 = new int[5]; - field694 = new int[5]; - field758 = new int[5]; - field872 = new int[5]; + field749 = new boolean[5]; + field779 = new int[5]; + field887 = new int[5]; + field871 = new int[5]; + field799 = new int[5]; field873 = 256; - field822 = 205; + field752 = 205; zoomHeight = 256; zoomWidth = 320; - field795 = 1; - field661 = 32767; - field652 = 1; - field791 = 32767; + field877 = 1; + field878 = 32767; + field879 = 1; + field717 = 32767; viewportOffsetX = 0; viewportOffsetY = 0; viewportWidth = 0; viewportHeight = 0; viewportZoom = 0; playerAppearance = new PlayerAppearance(); - field733 = -1; + field703 = -1; field888 = -1; platformInfoProvider = new DesktopPlatformInfoProvider(); grandExchangeOffers = new GrandExchangeOffer[8]; @@ -1546,19 +1527,19 @@ public final class Client extends GameShell implements Usernamed { archiveLoaders = new ArrayList(10); archiveLoaderArchive = 0; field895 = 0; - field684 = new class65(); - field697 = new int[50]; - field898 = new int[50]; + field896 = new class65(); + field897 = new int[50]; + field622 = new int[50]; } - @ObfuscatedName("y") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1917236425" + garbageValue = "1419567103" ) @Export("resizeGame") protected final void resizeGame() { - field836 = SequenceDefinition.method4686() + 500L; + field835 = SoundCache.method2480() + 500L; this.resizeJS(); if (rootInterface != -1) { this.resizeRoot(true); @@ -1566,471 +1547,426 @@ public final class Client extends GameShell implements Usernamed { } - @ObfuscatedName("az") + @ObfuscatedName("at") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1264140224" + signature = "(B)V", + garbageValue = "77" ) @Export("setUp") protected final void setUp() { - int[] var1 = new int[]{20, 260, 10000}; - int[] var2 = new int[]{1000, 100, 500}; - if (var1 != null && var2 != null) { - UserComparator4.ByteArrayPool_alternativeSizes = var1; - ByteArrayPool.ByteArrayPool_altSizeArrayCounts = new int[var1.length]; - FaceNormal.ByteArrayPool_arrays = new byte[var1.length][][]; - - for (int var3 = 0; var3 < UserComparator4.ByteArrayPool_alternativeSizes.length; ++var3) { - FaceNormal.ByteArrayPool_arrays[var3] = new byte[var2[var3]][]; - } - } else { - UserComparator4.ByteArrayPool_alternativeSizes = null; - ByteArrayPool.ByteArrayPool_altSizeArrayCounts = null; - FaceNormal.ByteArrayPool_arrays = null; - } - - WorldMapRectangle.port1 = gameBuild == 0 ? 43594 : worldId + 40000; - FloorDecoration.port2 = gameBuild == 0 ? 443 : worldId + 50000; - SecureRandomCallable.port3 = WorldMapRectangle.port1; - KeyHandler.field387 = class215.field2529; - FontName.field3651 = class215.field2531; - PlayerAppearance.field2523 = class215.field2528; - SoundCache.field1418 = class215.field2527; - ScriptEvent.urlRequester = new UrlRequester(); + LoginScreenAnimation.method1802(new int[]{20, 260, 10000}, new int[]{1000, 100, 500}); + WorldMapSection1.port1 = gameBuild == 0 ? 43594 : worldId + 40000; + IsaacCipher.port2 = gameBuild == 0 ? 443 : worldId + 50000; + LoginPacket.port3 = WorldMapSection1.port1; + UserComparator8.field1944 = class215.field2518; + PlayerAppearance.field2508 = class215.field2519; + PlayerAppearance.field2513 = class215.field2520; + PlayerAppearance.field2511 = class215.field2521; + RouteStrategy.urlRequester = new UrlRequester(); this.setUpKeyboard(); this.setUpMouse(); - Canvas.mouseWheel = this.mouseWheel(); - class293.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); - AccessFile var4 = null; - ClientPreferences var5 = new ClientPreferences(); + class80.mouseWheel = this.mouseWheel(); + RouteStrategy.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); + AccessFile var2 = null; + ClientPreferences var3 = new ClientPreferences(); try { - var4 = TaskHandler.getPreferencesFile("", WorldMapRectangle.field166.name, false); - byte[] var6 = new byte[(int)var4.length()]; + var2 = GrandExchangeOfferUnitPriceComparator.getPreferencesFile("", class43.field359.name, false); + byte[] var4 = new byte[(int)var2.length()]; - int var8; - for (int var7 = 0; var7 < var6.length; var7 += var8) { - var8 = var4.read(var6, var7, var6.length - var7); - if (var8 == -1) { + int var6; + for (int var5 = 0; var5 < var4.length; var5 += var6) { + var6 = var2.read(var4, var5, var4.length - var5); + if (var6 == -1) { throw new IOException(); } } - var5 = new ClientPreferences(new Buffer(var6)); - } catch (Exception var11) { + var3 = new ClientPreferences(new Buffer(var4)); + } catch (Exception var8) { } try { - if (var4 != null) { - var4.close(); + if (var2 != null) { + var2.close(); } - } catch (Exception var10) { + } catch (Exception var7) { } - GrandExchangeOffer.clientPreferences = var5; + Actor.clientPreferences = var3; this.setUpClipboard(); - Player.method1223(this, class4.null_string); + String var9 = class195.null_string; + class51.applet = this; + if (var9 != null) { + class51.field406 = var9; + } + if (gameBuild != 0) { displayFps = true; } - StudioGame.setWindowedMode(GrandExchangeOffer.clientPreferences.windowMode); - class32.friendSystem = new FriendSystem(FontName.loginType); + MusicPatchNode.setWindowedMode(Actor.clientPreferences.windowMode); + class218.friendSystem = new FriendSystem(class4.loginType); } - @ObfuscatedName("aj") + @ObfuscatedName("ao") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "712398470" + garbageValue = "-2117082118" ) @Export("doCycle") protected final void doCycle() { ++cycle; this.doCycleJs5(); - class32.method543(); + Login.method2051(); int var1; try { - if (class197.field2378 == 1) { - var1 = class197.midiPcmStream.method3648(); + if (class197.field2376 == 1) { + var1 = class197.midiPcmStream.method3687(); if (var1 > 0 && class197.midiPcmStream.isReady()) { - var1 -= class16.field98; + var1 -= ModelData0.field1833; if (var1 < 0) { var1 = 0; } - class197.midiPcmStream.method3670(var1); + class197.midiPcmStream.method3686(var1); } else { class197.midiPcmStream.clear(); class197.midiPcmStream.removeAll(); - if (WorldMapDecoration.musicTrackArchive != null) { - class197.field2378 = 2; + if (class197.musicTrackArchive != null) { + class197.field2376 = 2; } else { - class197.field2378 = 0; + class197.field2376 = 0; } - FontName.musicTrack = null; - class189.soundCache = null; + ReflectionCheck.musicTrack = null; + Language.soundCache = null; } } - } catch (Exception var44) { - var44.printStackTrace(); + } catch (Exception var60) { + var60.printStackTrace(); class197.midiPcmStream.clear(); - class197.field2378 = 0; - FontName.musicTrack = null; - class189.soundCache = null; - WorldMapDecoration.musicTrackArchive = null; + class197.field2376 = 0; + ReflectionCheck.musicTrack = null; + Language.soundCache = null; + class197.musicTrackArchive = null; } - WorldMapSectionType.playPcmPlayers(); - int var2; - synchronized(KeyHandler.KeyHandler_instance) { - ++KeyHandler.KeyHandler_idleCycles; - KeyHandler.field385 = KeyHandler.field383; - KeyHandler.field380 = 0; - if (KeyHandler.field378 >= 0) { - while (KeyHandler.field378 != KeyHandler.field375) { - var2 = KeyHandler.field374[KeyHandler.field375]; - KeyHandler.field375 = KeyHandler.field375 + 1 & 127; - if (var2 < 0) { - KeyHandler.KeyHandler_pressedKeys[~var2] = false; - } else { - if (!KeyHandler.KeyHandler_pressedKeys[var2] && KeyHandler.field380 < KeyHandler.field379.length - 1) { - KeyHandler.field379[++KeyHandler.field380 - 1] = var2; - } - - KeyHandler.KeyHandler_pressedKeys[var2] = true; - } - } - } else { - for (var2 = 0; var2 < 112; ++var2) { - KeyHandler.KeyHandler_pressedKeys[var2] = false; - } - - KeyHandler.field378 = KeyHandler.field375; - } - - if (KeyHandler.field380 > 0) { - KeyHandler.KeyHandler_idleCycles = 0; - } - - KeyHandler.field383 = KeyHandler.field382; + ModelData0.playPcmPlayers(); + WorldMapSectionType.method220(); + 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; } - class192.method3617(); - if (Canvas.mouseWheel != null) { - var1 = Canvas.mouseWheel.useRotation(); + if (class80.mouseWheel != null) { + var1 = class80.mouseWheel.useRotation(); mouseWheelRotation = var1; } if (gameState == 0) { - ItemContainer.load(); - GameShell.clock.mark(); - - for (var1 = 0; var1 < 32; ++var1) { - GameShell.field423[var1] = 0L; - } - - for (var1 = 0; var1 < 32; ++var1) { - GameShell.field417[var1] = 0L; - } - - GameShell.field413 = 0; + Decimator.load(); + WallDecoration.method3259(); } else if (gameState == 5) { - WorldMapDecoration.method326(this); - ItemContainer.load(); - GameShell.clock.mark(); - - for (var1 = 0; var1 < 32; ++var1) { - GameShell.field423[var1] = 0L; - } - - for (var1 = 0; var1 < 32; ++var1) { - GameShell.field417[var1] = 0L; - } - - GameShell.field413 = 0; + FontName.method5284(this); + Decimator.load(); + WallDecoration.method3259(); } else if (gameState != 10 && gameState != 11) { if (gameState == 20) { - WorldMapDecoration.method326(this); + FontName.method5284(this); this.doCycleLoggedOut(); } else if (gameState == 25) { - KeyHandler.method787(false); - field676 = 0; - boolean var46 = true; + StudioGame.method4131(false); + field674 = 0; + boolean var61 = true; - for (var2 = 0; var2 < GraphicsObject.regionLandArchives.length; ++var2) { - if (MouseHandler.regionMapArchiveIds[var2] != -1 && GraphicsObject.regionLandArchives[var2] == null) { - GraphicsObject.regionLandArchives[var2] = WorldMapDecoration.archive5.takeFile(MouseHandler.regionMapArchiveIds[var2], 0); - if (GraphicsObject.regionLandArchives[var2] == null) { - var46 = false; - ++field676; + int var44; + for (var44 = 0; var44 < MusicPatchPcmStream.regionLandArchives.length; ++var44) { + if (WorldMapEvent.regionMapArchiveIds[var44] != -1 && MusicPatchPcmStream.regionLandArchives[var44] == null) { + MusicPatchPcmStream.regionLandArchives[var44] = Timer.archive5.takeFile(WorldMapEvent.regionMapArchiveIds[var44], 0); + if (MusicPatchPcmStream.regionLandArchives[var44] == null) { + var61 = false; + ++field674; } } - if (ClanChat.regionLandArchiveIds[var2] != -1 && Messages.regionMapArchives[var2] == null) { - Messages.regionMapArchives[var2] = WorldMapDecoration.archive5.takeFileEncrypted(ClanChat.regionLandArchiveIds[var2], 0, ModelData0.xteaKeys[var2]); - if (Messages.regionMapArchives[var2] == null) { - var46 = false; - ++field676; + if (SequenceDefinition.regionLandArchiveIds[var44] != -1 && regionMapArchives[var44] == null) { + regionMapArchives[var44] = Timer.archive5.takeFileEncrypted(SequenceDefinition.regionLandArchiveIds[var44], 0, GrandExchangeOfferAgeComparator.xteaKeys[var44]); + if (regionMapArchives[var44] == null) { + var61 = false; + ++field674; } } } - if (!var46) { - field719 = 1; + if (!var61) { + field678 = 1; } else { - field678 = 0; - var46 = true; + field676 = 0; + var61 = true; int var4; int var5; - for (var2 = 0; var2 < GraphicsObject.regionLandArchives.length; ++var2) { - byte[] var3 = Messages.regionMapArchives[var2]; + for (var44 = 0; var44 < MusicPatchPcmStream.regionLandArchives.length; ++var44) { + byte[] var3 = regionMapArchives[var44]; if (var3 != null) { - var4 = (class186.regions[var2] >> 8) * 64 - PacketWriter.baseX * 64; - var5 = (class186.regions[var2] & 255) * 64 - RouteStrategy.baseY * 64; + var4 = (class197.regions[var44] >> 8) * 64 - class4.baseX * 64; + var5 = (class197.regions[var44] & 255) * 64 - ScriptEvent.baseY; if (isInInstance) { var4 = 10; var5 = 10; } - var46 &= WorldMapSection2.method325(var3, var4, var5); + var61 &= HitSplatDefinition.method4589(var3, var4, var5); } } - if (!var46) { - field719 = 2; + if (!var61) { + field678 = 2; } else { - if (field719 != 0) { - MusicPatch.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); + if (field678 != 0) { + GZipDecompressor.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); } - WorldMapSectionType.playPcmPlayers(); - Player.scene.clear(); + ModelData0.playPcmPlayers(); + WorldMapIcon_1.scene.clear(); - for (var2 = 0; var2 < 4; ++var2) { - collisionMaps[var2].clear(); + for (var44 = 0; var44 < 4; ++var44) { + collisionMaps[var44].clear(); } - int var37; - for (var2 = 0; var2 < 4; ++var2) { - for (var37 = 0; var37 < 104; ++var37) { + int var45; + for (var44 = 0; var44 < 4; ++var44) { + for (var45 = 0; var45 < 104; ++var45) { for (var4 = 0; var4 < 104; ++var4) { - Tiles.Tiles_renderFlags[var2][var37][var4] = 0; + Tiles.Tiles_renderFlags[var44][var45][var4] = 0; } } } - WorldMapSectionType.playPcmPlayers(); - Tiles.Tiles_minPlane = 99; - Tiles.field485 = new byte[4][104][104]; - AccessFile.field4061 = new byte[4][104][104]; - class210.field2492 = new byte[4][104][104]; - Tiles.field475 = new byte[4][104][104]; - Tiles.field483 = new int[4][105][105]; - class188.field2321 = new byte[4][105][105]; - class4.field31 = new int[105][105]; - Tiles.Tiles_hue = new int[104]; - class3.Tiles_saturation = new int[104]; - Buddy.Tiles_lightness = new int[104]; - class49.Tiles_hueMultiplier = new int[104]; - MenuAction.field1129 = new int[104]; - var2 = GraphicsObject.regionLandArchives.length; - - for (ObjectSound var45 = (ObjectSound)ObjectSound.objectSounds.last(); var45 != null; var45 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var45.stream1 != null) { - IgnoreList.pcmStreamMixer.removeSubStream(var45.stream1); - var45.stream1 = null; - } - - if (var45.stream2 != null) { - IgnoreList.pcmStreamMixer.removeSubStream(var45.stream2); - var45.stream2 = null; - } - } - - ObjectSound.objectSounds.clear(); - KeyHandler.method787(true); - int var7; - int var8; + ModelData0.playPcmPlayers(); + AbstractWorldMapData.method254(); + var44 = MusicPatchPcmStream.regionLandArchives.length; + Widget.method4074(); + StudioGame.method4131(true); int var10; int var11; int var12; int var13; - int var40; + int var14; + int var15; + int var16; + int var17; + int var18; + int var20; + int var21; + int var22; + int var47; if (!isInInstance) { - var37 = 0; - - label587: - while (true) { - byte[] var6; - if (var37 >= var2) { - for (var37 = 0; var37 < var2; ++var37) { - var4 = (class186.regions[var37] >> 8) * 64 - PacketWriter.baseX * 64; - var5 = (class186.regions[var37] & 255) * 64 - RouteStrategy.baseY * 64; - var6 = GraphicsObject.regionLandArchives[var37]; - if (var6 == null && class16.field101 < 800) { - WorldMapSectionType.playPcmPlayers(); - class195.method3627(var4, var5, 64, 64); - } - } - - KeyHandler.method787(true); - var37 = 0; - - while (true) { - if (var37 >= var2) { - break label587; - } - - byte[] var39 = Messages.regionMapArchives[var37]; - if (var39 != null) { - var5 = (class186.regions[var37] >> 8) * 64 - PacketWriter.baseX * 64; - var40 = (class186.regions[var37] & 255) * 64 - RouteStrategy.baseY * 64; - WorldMapSectionType.playPcmPlayers(); - WorldMapIcon_0.method203(var39, var5, var40, Player.scene, collisionMaps); - } - - ++var37; - } - } - - var4 = (class186.regions[var37] >> 8) * 64 - PacketWriter.baseX * 64; - var5 = (class186.regions[var37] & 255) * 64 - RouteStrategy.baseY * 64; - var6 = GraphicsObject.regionLandArchives[var37]; + byte[] var6; + for (var45 = 0; var45 < var44; ++var45) { + var4 = (class197.regions[var45] >> 8) * 64 - class4.baseX * 64; + var5 = (class197.regions[var45] & 255) * 64 - ScriptEvent.baseY; + var6 = MusicPatchPcmStream.regionLandArchives[var45]; if (var6 != null) { - WorldMapSectionType.playPcmPlayers(); - var7 = class13.field86 * 8 - 48; - var8 = class16.field101 * 8 - 48; - CollisionMap[] var9 = collisionMaps; - var10 = 0; + ModelData0.playPcmPlayers(); + GrandExchangeOfferOwnWorldComparator.method1244(var6, var4, var5, FloorDecoration.field1585 * 8 - 48, ReflectionCheck.field1303 * 8 - 48, collisionMaps); + } + } + + for (var45 = 0; var45 < var44; ++var45) { + var4 = (class197.regions[var45] >> 8) * 64 - class4.baseX * 64; + var5 = (class197.regions[var45] & 255) * 64 - ScriptEvent.baseY; + var6 = MusicPatchPcmStream.regionLandArchives[var45]; + if (var6 == null && ReflectionCheck.field1303 < 800) { + ModelData0.playPcmPlayers(); + FloorDecoration.method2813(var4, var5, 64, 64); + } + } + + StudioGame.method4131(true); + + for (var45 = 0; var45 < var44; ++var45) { + byte[] var46 = regionMapArchives[var45]; + if (var46 != null) { + var5 = (class197.regions[var45] >> 8) * 64 - class4.baseX * 64; + var47 = (class197.regions[var45] & 255) * 64 - ScriptEvent.baseY; + ModelData0.playPcmPlayers(); + Scene var7 = WorldMapIcon_1.scene; + CollisionMap[] var8 = collisionMaps; + Buffer var9 = new Buffer(var46); + var10 = -1; - label584: while (true) { - if (var10 >= 4) { - Buffer var38 = new Buffer(var6); - var11 = 0; - - while (true) { - if (var11 >= 4) { - break label584; - } - - for (var12 = 0; var12 < 64; ++var12) { - for (var13 = 0; var13 < 64; ++var13) { - class30.loadTerrain(var38, var11, var4 + var12, var5 + var13, var7, var8, 0); - } - } - - ++var11; - } + var11 = var9.method5480(); + if (var11 == 0) { + break; } - for (var11 = 0; var11 < 64; ++var11) { - for (var12 = 0; var12 < 64; ++var12) { - if (var4 + var11 > 0 && var4 + var11 < 103 && var5 + var12 > 0 && var12 + var5 < 103) { - int[] var10000 = var9[var10].flags[var4 + var11]; - var10000[var12 + var5] &= -16777217; + var10 += var11; + var12 = 0; + + while (true) { + var13 = var9.readUShortSmart(); + if (var13 == 0) { + break; + } + + var12 += var13 - 1; + var14 = var12 & 63; + var15 = var12 >> 6 & 63; + var16 = var12 >> 12; + var17 = var9.readUnsignedByte(); + var18 = var17 >> 2; + int var19 = var17 & 3; + var20 = var5 + var15; + var21 = var14 + var47; + if (var20 > 0 && var21 > 0 && var20 < 103 && var21 < 103) { + var22 = var16; + if ((Tiles.Tiles_renderFlags[1][var20][var21] & 2) == 2) { + var22 = var16 - 1; } + + CollisionMap var23 = null; + if (var22 >= 0) { + var23 = var8[var22]; + } + + class185.method3602(var16, var20, var21, var10, var19, var18, var7, var23); } } - - ++var10; } } - - ++var37; } } - int var41; + int var48; + int var49; + int var50; if (isInInstance) { - var37 = 0; + var45 = 0; - label533: + label558: while (true) { - if (var37 >= 4) { - for (var37 = 0; var37 < 13; ++var37) { + int var26; + int var28; + int var29; + int var30; + CollisionMap[] var52; + Buffer var53; + int var54; + if (var45 >= 4) { + for (var45 = 0; var45 < 13; ++var45) { for (var4 = 0; var4 < 13; ++var4) { - var5 = instanceChunkTemplates[0][var37][var4]; + var5 = instanceChunkTemplates[0][var45][var4]; if (var5 == -1) { - class195.method3627(var37 * 8, var4 * 8, 8, 8); + FloorDecoration.method2813(var45 * 8, var4 * 8, 8, 8); } } } - KeyHandler.method787(true); - var37 = 0; + StudioGame.method4131(true); + var45 = 0; while (true) { - if (var37 >= 4) { - break label533; + if (var45 >= 4) { + break label558; } - WorldMapSectionType.playPcmPlayers(); + ModelData0.playPcmPlayers(); for (var4 = 0; var4 < 13; ++var4) { - label490: + label481: for (var5 = 0; var5 < 13; ++var5) { - var40 = instanceChunkTemplates[var37][var4][var5]; - if (var40 != -1) { - var7 = var40 >> 24 & 3; - var8 = var40 >> 1 & 3; - var41 = var40 >> 14 & 1023; - var10 = var40 >> 3 & 2047; - var11 = (var41 / 8 << 8) + var10 / 8; + var47 = instanceChunkTemplates[var45][var4][var5]; + if (var47 != -1) { + var48 = var47 >> 24 & 3; + var49 = var47 >> 1 & 3; + var50 = var47 >> 14 & 1023; + var10 = var47 >> 3 & 2047; + var11 = (var50 / 8 << 8) + var10 / 8; - for (var12 = 0; var12 < class186.regions.length; ++var12) { - if (class186.regions[var12] == var11 && Messages.regionMapArchives[var12] != null) { - byte[] var42 = Messages.regionMapArchives[var12]; - int var14 = var4 * 8; - int var15 = var5 * 8; - int var16 = (var41 & 7) * 8; - int var17 = (var10 & 7) * 8; - Scene var18 = Player.scene; - CollisionMap[] var19 = collisionMaps; - Buffer var20 = new Buffer(var42); - int var21 = -1; + for (var12 = 0; var12 < class197.regions.length; ++var12) { + if (class197.regions[var12] == var11 && regionMapArchives[var12] != null) { + byte[] var55 = regionMapArchives[var12]; + var14 = var4 * 8; + var15 = var5 * 8; + var16 = (var50 & 7) * 8; + var17 = (var10 & 7) * 8; + Scene var56 = WorldMapIcon_1.scene; + var52 = collisionMaps; + var53 = new Buffer(var55); + var21 = -1; while (true) { - int var22 = var20.method5565(); + var22 = var53.method5480(); if (var22 == 0) { - continue label490; + continue label481; } var21 += var22; - int var23 = 0; + var54 = 0; while (true) { - int var24 = var20.readUShortSmart(); - if (var24 == 0) { + int var57 = var53.readUShortSmart(); + if (var57 == 0) { break; } - var23 += var24 - 1; - int var25 = var23 & 63; - int var26 = var23 >> 6 & 63; - int var27 = var23 >> 12; - int var28 = var20.readUnsignedByte(); - int var29 = var28 >> 2; - int var30 = var28 & 3; - if (var27 == var7 && var26 >= var16 && var26 < var16 + 8 && var25 >= var17 && var25 < var17 + 8) { - ObjectDefinition var31 = class215.getObjectDefinition(var21); - int var32 = var14 + UserComparator5.method3366(var26 & 7, var25 & 7, var8, var31.sizeX, var31.sizeY, var30); - int var33 = var15 + PlayerAppearance.method3944(var26 & 7, var25 & 7, var8, var31.sizeX, var31.sizeY, var30); - if (var32 > 0 && var33 > 0 && var32 < 103 && var33 < 103) { - int var34 = var37; - if ((Tiles.Tiles_renderFlags[1][var32][var33] & 2) == 2) { - var34 = var37 - 1; + var54 += var57 - 1; + int var25 = var54 & 63; + var26 = var54 >> 6 & 63; + int var27 = var54 >> 12; + var28 = var53.readUnsignedByte(); + var29 = var28 >> 2; + var30 = var28 & 3; + if (var48 == var27 && var26 >= var16 && var26 < var16 + 8 && var25 >= var17 && var25 < var17 + 8) { + ObjectDefinition var58 = WallDecoration.getObjectDefinition(var21); + int var32 = var14 + WorldMapAreaData.method673(var26 & 7, var25 & 7, var49, var58.sizeX, var58.sizeY, var30); + int var35 = var26 & 7; + int var36 = var25 & 7; + int var38 = var58.sizeX; + int var39 = var58.sizeY; + int var40; + if ((var30 & 1) == 1) { + var40 = var38; + var38 = var39; + var39 = var40; + } + + int var37 = var49 & 3; + int var34; + if (var37 == 0) { + var34 = var36; + } else if (var37 == 1) { + var34 = 7 - var35 - (var38 - 1); + } else if (var37 == 2) { + var34 = 7 - var36 - (var39 - 1); + } else { + var34 = var35; + } + + var40 = var15 + var34; + if (var32 > 0 && var40 > 0 && var32 < 103 && var40 < 103) { + int var41 = var45; + if ((Tiles.Tiles_renderFlags[1][var32][var40] & 2) == 2) { + var41 = var45 - 1; } - CollisionMap var35 = null; - if (var34 >= 0) { - var35 = var19[var34]; + CollisionMap var42 = null; + if (var41 >= 0) { + var42 = var52[var41]; } - class32.method544(var37, var32, var33, var21, var8 + var30 & 3, var29, var18, var35); + class185.method3602(var45, var32, var40, var21, var30 + var49 & 3, var29, var56, var42); } } } @@ -2041,125 +1977,158 @@ public final class Client extends GameShell implements Usernamed { } } - ++var37; + ++var45; } } - WorldMapSectionType.playPcmPlayers(); + ModelData0.playPcmPlayers(); for (var4 = 0; var4 < 13; ++var4) { for (var5 = 0; var5 < 13; ++var5) { - boolean var48 = false; - var7 = instanceChunkTemplates[var37][var4][var5]; - if (var7 != -1) { - var8 = var7 >> 24 & 3; - var41 = var7 >> 1 & 3; - var10 = var7 >> 14 & 1023; - var11 = var7 >> 3 & 2047; + boolean var63 = false; + var48 = instanceChunkTemplates[var45][var4][var5]; + if (var48 != -1) { + var49 = var48 >> 24 & 3; + var50 = var48 >> 1 & 3; + var10 = var48 >> 14 & 1023; + var11 = var48 >> 3 & 2047; var12 = (var10 / 8 << 8) + var11 / 8; - for (var13 = 0; var13 < class186.regions.length; ++var13) { - if (class186.regions[var13] == var12 && GraphicsObject.regionLandArchives[var13] != null) { - class269.method4894(GraphicsObject.regionLandArchives[var13], var37, var4 * 8, var5 * 8, var8, (var10 & 7) * 8, (var11 & 7) * 8, var41, collisionMaps); - var48 = true; + for (var13 = 0; var13 < class197.regions.length; ++var13) { + if (class197.regions[var13] == var12 && MusicPatchPcmStream.regionLandArchives[var13] != null) { + byte[] var51 = MusicPatchPcmStream.regionLandArchives[var13]; + var15 = var4 * 8; + var16 = var5 * 8; + var17 = (var10 & 7) * 8; + var18 = (var11 & 7) * 8; + var52 = collisionMaps; + + for (var20 = 0; var20 < 8; ++var20) { + for (var21 = 0; var21 < 8; ++var21) { + if (var15 + var20 > 0 && var15 + var20 < 103 && var21 + var16 > 0 && var16 + var21 < 103) { + int[] var10000 = var52[var45].flags[var15 + var20]; + var10000[var16 + var21] &= -16777217; + } + } + } + + var53 = new Buffer(var51); + + for (var21 = 0; var21 < 4; ++var21) { + for (var22 = 0; var22 < 64; ++var22) { + for (var54 = 0; var54 < 64; ++var54) { + if (var49 == var21 && var22 >= var17 && var22 < var17 + 8 && var54 >= var18 && var54 < var18 + 8) { + var26 = var15 + class40.method735(var22 & 7, var54 & 7, var50); + var29 = var22 & 7; + var30 = var54 & 7; + int var31 = var50 & 3; + if (var31 == 0) { + var28 = var30; + } else if (var31 == 1) { + var28 = 7 - var29; + } else if (var31 == 2) { + var28 = 7 - var30; + } else { + var28 = var29; + } + + class32.loadTerrain(var53, var45, var26, var16 + var28, 0, 0, var50); + } else { + class32.loadTerrain(var53, 0, -1, -1, 0, 0, 0); + } + } + } + } + + var63 = true; break; } } } - if (!var48) { - class312.method5787(var37, var4 * 8, var5 * 8); + if (!var63) { + VarbitDefinition.method4499(var45, var4 * 8, var5 * 8); } } } - ++var37; + ++var45; } } - KeyHandler.method787(true); - WorldMapSectionType.playPcmPlayers(); - GrandExchangeOfferTotalQuantityComparator.method98(Player.scene, collisionMaps); - KeyHandler.method787(true); - var37 = Tiles.Tiles_minPlane; - if (var37 > ItemContainer.plane) { - var37 = ItemContainer.plane; + StudioGame.method4131(true); + ModelData0.playPcmPlayers(); + WallDecoration.method3257(WorldMapIcon_1.scene, collisionMaps); + StudioGame.method4131(true); + var45 = Tiles.Tiles_minPlane; + if (var45 > MouseRecorder.plane) { + var45 = MouseRecorder.plane; } - if (var37 < ItemContainer.plane - 1) { - var37 = ItemContainer.plane - 1; + if (var45 < MouseRecorder.plane - 1) { + var45 = MouseRecorder.plane - 1; } if (isLowDetail) { - Player.scene.init(Tiles.Tiles_minPlane); + WorldMapIcon_1.scene.init(Tiles.Tiles_minPlane); } else { - Player.scene.init(0); + WorldMapIcon_1.scene.init(0); } for (var4 = 0; var4 < 104; ++var4) { for (var5 = 0; var5 < 104; ++var5) { - class189.updateItemPile(var4, var5); + WorldMapCacheName.updateItemPile(var4, var5); } } - WorldMapSectionType.playPcmPlayers(); - ChatChannel.method2161(); + ModelData0.playPcmPlayers(); + class247.method4484(); ObjectDefinition.ObjectDefinition_cachedModelData.clear(); - PacketBufferNode var47; - if (WorldMapID.client.hasFrame()) { - var47 = MenuAction.getPacketBufferNode(ClientPacket.field2189, packetWriter.isaacCipher); - var47.packetBuffer.writeInt(1057001181); - packetWriter.addNode(var47); + PacketBufferNode var62; + if (Coord.client.hasFrame()) { + var62 = MenuAction.getPacketBufferNode(ClientPacket.field2235, packetWriter.isaacCipher); + var62.packetBuffer.writeInt(1057001181); + packetWriter.addNode(var62); } if (!isInInstance) { - var4 = (class13.field86 - 6) / 8; - var5 = (class13.field86 + 6) / 8; - var40 = (class16.field101 - 6) / 8; - var7 = (class16.field101 + 6) / 8; + var4 = (FloorDecoration.field1585 - 6) / 8; + var5 = (FloorDecoration.field1585 + 6) / 8; + var47 = (ReflectionCheck.field1303 - 6) / 8; + var48 = (ReflectionCheck.field1303 + 6) / 8; - for (var8 = var4 - 1; var8 <= var5 + 1; ++var8) { - for (var41 = var40 - 1; var41 <= var7 + 1; ++var41) { - if (var8 < var4 || var8 > var5 || var41 < var40 || var41 > var7) { - WorldMapDecoration.archive5.loadRegionFromName("m" + var8 + "_" + var41); - WorldMapDecoration.archive5.loadRegionFromName("l" + var8 + "_" + var41); + for (var49 = var4 - 1; var49 <= var5 + 1; ++var49) { + for (var50 = var47 - 1; var50 <= var48 + 1; ++var50) { + if (var49 < var4 || var49 > var5 || var50 < var47 || var50 > var48) { + Timer.archive5.loadRegionFromName("m" + var49 + "_" + var50); + Timer.archive5.loadRegionFromName("l" + var49 + "_" + var50); } } } } - FloorDecoration.updateGameState(30); - WorldMapSectionType.playPcmPlayers(); - Tiles.field485 = null; - AccessFile.field4061 = null; - class210.field2492 = null; - Tiles.field475 = null; - Tiles.field483 = null; - class188.field2321 = null; - class4.field31 = null; - Tiles.Tiles_hue = null; - class3.Tiles_saturation = null; - Buddy.Tiles_lightness = null; - class49.Tiles_hueMultiplier = null; - MenuAction.field1129 = null; - var47 = MenuAction.getPacketBufferNode(ClientPacket.field2261, packetWriter.isaacCipher); - packetWriter.addNode(var47); - GameShell.clock.mark(); - - for (var5 = 0; var5 < 32; ++var5) { - GameShell.field423[var5] = 0L; - } - - for (var5 = 0; var5 < 32; ++var5) { - GameShell.field417[var5] = 0L; - } - - GameShell.field413 = 0; + WorldMapIcon_0.updateGameState(30); + ModelData0.playPcmPlayers(); + Tiles.field476 = null; + class30.field257 = null; + Tiles.field477 = null; + HealthBar.field1089 = null; + UserComparator3.field1961 = null; + Tiles.field473 = null; + class160.field1977 = null; + UserComparator7.Tiles_hue = null; + TileItem.Tiles_saturation = null; + class1.Tiles_lightness = null; + class42.Tiles_hueMultiplier = null; + Tiles.field488 = null; + var62 = MenuAction.getPacketBufferNode(ClientPacket.field2216, packetWriter.isaacCipher); + packetWriter.addNode(var62); + WallDecoration.method3259(); } } } } else { - WorldMapDecoration.method326(this); + FontName.method5284(this); } if (gameState == 30) { @@ -2170,206 +2139,192 @@ public final class Client extends GameShell implements Usernamed { } - @ObfuscatedName("an") + @ObfuscatedName("av") @ObfuscatedSignature( signature = "(ZI)V", - garbageValue = "2115085971" + garbageValue = "-2055189627" ) @Export("draw") protected final void draw(boolean var1) { boolean var2; - label173: { + label167: { try { - if (class197.field2378 == 2) { - if (FontName.musicTrack == null) { - FontName.musicTrack = MusicTrack.readTrack(WorldMapDecoration.musicTrackArchive, class197.musicTrackGroupId, class197.musicTrackFileId); - if (FontName.musicTrack == null) { + if (class197.field2376 == 2) { + if (ReflectionCheck.musicTrack == null) { + ReflectionCheck.musicTrack = MusicTrack.readTrack(class197.musicTrackArchive, class197.musicTrackGroupId, class197.musicTrackFileId); + if (ReflectionCheck.musicTrack == null) { var2 = false; - break label173; + break label167; } } - if (class189.soundCache == null) { - class189.soundCache = new SoundCache(class197.soundEffectsArchive, class197.musicSamplesArchive); + if (Language.soundCache == null) { + Language.soundCache = new SoundCache(class197.soundEffectsArchive, class197.musicSamplesArchive); } - if (class197.midiPcmStream.loadMusicTrack(FontName.musicTrack, class197.musicPatchesArchive, class189.soundCache, 22050)) { + if (class197.midiPcmStream.loadMusicTrack(ReflectionCheck.musicTrack, class197.musicPatchesArchive, Language.soundCache, 22050)) { class197.midiPcmStream.clearAll(); - class197.midiPcmStream.method3670(WorldMapSprite.field222); - class197.midiPcmStream.setMusicTrack(FontName.musicTrack, Varcs.musicTrackBoolean); - class197.field2378 = 0; - FontName.musicTrack = null; - class189.soundCache = null; - WorldMapDecoration.musicTrackArchive = null; + class197.midiPcmStream.method3686(Canvas.field395); + class197.midiPcmStream.setMusicTrack(ReflectionCheck.musicTrack, MouseRecorder.musicTrackBoolean); + class197.field2376 = 0; + ReflectionCheck.musicTrack = null; + Language.soundCache = null; + class197.musicTrackArchive = null; var2 = true; - break label173; + break label167; } } } catch (Exception var6) { var6.printStackTrace(); class197.midiPcmStream.clear(); - class197.field2378 = 0; - FontName.musicTrack = null; - class189.soundCache = null; - WorldMapDecoration.musicTrackArchive = null; + class197.field2376 = 0; + ReflectionCheck.musicTrack = null; + Language.soundCache = null; + class197.musicTrackArchive = null; } var2 = false; } - if (var2 && field858 && MouseRecorder.pcmPlayer0 != null) { - MouseRecorder.pcmPlayer0.tryDiscard(); + if (var2 && field746 && WorldMapIcon_1.pcmPlayer0 != null) { + WorldMapIcon_1.pcmPlayer0.tryDiscard(); } - if ((gameState == 10 || gameState == 20 || gameState == 30) && 0L != field836 && SequenceDefinition.method4686() > field836) { - StudioGame.setWindowedMode(UserComparator7.getWindowedMode()); + if ((gameState == 10 || gameState == 20 || gameState == 30) && field835 != 0L && SoundCache.method2480() > field835) { + MusicPatchNode.setWindowedMode(class43.getWindowedMode()); } int var4; if (var1) { for (var4 = 0; var4 < 100; ++var4) { - field703[var4] = true; + field827[var4] = true; } } if (gameState == 0) { this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1); } else if (gameState == 5) { - GrandExchangeEvent.drawTitle(class43.fontBold12, class30.fontPlain11, ClientPacket.fontPlain12); + GameShell.drawTitle(HealthBar.fontBold12, GrandExchangeEvent.fontPlain11, class197.fontPlain12); } else if (gameState != 10 && gameState != 11) { if (gameState == 20) { - GrandExchangeEvent.drawTitle(class43.fontBold12, class30.fontPlain11, ClientPacket.fontPlain12); + GameShell.drawTitle(HealthBar.fontBold12, GrandExchangeEvent.fontPlain11, class197.fontPlain12); } else if (gameState == 25) { - if (field719 == 1) { - if (field676 > field886) { - field886 = field676; + if (field678 == 1) { + if (field674 > field851) { + field851 = field674; } - var4 = (field886 * 50 - field676 * 50) / field886; - MusicPatch.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); - } else if (field719 == 2) { - if (field678 > field718) { - field718 = field678; + var4 = (field851 * 50 - field674 * 50) / field851; + GZipDecompressor.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); + } else if (field678 == 2) { + if (field676 > field872) { + field872 = field676; } - var4 = (field718 * 50 - field678 * 50) / field718 + 50; - MusicPatch.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); + var4 = (field872 * 50 - field676 * 50) / field872 + 50; + GZipDecompressor.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); } else { - MusicPatch.drawLoadingMessage("Loading - please wait.", false); + GZipDecompressor.drawLoadingMessage("Loading - please wait.", false); } } else if (gameState == 30) { this.drawLoggedIn(); } else if (gameState == 40) { - MusicPatch.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); + GZipDecompressor.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); } else if (gameState == 45) { - MusicPatch.drawLoadingMessage("Please wait...", false); + GZipDecompressor.drawLoadingMessage("Please wait...", false); } } else { - GrandExchangeEvent.drawTitle(class43.fontBold12, class30.fontPlain11, ClientPacket.fontPlain12); + GameShell.drawTitle(HealthBar.fontBold12, GrandExchangeEvent.fontPlain11, class197.fontPlain12); } if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { for (var4 = 0; var4 < rootWidgetCount; ++var4) { - if (field829[var4]) { - SpotAnimationDefinition.rasterProvider.draw(rootWidgetXs[var4], rootWidgetYs[var4], rootWidgetWidths[var4], rootWidgetHeights[var4]); - field829[var4] = false; + if (field828[var4]) { + DevicePcmPlayerProvider.rasterProvider.draw(rootWidgetXs[var4], rootWidgetYs[var4], rootWidgetWidths[var4], rootWidgetHeights[var4]); + field828[var4] = false; } } } else if (gameState > 0) { - SpotAnimationDefinition.rasterProvider.drawFull(0, 0); + DevicePcmPlayerProvider.rasterProvider.drawFull(0, 0); for (var4 = 0; var4 < rootWidgetCount; ++var4) { - field829[var4] = false; + field828[var4] = false; } } } - @ObfuscatedName("at") + @ObfuscatedName("an") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1993845226" + garbageValue = "890859408" ) @Export("kill0") protected final void kill0() { - if (KeyHandler.varcs.hasUnwrittenChanges()) { - KeyHandler.varcs.write(); + if (BoundaryObject.varcs.hasUnwrittenChanges()) { + BoundaryObject.varcs.write(); } - if (Language.mouseRecorder != null) { - Language.mouseRecorder.isRunning = false; + if (ParamDefinition.mouseRecorder != null) { + ParamDefinition.mouseRecorder.isRunning = false; } - Language.mouseRecorder = null; + ParamDefinition.mouseRecorder = null; packetWriter.close(); - if (KeyHandler.KeyHandler_instance != null) { - synchronized(KeyHandler.KeyHandler_instance) { - KeyHandler.KeyHandler_instance = null; - } - } - + FriendSystem.method1871(); if (MouseHandler.MouseHandler_instance != null) { synchronized(MouseHandler.MouseHandler_instance) { MouseHandler.MouseHandler_instance = null; } } - Canvas.mouseWheel = null; - if (MouseRecorder.pcmPlayer0 != null) { - MouseRecorder.pcmPlayer0.shutdown(); + class80.mouseWheel = null; + if (WorldMapIcon_1.pcmPlayer0 != null) { + WorldMapIcon_1.pcmPlayer0.shutdown(); } - if (SoundCache.pcmPlayer1 != null) { - SoundCache.pcmPlayer1.shutdown(); + if (ClientPreferences.pcmPlayer1 != null) { + ClientPreferences.pcmPlayer1.shutdown(); } if (NetCache.NetCache_socket != null) { NetCache.NetCache_socket.close(); } - class60.method1122(); - if (ScriptEvent.urlRequester != null) { - ScriptEvent.urlRequester.close(); - ScriptEvent.urlRequester = null; - } + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { + if (ArchiveDiskActionHandler.field3126 != 0) { + ArchiveDiskActionHandler.field3126 = 1; - try { - JagexCache.JagexCache_dat2File.close(); - - for (int var4 = 0; var4 < JagexCache.idxCount; ++var4) { - WorldMapSection1.JagexCache_idxFiles[var4].close(); + try { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); + } catch (InterruptedException var4) { + } } - - JagexCache.JagexCache_idx255File.close(); - JagexCache.JagexCache_randomDat.close(); - } catch (Exception var7) { } + if (RouteStrategy.urlRequester != null) { + RouteStrategy.urlRequester.close(); + RouteStrategy.urlRequester = null; + } + + FloorDecoration.method2811(); } - @ObfuscatedName("ag") + @ObfuscatedName("ae") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1142845100" + garbageValue = "792262956" ) - protected final void vmethod1655() { - } - - @ObfuscatedSignature( - signature = "()Ljx;" - ) - public Username aaj() { - return WorldMapIcon_1.localPlayer != null ? WorldMapIcon_1.localPlayer.username : null; + protected final void vmethod1248() { } public final void init() { try { if (this.checkHost()) { - int var4; - int var6; for (int var1 = 0; var1 <= 19; ++var1) { String var2 = this.getParameter(Integer.toString(var1)); if (var2 != null) { + int var4; switch(var1) { case 1: useBufferedSocket = Integer.parseInt(var2) != 0; @@ -2395,12 +2350,20 @@ public final class Client extends GameShell implements Usernamed { worldProperties = Integer.parseInt(var2); break; case 6: - class60.clientLanguage = Language.method3602(Integer.parseInt(var2)); + var4 = Integer.parseInt(var2); + Language var12; + if (var4 >= 0 && var4 < Language.Language_valuesOrdered.length) { + var12 = Language.Language_valuesOrdered[var4]; + } else { + var12 = null; + } + + class43.clientLanguage = var12; break; case 7: var4 = Integer.parseInt(var2); - ServerBuild[] var5 = Fonts.method5240(); - var6 = 0; + ServerBuild[] var5 = Tile.method2830(); + int var6 = 0; ServerBuild var3; while (true) { @@ -2410,7 +2373,7 @@ public final class Client extends GameShell implements Usernamed { } ServerBuild var7 = var5[var6]; - if (var4 == var7.field3080) { + if (var4 == var7.field3077) { var3 = var7; break; } @@ -2418,173 +2381,96 @@ public final class Client extends GameShell implements Usernamed { ++var6; } - SequenceDefinition.field3507 = var3; + WorldMapSprite.field226 = var3; break; case 8: if (var2.equalsIgnoreCase("true")) { } break; case 9: - Clock.field2037 = var2; + WorldMapArea.field217 = var2; break; case 10: - WorldMapRectangle.field166 = (StudioGame)FriendSystem.findEnumerated(WorldMapSprite.method402(), Integer.parseInt(var2)); - if (StudioGame.oldscape == WorldMapRectangle.field166) { - FontName.loginType = LoginType.oldscape; + class43.field359 = (StudioGame)ServerPacket.findEnumerated(Tile.method2831(), Integer.parseInt(var2)); + if (class43.field359 == StudioGame.oldscape) { + class4.loginType = LoginType.oldscape; } else { - FontName.loginType = LoginType.field4032; + class4.loginType = LoginType.field4024; } break; case 12: worldId = Integer.parseInt(var2); break; case 14: - SoundSystem.field1414 = Integer.parseInt(var2); + MouseRecorder.field565 = Integer.parseInt(var2); break; case 15: gameBuild = Integer.parseInt(var2); break; case 17: - class1.field6 = var2; + MouseHandler.field464 = var2; } } } Scene.Scene_isLowDetail = false; isLowDetail = false; - NetFileRequest.worldHost = this.getCodeBase().getHost(); - String var8 = SequenceDefinition.field3507.name; + ArchiveLoader.worldHost = this.getCodeBase().getHost(); + String var8 = WorldMapSprite.field226.name; byte var9 = 0; try { - JagexCache.idxCount = 21; - InterfaceParent.cacheGamebuild = var9; - - try { - Decimator.field1439 = System.getProperty("os.name"); - } catch (Exception var14) { - Decimator.field1439 = "Unknown"; - } - - ByteArrayPool.field3708 = Decimator.field1439.toLowerCase(); - - try { - FontName.userHomeDirectory = System.getProperty("user.home"); - if (FontName.userHomeDirectory != null) { - FontName.userHomeDirectory = FontName.userHomeDirectory + "/"; - } - } catch (Exception var13) { - } - - try { - if (ByteArrayPool.field3708.startsWith("win")) { - if (FontName.userHomeDirectory == null) { - FontName.userHomeDirectory = System.getenv("USERPROFILE"); - } - } else if (FontName.userHomeDirectory == null) { - FontName.userHomeDirectory = System.getenv("HOME"); - } - - if (FontName.userHomeDirectory != null) { - FontName.userHomeDirectory = FontName.userHomeDirectory + "/"; - } - } catch (Exception var12) { - } - - if (FontName.userHomeDirectory == null) { - FontName.userHomeDirectory = "~/"; - } - - GrandExchangeEvent.field47 = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", FontName.userHomeDirectory, "/tmp/", ""}; - Login.field1181 = new String[]{".jagex_cache_" + InterfaceParent.cacheGamebuild, ".file_store_" + InterfaceParent.cacheGamebuild}; - - label133: - for (int var10 = 0; var10 < 4; ++var10) { - JagexCache.cacheDir = class4.getCacheDir("oldschool", var8, var10); - if (!JagexCache.cacheDir.exists()) { - JagexCache.cacheDir.mkdirs(); - } - - File[] var11 = JagexCache.cacheDir.listFiles(); - if (var11 == null) { - break; - } - - File[] var18 = var11; - var6 = 0; - - while (true) { - if (var6 >= var18.length) { - break label133; - } - - File var19 = var18[var6]; - if (!GameShell.testReadWritePermissions(var19, false)) { - break; - } - - ++var6; - } - } - - File var17 = JagexCache.cacheDir; - FileSystem.FileSystem_cacheDir = var17; - if (!FileSystem.FileSystem_cacheDir.exists()) { - throw new RuntimeException(""); - } - - FileSystem.FileSystem_hasPermissions = true; - SoundSystem.method2417(); - JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(class42.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); - JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(class42.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); - WorldMapSection1.JagexCache_idxFiles = new BufferedFile[JagexCache.idxCount]; - - for (var4 = 0; var4 < JagexCache.idxCount; ++var4) { - WorldMapSection1.JagexCache_idxFiles[var4] = new BufferedFile(new AccessFile(class42.getFile("main_file_cache.idx" + var4), "rw", 1048576L), 6000, 0); - } - } catch (Exception var15) { - class3.RunException_sendStackTrace((String)null, var15); + class192.method3650("oldschool", var8, var9, 21); + } catch (Exception var10) { + class188.RunException_sendStackTrace((String)null, var10); } - WorldMapID.client = this; - GZipDecompressor.field4007 = clientType; - this.startThread(765, 503, 182); + Coord.client = this; + Skills.field2723 = clientType; + this.startThread(765, 503, 183); } - } catch (RuntimeException var16) { - throw class195.newRunException(var16, "client.init(" + ')'); + } catch (RuntimeException var11) { + throw ArchiveDiskActionHandler.newRunException(var11, "client.init(" + ')'); } } @ObfuscatedSignature( - signature = "()Ljx;" + signature = "()Ljt;" ) - public Username aag() { - return WorldMapIcon_1.localPlayer != null ? WorldMapIcon_1.localPlayer.username : null; + public Username aac() { + return Varps.localPlayer != null ? Varps.localPlayer.username : null; } @ObfuscatedSignature( - signature = "()Ljx;" + signature = "()Ljt;" ) - public Username abc() { - return WorldMapIcon_1.localPlayer != null ? WorldMapIcon_1.localPlayer.username : null; + public Username aak() { + return Varps.localPlayer != null ? Varps.localPlayer.username : null; } @ObfuscatedSignature( - signature = "()Ljx;" + signature = "()Ljt;" ) - public Username aba() { - return WorldMapIcon_1.localPlayer != null ? WorldMapIcon_1.localPlayer.username : null; + public Username aap() { + return Varps.localPlayer != null ? Varps.localPlayer.username : null; } - @ObfuscatedName("ep") + @ObfuscatedSignature( + signature = "()Ljt;" + ) + public Username aaa() { + return Varps.localPlayer != null ? Varps.localPlayer.username : null; + } + + @ObfuscatedName("ef") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1547089502" + garbageValue = "-465749667" ) @Export("doCycleJs5") void doCycleJs5() { if (gameState != 1000) { - boolean var1 = TilePaint.method3007(); + boolean var1 = ViewportMouse.method2957(); if (!var1) { this.doCycleJs5Connect(); } @@ -2592,10 +2478,10 @@ public final class Client extends GameShell implements Usernamed { } } - @ObfuscatedName("ek") + @ObfuscatedName("ed") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "529231386" + signature = "(B)V", + garbageValue = "1" ) @Export("doCycleJs5Connect") void doCycleJs5Connect() { @@ -2610,68 +2496,123 @@ public final class Client extends GameShell implements Usernamed { return; } - field681 = 3000; + field653 = 3000; NetCache.NetCache_ioExceptions = 3; } - if (--field681 + 1 <= 0) { + if (--field653 + 1 <= 0) { try { if (js5ConnectState == 0) { - RouteStrategy.js5SocketTask = GameShell.taskHandler.newSocketTask(NetFileRequest.worldHost, SecureRandomCallable.port3); + GrandExchangeOfferOwnWorldComparator.js5SocketTask = GameShell.taskHandler.newSocketTask(ArchiveLoader.worldHost, LoginPacket.port3); ++js5ConnectState; } if (js5ConnectState == 1) { - if (RouteStrategy.js5SocketTask.status == 2) { + if (GrandExchangeOfferOwnWorldComparator.js5SocketTask.status == 2) { this.js5Error(-1); return; } - if (RouteStrategy.js5SocketTask.status == 1) { + if (GrandExchangeOfferOwnWorldComparator.js5SocketTask.status == 1) { ++js5ConnectState; } } if (js5ConnectState == 2) { if (useBufferedSocket) { - Socket var2 = (Socket)RouteStrategy.js5SocketTask.result; - BufferedNetSocket var1 = new BufferedNetSocket(var2, 40000, 5000); - js5Socket = var1; + class219.js5Socket = Fonts.method5293((Socket)GrandExchangeOfferOwnWorldComparator.js5SocketTask.result, 40000, 5000); } else { - js5Socket = new NetSocket((Socket)RouteStrategy.js5SocketTask.result, GameShell.taskHandler, 5000); + class219.js5Socket = new NetSocket((Socket)GrandExchangeOfferOwnWorldComparator.js5SocketTask.result, GameShell.taskHandler, 5000); } - Buffer var5 = new Buffer(5); - var5.writeByte(15); - var5.writeInt(182); - js5Socket.write(var5.array, 0, 5); + Buffer var1 = new Buffer(5); + var1.writeByte(15); + var1.writeInt(183); + class219.js5Socket.write(var1.array, 0, 5); ++js5ConnectState; - Coord.field2511 = SequenceDefinition.method4686(); + UserComparator10.field1946 = SoundCache.method2480(); } if (js5ConnectState == 3) { - if (js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { - int var3 = js5Socket.readUnsignedByte(); - if (var3 != 0) { - this.js5Error(var3); + if (class219.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { + int var5 = class219.js5Socket.readUnsignedByte(); + if (var5 != 0) { + this.js5Error(var5); return; } ++js5ConnectState; - } else if (SequenceDefinition.method4686() - Coord.field2511 > 30000L) { + } else if (SoundCache.method2480() - UserComparator10.field1946 > 30000L) { this.js5Error(-2); return; } } if (js5ConnectState == 4) { - class83.NetCache_connect(js5Socket, gameState > 20); - RouteStrategy.js5SocketTask = null; - js5Socket = null; - js5ConnectState = 0; - js5Errors = 0; + AbstractSocket var10 = class219.js5Socket; + boolean var2 = gameState > 20; + if (NetCache.NetCache_socket != null) { + try { + NetCache.NetCache_socket.close(); + } catch (Exception var8) { + } + + NetCache.NetCache_socket = null; + } + + NetCache.NetCache_socket = var10; + class173.method3575(var2); + NetCache.NetCache_responseHeaderBuffer.offset = 0; + NetCache.NetCache_currentResponse = null; + class336.NetCache_responseArchiveBuffer = null; + NetCache.field3154 = 0; + + while (true) { + NetFileRequest var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); + if (var3 == null) { + while (true) { + var3 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); + if (var3 == null) { + if (NetCache.field3158 != 0) { + try { + Buffer var11 = new Buffer(4); + var11.writeByte(4); + var11.writeByte(NetCache.field3158); + var11.writeShort(0); + NetCache.NetCache_socket.write(var11.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; + NetCache.field3145 = SoundCache.method2480(); + GrandExchangeOfferOwnWorldComparator.js5SocketTask = null; + class219.js5Socket = null; + js5ConnectState = 0; + js5Errors = 0; + return; + } + + NetCache.NetCache_pendingWritesQueue.addLast(var3); + NetCache.NetCache_pendingWrites.put(var3, var3.key); + ++NetCache.NetCache_pendingWritesCount; + --NetCache.NetCache_pendingResponsesCount; + } + } + + NetCache.NetCache_pendingPriorityWrites.put(var3, var3.key); + ++NetCache.NetCache_pendingPriorityWritesCount; + --NetCache.NetCache_pendingPriorityResponsesCount; + } } - } catch (IOException var4) { + } catch (IOException var9) { this.js5Error(-3); } @@ -2679,20 +2620,20 @@ public final class Client extends GameShell implements Usernamed { } } - @ObfuscatedName("et") + @ObfuscatedName("eq") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1888640319" + garbageValue = "-972474352" ) @Export("js5Error") void js5Error(int var1) { - RouteStrategy.js5SocketTask = null; - js5Socket = null; + GrandExchangeOfferOwnWorldComparator.js5SocketTask = null; + class219.js5Socket = null; js5ConnectState = 0; - if (WorldMapRectangle.port1 == SecureRandomCallable.port3) { - SecureRandomCallable.port3 = FloorDecoration.port2; + if (LoginPacket.port3 == WorldMapSection1.port1) { + LoginPacket.port3 = IsaacCipher.port2; } else { - SecureRandomCallable.port3 = WorldMapRectangle.port1; + LoginPacket.port3 = WorldMapSection1.port1; } ++js5Errors; @@ -2701,7 +2642,7 @@ public final class Client extends GameShell implements Usernamed { this.error("js5connect_full"); gameState = 1000; } else { - field681 = 3000; + field653 = 3000; } } else if (js5Errors >= 2 && var1 == 6) { this.error("js5connect_outofdate"); @@ -2711,16 +2652,16 @@ public final class Client extends GameShell implements Usernamed { this.error("js5connect"); gameState = 1000; } else { - field681 = 3000; + field653 = 3000; } } } - @ObfuscatedName("el") + @ObfuscatedName("ez") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1767576334" + garbageValue = "-1821013754" ) @Export("doCycleLoggedOut") final void doCycleLoggedOut() { @@ -2729,54 +2670,55 @@ public final class Client extends GameShell implements Usernamed { try { if (loginState == 0) { - if (class2.secureRandom == null && (secureRandomFuture.isDone() || field658 > 250)) { - class2.secureRandom = secureRandomFuture.get(); + if (WorldMapEvent.secureRandom == null && (secureRandomFuture.isDone() || field656 > 250)) { + WorldMapEvent.secureRandom = secureRandomFuture.get(); secureRandomFuture.shutdown(); secureRandomFuture = null; } - if (class2.secureRandom != null) { + if (WorldMapEvent.secureRandom != null) { if (var1 != null) { ((AbstractSocket)var1).close(); var1 = null; } - WorldMapIcon_0.socketTask = null; - field672 = false; - field658 = 0; + PlayerType.socketTask = null; + field772 = false; + field656 = 0; loginState = 1; } } if (loginState == 1) { - if (WorldMapIcon_0.socketTask == null) { - WorldMapIcon_0.socketTask = GameShell.taskHandler.newSocketTask(NetFileRequest.worldHost, SecureRandomCallable.port3); + if (PlayerType.socketTask == null) { + PlayerType.socketTask = GameShell.taskHandler.newSocketTask(ArchiveLoader.worldHost, LoginPacket.port3); } - if (WorldMapIcon_0.socketTask.status == 2) { + if (PlayerType.socketTask.status == 2) { throw new IOException(); } - if (WorldMapIcon_0.socketTask.status == 1) { + if (PlayerType.socketTask.status == 1) { if (useBufferedSocket) { - Socket var4 = (Socket)WorldMapIcon_0.socketTask.result; - BufferedNetSocket var3 = new BufferedNetSocket(var4, 40000, 5000); - var1 = var3; + var1 = Fonts.method5293((Socket)PlayerType.socketTask.result, 40000, 5000); } else { - var1 = new NetSocket((Socket)WorldMapIcon_0.socketTask.result, GameShell.taskHandler, 5000); + var1 = new NetSocket((Socket)PlayerType.socketTask.result, GameShell.taskHandler, 5000); } packetWriter.setSocket((AbstractSocket)var1); - WorldMapIcon_0.socketTask = null; + PlayerType.socketTask = null; loginState = 2; } } if (loginState == 2) { packetWriter.clearBuffer(); - PacketBufferNode var21 = class2.method29(); - var21.packetBuffer.writeByte(LoginPacket.field2291.id); - packetWriter.addNode(var21); + PacketBufferNode var4 = Skills.method4100(); + var4.clientPacket = null; + var4.clientPacketLength = 0; + var4.packetBuffer = new PacketBuffer(5000); + var4.packetBuffer.writeByte(LoginPacket.field2291.id); + packetWriter.addNode(var4); packetWriter.flush(); var2.offset = 0; loginState = 3; @@ -2785,12 +2727,12 @@ public final class Client extends GameShell implements Usernamed { boolean var12; int var13; if (loginState == 3) { - if (MouseRecorder.pcmPlayer0 != null) { - MouseRecorder.pcmPlayer0.method2397(); + if (WorldMapIcon_1.pcmPlayer0 != null) { + WorldMapIcon_1.pcmPlayer0.method2389(); } - if (SoundCache.pcmPlayer1 != null) { - SoundCache.pcmPlayer1.method2397(); + if (ClientPreferences.pcmPlayer1 != null) { + ClientPreferences.pcmPlayer1.method2389(); } var12 = true; @@ -2800,16 +2742,16 @@ public final class Client extends GameShell implements Usernamed { if (var12) { var13 = ((AbstractSocket)var1).readUnsignedByte(); - if (MouseRecorder.pcmPlayer0 != null) { - MouseRecorder.pcmPlayer0.method2397(); + if (WorldMapIcon_1.pcmPlayer0 != null) { + WorldMapIcon_1.pcmPlayer0.method2389(); } - if (SoundCache.pcmPlayer1 != null) { - SoundCache.pcmPlayer1.method2397(); + if (ClientPreferences.pcmPlayer1 != null) { + ClientPreferences.pcmPlayer1.method2389(); } if (var13 != 0) { - GrandExchangeOfferOwnWorldComparator.getLoginError(var13); + WorldMapSprite.getLoginError(var13); return; } @@ -2818,158 +2760,158 @@ public final class Client extends GameShell implements Usernamed { } } - int var33; + int var28; if (loginState == 4) { if (var2.offset < 8) { - var33 = ((AbstractSocket)var1).available(); - if (var33 > 8 - var2.offset) { - var33 = 8 - var2.offset; + var28 = ((AbstractSocket)var1).available(); + if (var28 > 8 - var2.offset) { + var28 = 8 - var2.offset; } - if (var33 > 0) { - ((AbstractSocket)var1).read(var2.array, var2.offset, var33); - var2.offset += var33; + if (var28 > 0) { + ((AbstractSocket)var1).read(var2.array, var2.offset, var28); + var2.offset += var28; } } if (var2.offset == 8) { var2.offset = 0; - class65.field586 = var2.readLong(); + ObjectSound.field1055 = var2.readLong(); loginState = 5; } } - int var7; - int var9; - int var14; if (loginState == 5) { packetWriter.packetBuffer.offset = 0; packetWriter.clearBuffer(); - PacketBuffer var22 = new PacketBuffer(500); - int[] var24 = new int[]{class2.secureRandom.nextInt(), class2.secureRandom.nextInt(), class2.secureRandom.nextInt(), class2.secureRandom.nextInt()}; - var22.offset = 0; - var22.writeByte(1); - var22.writeInt(var24[0]); - var22.writeInt(var24[1]); - var22.writeInt(var24[2]); - var22.writeInt(var24[3]); - var22.writeLong(class65.field586); - int var10; + PacketBuffer var3 = new PacketBuffer(500); + int[] var23 = new int[]{WorldMapEvent.secureRandom.nextInt(), WorldMapEvent.secureRandom.nextInt(), WorldMapEvent.secureRandom.nextInt(), WorldMapEvent.secureRandom.nextInt()}; + var3.offset = 0; + var3.writeByte(1); + var3.writeInt(var23[0]); + var3.writeInt(var23[1]); + var3.writeInt(var23[2]); + var3.writeInt(var23[3]); + var3.writeLong(ObjectSound.field1055); + int var11; if (gameState == 40) { - var22.writeInt(class192.field2365[0]); - var22.writeInt(class192.field2365[1]); - var22.writeInt(class192.field2365[2]); - var22.writeInt(class192.field2365[3]); + var3.writeInt(UserComparator5.field1958[0]); + var3.writeInt(UserComparator5.field1958[1]); + var3.writeInt(UserComparator5.field1958[2]); + var3.writeInt(UserComparator5.field1958[3]); } else { - var22.writeByte(field870.rsOrdinal()); - switch(field870.field1986) { + var3.writeByte(field659.rsOrdinal()); + switch(field659.field1978) { case 0: - case 1: - var22.writeMedium(SecureRandomCallable.field500); - ++var22.offset; - break; case 2: - LinkedHashMap var6 = GrandExchangeOffer.clientPreferences.parameters; + var3.writeMedium(class222.field2729); + ++var3.offset; + break; + case 1: + LinkedHashMap var6 = Actor.clientPreferences.parameters; String var8 = Login.Login_username; - var9 = var8.length(); - var10 = 0; + int var9 = var8.length(); + int var10 = 0; - for (int var11 = 0; var11 < var9; ++var11) { + for (var11 = 0; var11 < var9; ++var11) { var10 = (var10 << 5) - var10 + var8.charAt(var11); } - var22.writeInt((Integer)var6.get(var10)); + var3.writeInt((Integer)var6.get(var10)); break; case 3: - var22.offset += 4; + var3.offset += 4; } - var22.writeByte(class312.field3810.rsOrdinal()); - var22.writeStringCp1252NullTerminated(Login.Login_password); + var3.writeByte(class312.field3805.rsOrdinal()); + var3.writeStringCp1252NullTerminated(Login.Login_password); } - var22.encryptRsa(class83.field1138, class83.field1137); - class192.field2365 = var24; - PacketBufferNode var5 = class2.method29(); - var5.packetBuffer.offset = 0; + var3.encryptRsa(class83.field1142, class83.field1139); + UserComparator5.field1958 = var23; + PacketBufferNode var26 = Skills.method4100(); + var26.clientPacket = null; + var26.clientPacketLength = 0; + var26.packetBuffer = new PacketBuffer(5000); + var26.packetBuffer.offset = 0; if (gameState == 40) { - var5.packetBuffer.writeByte(LoginPacket.field2292.id); + var26.packetBuffer.writeByte(LoginPacket.field2290.id); } else { - var5.packetBuffer.writeByte(LoginPacket.field2295.id); + var26.packetBuffer.writeByte(LoginPacket.field2289.id); } - var5.packetBuffer.writeShort(0); - var14 = var5.packetBuffer.offset; - var5.packetBuffer.writeInt(182); - var5.packetBuffer.writeInt(1); - var5.packetBuffer.writeByte(clientType); - var5.packetBuffer.writeBytes(var22.array, 0, var22.offset); - var7 = var5.packetBuffer.offset; - var5.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); - var5.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); - var5.packetBuffer.writeShort(KitDefinition.canvasWidth); - var5.packetBuffer.writeShort(class30.canvasHeight); - FloorDecoration.method2787(var5.packetBuffer); - var5.packetBuffer.writeStringCp1252NullTerminated(Clock.field2037); - var5.packetBuffer.writeInt(SoundSystem.field1414); - Buffer var31 = new Buffer(World.platformInfo.size()); - World.platformInfo.write(var31); - var5.packetBuffer.writeBytes(var31.array, 0, var31.array.length); - var5.packetBuffer.writeByte(clientType); - var5.packetBuffer.writeInt(0); - var5.packetBuffer.writeInt(archive0.hash); - var5.packetBuffer.writeInt(class269.archive1.hash); - var5.packetBuffer.writeInt(HealthBarUpdate.archive2.hash); - var5.packetBuffer.writeInt(UserComparator8.archive3.hash); - var5.packetBuffer.writeInt(WorldMapSprite.archive4.hash); - var5.packetBuffer.writeInt(WorldMapDecoration.archive5.hash); - var5.packetBuffer.writeInt(GrandExchangeEvent.archive6.hash); - var5.packetBuffer.writeInt(class51.archive7.hash); - var5.packetBuffer.writeInt(class2.archive8.hash); - var5.packetBuffer.writeInt(WorldMapDecoration.archive9.hash); - var5.packetBuffer.writeInt(GameObject.archive10.hash); - var5.packetBuffer.writeInt(WorldMapRectangle.archive11.hash); - var5.packetBuffer.writeInt(GameShell.archive12.hash); - var5.packetBuffer.writeInt(WorldMapID.archive13.hash); - var5.packetBuffer.writeInt(WorldMapSection1.archive14.hash); - var5.packetBuffer.writeInt(GrandExchangeOfferWorldComparator.archive15.hash); - var5.packetBuffer.writeInt(0); - var5.packetBuffer.writeInt(WorldMapIcon_1.archive17.hash); - var5.packetBuffer.writeInt(class40.archive18.hash); - var5.packetBuffer.writeInt(SoundCache.archive19.hash); - var5.packetBuffer.writeInt(Script.archive20.hash); - var5.packetBuffer.xteaEncrypt(var24, var7, var5.packetBuffer.offset); - var5.packetBuffer.writeLengthShort(var5.packetBuffer.offset - var14); - packetWriter.addNode(var5); + var26.packetBuffer.writeShort(0); + int var7 = var26.packetBuffer.offset; + var26.packetBuffer.writeInt(183); + var26.packetBuffer.writeInt(1); + var26.packetBuffer.writeByte(clientType); + var26.packetBuffer.writeBytes(var3.array, 0, var3.offset); + int var14 = var26.packetBuffer.offset; + var26.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); + var26.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); + var26.packetBuffer.writeShort(GraphicsDefaults.canvasWidth); + var26.packetBuffer.writeShort(GameShell.canvasHeight); + SequenceDefinition.method4770(var26.packetBuffer); + var26.packetBuffer.writeStringCp1252NullTerminated(WorldMapArea.field217); + var26.packetBuffer.writeInt(MouseRecorder.field565); + Buffer var15 = new Buffer(class32.platformInfo.size()); + class32.platformInfo.write(var15); + var26.packetBuffer.writeBytes(var15.array, 0, var15.array.length); + var26.packetBuffer.writeByte(clientType); + var26.packetBuffer.writeInt(0); + var26.packetBuffer.writeInt(ScriptEvent.archive0.hash); + var26.packetBuffer.writeInt(GrandExchangeOffer.archive1.hash); + var26.packetBuffer.writeInt(class173.archive2.hash); + var26.packetBuffer.writeInt(WorldMapData_0.archive3.hash); + var26.packetBuffer.writeInt(class13.archive4.hash); + var26.packetBuffer.writeInt(Timer.archive5.hash); + var26.packetBuffer.writeInt(WorldMapDecoration.archive6.hash); + var26.packetBuffer.writeInt(class49.archive7.hash); + var26.packetBuffer.writeInt(WorldMapDecoration.archive8.hash); + var26.packetBuffer.writeInt(WorldMapData_0.archive9.hash); + var26.packetBuffer.writeInt(FontName.archive10.hash); + var26.packetBuffer.writeInt(ArchiveDisk.archive11.hash); + var26.packetBuffer.writeInt(Message.archive12.hash); + var26.packetBuffer.writeInt(TextureProvider.archive13.hash); + var26.packetBuffer.writeInt(WorldMapLabel.archive14.hash); + var26.packetBuffer.writeInt(BufferedSource.archive15.hash); + var26.packetBuffer.writeInt(0); + var26.packetBuffer.writeInt(class49.archive17.hash); + var26.packetBuffer.writeInt(WorldMapArea.archive18.hash); + var26.packetBuffer.writeInt(UrlRequest.archive19.hash); + var26.packetBuffer.writeInt(WorldMapSection1.archive20.hash); + var26.packetBuffer.xteaEncrypt(var23, var14, var26.packetBuffer.offset); + var26.packetBuffer.writeLengthShort(var26.packetBuffer.offset - var7); + packetWriter.addNode(var26); packetWriter.flush(); - packetWriter.isaacCipher = new IsaacCipher(var24); - int[] var15 = new int[4]; + packetWriter.isaacCipher = new IsaacCipher(var23); + int[] var16 = new int[4]; - for (var10 = 0; var10 < 4; ++var10) { - var15[var10] = var24[var10] + 50; + for (var11 = 0; var11 < 4; ++var11) { + var16[var11] = var23[var11] + 50; } - var2.newIsaacCipher(var15); + var2.newIsaacCipher(var16); loginState = 6; } if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { - var33 = ((AbstractSocket)var1).readUnsignedByte(); - if (var33 == 21 && gameState == 20) { + var28 = ((AbstractSocket)var1).readUnsignedByte(); + if (var28 == 21 && gameState == 20) { loginState = 9; - } else if (var33 == 2) { + } else if (var28 == 2) { loginState = 11; - } else if (var33 == 15 && gameState == 40) { + } else if (var28 == 15 && gameState == 40) { packetWriter.serverPacketLength = -1; loginState = 16; - } else if (var33 == 64) { + } else if (var28 == 64) { loginState = 7; - } else if (var33 == 23 && field659 < 1) { - ++field659; + } else if (var28 == 23 && field841 < 1) { + ++field841; loginState = 0; } else { - if (var33 != 29) { - GrandExchangeOfferOwnWorldComparator.getLoginError(var33); + if (var28 != 29) { + WorldMapSprite.getLoginError(var28); return; } @@ -2978,120 +2920,119 @@ public final class Client extends GameShell implements Usernamed { } if (loginState == 7 && ((AbstractSocket)var1).available() > 0) { - WorldMapSection2.field183 = ((AbstractSocket)var1).readUnsignedByte(); + class208.field2475 = ((AbstractSocket)var1).readUnsignedByte(); loginState = 8; } - if (loginState == 8 && ((AbstractSocket)var1).available() >= WorldMapSection2.field183) { - ((AbstractSocket)var1).read(var2.array, 0, WorldMapSection2.field183); + if (loginState == 8 && ((AbstractSocket)var1).available() >= class208.field2475) { + ((AbstractSocket)var1).read(var2.array, 0, class208.field2475); var2.offset = 0; loginState = 6; } if (loginState == 9 && ((AbstractSocket)var1).available() > 0) { - field660 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; + field821 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; loginState = 10; } if (loginState == 10) { - field658 = 0; - GrandExchangeOfferOwnWorldComparator.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field660 / 60 + " seconds."); - if (--field660 <= 0) { + field656 = 0; + Canvas.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field821 / 60 + " seconds."); + if (--field821 <= 0) { loginState = 0; } } else { if (loginState == 11 && ((AbstractSocket)var1).available() >= 1) { - GameShell.field425 = ((AbstractSocket)var1).readUnsignedByte(); + class173.field2069 = ((AbstractSocket)var1).readUnsignedByte(); loginState = 12; } - if (loginState == 12 && ((AbstractSocket)var1).available() >= GameShell.field425) { + if (loginState == 12 && ((AbstractSocket)var1).available() >= class173.field2069) { var12 = ((AbstractSocket)var1).readUnsignedByte() == 1; ((AbstractSocket)var1).read(var2.array, 0, 4); var2.offset = 0; - boolean var34 = false; + boolean var29 = false; if (var12) { var13 = var2.readByteIsaac() << 24; var13 |= var2.readByteIsaac() << 16; var13 |= var2.readByteIsaac() << 8; var13 |= var2.readByteIsaac(); - String var30 = Login.Login_username; - var7 = var30.length(); - int var16 = 0; - var9 = 0; - - while (true) { - if (var9 >= var7) { - if (GrandExchangeOffer.clientPreferences.parameters.size() >= 10 && !GrandExchangeOffer.clientPreferences.parameters.containsKey(var16)) { - Iterator var32 = GrandExchangeOffer.clientPreferences.parameters.entrySet().iterator(); - var32.next(); - var32.remove(); - } - - GrandExchangeOffer.clientPreferences.parameters.put(var16, var13); - break; - } - - var16 = (var16 << 5) - var16 + var30.charAt(var9); - ++var9; + int var17 = WorldMapIcon_0.method195(Login.Login_username); + if (Actor.clientPreferences.parameters.size() >= 10 && !Actor.clientPreferences.parameters.containsKey(var17)) { + Iterator var27 = Actor.clientPreferences.parameters.entrySet().iterator(); + var27.next(); + var27.remove(); } + + Actor.clientPreferences.parameters.put(var17, var13); } if (Login_isUsernameRemembered) { - GrandExchangeOffer.clientPreferences.rememberedUsername = Login.Login_username; + Actor.clientPreferences.rememberedUsername = Login.Login_username; } else { - GrandExchangeOffer.clientPreferences.rememberedUsername = null; + Actor.clientPreferences.rememberedUsername = null; } - GrandExchangeOfferAgeComparator.savePreferences(); + class296.savePreferences(); staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); localPlayerIndex <<= 8; localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); - field741 = ((AbstractSocket)var1).readUnsignedByte(); + field739 = ((AbstractSocket)var1).readUnsignedByte(); ((AbstractSocket)var1).read(var2.array, 0, 1); var2.offset = 0; - ServerPacket[] var28 = MouseRecorder.ServerPacket_values(); - var14 = var2.readSmartByteShortIsaac(); - if (var14 < 0 || var14 >= var28.length) { - throw new IOException(var14 + " " + var2.offset); + ServerPacket[] var5 = class195.ServerPacket_values(); + int var18 = var2.readSmartByteShortIsaac(); + if (var18 < 0 || var18 >= var5.length) { + throw new IOException(var18 + " " + var2.offset); } - packetWriter.serverPacket = var28[var14]; + packetWriter.serverPacket = var5[var18]; packetWriter.serverPacketLength = packetWriter.serverPacket.length; ((AbstractSocket)var1).read(var2.array, 0, 2); var2.offset = 0; packetWriter.serverPacketLength = var2.readUnsignedShort(); try { - Client var18 = WorldMapID.client; - JSObject.getWindow(var18).call("zap", (Object[])null); - } catch (Throwable var19) { + class47.method812(Coord.client, "zap"); + } catch (Throwable var20) { } loginState = 13; } - if (loginState != 13) { + if (loginState == 13) { + if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { + var2.offset = 0; + ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); + timer.method4972(); + TilePaint.method3037(); + GraphicsObject.updatePlayer(var2); + FloorDecoration.field1585 = -1; + Canvas.loadRegions(false, var2); + packetWriter.serverPacket = null; + } + + } else { if (loginState == 14 && ((AbstractSocket)var1).available() >= 2) { var2.offset = 0; ((AbstractSocket)var1).read(var2.array, 0, 2); var2.offset = 0; - GrandExchangeOfferTotalQuantityComparator.field59 = var2.readUnsignedShort(); + Decimator.field1431 = var2.readUnsignedShort(); loginState = 15; } - if (loginState == 15 && ((AbstractSocket)var1).available() >= GrandExchangeOfferTotalQuantityComparator.field59) { + if (loginState == 15 && ((AbstractSocket)var1).available() >= Decimator.field1431) { var2.offset = 0; - ((AbstractSocket)var1).read(var2.array, 0, GrandExchangeOfferTotalQuantityComparator.field59); + ((AbstractSocket)var1).read(var2.array, 0, Decimator.field1431); var2.offset = 0; + String var22 = var2.readStringCp1252NullTerminated(); + String var24 = var2.readStringCp1252NullTerminated(); String var25 = var2.readStringCp1252NullTerminated(); - String var27 = var2.readStringCp1252NullTerminated(); - String var29 = var2.readStringCp1252NullTerminated(); - GrandExchangeOfferOwnWorldComparator.setLoginResponseString(var25, var27, var29); - FloorDecoration.updateGameState(10); + Canvas.setLoginResponseString(var22, var24, var25); + WorldMapIcon_0.updateGameState(10); } if (loginState == 16) { @@ -3108,168 +3049,53 @@ public final class Client extends GameShell implements Usernamed { if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); var2.offset = 0; - var33 = packetWriter.serverPacketLength; - timer.method4901(); - WorldMapAreaData.method654(); - ScriptFrame.updatePlayer(var2); - if (var33 != var2.offset) { + var28 = packetWriter.serverPacketLength; + timer.method4982(); + Entity.method3228(); + GraphicsObject.updatePlayer(var2); + if (var28 != var2.offset) { throw new RuntimeException(); } } } else { - ++field658; - if (field658 > 2000) { - if (field659 < 1) { - if (SecureRandomCallable.port3 == WorldMapRectangle.port1) { - SecureRandomCallable.port3 = FloorDecoration.port2; + ++field656; + if (field656 > 2000) { + if (field841 < 1) { + if (LoginPacket.port3 == WorldMapSection1.port1) { + LoginPacket.port3 = IsaacCipher.port2; } else { - SecureRandomCallable.port3 = WorldMapRectangle.port1; + LoginPacket.port3 = WorldMapSection1.port1; } - ++field659; + ++field841; loginState = 0; } else { - GrandExchangeOfferOwnWorldComparator.getLoginError(-3); + WorldMapSprite.getLoginError(-3); } } } - } else { - if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { - var2.offset = 0; - ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); - timer.method4900(); - mouseLastLastPressedTimeMillis = 1L; - Language.mouseRecorder.index = 0; - class3.hasFocus = true; - hadFocus = true; - field847 = -1L; - class96.reflectionChecks = new IterableNodeDeque(); - packetWriter.clearBuffer(); - packetWriter.packetBuffer.offset = 0; - packetWriter.serverPacket = null; - packetWriter.field1295 = null; - packetWriter.field1296 = null; - packetWriter.field1291 = null; - packetWriter.serverPacketLength = 0; - packetWriter.field1293 = 0; - rebootTimer = 0; - logoutTimer = 0; - hintArrowType = 0; - menuOptionsCount = 0; - isMenuOpen = false; - MouseHandler.MouseHandler_idleCycles = 0; - class219.method4021(); - isItemSelected = 0; - isSpellSelected = false; - soundEffectCount = 0; - camAngleY = 0; - oculusOrbState = 0; - GameObject.field1921 = null; - minimapState = 0; - field651 = -1; - destinationX = 0; - destinationY = 0; - playerAttackOption = AttackOption.AttackOption_hidden; - npcAttackOption = AttackOption.AttackOption_hidden; - npcCount = 0; - MenuAction.method1993(); - - for (var33 = 0; var33 < 2048; ++var33) { - players[var33] = null; - } - - for (var33 = 0; var33 < 32768; ++var33) { - npcs[var33] = null; - } - - combatTargetPlayerIndex = -1; - projectiles.clear(); - graphicsObjects.clear(); - - for (var33 = 0; var33 < 4; ++var33) { - for (var13 = 0; var13 < 104; ++var13) { - for (int var17 = 0; var17 < 104; ++var17) { - groundItems[var33][var13][var17] = null; - } - } - } - - pendingSpawns = new NodeDeque(); - class32.friendSystem.clear(); - - for (var33 = 0; var33 < VarpDefinition.VarpDefinition_fileCount; ++var33) { - VarpDefinition var26 = class16.method180(var33); - if (var26 != null) { - Varps.Varps_temp[var33] = 0; - Varps.Varps_main[var33] = 0; - } - } - - KeyHandler.varcs.clearTransient(); - followerIndex = -1; - if (rootInterface != -1) { - UrlRequester.method3250(rootInterface); - } - - for (InterfaceParent var23 = (InterfaceParent)interfaceParents.first(); var23 != null; var23 = (InterfaceParent)interfaceParents.next()) { - VarpDefinition.closeInterface(var23, true); - } - - rootInterface = -1; - interfaceParents = new NodeHashTable(8); - meslayerContinueWidget = null; - menuOptionsCount = 0; - isMenuOpen = false; - playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); - - for (var33 = 0; var33 < 8; ++var33) { - playerMenuActions[var33] = null; - playerOptionsPriorities[var33] = false; - } - - ItemContainer.itemContainers = new NodeHashTable(32); - isLoading = true; - - for (var33 = 0; var33 < 100; ++var33) { - field703[var33] = true; - } - - WorldMapCacheName.method593(); - clanChat = null; - - for (var33 = 0; var33 < 8; ++var33) { - grandExchangeOffers[var33] = new GrandExchangeOffer(); - } - - class2.grandExchangeEvents = null; - ScriptFrame.updatePlayer(var2); - class13.field86 = -1; - PendingSpawn.loadRegions(false, var2); - packetWriter.serverPacket = null; - } - } } - } catch (IOException var20) { - if (field659 < 1) { - if (WorldMapRectangle.port1 == SecureRandomCallable.port3) { - SecureRandomCallable.port3 = FloorDecoration.port2; + } catch (IOException var21) { + if (field841 < 1) { + if (WorldMapSection1.port1 == LoginPacket.port3) { + LoginPacket.port3 = IsaacCipher.port2; } else { - SecureRandomCallable.port3 = WorldMapRectangle.port1; + LoginPacket.port3 = WorldMapSection1.port1; } - ++field659; + ++field841; loginState = 0; } else { - GrandExchangeOfferOwnWorldComparator.getLoginError(-2); + WorldMapSprite.getLoginError(-2); } } } - @ObfuscatedName("fc") + @ObfuscatedName("ff") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "784775140" + signature = "(B)V", + garbageValue = "0" ) @Export("doCycleLoggedIn") final void doCycleLoggedIn() { @@ -3281,361 +3107,340 @@ public final class Client extends GameShell implements Usernamed { --logoutTimer; } - if (field672) { - field672 = false; - class2.method31(); + if (field772) { + field772 = false; + class185.method3607(); } else { if (!isMenuOpen) { - LoginScreenAnimation.addCancelMenuEntry(); + GraphicsObject.addCancelMenuEntry(); } int var1; - for (var1 = 0; var1 < 100 && this.method1467(packetWriter); ++var1) { + for (var1 = 0; var1 < 100 && this.method1262(packetWriter); ++var1) { } if (gameState == 30) { - int var2; - PacketBufferNode var14; - while (GraphicsObject.hasReflectionCheck()) { - var14 = MenuAction.getPacketBufferNode(ClientPacket.field2285, packetWriter.isaacCipher); - var14.packetBuffer.writeByte(0); - var2 = var14.packetBuffer.offset; - InterfaceParent.performReflectionCheck(var14.packetBuffer); - var14.packetBuffer.writeLengthByte(var14.packetBuffer.offset - var2); - packetWriter.addNode(var14); - } + while (true) { + ReflectionCheck var2 = (ReflectionCheck)class96.reflectionChecks.last(); + boolean var30; + if (var2 == null) { + var30 = false; + } else { + var30 = true; + } - if (timer.field3560) { - var14 = MenuAction.getPacketBufferNode(ClientPacket.field2195, packetWriter.isaacCipher); - var14.packetBuffer.writeByte(0); - var2 = var14.packetBuffer.offset; - timer.write(var14.packetBuffer); - var14.packetBuffer.writeLengthByte(var14.packetBuffer.offset - var2); - packetWriter.addNode(var14); - timer.method4925(); - } + int var3; + PacketBufferNode var31; + if (!var30) { + PacketBufferNode var14; + int var15; + if (timer.field3549) { + var14 = MenuAction.getPacketBufferNode(ClientPacket.field2191, packetWriter.isaacCipher); + var14.packetBuffer.writeByte(0); + var15 = var14.packetBuffer.offset; + timer.write(var14.packetBuffer); + var14.packetBuffer.writeLengthByte(var14.packetBuffer.offset - var15); + packetWriter.addNode(var14); + timer.method4973(); + } - int var3; - int var4; - int var5; - int var6; - int var7; - int var8; - int var9; - PacketBuffer var10000; - synchronized(Language.mouseRecorder.lock) { - if (!field783) { - Language.mouseRecorder.index = 0; - } else if (MouseHandler.MouseHandler_lastButton != 0 || Language.mouseRecorder.index >= 40) { - PacketBufferNode var15 = null; - var3 = 0; - var4 = 0; - var5 = 0; - var6 = 0; + int var4; + int var5; + int var6; + int var7; + int var8; + int var9; + int var10; + int var11; + int var12; + synchronized(ParamDefinition.mouseRecorder.lock) { + if (!field859) { + ParamDefinition.mouseRecorder.index = 0; + } else if (MouseHandler.MouseHandler_lastButton != 0 || ParamDefinition.mouseRecorder.index >= 40) { + var31 = null; + var3 = 0; + var4 = 0; + var5 = 0; + var6 = 0; - for (var7 = 0; var7 < Language.mouseRecorder.index && (var15 == null || var15.packetBuffer.offset - var3 < 246); ++var7) { - var4 = var7; - var8 = Language.mouseRecorder.ys[var7]; - if (var8 < -1) { - var8 = -1; - } else if (var8 > 65534) { - var8 = 65534; - } + for (var7 = 0; var7 < ParamDefinition.mouseRecorder.index && (var31 == null || var31.packetBuffer.offset - var3 < 246); ++var7) { + var4 = var7; + var8 = ParamDefinition.mouseRecorder.ys[var7]; + if (var8 < -1) { + var8 = -1; + } else if (var8 > 65534) { + var8 = 65534; + } - var9 = Language.mouseRecorder.xs[var7]; - if (var9 < -1) { - var9 = -1; - } else if (var9 > 65534) { - var9 = 65534; - } + var9 = ParamDefinition.mouseRecorder.xs[var7]; + if (var9 < -1) { + var9 = -1; + } else if (var9 > 65534) { + var9 = 65534; + } - if (var9 != field838 || var8 != field637) { - if (var15 == null) { - var15 = MenuAction.getPacketBufferNode(ClientPacket.field2219, packetWriter.isaacCipher); - var15.packetBuffer.writeByte(0); - var3 = var15.packetBuffer.offset; - var10000 = var15.packetBuffer; - var10000.offset += 2; - var5 = 0; - var6 = 0; + if (var9 != field635 || var8 != field667) { + if (var31 == null) { + var31 = MenuAction.getPacketBufferNode(ClientPacket.field2246, packetWriter.isaacCipher); + var31.packetBuffer.writeByte(0); + var3 = var31.packetBuffer.offset; + PacketBuffer var10000 = var31.packetBuffer; + var10000.offset += 2; + var5 = 0; + var6 = 0; + } + + if (field637 != -1L) { + var10 = var9 - field635; + var11 = var8 - field667; + var12 = (int)((ParamDefinition.mouseRecorder.millis[var7] - field637) / 20L); + var5 = (int)((long)var5 + (ParamDefinition.mouseRecorder.millis[var7] - field637) % 20L); + } else { + var10 = var9; + var11 = var8; + var12 = Integer.MAX_VALUE; + } + + field635 = var9; + field667 = var8; + if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { + var10 += 32; + var11 += 32; + var31.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); + } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { + var10 += 128; + var11 += 128; + var31.packetBuffer.writeByte(var12 + 128); + var31.packetBuffer.writeShort(var11 + (var10 << 8)); + } else if (var12 < 32) { + var31.packetBuffer.writeByte(var12 + 192); + if (var9 != -1 && var8 != -1) { + var31.packetBuffer.writeInt(var9 | var8 << 16); + } else { + var31.packetBuffer.writeInt(Integer.MIN_VALUE); + } + } else { + var31.packetBuffer.writeShort((var12 & 8191) + 57344); + if (var9 != -1 && var8 != -1) { + var31.packetBuffer.writeInt(var9 | var8 << 16); + } else { + var31.packetBuffer.writeInt(Integer.MIN_VALUE); + } + } + + ++var6; + field637 = ParamDefinition.mouseRecorder.millis[var7]; + } } - int var10; - int var11; - int var12; - if (field889 != -1L) { - var10 = var9 - field838; - var11 = var8 - field637; - var12 = (int)((Language.mouseRecorder.millis[var7] - field889) / 20L); - var5 = (int)((long)var5 + (Language.mouseRecorder.millis[var7] - field889) % 20L); + if (var31 != null) { + var31.packetBuffer.writeLengthByte(var31.packetBuffer.offset - var3); + var7 = var31.packetBuffer.offset; + var31.packetBuffer.offset = var3; + var31.packetBuffer.writeByte(var5 / var6); + var31.packetBuffer.writeByte(var5 % var6); + var31.packetBuffer.offset = var7; + packetWriter.addNode(var31); + } + + if (var4 >= ParamDefinition.mouseRecorder.index) { + ParamDefinition.mouseRecorder.index = 0; } else { - var10 = var9; - var11 = var8; - var12 = Integer.MAX_VALUE; + MouseRecorder var46 = ParamDefinition.mouseRecorder; + var46.index -= var4; + System.arraycopy(ParamDefinition.mouseRecorder.xs, var4, ParamDefinition.mouseRecorder.xs, 0, ParamDefinition.mouseRecorder.index); + System.arraycopy(ParamDefinition.mouseRecorder.ys, var4, ParamDefinition.mouseRecorder.ys, 0, ParamDefinition.mouseRecorder.index); + System.arraycopy(ParamDefinition.mouseRecorder.millis, var4, ParamDefinition.mouseRecorder.millis, 0, ParamDefinition.mouseRecorder.index); } - - field838 = var9; - field637 = var8; - if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { - var10 += 32; - var11 += 32; - var15.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); - } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { - var10 += 128; - var11 += 128; - var15.packetBuffer.writeByte(var12 + 128); - var15.packetBuffer.writeShort(var11 + (var10 << 8)); - } else if (var12 < 32) { - var15.packetBuffer.writeByte(var12 + 192); - if (var9 != -1 && var8 != -1) { - var15.packetBuffer.writeInt(var9 | var8 << 16); - } else { - var15.packetBuffer.writeInt(Integer.MIN_VALUE); - } - } else { - var15.packetBuffer.writeShort((var12 & 8191) + 57344); - if (var9 != -1 && var8 != -1) { - var15.packetBuffer.writeInt(var9 | var8 << 16); - } else { - var15.packetBuffer.writeInt(Integer.MIN_VALUE); - } - } - - ++var6; - field889 = Language.mouseRecorder.millis[var7]; } } - if (var15 != null) { - var15.packetBuffer.writeLengthByte(var15.packetBuffer.offset - var3); - var7 = var15.packetBuffer.offset; - var15.packetBuffer.offset = var3; - var15.packetBuffer.writeByte(var5 / var6); - var15.packetBuffer.writeByte(var5 % var6); - var15.packetBuffer.offset = var7; - packetWriter.addNode(var15); - } - - if (var4 >= Language.mouseRecorder.index) { - Language.mouseRecorder.index = 0; - } else { - MouseRecorder var47 = Language.mouseRecorder; - var47.index -= var4; - System.arraycopy(Language.mouseRecorder.xs, var4, Language.mouseRecorder.xs, 0, Language.mouseRecorder.index); - System.arraycopy(Language.mouseRecorder.ys, var4, Language.mouseRecorder.ys, 0, Language.mouseRecorder.index); - System.arraycopy(Language.mouseRecorder.millis, var4, Language.mouseRecorder.millis, 0, Language.mouseRecorder.index); - } - } - } - - PacketBufferNode var18; - if (MouseHandler.MouseHandler_lastButton == 1 || !FriendSystem.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { - long var16 = (MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis * -1L) / 50L; - if (var16 > 4095L) { - var16 = 4095L; - } - - mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis * -1L; - var3 = MouseHandler.MouseHandler_lastPressedY; - if (var3 < 0) { - var3 = 0; - } else if (var3 > class30.canvasHeight) { - var3 = class30.canvasHeight; - } - - var4 = MouseHandler.MouseHandler_lastPressedX; - if (var4 < 0) { - var4 = 0; - } else if (var4 > KitDefinition.canvasWidth) { - var4 = KitDefinition.canvasWidth; - } - - var5 = (int)var16; - var18 = MenuAction.getPacketBufferNode(ClientPacket.field2226, packetWriter.isaacCipher); - var18.packetBuffer.writeShort((var5 << 1) + (MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0)); - var18.packetBuffer.writeShort(var4); - var18.packetBuffer.writeShort(var3); - packetWriter.addNode(var18); - } - - if (KeyHandler.field380 > 0) { - var14 = MenuAction.getPacketBufferNode(ClientPacket.field2252, packetWriter.isaacCipher); - var14.packetBuffer.writeShort(0); - var2 = var14.packetBuffer.offset; - long var19 = SequenceDefinition.method4686(); - - for (var5 = 0; var5 < KeyHandler.field380; ++var5) { - long var21 = var19 - field847; - if (var21 > 16777215L) { - var21 = 16777215L; - } - - field847 = var19; - var14.packetBuffer.method5545(KeyHandler.field379[var5]); - var14.packetBuffer.writeMedium((int)var21); - } - - var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var2); - packetWriter.addNode(var14); - } - - if (field712 > 0) { - --field712; - } - - if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { - field708 = true; - } - - if (field708 && field712 <= 0) { - field712 = 20; - field708 = false; - var14 = MenuAction.getPacketBufferNode(ClientPacket.field2224, packetWriter.isaacCipher); - var14.packetBuffer.method5432(camAngleX); - var14.packetBuffer.writeShortLE(camAngleY); - packetWriter.addNode(var14); - } - - if (class3.hasFocus && !hadFocus) { - hadFocus = true; - var14 = MenuAction.getPacketBufferNode(ClientPacket.field2258, packetWriter.isaacCipher); - var14.packetBuffer.writeByte(1); - packetWriter.addNode(var14); - } - - if (!class3.hasFocus && hadFocus) { - hadFocus = false; - var14 = MenuAction.getPacketBufferNode(ClientPacket.field2258, packetWriter.isaacCipher); - var14.packetBuffer.writeByte(0); - packetWriter.addNode(var14); - } - - if (WorldMapCacheName.worldMap != null) { - WorldMapCacheName.worldMap.method6187(); - } - - if (class13.ClanChat_inClanChat) { - if (clanChat != null) { - clanChat.sort(); - } - - for (var1 = 0; var1 < Players.Players_count; ++var1) { - Player var34 = players[Players.Players_indices[var1]]; - var34.clearIsInClanChat(); - } - - class13.ClanChat_inClanChat = false; - } - - GrandExchangeOfferUnitPriceComparator.method133(); - if (gameState == 30) { - FloorDecoration.method2788(); - - int var10002; - for (var1 = 0; var1 < soundEffectCount; ++var1) { - var10002 = queuedSoundEffectDelays[var1]--; - if (queuedSoundEffectDelays[var1] >= -10) { - SoundEffect var35 = soundEffects[var1]; - if (var35 == null) { - var10000 = null; - var35 = SoundEffect.readSoundEffect(WorldMapSprite.archive4, soundEffectIds[var1], 0); - if (var35 == null) { - continue; - } - - int[] var48 = queuedSoundEffectDelays; - var48[var1] += var35.calculateDelay(); - soundEffects[var1] = var35; + PacketBufferNode var18; + if (MouseHandler.MouseHandler_lastButton == 1 || !WorldMapSection1.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { + long var16 = (MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis * -1L) / 50L; + if (var16 > 4095L) { + var16 = 4095L; } - if (queuedSoundEffectDelays[var1] < 0) { - if (soundLocations[var1] != 0) { - var4 = (soundLocations[var1] & 255) * 128; - var5 = soundLocations[var1] >> 16 & 255; - var6 = var5 * 128 + 64 - WorldMapIcon_1.localPlayer.x; - if (var6 < 0) { - var6 = -var6; + mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis * -1L; + var3 = MouseHandler.MouseHandler_lastPressedY; + if (var3 < 0) { + var3 = 0; + } else if (var3 > GameShell.canvasHeight) { + var3 = GameShell.canvasHeight; + } + + var4 = MouseHandler.MouseHandler_lastPressedX; + if (var4 < 0) { + var4 = 0; + } else if (var4 > GraphicsDefaults.canvasWidth) { + var4 = GraphicsDefaults.canvasWidth; + } + + var5 = (int)var16; + var18 = MenuAction.getPacketBufferNode(ClientPacket.field2213, 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.field380 > 0) { + var14 = MenuAction.getPacketBufferNode(ClientPacket.field2224, packetWriter.isaacCipher); + var14.packetBuffer.writeShort(0); + var15 = var14.packetBuffer.offset; + long var19 = SoundCache.method2480(); + + for (var5 = 0; var5 < KeyHandler.field380; ++var5) { + long var21 = var19 - field750; + if (var21 > 16777215L) { + var21 = 16777215L; + } + + field750 = var19; + var14.packetBuffer.writeByte(KeyHandler.field379[var5]); + var14.packetBuffer.method5466((int)var21); + } + + var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var15); + packetWriter.addNode(var14); + } + + if (field883 > 0) { + --field883; + } + + if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { + field858 = true; + } + + if (field858 && field883 <= 0) { + field883 = 20; + field858 = false; + var14 = MenuAction.getPacketBufferNode(ClientPacket.field2271, packetWriter.isaacCipher); + var14.packetBuffer.writeIntME(camAngleY); + var14.packetBuffer.writeShort(camAngleX); + packetWriter.addNode(var14); + } + + if (PendingSpawn.hasFocus && !hadFocus) { + hadFocus = true; + var14 = MenuAction.getPacketBufferNode(ClientPacket.field2200, packetWriter.isaacCipher); + var14.packetBuffer.writeByte(1); + packetWriter.addNode(var14); + } + + if (!PendingSpawn.hasFocus && hadFocus) { + hadFocus = false; + var14 = MenuAction.getPacketBufferNode(ClientPacket.field2200, packetWriter.isaacCipher); + var14.packetBuffer.writeByte(0); + packetWriter.addNode(var14); + } + + if (GrandExchangeOfferUnitPriceComparator.worldMap != null) { + GrandExchangeOfferUnitPriceComparator.worldMap.method6291(); + } + + if (InterfaceParent.ClanChat_inClanChat) { + if (GrandExchangeOfferUnitPriceComparator.clanChat != null) { + GrandExchangeOfferUnitPriceComparator.clanChat.sort(); + } + + WorldMapCacheName.method592(); + InterfaceParent.ClanChat_inClanChat = false; + } + + if (MouseRecorder.plane != field848) { + field848 = MouseRecorder.plane; + class4.method48(MouseRecorder.plane); + } + + if (gameState != 30) { + return; + } + + for (PendingSpawn var37 = (PendingSpawn)pendingSpawns.last(); var37 != null; var37 = (PendingSpawn)pendingSpawns.previous()) { + if (var37.hitpoints > 0) { + --var37.hitpoints; + } + + ObjectDefinition var23; + boolean var38; + if (var37.hitpoints == 0) { + if (var37.objectId >= 0) { + var3 = var37.objectId; + var4 = var37.field903; + var23 = WallDecoration.getObjectDefinition(var3); + if (var4 == 11) { + var4 = 10; } - var7 = soundLocations[var1] >> 8 & 255; - var8 = var7 * 128 + 64 - WorldMapIcon_1.localPlayer.y; - if (var8 < 0) { - var8 = -var8; + if (var4 >= 5 && var4 <= 8) { + var4 = 4; } - var9 = var8 + var6 - 128; - if (var9 > var4) { - queuedSoundEffectDelays[var1] = -100; + var38 = var23.method4599(var4); + if (!var38) { continue; } + } - if (var9 < 0) { - var9 = 0; + Message.addPendingSpawnToScene(var37.plane, var37.type, var37.x, var37.y, var37.objectId, var37.field900, var37.field903); + var37.remove(); + } else { + if (var37.delay > 0) { + --var37.delay; + } + + if (var37.delay == 0 && var37.x >= 1 && var37.y >= 1 && var37.x <= 102 && var37.y <= 102) { + if (var37.id >= 0) { + var3 = var37.id; + var4 = var37.field911; + var23 = WallDecoration.getObjectDefinition(var3); + if (var4 == 11) { + var4 = 10; + } + + if (var4 >= 5 && var4 <= 8) { + var4 = 4; + } + + var38 = var23.method4599(var4); + if (!var38) { + continue; + } } - var3 = (var4 - var9) * field860 / var4; - } else { - var3 = soundEffectVolume; + Message.addPendingSpawnToScene(var37.plane, var37.type, var37.x, var37.y, var37.id, var37.orientation, var37.field911); + var37.delay = -1; + if (var37.id == var37.objectId && var37.objectId == -1) { + var37.remove(); + } else if (var37.objectId == var37.id && var37.orientation == var37.field900 && var37.field911 == var37.field903) { + var37.remove(); + } } - - if (var3 > 0) { - RawSound var23 = var35.toRawSound().resample(class247.decimator); - RawPcmStream var24 = RawPcmStream.createRawPcmStream(var23, 100, var3); - var24.setNumLoops(queuedSoundEffectLoops[var1] - 1); - IgnoreList.pcmStreamMixer.addSubStream(var24); - } - - queuedSoundEffectDelays[var1] = -100; - } - } else { - --soundEffectCount; - - for (var2 = var1; var2 < soundEffectCount; ++var2) { - soundEffectIds[var2] = soundEffectIds[var2 + 1]; - soundEffects[var2] = soundEffects[var2 + 1]; - queuedSoundEffectLoops[var2] = queuedSoundEffectLoops[var2 + 1]; - queuedSoundEffectDelays[var2] = queuedSoundEffectDelays[var2 + 1]; - soundLocations[var2] = soundLocations[var2 + 1]; - } - - --var1; - } - } - - if (field858) { - boolean var29; - if (class197.field2378 != 0) { - var29 = true; - } else { - var29 = class197.midiPcmStream.isReady(); - } - - if (!var29) { - if (field856 != 0 && field857 != -1) { - PacketBufferNode.method3574(GrandExchangeEvent.archive6, field857, 0, field856, false); - } - - field858 = false; - } - } - - ++packetWriter.field1293; - if (packetWriter.field1293 > 750) { - class2.method31(); - } else { - var1 = Players.Players_count; - int[] var36 = Players.Players_indices; - - for (var3 = 0; var3 < var1; ++var3) { - Player var41 = players[var36[var3]]; - if (var41 != null) { - class1.calculateActorPosition(var41, 1); } } - WorldMapRectangle.method280(); - UserComparator3.processOverheadText(); - ++field879; + VerticalAlignment.method4329(); + ++packetWriter.field1283; + if (packetWriter.field1283 > 750) { + class185.method3607(); + return; + } + + class1.method14(); + + for (var1 = 0; var1 < npcCount; ++var1) { + var15 = npcIndices[var1]; + NPC var24 = npcs[var15]; + if (var24 != null) { + Tile.calculateActorPosition(var24, var24.definition.size); + } + } + + ServerPacket.processOverheadText(); + ++field683; if (mouseCrossColor != 0) { mouseCrossState = mouseCrossState * 400 + 20; if (mouseCrossState * 400 >= 400) { @@ -3643,287 +3448,563 @@ public final class Client extends GameShell implements Usernamed { } } - if (Actor.field978 != null) { - ++field729; - if (field729 >= 15) { - FriendSystem.invalidateWidget(Actor.field978); - Actor.field978 = null; + if (Entity.field1835 != null) { + ++field727; + if (field727 >= 15) { + WorldMapID.invalidateWidget(Entity.field1835); + Entity.field1835 = null; } } - Widget var33 = class65.mousedOverWidgetIf1; - Widget var38 = WorldMapDecoration.field198; - class65.mousedOverWidgetIf1 = null; - WorldMapDecoration.field198 = null; + Widget var39 = class32.mousedOverWidgetIf1; + Widget var32 = AbstractWorldMapIcon.field292; + class32.mousedOverWidgetIf1 = null; + AbstractWorldMapIcon.field292 = null; draggedOnWidget = null; - field804 = false; - field641 = false; - field677 = 0; + field803 = false; + field800 = false; + field844 = 0; - while (FontName.isKeyDown() && field677 < 128) { - if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && ReflectionCheck.field1307 == 66) { - String var42 = ""; - - Message var37; - for (Iterator var43 = Messages.Messages_hashTable.iterator(); var43.hasNext(); var42 = var42 + var37.sender + ':' + var37.text + '\n') { - var37 = (Message)var43.next(); - } - - WorldMapID.client.clipboardSetString(var42); - } else if (oculusOrbState != 1 || SpriteMask.field2499 <= 0) { - field815[field677] = ReflectionCheck.field1307; - field845[field677] = SpriteMask.field2499; - ++field677; + while (AbstractUserComparator.isKeyDown() && field844 < 128) { + if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && class43.field361 == 66) { + String var41 = class14.method145(); + Coord.client.clipboardSetString(var41); + } else if (oculusOrbState != 1 || WorldMapIcon_0.field126 <= 0) { + field846[field844] = class43.field361; + field845[field844] = WorldMapIcon_0.field126; + ++field844; } } - boolean var30 = staffModLevel >= 2; - if (var30 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { - var4 = WorldMapIcon_1.localPlayer.plane - mouseWheelRotation; - if (var4 < 0) { - var4 = 0; - } else if (var4 > 3) { - var4 = 3; + if (SecureRandomCallable.method1092() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { + var3 = Varps.localPlayer.plane - mouseWheelRotation; + if (var3 < 0) { + var3 = 0; + } else if (var3 > 3) { + var3 = 3; } - if (var4 != WorldMapIcon_1.localPlayer.plane) { - BoundaryObject.method3215(WorldMapIcon_1.localPlayer.pathX[0] + PacketWriter.baseX * 64, WorldMapIcon_1.localPlayer.pathY[0] + RouteStrategy.baseY * 64, var4, false); + if (var3 != Varps.localPlayer.plane) { + var4 = Varps.localPlayer.pathX[0] + class4.baseX * 64; + var5 = Varps.localPlayer.pathY[0] + ScriptEvent.baseY; + var18 = MenuAction.getPacketBufferNode(ClientPacket.field2187, packetWriter.isaacCipher); + var18.packetBuffer.method5500(var4); + var18.packetBuffer.writeShort(var5); + var18.packetBuffer.method5491(var3); + var18.packetBuffer.writeIntLE16(0); + packetWriter.addNode(var18); } mouseWheelRotation = 0; } if (rootInterface != -1) { - MouseRecorder.updateRootInterface(rootInterface, 0, 0, KitDefinition.canvasWidth, class30.canvasHeight, 0, 0); + TextureProvider.updateRootInterface(rootInterface, 0, 0, GraphicsDefaults.canvasWidth, GameShell.canvasHeight, 0, 0); } ++cycleCntr; while (true) { - Widget var39; - ScriptEvent var44; - Widget var45; + Widget var25; + Widget var40; + ScriptEvent var42; do { - var44 = (ScriptEvent)field633.removeLast(); - if (var44 == null) { + var42 = (ScriptEvent)field822.removeLast(); + if (var42 == null) { while (true) { do { - var44 = (ScriptEvent)field824.removeLast(); - if (var44 == null) { + var42 = (ScriptEvent)field823.removeLast(); + if (var42 == null) { while (true) { do { - var44 = (ScriptEvent)scriptEvents.removeLast(); - if (var44 == null) { - this.method1293(); - if (WorldMapCacheName.worldMap != null) { - WorldMapCacheName.worldMap.method6193(ItemContainer.plane, PacketWriter.baseX * 64 + (WorldMapIcon_1.localPlayer.x >> 7), RouteStrategy.baseY * 64 + (WorldMapIcon_1.localPlayer.y >> 7), false); - WorldMapCacheName.worldMap.loadCache(); - } - + var42 = (ScriptEvent)scriptEvents.removeLast(); + if (var42 == null) { + this.method1263(); + AbstractByteArrayCopier.method3922(); if (clickedWidget != null) { - this.method1615(); + this.method1268(); } - if (class188.dragInventoryWidget != null) { - FriendSystem.invalidateWidget(class188.dragInventoryWidget); + PacketBufferNode var26; + if (class4.dragInventoryWidget != null) { + WorldMapID.invalidateWidget(class4.dragInventoryWidget); ++itemDragDuration; if (MouseHandler.MouseHandler_currentButton == 0) { - if (field867) { - if (class188.dragInventoryWidget == class222.field2730 && dragItemSlotSource != dragItemSlotDestination) { - Widget var46 = class188.dragInventoryWidget; - byte var31 = 0; - if (field788 == 1 && var46.contentType == 206) { - var31 = 1; + if (field733) { + if (class4.dragInventoryWidget == World.field996 && dragItemSlotDestination != dragItemSlotSource) { + Widget var45 = class4.dragInventoryWidget; + byte var35 = 0; + if (field787 == 1 && var45.contentType == 206) { + var35 = 1; } - if (var46.itemIds[dragItemSlotDestination] <= 0) { - var31 = 0; + if (var45.itemIds[dragItemSlotDestination] <= 0) { + var35 = 0; } - var7 = ParamDefinition.getWidgetClickMask(var46); - boolean var32 = (var7 >> 29 & 1) != 0; - if (var32) { - var8 = dragItemSlotSource; - var9 = dragItemSlotDestination; - var46.itemIds[var9] = var46.itemIds[var8]; - var46.itemQuantities[var9] = var46.itemQuantities[var8]; - var46.itemIds[var8] = -1; - var46.itemQuantities[var8] = 0; - } else if (var31 == 1) { - var8 = dragItemSlotSource; - var9 = dragItemSlotDestination; + var6 = class60.getWidgetClickMask(var45); + boolean var33 = (var6 >> 29 & 1) != 0; + if (var33) { + var7 = dragItemSlotSource; + var8 = dragItemSlotDestination; + var45.itemIds[var8] = var45.itemIds[var7]; + var45.itemQuantities[var8] = var45.itemQuantities[var7]; + var45.itemIds[var7] = -1; + var45.itemQuantities[var7] = 0; + } else if (var35 == 1) { + var7 = dragItemSlotSource; + var8 = dragItemSlotDestination; - while (var8 != var9) { - if (var8 > var9) { - var46.swapItems(var8 - 1, var8); - --var8; - } else if (var8 < var9) { - var46.swapItems(var8 + 1, var8); - ++var8; + while (var8 != var7) { + if (var7 > var8) { + var45.swapItems(var7 - 1, var7); + --var7; + } else if (var7 < var8) { + var45.swapItems(var7 + 1, var7); + ++var7; } } } else { - var46.swapItems(dragItemSlotDestination, dragItemSlotSource); + var45.swapItems(dragItemSlotDestination, dragItemSlotSource); } - PacketBufferNode var26 = MenuAction.getPacketBufferNode(ClientPacket.field2265, packetWriter.isaacCipher); - var26.packetBuffer.writeShort(dragItemSlotDestination); - var26.packetBuffer.writeShortLE(dragItemSlotSource); - var26.packetBuffer.writeInt(class188.dragInventoryWidget.id); - var26.packetBuffer.method5545(var31); + var26 = MenuAction.getPacketBufferNode(ClientPacket.field2267, packetWriter.isaacCipher); + var26.packetBuffer.writeIntLE16(class4.dragInventoryWidget.id); + var26.packetBuffer.writeIntME(dragItemSlotDestination); + var26.packetBuffer.method5493(var35); + var26.packetBuffer.writeIntME(dragItemSlotSource); packetWriter.addNode(var26); } } else if (this.shouldLeftClickOpenMenu()) { - this.openMenu(field732, field744); + this.openMenu(field730, field870); } else if (menuOptionsCount > 0) { - var4 = field732; - var5 = field744; - MenuAction var40 = class1.tempMenuAction; - SecureRandomFuture.menuAction(var40.argument1, var40.argument2, var40.opcode, var40.argument0, var40.action, var40.action, var4, var5); - class1.tempMenuAction = null; + var3 = field730; + var4 = field870; + MenuAction var43 = SoundCache.tempMenuAction; + EnumDefinition.menuAction(var43.argument1, var43.argument2, var43.opcode, var43.argument0, var43.action, var43.action, var3, var4); + SoundCache.tempMenuAction = null; } - field729 = 10; + field727 = 10; MouseHandler.MouseHandler_lastButton = 0; - class188.dragInventoryWidget = null; - } else if (itemDragDuration >= 5 && (MouseHandler.MouseHandler_x > field732 + 5 || MouseHandler.MouseHandler_x < field732 - 5 || MouseHandler.MouseHandler_y > field744 + 5 || MouseHandler.MouseHandler_y < field744 - 5)) { - field867 = true; + class4.dragInventoryWidget = null; + } else if (itemDragDuration >= 5 && (MouseHandler.MouseHandler_x > field730 + 5 || MouseHandler.MouseHandler_x < field730 - 5 || MouseHandler.MouseHandler_y > field870 + 5 || MouseHandler.MouseHandler_y < field870 - 5)) { + field733 = true; } } - if (Scene.method3049()) { - var4 = Scene.Scene_selectedX; - var5 = Scene.Scene_selectedY; - var18 = MenuAction.getPacketBufferNode(ClientPacket.field2281, packetWriter.isaacCipher); - var18.packetBuffer.writeByte(5); - var18.packetBuffer.method5443(RouteStrategy.baseY * 64 + var5); - var18.packetBuffer.method5443(PacketWriter.baseX * 64 + var4); - var18.packetBuffer.method5433(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); - packetWriter.addNode(var18); - Scene.method3050(); + if (Scene.method3080()) { + var3 = Scene.Scene_selectedX; + var4 = Scene.Scene_selectedY; + PacketBufferNode var44 = MenuAction.getPacketBufferNode(ClientPacket.field2184, packetWriter.isaacCipher); + var44.packetBuffer.writeByte(5); + var44.packetBuffer.method5491(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); + var44.packetBuffer.writeShort(var4 + ScriptEvent.baseY); + var44.packetBuffer.writeShort(class4.baseX * 64 + var3); + packetWriter.addNode(var44); + Scene.method3117(); mouseCrossX = MouseHandler.MouseHandler_lastPressedX; mouseCrossY = MouseHandler.MouseHandler_lastPressedY; mouseCrossColor = 1; mouseCrossState = 0; - destinationX = var4; - destinationY = var5; + destinationX = var3; + destinationY = var4; } - if (var33 != class65.mousedOverWidgetIf1) { - if (var33 != null) { - FriendSystem.invalidateWidget(var33); + if (var39 != class32.mousedOverWidgetIf1) { + if (var39 != null) { + WorldMapID.invalidateWidget(var39); } - if (class65.mousedOverWidgetIf1 != null) { - FriendSystem.invalidateWidget(class65.mousedOverWidgetIf1); + if (class32.mousedOverWidgetIf1 != null) { + WorldMapID.invalidateWidget(class32.mousedOverWidgetIf1); } } - if (var38 != WorldMapDecoration.field198 && field774 == field848) { - if (var38 != null) { - FriendSystem.invalidateWidget(var38); + if (var32 != AbstractWorldMapIcon.field292 && field738 == field773) { + if (var32 != null) { + WorldMapID.invalidateWidget(var32); } - if (WorldMapDecoration.field198 != null) { - FriendSystem.invalidateWidget(WorldMapDecoration.field198); + if (AbstractWorldMapIcon.field292 != null) { + WorldMapID.invalidateWidget(AbstractWorldMapIcon.field292); } } - if (WorldMapDecoration.field198 != null) { - if (field774 < field848) { - ++field774; - if (field774 == field848) { - FriendSystem.invalidateWidget(WorldMapDecoration.field198); + if (AbstractWorldMapIcon.field292 != null) { + if (field773 < field738) { + ++field773; + if (field773 == field738) { + WorldMapID.invalidateWidget(AbstractWorldMapIcon.field292); } } - } else if (field774 > 0) { - --field774; + } else if (field773 > 0) { + --field773; + } + + if (oculusOrbState == 0) { + var3 = Varps.localPlayer.x * -78439701; + var4 = Varps.localPlayer.y; + if (SecureRandomFuture.oculusOrbFocalPointX - var3 < -500 || SecureRandomFuture.oculusOrbFocalPointX - var3 > 500 || AbstractByteArrayCopier.oculusOrbFocalPointY - var4 < -500 || AbstractByteArrayCopier.oculusOrbFocalPointY - var4 > 500) { + SecureRandomFuture.oculusOrbFocalPointX = var3; + AbstractByteArrayCopier.oculusOrbFocalPointY = var4; + } + + if (var3 != SecureRandomFuture.oculusOrbFocalPointX) { + SecureRandomFuture.oculusOrbFocalPointX += (var3 - SecureRandomFuture.oculusOrbFocalPointX) / 16; + } + + if (var4 != AbstractByteArrayCopier.oculusOrbFocalPointY) { + AbstractByteArrayCopier.oculusOrbFocalPointY += (var4 - AbstractByteArrayCopier.oculusOrbFocalPointY) / 16; + } + + var5 = SecureRandomFuture.oculusOrbFocalPointX >> 7; + var6 = AbstractByteArrayCopier.oculusOrbFocalPointY >> 7; + var7 = WorldMapAreaData.getTileHeight(SecureRandomFuture.oculusOrbFocalPointX, AbstractByteArrayCopier.oculusOrbFocalPointY, MouseRecorder.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 = MouseRecorder.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 > field707) { + field707 += (var9 - field707) / 24; + } else if (var9 < field707) { + field707 += (var9 - field707) / 80; + } + + class65.field580 = (WorldMapAreaData.getTileHeight(Varps.localPlayer.x * -78439701, Varps.localPlayer.y, MouseRecorder.plane) - 172735687 * camFollowHeight) * -59362433; + } else if (oculusOrbState == 1) { + class268.method4967(); + short var34 = -1; + if (KeyHandler.KeyHandler_pressedKeys[33]) { + var34 = 0; + } else if (KeyHandler.KeyHandler_pressedKeys[49]) { + var34 = 1024; + } + + if (KeyHandler.KeyHandler_pressedKeys[48]) { + if (var34 == 0) { + var34 = 1792; + } else if (var34 == 1024) { + var34 = 1280; + } else { + var34 = 1536; + } + } else if (KeyHandler.KeyHandler_pressedKeys[50]) { + if (var34 == 0) { + var34 = 256; + } else if (var34 == 1024) { + var34 = 768; + } else { + var34 = 512; + } + } + + byte var36 = 0; + if (KeyHandler.KeyHandler_pressedKeys[35]) { + var36 = -1; + } else if (KeyHandler.KeyHandler_pressedKeys[51]) { + var36 = 1; + } + + var5 = 0; + if (var34 >= 0 || var36 != 0) { + var5 = KeyHandler.KeyHandler_pressedKeys[81] ? oculusOrbSlowedSpeed : oculusOrbNormalSpeed; + var5 *= 16; + field802 = var34; + field700 = var36; + } + + if (field698 < var5) { + field698 += var5 / 8; + if (field698 > var5) { + field698 = var5; + } + } else if (field698 > var5) { + field698 = field698 * 9 / 10; + } + + if (field698 > 0) { + var6 = field698 / 16; + if (field802 >= 0) { + var3 = field802 - Tile.cameraYaw & 2047; + var7 = Rasterizer3D.Rasterizer3D_sine[var3]; + var8 = Rasterizer3D.Rasterizer3D_cosine[var3]; + SecureRandomFuture.oculusOrbFocalPointX += var6 * var7 / 65536; + AbstractByteArrayCopier.oculusOrbFocalPointY += var6 * var8 / 65536; + } + + if (field700 != 0) { + class65.field580 += var6 * field700 * -59362433; + if (class65.field580 * 1615694975 > 0) { + class65.field580 = 0; + } + } + } else { + field802 = -1; + field700 = -1; + } + + if (KeyHandler.KeyHandler_pressedKeys[13]) { + UserComparator6.method3417(); + } + } + + if (MouseHandler.MouseHandler_currentButton == 4 && WorldMapSection1.mouseCam) { + var3 = MouseHandler.MouseHandler_y - mouseCamClickedY; + camAngleDX = var3 * 2; + mouseCamClickedY = var3 != -1 && var3 != 1 ? (MouseHandler.MouseHandler_y + mouseCamClickedY) / 2 : MouseHandler.MouseHandler_y; + var4 = mouseCamClickedX - MouseHandler.MouseHandler_x; + camAngleDY = var4 * 2; + mouseCamClickedX = var4 != -1 && var4 != 1 ? (mouseCamClickedX + MouseHandler.MouseHandler_x) / 2 : MouseHandler.MouseHandler_x; + } 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; } - MilliClock.method3405(); if (isCameraLocked) { - WorldMapIcon_1.method294(); + var3 = MilliClock.field1990 * 128 + 64; + var4 = FriendSystem.field1037 * 16384 + 64; + var5 = WorldMapAreaData.getTileHeight(var3, var4, MouseRecorder.plane) - FileSystem.field2027; + if (ScriptFrame.cameraX < var3) { + ScriptFrame.cameraX = (var3 - ScriptFrame.cameraX) * WorldMapArea.field211 / 1000 + ScriptFrame.cameraX + WorldMapCacheName.field301; + if (ScriptFrame.cameraX > var3) { + ScriptFrame.cameraX = var3; + } + } + + if (ScriptFrame.cameraX > var3) { + ScriptFrame.cameraX -= WorldMapArea.field211 * (ScriptFrame.cameraX - var3) / 1000 + WorldMapCacheName.field301; + if (ScriptFrame.cameraX < var3) { + ScriptFrame.cameraX = var3; + } + } + + if (GrandExchangeOfferTotalQuantityComparator.cameraY < var5) { + GrandExchangeOfferTotalQuantityComparator.cameraY = (var5 - GrandExchangeOfferTotalQuantityComparator.cameraY) * WorldMapArea.field211 / 1000 + GrandExchangeOfferTotalQuantityComparator.cameraY + WorldMapCacheName.field301; + if (GrandExchangeOfferTotalQuantityComparator.cameraY > var5) { + GrandExchangeOfferTotalQuantityComparator.cameraY = var5; + } + } + + if (GrandExchangeOfferTotalQuantityComparator.cameraY > var5) { + GrandExchangeOfferTotalQuantityComparator.cameraY -= WorldMapArea.field211 * (GrandExchangeOfferTotalQuantityComparator.cameraY - var5) / 1000 + WorldMapCacheName.field301; + if (GrandExchangeOfferTotalQuantityComparator.cameraY < var5) { + GrandExchangeOfferTotalQuantityComparator.cameraY = var5; + } + } + + if (class14.cameraZ < var4) { + class14.cameraZ = (var4 - class14.cameraZ) * WorldMapArea.field211 / 1000 + class14.cameraZ + WorldMapCacheName.field301; + if (class14.cameraZ > var4) { + class14.cameraZ = var4; + } + } + + if (class14.cameraZ > var4) { + class14.cameraZ -= WorldMapArea.field211 * (class14.cameraZ - var4) / 1000 + WorldMapCacheName.field301; + if (class14.cameraZ < var4) { + class14.cameraZ = var4; + } + } + + var3 = class40.field334 * 16384 + 64; + var4 = SecureRandomCallable.field499 * 16384 + 64; + var5 = WorldMapAreaData.getTileHeight(var3, var4, MouseRecorder.plane) - Varcs.field1242; + var6 = var3 - ScriptFrame.cameraX; + var7 = var5 - GrandExchangeOfferTotalQuantityComparator.cameraY; + var8 = var4 - class14.cameraZ; + var9 = (int)Math.sqrt((double)(var8 * var8 + var6 * var6)); + var10 = (int)(Math.atan2((double)var7, (double)var9) * 325.949D) & 2047; + var11 = (int)(Math.atan2((double)var6, (double)var8) * -325.949D) & 2047; + if (var10 < 128) { + var10 = 128; + } + + if (var10 > 383) { + var10 = 383; + } + + if (class319.cameraPitch < var10) { + class319.cameraPitch = (var10 - class319.cameraPitch) * WorldMapSection1.field285 / 1000 + class319.cameraPitch + class65.field581; + if (class319.cameraPitch > var10) { + class319.cameraPitch = var10; + } + } + + if (class319.cameraPitch > var10) { + class319.cameraPitch -= WorldMapSection1.field285 * (class319.cameraPitch - var10) / 1000 + class65.field581; + if (class319.cameraPitch < var10) { + class319.cameraPitch = var10; + } + } + + var12 = var11 - Tile.cameraYaw; + if (var12 > 1024) { + var12 -= 2048; + } + + if (var12 < -1024) { + var12 += 2048; + } + + if (var12 > 0) { + Tile.cameraYaw = var12 * WorldMapSection1.field285 / 1000 + Tile.cameraYaw + class65.field581; + Tile.cameraYaw &= 2047; + } + + if (var12 < 0) { + Tile.cameraYaw -= class65.field581 + -var12 * WorldMapSection1.field285 / 1000; + Tile.cameraYaw &= 2047; + } + + int var27 = var11 - Tile.cameraYaw; + if (var27 > 1024) { + var27 -= 2048; + } + + if (var27 < -1024) { + var27 += 2048; + } + + if (var27 < 0 && var12 > 0 || var27 > 0 && var12 < 0) { + Tile.cameraYaw = var11; + } } - for (var4 = 0; var4 < 5; ++var4) { - var10002 = field872[var4]++; + for (var3 = 0; var3 < 5; ++var3) { + int var10002 = field799[var3]++; } - KeyHandler.varcs.tryWrite(); - var4 = UserComparator3.method3371(); - var5 = Skeleton.method3008(); - if (var4 > 15000 && var5 > 15000) { + BoundaryObject.varcs.tryWrite(); + var3 = ++MouseHandler.MouseHandler_idleCycles - 1; + var5 = KeyHandler.KeyHandler_idleCycles; + if (var3 > 15000 && var5 > 15000) { logoutTimer = 250; MouseHandler.MouseHandler_idleCycles = 14500; - var18 = MenuAction.getPacketBufferNode(ClientPacket.field2234, packetWriter.isaacCipher); - packetWriter.addNode(var18); + var26 = MenuAction.getPacketBufferNode(ClientPacket.field2265, packetWriter.isaacCipher); + packetWriter.addNode(var26); } - class32.friendSystem.processFriendUpdates(); + class218.friendSystem.processFriendUpdates(); ++packetWriter.pendingWrites; if (packetWriter.pendingWrites > 50) { - var18 = MenuAction.getPacketBufferNode(ClientPacket.field2207, packetWriter.isaacCipher); - packetWriter.addNode(var18); + var26 = MenuAction.getPacketBufferNode(ClientPacket.field2185, packetWriter.isaacCipher); + packetWriter.addNode(var26); } try { packetWriter.flush(); - } catch (IOException var27) { - class2.method31(); + } catch (IOException var28) { + class185.method3607(); } return; } - var45 = var44.widget; - if (var45.childIndex < 0) { + var25 = var42.widget; + if (var25.childIndex < 0) { break; } - var39 = WorldMapElement.getWidget(var45.parentId); - } while(var39 == null || var39.children == null || var45.childIndex >= var39.children.length || var45 != var39.children[var45.childIndex]); + var40 = Player.getWidget(var25.parentId); + } while(var40 == null || var40.children == null || var25.childIndex >= var40.children.length || var25 != var40.children[var25.childIndex]); - class81.runScriptEvent(var44); + SecureRandomFuture.runScriptEvent(var42); } } - var45 = var44.widget; - if (var45.childIndex < 0) { + var25 = var42.widget; + if (var25.childIndex < 0) { break; } - var39 = WorldMapElement.getWidget(var45.parentId); - } while(var39 == null || var39.children == null || var45.childIndex >= var39.children.length || var45 != var39.children[var45.childIndex]); + var40 = Player.getWidget(var25.parentId); + } while(var40 == null || var40.children == null || var25.childIndex >= var40.children.length || var25 != var40.children[var25.childIndex]); - class81.runScriptEvent(var44); + SecureRandomFuture.runScriptEvent(var42); } } - var45 = var44.widget; - if (var45.childIndex < 0) { + var25 = var42.widget; + if (var25.childIndex < 0) { break; } - var39 = WorldMapElement.getWidget(var45.parentId); - } while(var39 == null || var39.children == null || var45.childIndex >= var39.children.length || var45 != var39.children[var45.childIndex]); + var40 = Player.getWidget(var25.parentId); + } while(var40 == null || var40.children == null || var25.childIndex >= var40.children.length || var25 != var40.children[var25.childIndex]); - class81.runScriptEvent(var44); + SecureRandomFuture.runScriptEvent(var42); } } + + var31 = MenuAction.getPacketBufferNode(ClientPacket.field2272, packetWriter.isaacCipher); + var31.packetBuffer.writeByte(0); + var3 = var31.packetBuffer.offset; + WorldMapSection0.performReflectionCheck(var31.packetBuffer); + var31.packetBuffer.writeLengthByte(var31.packetBuffer.offset - var3); + packetWriter.addNode(var31); } } } } - @ObfuscatedName("gj") + @ObfuscatedName("fg") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "48" + garbageValue = "-99" ) @Export("resizeJS") void resizeJS() { - int var1 = KitDefinition.canvasWidth; - int var2 = class30.canvasHeight; + int var1 = GraphicsDefaults.canvasWidth; + int var2 = GameShell.canvasHeight; if (super.contentWidth < var1) { var1 = super.contentWidth; } @@ -3932,143 +4013,121 @@ public final class Client extends GameShell implements Usernamed { var2 = super.contentHeight; } - if (GrandExchangeOffer.clientPreferences != null) { + if (Actor.clientPreferences != null) { try { - class47.method795(WorldMapID.client, "resize", new Object[]{UserComparator7.getWindowedMode()}); - } catch (Throwable var4) { + Client var3 = Coord.client; + Object[] var4 = new Object[]{class43.getWindowedMode()}; + JSObject.getWindow(var3).call("resize", var4); + } catch (Throwable var5) { } } } - @ObfuscatedName("gv") + @ObfuscatedName("fx") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1443286014" + garbageValue = "-1715199182" ) @Export("drawLoggedIn") final void drawLoggedIn() { + int var1; if (rootInterface != -1) { - CollisionMap.drawInterfaceModelComponents(rootInterface); + var1 = rootInterface; + if (TaskHandler.loadInterface(var1)) { + WorldMapDecoration.drawModelComponents(class289.Widget_interfaceComponents[var1], -1); + } } - int var1; for (var1 = 0; var1 < rootWidgetCount; ++var1) { - if (field703[var1]) { - field829[var1] = true; + if (field827[var1]) { + field828[var1] = true; } - field830[var1] = field703[var1]; - field703[var1] = false; + field647[var1] = field827[var1]; + field827[var1] = false; } - field752 = cycle; + field826 = cycle; viewportX = -1; viewportY = -1; - class222.field2730 = null; + World.field996 = null; if (rootInterface != -1) { rootWidgetCount = 0; - class2.drawWidgets(rootInterface, 0, 0, KitDefinition.canvasWidth, class30.canvasHeight, 0, 0, -1); + AbstractWorldMapIcon.drawWidgets(rootInterface, 0, 0, GraphicsDefaults.canvasWidth, GameShell.canvasHeight, 0, 0, -1); } Rasterizer2D.Rasterizer2D_resetClip(); if (showMouseCross) { if (mouseCrossColor == 1) { - DefaultsGroup.crossSprites[mouseCrossState * 400 / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); + class270.crossSprites[mouseCrossState * 400 / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); } if (mouseCrossColor == 2) { - DefaultsGroup.crossSprites[mouseCrossState * 400 / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); + class270.crossSprites[mouseCrossState * 400 / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); } } if (!isMenuOpen) { if (viewportX != -1) { - var1 = viewportX; - int var2 = viewportY; - if ((menuOptionsCount >= 2 || isItemSelected != 0 || isSpellSelected) && showMouseOverText) { - int var3 = Player.getNewestMenuIdx(); - String var4; - if (isItemSelected == 1 && menuOptionsCount < 2) { - var4 = "Use" + " " + selectedItemName + " " + "->"; - } else if (isSpellSelected && menuOptionsCount < 2) { - var4 = selectedSpellActionName + " " + selectedSpellName + " " + "->"; - } else { - String var5; - if (var3 < 0) { - var5 = ""; - } else if (menuTargets[var3].length() > 0) { - var5 = menuActions[var3] + " " + menuTargets[var3]; - } else { - var5 = menuActions[var3]; - } - - var4 = var5; - } - - if (menuOptionsCount > 2) { - var4 = var4 + class16.colorStartTag(16777215) + " " + '/' + " " + (menuOptionsCount - 2) + " more options"; - } - - class43.fontBold12.drawRandomAlphaAndSpacing(var4, var1 + 4, var2 + 15, 16777215, 0, cycle / 1000); - } + WorldMapData_0.method160(viewportX, viewportY); } } else { - WorldMapData_0.method176(); + WorldMapLabelSize.method173(); } if (gameDrawingMode == 3) { for (var1 = 0; var1 < rootWidgetCount; ++var1) { - if (field830[var1]) { + if (field647[var1]) { Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); - } else if (field829[var1]) { + } else if (field828[var1]) { Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); } } } - GrandExchangeOfferAgeComparator.method156(ItemContainer.plane, WorldMapIcon_1.localPlayer.x, WorldMapIcon_1.localPlayer.y, field879); - field879 = 0; + WorldMapID.method521(MouseRecorder.plane, Varps.localPlayer.x * -78439701, Varps.localPlayer.y, field683); + field683 = 0; } - @ObfuscatedName("hc") + @ObfuscatedName("gi") @ObfuscatedSignature( - signature = "(Lcy;B)Z", - garbageValue = "104" + signature = "(Lcx;I)Z", + garbageValue = "1403409540" ) - final boolean method1467(PacketWriter var1) { + final boolean method1262(PacketWriter var1) { AbstractSocket var2 = var1.getSocket(); PacketBuffer var3 = var1.packetBuffer; if (var2 == null) { return false; } else { int var6; - String var19; + String var17; try { int var5; if (var1.serverPacket == null) { - if (var1.field1284) { + if (var1.field1281) { if (!var2.isAvailable(1)) { return false; } var2.read(var1.packetBuffer.array, 0, 1); - var1.field1293 = 0; - var1.field1284 = false; + var1.field1283 = 0; + var1.field1281 = false; } var3.offset = 0; - if (var3.method5353()) { + if (var3.method5417()) { if (!var2.isAvailable(1)) { return false; } var2.read(var1.packetBuffer.array, 1, 1); - var1.field1293 = 0; + var1.field1283 = 0; } - var1.field1284 = true; - ServerPacket[] var4 = MouseRecorder.ServerPacket_values(); + var1.field1281 = true; + ServerPacket[] var4 = class195.ServerPacket_values(); var5 = var3.readSmartByteShortIsaac(); if (var5 < 0 || var5 >= var4.length) { throw new IOException(var5 + " " + var3.offset); @@ -4103,125 +4162,389 @@ public final class Client extends GameShell implements Usernamed { var3.offset = 0; var2.read(var3.array, 0, var1.serverPacketLength); - var1.field1293 = 0; - timer.method4897(); - var1.field1291 = var1.field1296; - var1.field1296 = var1.field1295; - var1.field1295 = var1.serverPacket; + var1.field1283 = 0; + timer.method4969(); + var1.field1287 = var1.field1286; + var1.field1286 = var1.field1274; + var1.field1274 = var1.serverPacket; + if (ServerPacket.field2172 == var1.serverPacket) { + class192.privateChatMode = GameObject.method3263(var3.readUnsignedByte()); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2104 == var1.serverPacket) { + Canvas.method815(class185.field2297); + var1.serverPacket = null; + return true; + } + + int var48; + if (ServerPacket.field2100 == var1.serverPacket) { + WorldMapSection1.field286 = var3.method5547(); + ArchiveLoader.field508 = var3.readUnsignedByteNegate(); + + for (var48 = WorldMapSection1.field286; var48 < WorldMapSection1.field286 + 8; ++var48) { + for (var5 = ArchiveLoader.field508; var5 < ArchiveLoader.field508 + 8; ++var5) { + if (groundItems[MouseRecorder.plane][var48][var5] != null) { + groundItems[MouseRecorder.plane][var48][var5] = null; + WorldMapCacheName.updateItemPile(var48, var5); + } + } + } + + for (PendingSpawn var40 = (PendingSpawn)pendingSpawns.last(); var40 != null; var40 = (PendingSpawn)pendingSpawns.previous()) { + if (var40.x >= WorldMapSection1.field286 && var40.x < WorldMapSection1.field286 + 8 && var40.y >= ArchiveLoader.field508 && var40.y < ArchiveLoader.field508 + 8 && var40.plane == MouseRecorder.plane) { + var40.hitpoints = 0; + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2113 == var1.serverPacket) { + rebootTimer = var3.method5514() * 30; + field670 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2109 == var1.serverPacket) { + var48 = var3.method5494(); + var17 = var3.readStringCp1252NullTerminated(); + var6 = var3.readUnsignedByteNegate(); + if (var48 >= 1 && var48 <= 8) { + if (var17.equalsIgnoreCase("null")) { + var17 = null; + } + + playerMenuActions[var48 - 1] = var17; + playerOptionsPriorities[var48 - 1] = var6 == 0; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2168 == var1.serverPacket) { + Canvas.method815(class185.field2303); + var1.serverPacket = null; + return true; + } + if (ServerPacket.field2150 == var1.serverPacket) { - SoundSystem.readReflectionCheck(var3, var1.serverPacketLength); + var48 = var3.readUnsignedByte(); + if (var3.readUnsignedByte() == 0) { + grandExchangeOffers[var48] = new GrandExchangeOffer(); + var3.offset += 18; + } else { + --var3.offset; + grandExchangeOffers[var48] = new GrandExchangeOffer(var3, false); + } + + field866 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.field2139 == var1.serverPacket) { - JagexCache.method3438(class185.field2298); + Widget var49; + if (ServerPacket.field2162 == var1.serverPacket) { + var48 = var3.method5515(); + var49 = Player.getWidget(var48); + var49.modelType = 3; + var49.modelId = Varps.localPlayer.appearance.getChatHeadId(); + WorldMapID.invalidateWidget(var49); var1.serverPacket = null; return true; } - if (ServerPacket.field2125 == var1.serverPacket) { - PendingSpawn.loadRegions(true, var1.packetBuffer); + InterfaceParent var42; + if (ServerPacket.field2106 == var1.serverPacket) { + var48 = var3.readUnsignedByte(); + var5 = var3.method5503(); + var6 = var3.method5587(); + var42 = (InterfaceParent)interfaceParents.get((long)var6); + if (var42 != null) { + StructDefinition.closeInterface(var42, var5 != var42.group); + } + + GraphicsDefaults.method5875(var6, var5, var48); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2134 == var1.serverPacket) { + Canvas.method815(class185.field2301); + var1.serverPacket = null; + return true; + } + + String var57; + if (ServerPacket.field2163 == var1.serverPacket) { + var48 = var3.readUShortSmart(); + boolean var47 = var3.readUnsignedByte() == 1; + var57 = ""; + boolean var58 = false; + if (var47) { + var57 = var3.readStringCp1252NullTerminated(); + if (class218.friendSystem.isIgnored(new Username(var57, class4.loginType))) { + var58 = true; + } + } + + String var44 = var3.readStringCp1252NullTerminated(); + if (!var58) { + WorldMapCacheName.addGameMessage(var48, var57, var44); + } + + var1.serverPacket = null; + return true; + } + + int var19; + if (ServerPacket.field2130 == var1.serverPacket) { + var48 = var3.readUnsignedByte(); + var5 = var3.readUnsignedByte(); + var6 = var3.readUnsignedByte(); + var19 = var3.readUnsignedByte(); + field749[var48] = true; + field779[var48] = var5; + field887[var48] = var6; + field871[var48] = var19; + field799[var48] = 0; + var1.serverPacket = null; + return true; + } + + Widget var18; + if (ServerPacket.field2122 == var1.serverPacket) { + var48 = var3.readInt(); + var17 = var3.readStringCp1252NullTerminated(); + var18 = Player.getWidget(var48); + if (!var17.equals(var18.text)) { + var18.text = var17; + WorldMapID.invalidateWidget(var18); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2178 == var1.serverPacket) { + WorldMapRectangle.method257(); + weight = var3.readShort(); + field670 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2153 == var1.serverPacket) { + World var39 = new World(); + var39.host = var3.readStringCp1252NullTerminated(); + var39.id = var3.readUnsignedShort(); + var5 = var3.readInt(); + var39.properties = var5; + WorldMapIcon_0.updateGameState(45); + var2.close(); + var2 = null; + ReflectionCheck.changeWorld(var39); + var1.serverPacket = null; + return false; + } + + int var9; + int var20; + if (ServerPacket.field2180 == var1.serverPacket) { + var48 = var3.method5515(); + var5 = var3.readUnsignedShort(); + var6 = var5 >> 10 & 31; + var19 = var5 >> 5 & 31; + var20 = var5 & 31; + var9 = (var19 << 11) + (var6 << 19) + (var20 << 3); + Widget var45 = Player.getWidget(var48); + if (var9 != var45.color) { + var45.color = var9; + WorldMapID.invalidateWidget(var45); + } + + var1.serverPacket = null; + return true; + } + + boolean var16; + if (ServerPacket.field2179 == var1.serverPacket) { + var16 = var3.method5547() == 1; + var5 = var3.method5580(); + var18 = Player.getWidget(var5); + if (var16 != var18.isHidden) { + var18.isHidden = var16; + WorldMapID.invalidateWidget(var18); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2152 == var1.serverPacket) { + var48 = var3.readUnsignedShort(); + var5 = var3.readUnsignedByte(); + var6 = var3.readUnsignedShort(); + class192.queueSoundEffect(var48, var5, var6); + var1.serverPacket = null; + return true; + } + + long var12; + int var21; + if (ServerPacket.field2099 == var1.serverPacket) { + var48 = var3.offset + var1.serverPacketLength; + var5 = var3.readUnsignedShort(); + var6 = var3.readUnsignedShort(); + if (var5 != rootInterface) { + rootInterface = var5; + this.resizeRoot(false); + DevicePcmPlayerProvider.Widget_resetModelFrames(rootInterface); + Tile.runWidgetOnLoadListener(rootInterface); + + for (var19 = 0; var19 < 100; ++var19) { + field827[var19] = true; + } + } + + InterfaceParent var10; + for (; var6-- > 0; var10.field538 = true) { + var19 = var3.readInt(); + var20 = var3.readUnsignedShort(); + var9 = var3.readUnsignedByte(); + var10 = (InterfaceParent)interfaceParents.get((long)var19); + if (var10 != null && var20 != var10.group) { + StructDefinition.closeInterface(var10, true); + var10 = null; + } + + if (var10 == null) { + var10 = GraphicsDefaults.method5875(var19, var20, var9); + } + } + + for (var42 = (InterfaceParent)interfaceParents.first(); var42 != null; var42 = (InterfaceParent)interfaceParents.next()) { + if (var42.field538) { + var42.field538 = false; + } else { + StructDefinition.closeInterface(var42, true); + } + } + + widgetClickMasks = new NodeHashTable(512); + + while (var3.offset < var48) { + var19 = var3.readInt(); + var20 = var3.readUnsignedShort(); + var9 = var3.readUnsignedShort(); + var21 = var3.readInt(); + + for (int var11 = var20; var11 <= var9; ++var11) { + var12 = ((long)var19 << 32) + (long)var11; + widgetClickMasks.put(new IntegerNode(var21), var12); + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2160 == var1.serverPacket) { + publicChatMode = var3.readUnsignedByte(); + tradeChatMode = var3.method5494(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2123 == var1.serverPacket) { + WorldMapElement.updateNpcs(false, var3); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2096 == var1.serverPacket) { + Canvas.method815(class185.field2299); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2171 == var1.serverPacket) { + minimapState = var3.readUnsignedByte(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2120 == var1.serverPacket) { + ArchiveLoader.field508 = var3.method5494(); + WorldMapSection1.field286 = var3.readUnsignedByte(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2121 == var1.serverPacket) { + Canvas.method815(class185.field2298); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2129 == var1.serverPacket) { + var48 = var3.readInt(); + InterfaceParent var54 = (InterfaceParent)interfaceParents.get((long)var48); + if (var54 != null) { + StructDefinition.closeInterface(var54, true); + } + + if (meslayerContinueWidget != null) { + WorldMapID.invalidateWidget(meslayerContinueWidget); + meslayerContinueWidget = null; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2127 == var1.serverPacket) { + var48 = var3.method5459(); + var5 = var3.method5580(); + Varps.Varps_temp[var48] = var5; + if (Varps.Varps_main[var48] != var5) { + Varps.Varps_main[var48] = var5; + } + + Players.method2123(var48); + field808[++field809 - 1 & 31] = var48; + var1.serverPacket = null; + return true; + } + + Widget var7; + if (ServerPacket.field2158 == var1.serverPacket) { + var48 = var3.method5515(); + var5 = var3.readShort(); + var6 = var3.method5506(); + var7 = Player.getWidget(var48); + if (var5 != var7.rawX || var6 != var7.rawY || var7.xAlignment != 0 || var7.yAlignment != 0) { + var7.rawX = var5; + var7.rawY = var6; + var7.xAlignment = 0; + var7.yAlignment = 0; + WorldMapID.invalidateWidget(var7); + this.alignWidget(var7); + if (var7.type == 0) { + class197.revalidateWidgetScroll(class289.Widget_interfaceComponents[var48 >> 16], var7, false); + } + } + var1.serverPacket = null; return true; } if (ServerPacket.field2155 == var1.serverPacket) { - class32.friendSystem.readUpdate(var3, var1.serverPacketLength); - field629 = cycleCntr; - var1.serverPacket = null; - return true; - } - - InterfaceParent var7; - int var16; - if (ServerPacket.field2174 == var1.serverPacket) { - var16 = var3.method5436(); - var5 = var3.method5455(); - var6 = var3.method5447(); - var7 = (InterfaceParent)interfaceParents.get((long)var5); - if (var7 != null) { - VarpDefinition.closeInterface(var7, var6 != var7.group); - } - - NPC.method1967(var5, var6, var16); - var1.serverPacket = null; - return true; - } - - boolean var46; - String var49; - if (ServerPacket.field2183 == var1.serverPacket) { - var16 = var3.readUShortSmart(); - var46 = var3.readUnsignedByte() == 1; - var49 = ""; - boolean var59 = false; - if (var46) { - var49 = var3.readStringCp1252NullTerminated(); - if (class32.friendSystem.isIgnored(new Username(var49, FontName.loginType))) { - var59 = true; - } - } - - String var44 = var3.readStringCp1252NullTerminated(); - if (!var59) { - DirectByteArrayCopier.addGameMessage(var16, var49, var44); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2165 == var1.serverPacket) { - WorldMapIcon_0.privateChatMode = class270.method4895(var3.readUnsignedByte()); - var1.serverPacket = null; - return true; - } - - Widget var17; - if (ServerPacket.field2173 == var1.serverPacket) { - var16 = var3.method5414(); - var5 = var3.method5447(); - var17 = WorldMapElement.getWidget(var16); - if (var17 != null && var17.type == 0) { - if (var5 > var17.scrollHeight - var17.height) { - var5 = var17.scrollHeight - var17.height; - } - - if (var5 < 0) { - var5 = 0; - } - - if (var5 != var17.scrollY) { - var17.scrollY = var5; - FriendSystem.invalidateWidget(var17); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2108 == var1.serverPacket) { - JagexCache.method3438(class185.field2306); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2177 == var1.serverPacket) { - tradeChatMode = var3.readUnsignedByteNegate(); - publicChatMode = var3.readUnsignedByteNegate(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2098 == var1.serverPacket) { - class65.method1182(); - var1.serverPacket = null; - return false; - } - - if (ServerPacket.field2164 == var1.serverPacket) { destinationX = var3.readUnsignedByte(); if (destinationX == 255) { destinationX = 0; @@ -4236,45 +4559,372 @@ public final class Client extends GameShell implements Usernamed { return true; } - boolean var48; - if (ServerPacket.field2124 == var1.serverPacket) { - var48 = var3.readUnsignedByte() == 1; - if (var48) { - Occluder.field1890 = SequenceDefinition.method4686() - var3.readLong(); - class2.grandExchangeEvents = new GrandExchangeEvents(var3, true); + if (ServerPacket.field2157 == var1.serverPacket) { + var48 = var3.method5503(); + if (var48 == 65535) { + var48 = -1; + } + + WorldMapData_1.playSong(var48); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2169 == var1.serverPacket) { + var48 = var3.method5459(); + if (var48 == 65535) { + var48 = -1; + } + + var5 = var3.method5508(); + SecureRandomCallable.playSoundJingle(var48, var5); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2118 == var1.serverPacket) { + var48 = var3.readInt(); + var5 = var3.method5580(); + var6 = var3.method5503(); + if (var6 == 65535) { + var6 = -1; + } + + var7 = Player.getWidget(var48); + ItemDefinition var43; + if (!var7.isIf3) { + if (var6 == -1) { + var7.modelType = 0; + var1.serverPacket = null; + return true; + } + + var43 = Player.ItemDefinition_get(var6); + var7.modelType = 4; + var7.modelId = var6; + var7.modelAngleX = var43.xan2d; + var7.modelAngleY = var43.yan2d; + var7.modelZoom = var43.zoom2d * 100 / var5; + WorldMapID.invalidateWidget(var7); } else { - class2.grandExchangeEvents = null; + var7.itemId = var6; + var7.itemQuantity = var5; + var43 = Player.ItemDefinition_get(var6); + var7.modelAngleX = var43.xan2d; + var7.modelAngleY = var43.yan2d; + var7.modelAngleZ = var43.zan2d; + var7.modelOffsetX = var43.offsetX2d; + var7.modelOffsetY = var43.offsetY2d; + var7.modelZoom = var43.zoom2d; + if (var43.isStackable == 1) { + var7.itemQuantityMode = 1; + } else { + var7.itemQuantityMode = 2; + } + + if (var7.field2582 > 0) { + var7.modelZoom = var7.modelZoom * 32 / var7.field2582; + } else if (var7.rawWidth > 0) { + var7.modelZoom = var7.modelZoom * 32 / var7.rawWidth; + } + + WorldMapID.invalidateWidget(var7); } - field819 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.field2120 == var1.serverPacket) { - var16 = var3.method5447(); - if (var16 == 65535) { - var16 = -1; + if (ServerPacket.field2161 == var1.serverPacket) { + var3.offset += 28; + if (var3.checkCrc()) { + class195.method3664(var3, var3.offset - 28); } - SoundCache.playSong(var16); var1.serverPacket = null; return true; } - if (ServerPacket.field2175 == var1.serverPacket) { - var16 = var3.method5449(); - var5 = var3.method5446(); - if (var5 == 65535) { - var5 = -1; + if (ServerPacket.field2140 == var1.serverPacket) { + var48 = var3.method5515(); + var5 = var3.method5584(); + var18 = Player.getWidget(var48); + if (var5 != var18.sequenceId || var5 == -1) { + var18.sequenceId = var5; + var18.modelFrame = 0; + var18.modelFrameCycle = 0; + WorldMapID.invalidateWidget(var18); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2132 == var1.serverPacket) { + WorldMapData_1.readReflectionCheck(var3, var1.serverPacketLength); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2156 == var1.serverPacket) { + byte[] var38 = new byte[var1.serverPacketLength]; + var3.method5419(var38, 0, var38.length); + Buffer var53 = new Buffer(var38); + var57 = var53.readStringCp1252NullTerminated(); + WorldMapIcon_0.openURL(var57, true, false); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2126 == var1.serverPacket) { + Canvas.method815(class185.field2304); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2115 == var1.serverPacket) { + class40.method736(); + var1.serverPacket = null; + return false; + } + + Widget var8; + if (ServerPacket.field2119 == var1.serverPacket) { + var48 = var3.readInt(); + var5 = var3.method5587(); + InterfaceParent var56 = (InterfaceParent)interfaceParents.get((long)var5); + var42 = (InterfaceParent)interfaceParents.get((long)var48); + if (var42 != null) { + StructDefinition.closeInterface(var42, var56 == null || var56.group != var42.group); + } + + if (var56 != null) { + var56.remove(); + interfaceParents.put(var56, (long)var48); + } + + var8 = Player.getWidget(var5); + if (var8 != null) { + WorldMapID.invalidateWidget(var8); + } + + var8 = Player.getWidget(var48); + if (var8 != null) { + WorldMapID.invalidateWidget(var8); + class197.revalidateWidgetScroll(class289.Widget_interfaceComponents[var8.id >>> 16], var8, true); + } + + if (rootInterface != -1) { + WorldMapRectangle.runIntfCloseListeners(rootInterface, 1); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2112 == var1.serverPacket) { + isCameraLocked = true; + MilliClock.field1990 = var3.readUnsignedByte() * 16384; + FriendSystem.field1037 = var3.readUnsignedByte() * 128; + FileSystem.field2027 = var3.readUnsignedShort(); + WorldMapCacheName.field301 = var3.readUnsignedByte(); + WorldMapArea.field211 = var3.readUnsignedByte(); + if (WorldMapArea.field211 >= 100) { + ScriptFrame.cameraX = MilliClock.field1990 * 128 + 64; + class14.cameraZ = FriendSystem.field1037 * 16384 + 64; + GrandExchangeOfferTotalQuantityComparator.cameraY = WorldMapAreaData.getTileHeight(ScriptFrame.cameraX, class14.cameraZ, MouseRecorder.plane) - FileSystem.field2027; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2159 == var1.serverPacket) { + WorldMapSection1.field286 = var3.method5547(); + ArchiveLoader.field508 = var3.readUnsignedByte(); + + while (var3.offset < var1.serverPacketLength) { + var48 = var3.readUnsignedByte(); + class185 var52 = GrandExchangeOfferUnitPriceComparator.method116()[var48]; + Canvas.method815(var52); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2154 == var1.serverPacket) { + class218.friendSystem.method1856(); + field815 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2117 == var1.serverPacket) { + if (var1.serverPacketLength == 0) { + GrandExchangeOfferUnitPriceComparator.clanChat = null; + } else { + if (GrandExchangeOfferUnitPriceComparator.clanChat == null) { + GrandExchangeOfferUnitPriceComparator.clanChat = new ClanChat(class4.loginType, Coord.client); + } + + GrandExchangeOfferUnitPriceComparator.clanChat.readUpdate(var3); + } + + class65.method1176(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2097 == var1.serverPacket) { + Canvas.method815(class185.field2300); + var1.serverPacket = null; + return true; + } + + String var37; + if (ServerPacket.field2105 == var1.serverPacket) { + var37 = var3.readStringCp1252NullTerminated(); + Object[] var51 = new Object[var37.length() + 1]; + + for (var6 = var37.length() - 1; var6 >= 0; --var6) { + if (var37.charAt(var6) == 's') { + var51[var6 + 1] = var3.readStringCp1252NullTerminated(); + } else { + var51[var6 + 1] = new Integer(var3.readInt()); + } + } + + var51[0] = new Integer(var3.readInt()); + ScriptEvent var55 = new ScriptEvent(); + var55.args = var51; + SecureRandomFuture.runScriptEvent(var55); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2181 == var1.serverPacket) { + var48 = var3.readUnsignedShort(); + var5 = var3.readInt(); + var18 = Player.getWidget(var5); + if (var18 != null && var18.type == 0) { + if (var48 > var18.scrollHeight - var18.height) { + var48 = var18.scrollHeight - var18.height; + } + + if (var48 < 0) { + var48 = 0; + } + + if (var48 != var18.scrollY) { + var18.scrollY = var48; + WorldMapID.invalidateWidget(var18); + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2107 == var1.serverPacket) { + Canvas.method815(class185.field2302); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2146 == var1.serverPacket) { + for (var48 = 0; var48 < Varps.Varps_main.length; ++var48) { + if (Varps.Varps_temp[var48] != Varps.Varps_main[var48]) { + Varps.Varps_main[var48] = Varps.Varps_temp[var48]; + Players.method2123(var48); + field808[++field809 - 1 & 31] = var48; + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2165 == var1.serverPacket) { + var48 = var3.method5459(); + rootInterface = var48; + this.resizeRoot(false); + DevicePcmPlayerProvider.Widget_resetModelFrames(var48); + Tile.runWidgetOnLoadListener(rootInterface); + + for (var5 = 0; var5 < 100; ++var5) { + field827[var5] = true; } - MouseRecorder.playSoundJingle(var5, var16); var1.serverPacket = null; return true; } if (ServerPacket.field2133 == var1.serverPacket) { + WorldMapElement.updateNpcs(true, var3); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2103 == var1.serverPacket) { + WorldMapRectangle.method257(); + var48 = var3.readUnsignedByte(); + var5 = var3.readUnsignedByte(); + var6 = var3.method5587(); + experience[var5] = var6; + currentLevels[var5] = var48; + levels[var5] = 1; + + for (var19 = 0; var19 < 98; ++var19) { + if (var6 >= Skills.Skills_experienceTable[var19]) { + levels[var5] = var19 + 2; + } + } + + changedSkills[++changedSkillsCount - 1 & 31] = var5; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2164 == var1.serverPacket) { + class218.friendSystem.ignoreList.read(var3, var1.serverPacketLength); + HealthBarUpdate.FriendSystem_invalidateIgnoreds(); + field815 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2176 == var1.serverPacket) { + isCameraLocked = true; + class40.field334 = var3.readUnsignedByte() * 128; + SecureRandomCallable.field499 = var3.readUnsignedByte() * 128; + Varcs.field1242 = var3.readUnsignedShort(); + class65.field581 = var3.readUnsignedByte(); + WorldMapSection1.field285 = var3.readUnsignedByte(); + if (WorldMapSection1.field285 >= 100) { + var48 = class40.field334 * 16384 + 64; + var5 = SecureRandomCallable.field499 * 16384 + 64; + var6 = WorldMapAreaData.getTileHeight(var48, var5, MouseRecorder.plane) - Varcs.field1242; + var19 = var48 - ScriptFrame.cameraX; + var20 = var6 - GrandExchangeOfferTotalQuantityComparator.cameraY; + var9 = var5 - class14.cameraZ; + var21 = (int)Math.sqrt((double)(var9 * var9 + var19 * var19)); + class319.cameraPitch = (int)(Math.atan2((double)var20, (double)var21) * 325.949D) & 2047; + Tile.cameraYaw = (int)(Math.atan2((double)var19, (double)var9) * -325.949D) & 2047; + if (class319.cameraPitch < 128) { + class319.cameraPitch = 128; + } + + if (class319.cameraPitch > 383) { + class319.cameraPitch = 383; + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2175 == var1.serverPacket) { hintArrowType = var3.readUnsignedByte(); if (hintArrowType == 1) { hintArrowNpcIndex = var3.readUnsignedShort(); @@ -4283,17 +4933,17 @@ public final class Client extends GameShell implements Usernamed { if (hintArrowType >= 2 && hintArrowType <= 6) { if (hintArrowType == 2) { hintArrowSubX = 4096; - hintArrowSubY = 64; + hintArrowSubY = 4096; } if (hintArrowType == 3) { hintArrowSubX = 0; - hintArrowSubY = 64; + hintArrowSubY = 4096; } if (hintArrowType == 4) { hintArrowSubX = 8192; - hintArrowSubY = 64; + hintArrowSubY = 4096; } if (hintArrowType == 5) { @@ -4303,7 +4953,7 @@ public final class Client extends GameShell implements Usernamed { if (hintArrowType == 6) { hintArrowSubX = 4096; - hintArrowSubY = 128; + hintArrowSubY = 8192; } hintArrowType = 2; @@ -4320,171 +4970,350 @@ public final class Client extends GameShell implements Usernamed { return true; } - if (ServerPacket.field2179 == var1.serverPacket) { - var16 = var3.readInt(); - var5 = var3.readInt(); - var6 = class225.getGcDuration(); - PacketBufferNode var43 = MenuAction.getPacketBufferNode(ClientPacket.field2203, packetWriter.isaacCipher); - var43.packetBuffer.method5545(var6); - var43.packetBuffer.writeByte(GameShell.fps); - var43.packetBuffer.writeIntME(var16); - var43.packetBuffer.writeIntLE(var5); - packetWriter.addNode(var43); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2126 == var1.serverPacket) { - class32.friendSystem.method1774(); - field629 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2181 == var1.serverPacket) { - var16 = var3.method5447(); - rootInterface = var16; - this.resizeRoot(false); - WorldMapSectionType.Widget_resetModelFrames(var16); - class51.runWidgetOnLoadListener(rootInterface); - - for (var5 = 0; var5 < 100; ++var5) { - field703[var5] = true; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2134 == var1.serverPacket) { - var16 = var3.readInt(); - var46 = var3.readUnsignedByte() == 1; - var17 = WorldMapElement.getWidget(var16); - if (var46 != var17.isHidden) { - var17.isHidden = var46; - FriendSystem.invalidateWidget(var17); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2129 == var1.serverPacket) { - UrlRequest.method3258(var3.readStringCp1252NullTerminated()); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2118 == var1.serverPacket) { - WorldMapIcon_0.method207(); + if (ServerPacket.field2102 == var1.serverPacket) { + WorldMapRectangle.method257(); runEnergy = var3.readUnsignedByte(); - field820 = cycleCntr; + field670 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.field2113 == var1.serverPacket) { - GrandExchangeOffer.updateNpcs(true, var3); + if (ServerPacket.field2135 == var1.serverPacket) { + ClientPacket.method3599(var3.readStringCp1252NullTerminated()); var1.serverPacket = null; return true; } - if (ServerPacket.field2184 == var1.serverPacket) { - JagexCache.method3438(class185.field2302); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2143 == var1.serverPacket) { - var16 = var3.method5445(); - class1.method21(var16); - field811[++field812 - 1 & 31] = var16 & 32767; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2122 == var1.serverPacket) { - Varps.field2507 = var3.readUnsignedByteNegate(); - WorldMapSection1.field283 = var3.readUnsignedByte(); - - for (var16 = WorldMapSection1.field283; var16 < WorldMapSection1.field283 + 8; ++var16) { - for (var5 = Varps.field2507; var5 < Varps.field2507 + 8; ++var5) { - if (groundItems[ItemContainer.plane][var16][var5] != null) { - groundItems[ItemContainer.plane][var16][var5] = null; - class189.updateItemPile(var16, var5); - } - } - } - - for (PendingSpawn var40 = (PendingSpawn)pendingSpawns.last(); var40 != null; var40 = (PendingSpawn)pendingSpawns.previous()) { - if (var40.x >= WorldMapSection1.field283 && var40.x < WorldMapSection1.field283 + 8 && var40.y >= Varps.field2507 && var40.y < Varps.field2507 + 8 && var40.plane == ItemContainer.plane) { - var40.hitpoints = 0; - } - } - + if (ServerPacket.field2177 == var1.serverPacket) { + Canvas.loadRegions(true, var1.packetBuffer); var1.serverPacket = null; return true; } + long var22; + long var24; if (ServerPacket.field2182 == var1.serverPacket) { - var16 = var3.readUnsignedByte(); - class83.method1997(var16); + var37 = var3.readStringCp1252NullTerminated(); + var22 = (long)var3.readUnsignedShort(); + var24 = (long)var3.readMedium(); + PlayerType var26 = (PlayerType)ServerPacket.findEnumerated(PlayerAppearance.PlayerType_values(), var3.readUnsignedByte()); + long var27 = var24 + (var22 << 32); + boolean var29 = false; + + for (int var13 = 0; var13 < 100; ++var13) { + if (field842[var13] == var27) { + var29 = true; + break; + } + } + + if (class218.friendSystem.isIgnored(new Username(var37, class4.loginType))) { + var29 = true; + } + + if (!var29 && field735 == 0) { + field842[field843] = var27; + field843 = (field843 + 1) % 100; + String var30 = AbstractFont.escapeBrackets(PacketBufferNode.method3616(GrandExchangeOfferWorldComparator.method60(var3))); + byte var46; + if (var26.isPrivileged) { + var46 = 7; + } else { + var46 = 3; + } + + if (var26.modIcon != -1) { + WorldMapCacheName.addGameMessage(var46, ArchiveDiskAction.method4133(var26.modIcon) + var37, var30); + } else { + WorldMapCacheName.addGameMessage(var46, var37, var30); + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2149 == var1.serverPacket) { + Canvas.method815(class185.field2296); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2166 == var1.serverPacket) { + var48 = var3.readUnsignedByte(); + class96.method2258(var48); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2142 == var1.serverPacket) { + byte var59 = var3.method5634(); + var5 = var3.method5459(); + Varps.Varps_temp[var5] = var59; + if (Varps.Varps_main[var5] != var59) { + Varps.Varps_main[var5] = var59; + } + + Players.method2123(var5); + field808[++field809 - 1 & 31] = var5; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2147 == var1.serverPacket) { + var48 = var3.readInt(); + if (var48 != field688) { + field688 = var48; + class14.method144(); + } + + var1.serverPacket = null; + return true; + } + + long var31; + if (ServerPacket.field2108 == var1.serverPacket) { + var37 = var3.readStringCp1252NullTerminated(); + var22 = var3.readLong(); + var24 = (long)var3.readUnsignedShort(); + var31 = (long)var3.readMedium(); + PlayerType var60 = (PlayerType)ServerPacket.findEnumerated(PlayerAppearance.PlayerType_values(), var3.readUnsignedByte()); + var12 = (var24 << 32) + var31; + boolean var14 = false; + + for (int var15 = 0; var15 < 100; ++var15) { + if (var12 == field842[var15]) { + var14 = true; + break; + } + } + + if (var60.isUser && class218.friendSystem.isIgnored(new Username(var37, class4.loginType))) { + var14 = true; + } + + if (!var14 && field735 == 0) { + field842[field843] = var12; + field843 = (field843 + 1) % 100; + String var34 = AbstractFont.escapeBrackets(PacketBufferNode.method3616(GrandExchangeOfferWorldComparator.method60(var3))); + if (var60.modIcon != -1) { + UserComparator9.addChatMessage(9, ArchiveDiskAction.method4133(var60.modIcon) + var37, var34, StudioGame.base37DecodeLong(var22)); + } else { + UserComparator9.addChatMessage(9, var37, var34, StudioGame.base37DecodeLong(var22)); + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2145 == var1.serverPacket) { + for (var48 = 0; var48 < CollisionMap.VarpDefinition_fileCount; ++var48) { + VarpDefinition var50 = class30.method518(var48); + if (var50 != null) { + Varps.Varps_temp[var48] = 0; + Varps.Varps_main[var48] = 0; + } + } + + WorldMapRectangle.method257(); + field809 += 32; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2139 == var1.serverPacket) { + if (rootInterface != -1) { + WorldMapRectangle.runIntfCloseListeners(rootInterface, 0); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2125 == var1.serverPacket) { + class192.updatePlayers(var3, var1.serverPacketLength); + class3.method30(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2124 == var1.serverPacket) { + isCameraLocked = false; + + for (var48 = 0; var48 < 5; ++var48) { + field749[var48] = false; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2137 == var1.serverPacket) { + var48 = var3.readInt(); + var5 = var3.readUnsignedShort(); + if (var48 < -70000) { + var5 += 32768; + } + + if (var48 >= 0) { + var18 = Player.getWidget(var48); + } else { + var18 = null; + } + + if (var18 != null) { + for (var19 = 0; var19 < var18.itemIds.length; ++var19) { + var18.itemIds[var19] = 0; + var18.itemQuantities[var19] = 0; + } + } + + class226.clearItemContainer(var5); + var19 = var3.readUnsignedShort(); + + for (var20 = 0; var20 < var19; ++var20) { + var9 = var3.method5459(); + var21 = var3.readUnsignedByteNegate(); + if (var21 == 255) { + var21 = var3.method5515(); + } + + if (var18 != null && var20 < var18.itemIds.length) { + var18.itemIds[var20] = var9; + var18.itemQuantities[var20] = var21; + } + + WorldMapArea.itemContainerSetItem(var5, var20, var9 - 1, var21); + } + + if (var18 != null) { + WorldMapID.invalidateWidget(var18); + } + + WorldMapRectangle.method257(); + field810[++field811 - 1 & 31] = var5 & 32767; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2141 == var1.serverPacket) { + Canvas.loadRegions(false, var1.packetBuffer); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2174 == var1.serverPacket) { + var48 = var3.readUnsignedByte(); + WorldMapIcon_0.method196(var48); var1.serverPacket = null; return false; } - if (ServerPacket.field2128 == var1.serverPacket) { - var16 = var3.method5414(); - var5 = var3.method5447(); - var17 = WorldMapElement.getWidget(var16); - if (var17.modelType != 1 || var5 != var17.modelId) { - var17.modelType = 1; - var17.modelId = var5; - FriendSystem.invalidateWidget(var17); + if (ServerPacket.field2144 == var1.serverPacket) { + var48 = var3.method5503(); + var5 = var3.method5515(); + var18 = Player.getWidget(var5); + if (var18.modelType != 2 || var48 != var18.modelId) { + var18.modelType = 2; + var18.modelId = var48; + WorldMapID.invalidateWidget(var18); } var1.serverPacket = null; return true; } - String var38; - if (ServerPacket.field2135 == var1.serverPacket) { - var38 = var3.readStringCp1252NullTerminated(); - var19 = AbstractFont.escapeBrackets(class189.method3596(class51.method845(var3))); - DirectByteArrayCopier.addGameMessage(6, var38, var19); - var1.serverPacket = null; - return true; - } - if (ServerPacket.field2170 == var1.serverPacket) { - var16 = var3.readInt(); - if (var16 != field705) { - field705 = var16; - ItemContainer.method1111(); + var48 = var3.method5459(); + var5 = var3.method5459(); + var6 = var3.readUnsignedShort(); + var19 = var3.method5587(); + var8 = Player.getWidget(var19); + if (var48 != var8.modelAngleX || var6 != var8.modelAngleY || var5 != var8.modelZoom) { + var8.modelAngleX = var48; + var8.modelAngleY = var6; + var8.modelZoom = var5; + WorldMapID.invalidateWidget(var8); } var1.serverPacket = null; return true; } - int var9; - int var18; - int var20; - if (ServerPacket.field2141 == var1.serverPacket) { - var16 = var3.readInt(); + if (ServerPacket.field2148 == var1.serverPacket) { + var48 = var3.readInt(); + var5 = var3.readInt(); + var6 = Canvas.getGcDuration(); + PacketBufferNode var41 = MenuAction.getPacketBufferNode(ClientPacket.field2266, packetWriter.isaacCipher); + var41.packetBuffer.method5491(GameShell.fps); + var41.packetBuffer.method5491(var6); + var41.packetBuffer.writeIntLE(var48); + var41.packetBuffer.writeIntLE16(var5); + packetWriter.addNode(var41); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2131 == var1.serverPacket) { + var48 = var3.method5503(); + var5 = var3.readInt(); + var6 = var3.method5503(); + var7 = Player.getWidget(var5); + var7.field2594 = var48 + (var6 << 16); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2128 == var1.serverPacket) { + var48 = var3.method5503(); + if (var48 == 65535) { + var48 = -1; + } + + var5 = var3.method5587(); + var6 = var3.method5514(); + if (var6 == 65535) { + var6 = -1; + } + + var19 = var3.method5515(); + + for (var20 = var6; var20 <= var48; ++var20) { + var31 = (long)var20 + ((long)var19 << 32); + Node var33 = widgetClickMasks.get(var31); + if (var33 != null) { + var33.remove(); + } + + widgetClickMasks.put(new IntegerNode(var5), var31); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2138 == var1.serverPacket) { + Canvas.method815(class185.field2305); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2101 == var1.serverPacket) { + var48 = var3.readInt(); var5 = var3.readUnsignedShort(); - if (var16 < -70000) { + if (var48 < -70000) { var5 += 32768; } - if (var16 >= 0) { - var17 = WorldMapElement.getWidget(var16); + if (var48 >= 0) { + var18 = Player.getWidget(var48); } else { - var17 = null; + var18 = null; } - for (; var3.offset < var1.serverPacketLength; Canvas.itemContainerSetItem(var5, var18, var20 - 1, var9)) { - var18 = var3.readUShortSmart(); + for (; var3.offset < var1.serverPacketLength; WorldMapArea.itemContainerSetItem(var5, var19, var20 - 1, var9)) { + var19 = var3.readUShortSmart(); var20 = var3.readUnsignedShort(); var9 = 0; if (var20 != 0) { @@ -4494,44 +5323,121 @@ public final class Client extends GameShell implements Usernamed { } } - if (var17 != null && var18 >= 0 && var18 < var17.itemIds.length) { - var17.itemIds[var18] = var20; - var17.itemQuantities[var18] = var9; + if (var18 != null && var19 >= 0 && var19 < var18.itemIds.length) { + var18.itemIds[var19] = var20; + var18.itemQuantities[var19] = var9; } } - if (var17 != null) { - FriendSystem.invalidateWidget(var17); + if (var18 != null) { + WorldMapID.invalidateWidget(var18); } - WorldMapIcon_0.method207(); - field811[++field812 - 1 & 31] = var5 & 32767; + WorldMapRectangle.method257(); + field810[++field811 - 1 & 31] = var5 & 32767; var1.serverPacket = null; return true; } - if (ServerPacket.field2148 == var1.serverPacket) { - var16 = var3.readUnsignedByte(); - var5 = var3.readUnsignedByte(); - var6 = var3.readUnsignedByte(); - var18 = var3.readUnsignedByte(); - field897[var16] = true; - field869[var16] = var5; - field694[var16] = var6; - field758[var16] = var18; - field872[var16] = 0; + if (ServerPacket.field2110 == var1.serverPacket) { + if (GrandExchangeOfferUnitPriceComparator.clanChat != null) { + GrandExchangeOfferUnitPriceComparator.clanChat.method5217(var3); + } + + class65.method1176(); var1.serverPacket = null; return true; } - if (ServerPacket.field2152 == var1.serverPacket) { - var16 = var3.readUnsignedByte(); - if (var3.readUnsignedByte() == 0) { - grandExchangeOffers[var16] = new GrandExchangeOffer(); - var3.offset += 18; + if (ServerPacket.field2136 == var1.serverPacket) { + var16 = var3.readBoolean(); + if (var16) { + if (MenuAction.field1133 == null) { + MenuAction.field1133 = new class237(); + } } else { - --var3.offset; - grandExchangeOffers[var16] = new GrandExchangeOffer(var3, false); + MenuAction.field1133 = null; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2098 == var1.serverPacket) { + var48 = var3.method5503(); + UrlRequest.method3276(var48); + field810[++field811 - 1 & 31] = var48 & 32767; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2143 == var1.serverPacket) { + var48 = var3.method5515(); + var5 = var3.method5514(); + var18 = Player.getWidget(var48); + if (var18.modelType != 1 || var5 != var18.modelId) { + var18.modelType = 1; + var18.modelId = var5; + WorldMapID.invalidateWidget(var18); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2151 == var1.serverPacket) { + class218.friendSystem.readUpdate(var3, var1.serverPacketLength); + field815 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2167 == var1.serverPacket) { + var48 = var3.method5580(); + var49 = Player.getWidget(var48); + + for (var6 = 0; var6 < var49.itemIds.length; ++var6) { + var49.itemIds[var6] = -1; + var49.itemIds[var6] = 0; + } + + WorldMapID.invalidateWidget(var49); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2116 == var1.serverPacket) { + for (var48 = 0; var48 < players.length; ++var48) { + if (players[var48] != null) { + players[var48].sequence = -1; + } + } + + for (var48 = 0; var48 < npcs.length; ++var48) { + if (npcs[var48] != null) { + npcs[var48].sequence = -1; + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2111 == var1.serverPacket) { + var37 = var3.readStringCp1252NullTerminated(); + var17 = AbstractFont.escapeBrackets(PacketBufferNode.method3616(GrandExchangeOfferWorldComparator.method60(var3))); + WorldMapCacheName.addGameMessage(6, var37, var17); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2173 == var1.serverPacket) { + var16 = var3.readUnsignedByte() == 1; + if (var16) { + GrandExchangeOfferWorldComparator.field25 = SoundCache.method2480() - var3.readLong(); + PacketWriter.grandExchangeEvents = new GrandExchangeEvents(var3, true); + } else { + PacketWriter.grandExchangeEvents = null; } field818 = cycleCntr; @@ -4539,1100 +5445,289 @@ public final class Client extends GameShell implements Usernamed { return true; } - if (ServerPacket.field2159 == var1.serverPacket) { - for (var16 = 0; var16 < players.length; ++var16) { - if (players[var16] != null) { - players[var16].sequence = -1; - } - } - - for (var16 = 0; var16 < npcs.length; ++var16) { - if (npcs[var16] != null) { - npcs[var16].sequence = -1; - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2154 == var1.serverPacket) { - var16 = var3.method5436(); - var5 = var3.method5436(); - var49 = var3.readStringCp1252NullTerminated(); - if (var5 >= 1 && var5 <= 8) { - if (var49.equalsIgnoreCase("null")) { - var49 = null; - } - - playerMenuActions[var5 - 1] = var49; - playerOptionsPriorities[var5 - 1] = var16 == 0; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2106 == var1.serverPacket) { - var16 = var3.readInt(); - InterfaceParent var57 = (InterfaceParent)interfaceParents.get((long)var16); - if (var57 != null) { - VarpDefinition.closeInterface(var57, true); - } - - if (meslayerContinueWidget != null) { - FriendSystem.invalidateWidget(meslayerContinueWidget); - meslayerContinueWidget = null; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2102 == var1.serverPacket) { - PendingSpawn.loadRegions(false, var1.packetBuffer); - var1.serverPacket = null; - return true; - } - - Widget var8; - if (ServerPacket.field2147 == var1.serverPacket) { - var16 = var3.method5447(); - var5 = var3.method5447(); - var6 = var3.method5447(); - var18 = var3.method5414(); - var8 = WorldMapElement.getWidget(var18); - if (var16 != var8.modelAngleX || var6 != var8.modelAngleY || var5 != var8.modelZoom) { - var8.modelAngleX = var16; - var8.modelAngleY = var6; - var8.modelZoom = var5; - FriendSystem.invalidateWidget(var8); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2114 == var1.serverPacket) { - Varps.field2507 = var3.method5438(); - WorldMapSection1.field283 = var3.readUnsignedByteNegate(); - - while (var3.offset < var1.serverPacketLength) { - var16 = var3.readUnsignedByte(); - class185 var55 = WorldMapDecoration.method327()[var16]; - JagexCache.method3438(var55); - } - - var1.serverPacket = null; - return true; - } - - Widget var52; - if (ServerPacket.field2136 == var1.serverPacket) { - var16 = var3.method5414(); - var52 = WorldMapElement.getWidget(var16); - var52.modelType = 3; - var52.modelId = WorldMapIcon_1.localPlayer.appearance.getChatHeadId(); - FriendSystem.invalidateWidget(var52); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2112 == var1.serverPacket) { - JagexCache.method3438(class185.field2301); - var1.serverPacket = null; - return true; - } - - int var10; - if (ServerPacket.field2180 == var1.serverPacket) { - isCameraLocked = true; - WorldMapSection2.field190 = var3.readUnsignedByte() * 128; - UrlRequest.field1932 = var3.readUnsignedByte() * 16384; - GameShell.field446 = var3.readUnsignedShort(); - GrandExchangeOfferWorldComparator.field34 = var3.readUnsignedByte(); - Player.field605 = var3.readUnsignedByte(); - if (Player.field605 >= 100) { - var16 = WorldMapSection2.field190 * 16384 + 64; - var5 = UrlRequest.field1932 * 128 + 64; - var6 = GrandExchangeOfferTotalQuantityComparator.getTileHeight(var16, var5, ItemContainer.plane) - GameShell.field446; - var18 = var16 - WallDecoration.cameraX; - var20 = var6 - Coord.cameraY; - var9 = var5 - UserComparator7.cameraZ; - var10 = (int)Math.sqrt((double)(var18 * var18 + var9 * var9)); - class43.cameraPitch = (int)(Math.atan2((double)var20, (double)var10) * 325.949D) & 2047; - class40.cameraYaw = (int)(Math.atan2((double)var18, (double)var9) * -325.949D) & 2047; - if (class43.cameraPitch < 128) { - class43.cameraPitch = 128; - } - - if (class43.cameraPitch > 383) { - class43.cameraPitch = 383; - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2121 == var1.serverPacket) { - var16 = var3.method5455(); - var5 = var3.method5446(); - var6 = var5 >> 10 & 31; - var18 = var5 >> 5 & 31; - var20 = var5 & 31; - var9 = (var18 << 11) + (var6 << 19) + (var20 << 3); - Widget var58 = WorldMapElement.getWidget(var16); - if (var9 != var58.color) { - var58.color = var9; - FriendSystem.invalidateWidget(var58); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2171 == var1.serverPacket) { - minimapState = var3.readUnsignedByte(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2178 == var1.serverPacket) { - JagexCache.method3438(class185.field2297); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2166 == var1.serverPacket) { - for (var16 = 0; var16 < Varps.Varps_main.length; ++var16) { - if (Varps.Varps_main[var16] != Varps.Varps_temp[var16]) { - Varps.Varps_main[var16] = Varps.Varps_temp[var16]; - ObjectSound.method1837(var16); - field809[++field800 - 1 & 31] = var16; - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2110 == var1.serverPacket) { - var38 = var3.readStringCp1252NullTerminated(); - Object[] var54 = new Object[var38.length() + 1]; - - for (var6 = var38.length() - 1; var6 >= 0; --var6) { - if (var38.charAt(var6) == 's') { - var54[var6 + 1] = var3.readStringCp1252NullTerminated(); - } else { - var54[var6 + 1] = new Integer(var3.readInt()); - } - } - - var54[0] = new Integer(var3.readInt()); - ScriptEvent var50 = new ScriptEvent(); - var50.args = var54; - class81.runScriptEvent(var50); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2163 == var1.serverPacket) { - class32.friendSystem.ignoreList.read(var3, var1.serverPacketLength); - InterfaceParent.FriendSystem_invalidateIgnoreds(); - field629 = cycleCntr; - var1.serverPacket = null; - return true; - } - - Widget var41; - if (ServerPacket.field2115 == var1.serverPacket) { - var16 = var3.readInt(); - var5 = var3.readUnsignedShort(); - if (var5 == 65535) { - var5 = -1; - } - - var6 = var3.method5414(); - var41 = WorldMapElement.getWidget(var16); - ItemDefinition var42; - if (!var41.isIf3) { - if (var5 == -1) { - var41.modelType = 0; - var1.serverPacket = null; - return true; - } - - var42 = WorldMapData_0.ItemDefinition_get(var5); - var41.modelType = 4; - var41.modelId = var5; - var41.modelAngleX = var42.xan2d; - var41.modelAngleY = var42.yan2d; - var41.modelZoom = var42.zoom2d * 100 / var6; - FriendSystem.invalidateWidget(var41); - } else { - var41.itemId = var5; - var41.itemQuantity = var6; - var42 = WorldMapData_0.ItemDefinition_get(var5); - var41.modelAngleX = var42.xan2d; - var41.modelAngleY = var42.yan2d; - var41.modelAngleZ = var42.zan2d; - var41.modelOffsetX = var42.offsetX2d; - var41.modelOffsetY = var42.offsetY2d; - var41.modelZoom = var42.zoom2d; - if (var42.isStackable == 1) { - var41.itemQuantityMode = 1; - } else { - var41.itemQuantityMode = 2; - } - - if (var41.field2638 > 0) { - var41.modelZoom = var41.modelZoom * 32 / var41.field2638; - } else if (var41.rawWidth > 0) { - var41.modelZoom = var41.modelZoom * 32 / var41.rawWidth; - } - - FriendSystem.invalidateWidget(var41); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2132 == var1.serverPacket) { - var16 = var3.readShort(); - var5 = var3.method5414(); - var17 = WorldMapElement.getWidget(var5); - if (var16 != var17.sequenceId || var16 == -1) { - var17.sequenceId = var16; - var17.modelFrame = 0; - var17.modelFrameCycle = 0; - FriendSystem.invalidateWidget(var17); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2146 == var1.serverPacket) { - JagexCache.method3438(class185.field2300); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2161 == var1.serverPacket) { - JagexCache.method3438(class185.field2304); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2117 == var1.serverPacket) { - GrandExchangeOffer.updateNpcs(false, var3); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2104 == var1.serverPacket) { - byte[] var39 = new byte[var1.serverPacketLength]; - var3.method5384(var39, 0, var39.length); - Buffer var53 = new Buffer(var39); - var49 = var53.readStringCp1252NullTerminated(); - GameObject.openURL(var49, true, false); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2168 == var1.serverPacket) { - WorldMapIcon_0.method207(); - weight = var3.readShort(); - field820 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2097 == var1.serverPacket) { - var3.offset += 28; - if (var3.checkCrc()) { - Login.method2031(var3, var3.offset - 28); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2172 == var1.serverPacket) { - isCameraLocked = true; - GraphicsObject.field1079 = var3.readUnsignedByte() * 16384; - class3.field24 = var3.readUnsignedByte() * 16384; - WorldMapSection0.field129 = var3.readUnsignedShort(); - WorldMapSectionType.field142 = var3.readUnsignedByte(); - WorldMapSection2.field191 = var3.readUnsignedByte(); - if (WorldMapSection2.field191 >= 100) { - WallDecoration.cameraX = GraphicsObject.field1079 * 128 + 64; - UserComparator7.cameraZ = class3.field24 * 128 + 64; - Coord.cameraY = GrandExchangeOfferTotalQuantityComparator.getTileHeight(WallDecoration.cameraX, UserComparator7.cameraZ, ItemContainer.plane) - WorldMapSection0.field129; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2101 == var1.serverPacket) { - var16 = var3.readUnsignedShort(); - var5 = var3.readInt(); - Varps.Varps_temp[var16] = var5; - if (Varps.Varps_main[var16] != var5) { - Varps.Varps_main[var16] = var5; - } - - ObjectSound.method1837(var16); - field809[++field800 - 1 & 31] = var16; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2160 == var1.serverPacket) { - byte var56 = var3.method5616(); - var5 = var3.method5446(); - Varps.Varps_temp[var5] = var56; - if (Varps.Varps_main[var5] != var56) { - Varps.Varps_main[var5] = var56; - } - - ObjectSound.method1837(var5); - field809[++field800 - 1 & 31] = var5; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2142 == var1.serverPacket) { - if (clanChat != null) { - clanChat.method5135(var3); - } - - FaceNormal.method3221(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2123 == var1.serverPacket) { - JagexCache.method3438(class185.field2303); - var1.serverPacket = null; - return true; - } - - long var12; - if (ServerPacket.field2162 == var1.serverPacket) { - var16 = var3.offset + var1.serverPacketLength; - var5 = var3.readUnsignedShort(); - var6 = var3.readUnsignedShort(); - if (var5 != rootInterface) { - rootInterface = var5; - this.resizeRoot(false); - WorldMapSectionType.Widget_resetModelFrames(rootInterface); - class51.runWidgetOnLoadListener(rootInterface); - - for (var18 = 0; var18 < 100; ++var18) { - field703[var18] = true; - } - } - - InterfaceParent var21; - for (; var6-- > 0; var21.field540 = true) { - var18 = var3.readInt(); - var20 = var3.readUnsignedShort(); - var9 = var3.readUnsignedByte(); - var21 = (InterfaceParent)interfaceParents.get((long)var18); - if (var21 != null && var20 != var21.group) { - VarpDefinition.closeInterface(var21, true); - var21 = null; - } - - if (var21 == null) { - var21 = NPC.method1967(var18, var20, var9); - } - } - - for (var7 = (InterfaceParent)interfaceParents.first(); var7 != null; var7 = (InterfaceParent)interfaceParents.next()) { - if (var7.field540) { - var7.field540 = false; - } else { - VarpDefinition.closeInterface(var7, true); - } - } - - widgetClickMasks = new NodeHashTable(512); - - while (var3.offset < var16) { - var18 = var3.readInt(); - var20 = var3.readUnsignedShort(); - var9 = var3.readUnsignedShort(); - var10 = var3.readInt(); - - for (int var11 = var20; var11 <= var9; ++var11) { - var12 = (long)var11 + ((long)var18 << 32); - widgetClickMasks.put(new IntegerNode(var10), var12); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2156 == var1.serverPacket) { - var16 = var3.method5455(); - var5 = var3.method5434(); - var6 = var3.method5448(); - var41 = WorldMapElement.getWidget(var16); - if (var6 != var41.rawX || var5 != var41.rawY || var41.xAlignment != 0 || var41.yAlignment != 0) { - var41.rawX = var6; - var41.rawY = var5; - var41.xAlignment = 0; - var41.yAlignment = 0; - FriendSystem.invalidateWidget(var41); - this.alignWidget(var41); - if (var41.type == 0) { - WorldMapAreaData.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var16 >> 16], var41, false); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2119 == var1.serverPacket) { - WorldMapIcon_0.method207(); - var16 = var3.method5505(); - var5 = var3.readUnsignedByteNegate(); - var6 = var3.readUnsignedByte(); - experience[var5] = var16; - currentLevels[var5] = var6; - levels[var5] = 1; - - for (var18 = 0; var18 < 98; ++var18) { - if (var16 >= Skills.Skills_experienceTable[var18]) { - levels[var5] = var18 + 2; - } - } - - changedSkills[++changedSkillsCount - 1 & 31] = var5; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2176 == var1.serverPacket) { - class30.updatePlayers(var3, var1.serverPacketLength); - WorldMapSection0.method230(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2131 == var1.serverPacket) { - var16 = var3.readUnsignedByte(); - AbstractWorldMapData.method272(var16); - var1.serverPacket = null; - return true; - } - - long var22; - if (ServerPacket.field2145 == var1.serverPacket) { - var16 = var3.method5505(); - var5 = var3.method5446(); - if (var5 == 65535) { - var5 = -1; - } - - var6 = var3.method5414(); - var18 = var3.readUnsignedShort(); - if (var18 == 65535) { - var18 = -1; - } - - for (var20 = var18; var20 <= var5; ++var20) { - var22 = (long)var20 + ((long)var6 << 32); - Node var60 = widgetClickMasks.get(var22); - if (var60 != null) { - var60.remove(); - } - - widgetClickMasks.put(new IntegerNode(var16), var22); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2138 == var1.serverPacket) { - var16 = var3.method5446(); - var5 = var3.method5445(); - var6 = var3.method5455(); - var41 = WorldMapElement.getWidget(var6); - var41.field2602 = var16 + (var5 << 16); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2157 == var1.serverPacket) { - var16 = var3.readInt(); - var5 = var3.readInt(); - InterfaceParent var47 = (InterfaceParent)interfaceParents.get((long)var5); - var7 = (InterfaceParent)interfaceParents.get((long)var16); - if (var7 != null) { - VarpDefinition.closeInterface(var7, var47 == null || var7.group != var47.group); - } - - if (var47 != null) { - var47.remove(); - interfaceParents.put(var47, (long)var16); - } - - var8 = WorldMapElement.getWidget(var5); - if (var8 != null) { - FriendSystem.invalidateWidget(var8); - } - - var8 = WorldMapElement.getWidget(var16); - if (var8 != null) { - FriendSystem.invalidateWidget(var8); - WorldMapAreaData.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var8.id >>> 16], var8, true); - } - - if (rootInterface != -1) { - UserComparator6.runIntfCloseListeners(rootInterface, 1); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2167 == var1.serverPacket) { - var16 = var3.readInt(); - var5 = var3.readUnsignedShort(); - if (var16 < -70000) { - var5 += 32768; - } - - if (var16 >= 0) { - var17 = WorldMapElement.getWidget(var16); - } else { - var17 = null; - } - - if (var17 != null) { - for (var18 = 0; var18 < var17.itemIds.length; ++var18) { - var17.itemIds[var18] = 0; - var17.itemQuantities[var18] = 0; - } - } - - class13.clearItemContainer(var5); - var18 = var3.readUnsignedShort(); - - for (var20 = 0; var20 < var18; ++var20) { - var9 = var3.readUnsignedShort(); - var10 = var3.readUnsignedByte(); - if (var10 == 255) { - var10 = var3.method5414(); - } - - if (var17 != null && var20 < var17.itemIds.length) { - var17.itemIds[var20] = var9; - var17.itemQuantities[var20] = var10; - } - - Canvas.itemContainerSetItem(var5, var20, var9 - 1, var10); - } - - if (var17 != null) { - FriendSystem.invalidateWidget(var17); - } - - WorldMapIcon_0.method207(); - field811[++field812 - 1 & 31] = var5 & 32767; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2103 == var1.serverPacket) { - WorldMapSection1.field283 = var3.readUnsignedByteNegate(); - Varps.field2507 = var3.method5438(); - var1.serverPacket = null; - return true; - } - - long var25; - long var27; - if (ServerPacket.field2107 == var1.serverPacket) { - var38 = var3.readStringCp1252NullTerminated(); - var25 = (long)var3.readUnsignedShort(); - var27 = (long)var3.readMedium(); - PlayerType var29 = (PlayerType)FriendSystem.findEnumerated(class191.PlayerType_values(), var3.readUnsignedByte()); - long var30 = (var25 << 32) + var27; - boolean var32 = false; - - for (int var13 = 0; var13 < 100; ++var13) { - if (field842[var13] == var30) { - var32 = true; - break; - } - } - - if (class32.friendSystem.isIgnored(new Username(var38, FontName.loginType))) { - var32 = true; - } - - if (!var32 && field737 == 0) { - field842[field843] = var30; - field843 = (field843 + 1) % 100; - String var33 = AbstractFont.escapeBrackets(class189.method3596(class51.method845(var3))); - byte var45; - if (var29.isPrivileged) { - var45 = 7; - } else { - var45 = 3; - } - - if (var29.modIcon * 714577229 != -1) { - DirectByteArrayCopier.addGameMessage(var45, AbstractWorldMapData.method278(var29.modIcon * 714577229) + var38, var33); - } else { - DirectByteArrayCopier.addGameMessage(var45, var38, var33); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2149 == var1.serverPacket) { - if (rootInterface != -1) { - UserComparator6.runIntfCloseListeners(rootInterface, 0); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2137 == var1.serverPacket) { - var48 = var3.readBoolean(); - if (var48) { - if (GameObject.field1921 == null) { - GameObject.field1921 = new class237(); - } - } else { - GameObject.field1921 = null; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2169 == var1.serverPacket) { - rebootTimer = var3.readUnsignedShort() * 30; - field820 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2127 == var1.serverPacket) { - var16 = var3.readUnsignedShort(); - var5 = var3.readUnsignedByte(); - var6 = var3.readUnsignedShort(); - GrandExchangeOfferUnitPriceComparator.queueSoundEffect(var16, var5, var6); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2130 == var1.serverPacket) { - var16 = var3.method5447(); - var5 = var3.method5414(); - var17 = WorldMapElement.getWidget(var5); - if (var17.modelType != 2 || var16 != var17.modelId) { - var17.modelType = 2; - var17.modelId = var16; - FriendSystem.invalidateWidget(var17); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2158 == var1.serverPacket) { - var16 = var3.method5455(); - var52 = WorldMapElement.getWidget(var16); - - for (var6 = 0; var6 < var52.itemIds.length; ++var6) { - var52.itemIds[var6] = -1; - var52.itemIds[var6] = 0; - } - - FriendSystem.invalidateWidget(var52); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2140 == var1.serverPacket) { - if (var1.serverPacketLength == 0) { - clanChat = null; - } else { - if (clanChat == null) { - clanChat = new ClanChat(FontName.loginType, WorldMapID.client); - } - - clanChat.readUpdate(var3); - } - - FaceNormal.method3221(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2151 == var1.serverPacket) { - var38 = var3.readStringCp1252NullTerminated(); - var25 = var3.readLong(); - var27 = (long)var3.readUnsignedShort(); - var22 = (long)var3.readMedium(); - PlayerType var24 = (PlayerType)FriendSystem.findEnumerated(class191.PlayerType_values(), var3.readUnsignedByte()); - var12 = var22 + (var27 << 32); - boolean var14 = false; - - for (int var15 = 0; var15 < 100; ++var15) { - if (field842[var15] == var12) { - var14 = true; - break; - } - } - - if (var24.isUser && class32.friendSystem.isIgnored(new Username(var38, FontName.loginType))) { - var14 = true; - } - - if (!var14 && field737 == 0) { - field842[field843] = var12; - field843 = (field843 + 1) % 100; - String var34 = AbstractFont.escapeBrackets(class189.method3596(class51.method845(var3))); - if (var24.modIcon * 714577229 != -1) { - MilliClock.addChatMessage(9, AbstractWorldMapData.method278(var24.modIcon * 714577229) + var38, var34, class266.base37DecodeLong(var25)); - } else { - MilliClock.addChatMessage(9, var38, var34, class266.base37DecodeLong(var25)); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2100 == var1.serverPacket) { - JagexCache.method3438(class185.field2305); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2099 == var1.serverPacket) { - isCameraLocked = false; - - for (var16 = 0; var16 < 5; ++var16) { - field897[var16] = false; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2153 == var1.serverPacket) { - for (var16 = 0; var16 < VarpDefinition.VarpDefinition_fileCount; ++var16) { - VarpDefinition var51 = class16.method180(var16); - if (var51 != null) { - Varps.Varps_temp[var16] = 0; - Varps.Varps_main[var16] = 0; - } - } - - WorldMapIcon_0.method207(); - field800 += 32; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2144 == var1.serverPacket) { - World var37 = new World(); - var37.host = var3.readStringCp1252NullTerminated(); - var37.id = var3.readUnsignedShort(); - var5 = var3.readInt(); - var37.properties = var5; - FloorDecoration.updateGameState(45); - var2.close(); - var2 = null; - class65.changeWorld(var37); - var1.serverPacket = null; - return false; - } - - if (ServerPacket.field2116 == var1.serverPacket) { - var16 = var3.readInt(); - var19 = var3.readStringCp1252NullTerminated(); - var17 = WorldMapElement.getWidget(var16); - if (!var19.equals(var17.text)) { - var17.text = var19; - FriendSystem.invalidateWidget(var17); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2105 == var1.serverPacket) { - JagexCache.method3438(class185.field2299); - var1.serverPacket = null; - return true; - } - - class3.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id : -1) + "," + (var1.field1296 != null ? var1.field1296.id : -1) + "," + (var1.field1291 != null ? var1.field1291.id : -1) + "," + var1.serverPacketLength, (Throwable)null); - class65.method1182(); + class188.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id : -1) + "," + (var1.field1286 != null ? var1.field1286.id : -1) + "," + (var1.field1287 != null ? var1.field1287.id : -1) + "," + var1.serverPacketLength, (Throwable)null); + class40.method736(); } catch (IOException var35) { - class2.method31(); + class185.method3607(); } catch (Exception var36) { - var19 = "" + (var1.serverPacket != null ? var1.serverPacket.id : -1) + "," + (var1.field1296 != null ? var1.field1296.id : -1) + "," + (var1.field1291 != null ? var1.field1291.id : -1) + "," + var1.serverPacketLength + "," + (WorldMapIcon_1.localPlayer.pathX[0] + PacketWriter.baseX * 64) + "," + (WorldMapIcon_1.localPlayer.pathY[0] + RouteStrategy.baseY * 64) + ","; + var17 = "" + (var1.serverPacket != null ? var1.serverPacket.id : -1) + "," + (var1.field1286 != null ? var1.field1286.id : -1) + "," + (var1.field1287 != null ? var1.field1287.id : -1) + "," + var1.serverPacketLength + "," + (Varps.localPlayer.pathX[0] + class4.baseX * 64) + "," + (Varps.localPlayer.pathY[0] + ScriptEvent.baseY) + ","; for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { - var19 = var19 + var3.array[var6] + ","; + var17 = var17 + var3.array[var6] + ","; } - class3.RunException_sendStackTrace(var19, var36); - class65.method1182(); + class188.RunException_sendStackTrace(var17, var36); + class40.method736(); } return true; } } - @ObfuscatedName("ho") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "1" - ) - final void method1293() { - WorldMapID.sortMenuEntries(); - if (class188.dragInventoryWidget != null) { - return; - } - if (clickedWidget != null) { - return; - } - int var2; - int var4; - int var5; - int var10; - int var19; - label274: { - int var1 = MouseHandler.MouseHandler_lastButton; - int var3; - int var6; - int var8; - if (isMenuOpen) { - if (var1 != 1 && (FriendSystem.mouseCam || var1 != 4)) { - var2 = MouseHandler.MouseHandler_x; - var3 = MouseHandler.MouseHandler_y; - if (var2 < MilliClock.menuX - 10 || var2 > World.menuWidth + MilliClock.menuX + 10 || var3 < class96.menuY - 10 || var3 > class1.menuHeight + class96.menuY + 10) { - isMenuOpen = false; - FloorDecoration.method2786(MilliClock.menuX, class96.menuY, World.menuWidth, class1.menuHeight); - } - } - - if (var1 == 1 || !FriendSystem.mouseCam && var1 == 4) { - var2 = MilliClock.menuX; - var3 = class96.menuY; - var4 = World.menuWidth; - var5 = MouseHandler.MouseHandler_lastPressedX; - var6 = MouseHandler.MouseHandler_lastPressedY; - int var18 = -1; - - for (var8 = 0; var8 < menuOptionsCount; ++var8) { - var19 = var3 + (menuOptionsCount - 1 - var8) * 15 + 31; - if (var5 > var2 && var5 < var4 + var2 && var6 > var19 - 13 && var6 < var19 + 3) { - var18 = var8; - } - } - - if (var18 != -1 && var18 >= 0) { - var8 = menuArguments1[var18]; - var19 = menuArguments2[var18]; - var10 = menuOpcodes[var18]; - int var17 = menuIdentifiers[var18]; - String var12 = menuActions[var18]; - String var13 = menuTargets[var18]; - SecureRandomFuture.menuAction(var8, var19, var10, var17, var12, var13, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); - } - - isMenuOpen = false; - FloorDecoration.method2786(MilliClock.menuX, class96.menuY, World.menuWidth, class1.menuHeight); - } - } else { - var2 = Player.getNewestMenuIdx(); - if ((var1 == 1 || !FriendSystem.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 var14 = WorldMapElement.getWidget(var5); - var8 = ParamDefinition.getWidgetClickMask(var14); - boolean var7 = (var8 >> 28 & 1) != 0; - if (var7) { - break label274; - } - - var10 = ParamDefinition.getWidgetClickMask(var14); - boolean var9 = (var10 >> 29 & 1) != 0; - if (var9) { - break label274; - } - } - } - - if ((var1 == 1 || !FriendSystem.mouseCam && var1 == 4) && this.shouldLeftClickOpenMenu()) { - var1 = 2; - } - - if ((var1 == 1 || !FriendSystem.mouseCam && var1 == 4) && menuOptionsCount > 0 && var2 >= 0) { - var3 = menuArguments1[var2]; - var4 = menuArguments2[var2]; - var5 = menuOpcodes[var2]; - var6 = menuIdentifiers[var2]; - String var15 = menuActions[var2]; - String var16 = menuTargets[var2]; - SecureRandomFuture.menuAction(var3, var4, var5, var6, var15, var16, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); - } - - if (var1 == 2 && menuOptionsCount > 0) { - this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); - } - } - - return; - } - - if (class188.dragInventoryWidget != null && !field867 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { - var19 = field732; - var10 = field744; - MenuAction var11 = class1.tempMenuAction; - SecureRandomFuture.menuAction(var11.argument1, var11.argument2, var11.opcode, var11.argument0, var11.action, var11.action, var19, var10); - class1.tempMenuAction = null; - } - - field867 = false; - itemDragDuration = 0; - if (class188.dragInventoryWidget != null) { - FriendSystem.invalidateWidget(class188.dragInventoryWidget); - } - - class188.dragInventoryWidget = WorldMapElement.getWidget(var5); - dragItemSlotSource = var4; - field732 = MouseHandler.MouseHandler_lastPressedX; - field744 = MouseHandler.MouseHandler_lastPressedY; - if (var2 >= 0) { - class1.tempMenuAction = new MenuAction(); - class1.tempMenuAction.argument1 = menuArguments1[var2]; - class1.tempMenuAction.argument2 = menuArguments2[var2]; - class1.tempMenuAction.opcode = menuOpcodes[var2]; - class1.tempMenuAction.argument0 = menuIdentifiers[var2]; - class1.tempMenuAction.action = menuActions[var2]; - } - - FriendSystem.invalidateWidget(class188.dragInventoryWidget); - } - @ObfuscatedName("hf") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-1478367843" + signature = "(B)V", + garbageValue = "28" + ) + final void method1263() { + 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 var3 = menuTargets[var2]; + menuTargets[var2] = menuTargets[var2 + 1]; + menuTargets[var2 + 1] = var3; + String var4 = menuActions[var2]; + menuActions[var2] = menuActions[var2 + 1]; + menuActions[var2 + 1] = var4; + 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 var6 = menuShiftClick[var2]; + menuShiftClick[var2] = menuShiftClick[var2 + 1]; + menuShiftClick[var2 + 1] = var6; + var1 = false; + } + } + } + + if (class4.dragInventoryWidget == null) { + if (clickedWidget == null) { + int var15 = MouseHandler.MouseHandler_lastButton; + int var8; + int var12; + int var13; + int var18; + if (isMenuOpen) { + if (var15 != 1 && (WorldMapSection1.mouseCam || var15 != 4)) { + var2 = MouseHandler.MouseHandler_x; + var12 = MouseHandler.MouseHandler_y; + if (var2 < FileSystem.menuX - 10 || var2 > FileSystem.menuX + class173.menuWidth + 10 || var12 < class83.menuY - 10 || var12 > class83.menuY + FaceNormal.menuHeight + 10) { + isMenuOpen = false; + HealthBar.method2007(FileSystem.menuX, class83.menuY, class173.menuWidth, FaceNormal.menuHeight); + } + } + + if (var15 == 1 || !WorldMapSection1.mouseCam && var15 == 4) { + var2 = FileSystem.menuX; + var12 = class83.menuY; + var13 = class173.menuWidth; + var5 = MouseHandler.MouseHandler_lastPressedX; + int var16 = MouseHandler.MouseHandler_lastPressedY; + int var17 = -1; + + for (var8 = 0; var8 < menuOptionsCount; ++var8) { + var18 = var12 + (menuOptionsCount - 1 - var8) * 15 + 31; + if (var5 > var2 && var5 < var13 + var2 && var16 > var18 - 13 && var16 < var18 + 3) { + var17 = var8; + } + } + + if (var17 != -1) { + AbstractWorldMapIcon.method572(var17); + } + + isMenuOpen = false; + HealthBar.method2007(FileSystem.menuX, class83.menuY, class173.menuWidth, FaceNormal.menuHeight); + } + } else { + var2 = WorldMapCacheName.getNewestMenuIdx(); + if ((var15 == 1 || !WorldMapSection1.mouseCam && var15 == 4) && var2 >= 0) { + var12 = menuOpcodes[var2]; + if (var12 == 39 || var12 == 40 || var12 == 41 || var12 == 42 || var12 == 43 || var12 == 33 || var12 == 34 || var12 == 35 || var12 == 36 || var12 == 37 || var12 == 38 || var12 == 1005) { + label274: { + var13 = menuArguments1[var2]; + var5 = menuArguments2[var2]; + Widget var14 = Player.getWidget(var5); + var8 = class60.getWidgetClickMask(var14); + boolean var7 = (var8 >> 28 & 1) != 0; + int var10; + if (!var7) { + var10 = class60.getWidgetClickMask(var14); + boolean var9 = (var10 >> 29 & 1) != 0; + if (!var9) { + break label274; + } + } + + if (class4.dragInventoryWidget != null && !field733 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { + var18 = field730; + var10 = field870; + MenuAction var11 = SoundCache.tempMenuAction; + EnumDefinition.menuAction(var11.argument1, var11.argument2, var11.opcode, var11.argument0, var11.action, var11.action, var18, var10); + SoundCache.tempMenuAction = null; + } + + field733 = false; + itemDragDuration = 0; + if (class4.dragInventoryWidget != null) { + WorldMapID.invalidateWidget(class4.dragInventoryWidget); + } + + class4.dragInventoryWidget = Player.getWidget(var5); + dragItemSlotSource = var13; + field730 = MouseHandler.MouseHandler_lastPressedX; + field870 = MouseHandler.MouseHandler_lastPressedY; + if (var2 >= 0) { + SoundCache.tempMenuAction = new MenuAction(); + SoundCache.tempMenuAction.argument1 = menuArguments1[var2]; + SoundCache.tempMenuAction.argument2 = menuArguments2[var2]; + SoundCache.tempMenuAction.opcode = menuOpcodes[var2]; + SoundCache.tempMenuAction.argument0 = menuIdentifiers[var2]; + SoundCache.tempMenuAction.action = menuActions[var2]; + } + + WorldMapID.invalidateWidget(class4.dragInventoryWidget); + return; + } + } + } + + if ((var15 == 1 || !WorldMapSection1.mouseCam && var15 == 4) && this.shouldLeftClickOpenMenu()) { + var15 = 2; + } + + if ((var15 == 1 || !WorldMapSection1.mouseCam && var15 == 4) && menuOptionsCount > 0) { + AbstractWorldMapIcon.method572(var2); + } + + if (var15 == 2 && menuOptionsCount > 0) { + this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); + } + } + + } + } + } + + @ObfuscatedName("ha") + @ObfuscatedSignature( + signature = "(B)Z", + garbageValue = "0" ) @Export("shouldLeftClickOpenMenu") final boolean shouldLeftClickOpenMenu() { - int var1 = Player.getNewestMenuIdx(); - return (leftClickOpensMenu == 1 && menuOptionsCount > 2 || ClientPacket.isRightClickOnlyMenu(var1)) && !menuShiftClick[var1]; + int var1 = WorldMapCacheName.getNewestMenuIdx(); + boolean var2 = leftClickOpensMenu == 1 && menuOptionsCount > 2; + if (!var2) { + boolean var3; + if (var1 < 0) { + var3 = false; + } else { + int var4 = menuOpcodes[var1]; + if (var4 >= 2000) { + var4 -= 2000; + } + + if (var4 == 1007) { + var3 = true; + } else { + var3 = false; + } + } + + var2 = var3; + } + + return var2 && !menuShiftClick[var1]; } @ObfuscatedName("hu") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "7" + signature = "(III)V", + garbageValue = "-1915079329" ) @Export("openMenu") final void openMenu(int var1, int var2) { - WorldMapData_1.calculateMenuBounds(var1, var2); - Player.scene.menuOpen(ItemContainer.plane, var1, var2, false); + ScriptEvent.calculateMenuBounds(var1, var2); + WorldMapIcon_1.scene.menuOpen(MouseRecorder.plane, var1, var2, false); isMenuOpen = true; } - @ObfuscatedName("ir") + @ObfuscatedName("im") @ObfuscatedSignature( signature = "(ZI)V", - garbageValue = "1310115319" + garbageValue = "-475129533" ) @Export("resizeRoot") final void resizeRoot(boolean var1) { - GrandExchangeOfferNameComparator.resizeComponents(rootInterface, KitDefinition.canvasWidth, class30.canvasHeight, var1); + Occluder.resizeComponents(rootInterface, GraphicsDefaults.canvasWidth, GameShell.canvasHeight, var1); } - @ObfuscatedName("io") + @ObfuscatedName("il") @ObfuscatedSignature( - signature = "(Lhp;B)V", - garbageValue = "53" + signature = "(Lhy;B)V", + garbageValue = "4" ) @Export("alignWidget") void alignWidget(Widget var1) { - Widget var2 = var1.parentId == -1 ? null : WorldMapElement.getWidget(var1.parentId); + Widget var2 = var1.parentId == -1 ? null : Player.getWidget(var1.parentId); int var3; int var4; if (var2 == null) { - var3 = KitDefinition.canvasWidth; - var4 = class30.canvasHeight; + var3 = GraphicsDefaults.canvasWidth; + var4 = GameShell.canvasHeight; } else { var3 = var2.width; var4 = var2.height; } - NetSocket.alignWidgetSize(var1, var3, var4, false); - Message.alignWidgetPosition(var1, var3, var4); + class192.alignWidgetSize(var1, var3, var4, false); + WorldMapEvent.alignWidgetPosition(var1, var3, var4); } - @ObfuscatedName("ju") + @ObfuscatedName("jn") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1084041497" + garbageValue = "-1922845127" ) - final void method1615() { - FriendSystem.invalidateWidget(clickedWidget); - ++class60.widgetDragDuration; - if (field804 && field641) { + final void method1268() { + WorldMapID.invalidateWidget(clickedWidget); + ++ArchiveLoader.widgetDragDuration; + if (field803 && field800) { int var1 = MouseHandler.MouseHandler_x; int var2 = MouseHandler.MouseHandler_y; var1 -= widgetClickX; var2 -= widgetClickY; - if (var1 < field802) { - var1 = field802; + if (var1 < field801) { + var1 = field801; } - if (var1 + clickedWidget.width > field802 + clickedWidgetParent.width) { - var1 = field802 + clickedWidgetParent.width - clickedWidget.width; + if (var1 + clickedWidget.width > field801 + clickedWidgetParent.width) { + var1 = field801 + clickedWidgetParent.width - clickedWidget.width; } - if (var2 < field803) { - var2 = field803; + if (var2 < field706) { + var2 = field706; } - if (var2 + clickedWidget.height > field803 + clickedWidgetParent.height) { - var2 = field803 + clickedWidgetParent.height - clickedWidget.height; + if (var2 + clickedWidget.height > field706 + clickedWidgetParent.height) { + var2 = field706 + clickedWidgetParent.height - clickedWidget.height; } - int var3 = var1 - field805; - int var4 = var2 - field806; + int var3 = var1 - field804; + int var4 = var2 - field699; int var5 = clickedWidget.dragZoneSize; - if (class60.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { + if (ArchiveLoader.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { isDraggingWidget = true; } - int var6 = var1 - field802 + clickedWidgetParent.scrollX; - int var7 = var2 - field803 + clickedWidgetParent.scrollY; + int var6 = var1 - field801 + clickedWidgetParent.scrollX; + int var7 = var2 - field706 + clickedWidgetParent.scrollY; ScriptEvent var8; if (clickedWidget.onDrag != null && isDraggingWidget) { var8 = new ScriptEvent(); @@ -5640,7 +5735,7 @@ public final class Client extends GameShell implements Usernamed { var8.mouseX = var6; var8.mouseY = var7; var8.args = clickedWidget.onDrag; - class81.runScriptEvent(var8); + SecureRandomFuture.runScriptEvent(var8); } if (MouseHandler.MouseHandler_currentButton == 0) { @@ -5652,406 +5747,159 @@ public final class Client extends GameShell implements Usernamed { var8.mouseY = var7; var8.dragTarget = draggedOnWidget; var8.args = clickedWidget.onDragComplete; - class81.runScriptEvent(var8); + SecureRandomFuture.runScriptEvent(var8); } - if (draggedOnWidget != null && AbstractByteArrayCopier.method3871(clickedWidget) != null) { - PacketBufferNode var9 = MenuAction.getPacketBufferNode(ClientPacket.field2213, packetWriter.isaacCipher); - var9.packetBuffer.method5443(clickedWidget.childIndex); - var9.packetBuffer.method5443(draggedOnWidget.itemId); - var9.packetBuffer.writeShort(draggedOnWidget.childIndex); - var9.packetBuffer.writeIntLE(clickedWidget.id); - var9.packetBuffer.writeIntME(draggedOnWidget.id); - var9.packetBuffer.writeShort(clickedWidget.itemId); - packetWriter.addNode(var9); + if (draggedOnWidget != null && FontName.method5290(clickedWidget) != null) { + PacketBufferNode var12 = MenuAction.getPacketBufferNode(ClientPacket.field2242, packetWriter.isaacCipher); + var12.packetBuffer.writeShortLE(draggedOnWidget.id); + var12.packetBuffer.method5500(clickedWidget.itemId); + var12.packetBuffer.method5502(draggedOnWidget.itemId); + var12.packetBuffer.writeIntME(draggedOnWidget.childIndex); + var12.packetBuffer.writeIntME(clickedWidget.childIndex); + var12.packetBuffer.writeIntLE(clickedWidget.id); + packetWriter.addNode(var12); } } else if (this.shouldLeftClickOpenMenu()) { - this.openMenu(field805 + widgetClickX, field806 + widgetClickY); + this.openMenu(widgetClickX + field804, field699 + widgetClickY); } else if (menuOptionsCount > 0) { - ScriptFrame.method1092(field805 + widgetClickX, field806 + widgetClickY); + int var11 = widgetClickX + field804; + int var9 = field699 + widgetClickY; + MenuAction var10 = SoundCache.tempMenuAction; + EnumDefinition.menuAction(var10.argument1, var10.argument2, var10.opcode, var10.argument0, var10.action, var10.action, var11, var9); + SoundCache.tempMenuAction = null; } clickedWidget = null; } } else { - if (class60.widgetDragDuration > 1) { + if (ArchiveLoader.widgetDragDuration > 1) { clickedWidget = null; } } } - @ObfuscatedName("kk") + @ObfuscatedName("kp") @ObfuscatedSignature( - signature = "(I)Ljx;", - garbageValue = "962934553" + signature = "(B)Ljt;", + garbageValue = "1" ) @Export("username") public Username username() { - return WorldMapIcon_1.localPlayer != null ? WorldMapIcon_1.localPlayer.username : null; + return Varps.localPlayer != null ? Varps.localPlayer.username : null; } - @ObfuscatedName("z") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(IIIIIIILea;Lfm;I)V", - garbageValue = "1851683520" + signature = "(CI)Z", + garbageValue = "1135918061" ) - @Export("addPendingGameObject") - static final void addPendingGameObject(int var0, int var1, int var2, int var3, int var4, int var5, int var6, Scene var7, CollisionMap var8) { - ObjectDefinition var9 = class215.getObjectDefinition(var4); - int var10; - int var11; - if (var5 != 1 && var5 != 3) { - var10 = var9.sizeX; - var11 = var9.sizeY; - } else { - var10 = var9.sizeY; - var11 = var9.sizeX; + @Export("isCharAlphabetic") + public static boolean isCharAlphabetic(char var0) { + return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; + } + + static void aab() { + if (field824 && Varps.localPlayer != null) { + int var0 = Varps.localPlayer.pathX[0]; + int var1 = Varps.localPlayer.pathY[0]; + if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) { + return; + } + + SecureRandomFuture.oculusOrbFocalPointX = Varps.localPlayer.x * -78439701; + int var2 = WorldMapAreaData.getTileHeight(Varps.localPlayer.x * -78439701, Varps.localPlayer.y, MouseRecorder.plane) - camFollowHeight * 172735687; + if (var2 < class65.field580 * 1615694975) { + class65.field580 = var2 * -59362433; + } + + AbstractByteArrayCopier.oculusOrbFocalPointY = Varps.localPlayer.y; + field824 = false; } - int var12; - int var13; - if (var10 + var2 <= 104) { - var12 = (var10 >> 1) + var2; - var13 = var2 + (var10 + 1 >> 1); + } + + @ObfuscatedSignature( + signature = "(Lkz;)V" + ) + static void aao(Buffer var0) { + if (randomDatData != null) { + var0.writeBytes(randomDatData, 0, randomDatData.length); } else { - var12 = var2; - var13 = var2 + 1; - } + byte[] var2 = new byte[24]; - int var14; - int var15; - if (var3 + var11 <= 104) { - var14 = var3 + (var11 >> 1); - var15 = var3 + (var11 + 1 >> 1); - } else { - var14 = var3; - var15 = var3 + 1; - } + try { + JagexCache.JagexCache_randomDat.seek(0L); + JagexCache.JagexCache_randomDat.readFully(var2); - int[][] var16 = Tiles.Tiles_heights[var1]; - int var17 = var16[var13][var15] + var16[var12][var15] + var16[var13][var14] + var16[var12][var14] >> 2; - int var18 = (var2 << 7) + (var10 << 6); - int var19 = (var3 << 7) + (var11 << 6); - long var20 = WorldMapSprite.calculateTag(var2, var3, 2, var9.int1 == 0, var4); - int var22 = (var5 << 6) + var6; - if (var9.int3 == 1) { - var22 += 256; - } - - Object var23; - if (var6 == 22) { - if (var9.animationId == -1 && var9.transforms == null) { - var23 = var9.getModel(22, var5, var16, var18, var17, var19); - } else { - var23 = new DynamicObject(var4, 22, var5, var1, var2, var3, var9.animationId, true, (Entity)null); - } - - var7.newFloorDecoration(var0, var2, var3, var17, (Entity)var23, 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) { - var23 = var9.getModel(var6, var5, var16, var18, var17, var19); - } else { - var23 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, true, (Entity)null); + int var3; + for (var3 = 0; var3 < 24 && var2[var3] == 0; ++var3) { } - var7.method3013(var0, var2, var3, var17, 1, 1, (Entity)var23, 0, var20, var22); - if (var9.interactType != 0) { - var8.addGameObject(var2, var3, var10, var11, var9.boolean1); + if (var3 >= 24) { + throw new IOException(); } - - } else if (var6 == 0) { - if (var9.animationId == -1 && var9.transforms == null) { - var23 = var9.getModel(0, var5, var16, var18, var17, var19); - } else { - var23 = new DynamicObject(var4, 0, var5, var1, var2, var3, var9.animationId, true, (Entity)null); - } - - var7.newBoundaryObject(var0, var2, var3, var17, (Entity)var23, (Entity)null, Tiles.field479[var5], 0, var20, var22); - if (var9.interactType != 0) { - var8.method3495(var2, var3, var6, var5, var9.boolean1); - } - - } else if (var6 == 1) { - if (var9.animationId == -1 && var9.transforms == null) { - var23 = var9.getModel(1, var5, var16, var18, var17, var19); - } else { - var23 = new DynamicObject(var4, 1, var5, var1, var2, var3, var9.animationId, true, (Entity)null); - } - - var7.newBoundaryObject(var0, var2, var3, var17, (Entity)var23, (Entity)null, Tiles.field480[var5], 0, var20, var22); - if (var9.interactType != 0) { - var8.method3495(var2, var3, var6, var5, var9.boolean1); - } - - } else { - int var29; - if (var6 == 2) { - var29 = var5 + 1 & 3; - Object var24; - Object var25; - if (var9.animationId == -1 && var9.transforms == null) { - var24 = var9.getModel(2, var5 + 4, var16, var18, var17, var19); - var25 = var9.getModel(2, var29, var16, var18, var17, var19); - } else { - var24 = new DynamicObject(var4, 2, var5 + 4, var1, var2, var3, var9.animationId, true, (Entity)null); - var25 = new DynamicObject(var4, 2, var29, var1, var2, var3, var9.animationId, true, (Entity)null); - } - - var7.newBoundaryObject(var0, var2, var3, var17, (Entity)var24, (Entity)var25, Tiles.field479[var5], Tiles.field479[var29], var20, var22); - if (var9.interactType != 0) { - var8.method3495(var2, var3, var6, var5, var9.boolean1); - } - - } else if (var6 == 3) { - if (var9.animationId == -1 && var9.transforms == null) { - var23 = var9.getModel(3, var5, var16, var18, var17, var19); - } else { - var23 = new DynamicObject(var4, 3, var5, var1, var2, var3, var9.animationId, true, (Entity)null); - } - - var7.newBoundaryObject(var0, var2, var3, var17, (Entity)var23, (Entity)null, Tiles.field480[var5], 0, var20, var22); - if (var9.interactType != 0) { - var8.method3495(var2, var3, var6, var5, var9.boolean1); - } - - } else if (var6 == 9) { - if (var9.animationId == -1 && var9.transforms == null) { - var23 = var9.getModel(var6, var5, var16, var18, var17, var19); - } else { - var23 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, true, (Entity)null); - } - - var7.method3013(var0, var2, var3, var17, 1, 1, (Entity)var23, 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) { - var23 = var9.getModel(4, var5, var16, var18, var17, var19); - } else { - var23 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, true, (Entity)null); - } - - var7.newWallDecoration(var0, var2, var3, var17, (Entity)var23, (Entity)null, Tiles.field479[var5], 0, 0, 0, var20, var22); - } else { - Object var26; - long var30; - if (var6 == 5) { - var29 = 16; - var30 = var7.getBoundaryObjectTag(var0, var2, var3); - if (0L != var30) { - var29 = class215.getObjectDefinition(BoundaryObject.Entity_unpackID(var30)).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, true, (Entity)null); - } - - var7.newWallDecoration(var0, var2, var3, var17, (Entity)var26, (Entity)null, Tiles.field479[var5], 0, var29 * Tiles.field481[var5], var29 * Tiles.field482[var5], var20, var22); - } else if (var6 == 6) { - var29 = 8; - var30 = var7.getBoundaryObjectTag(var0, var2, var3); - if (var30 != 0L) { - var29 = class215.getObjectDefinition(BoundaryObject.Entity_unpackID(var30)).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, true, (Entity)null); - } - - var7.newWallDecoration(var0, var2, var3, var17, (Entity)var26, (Entity)null, 256, var5, var29 * Tiles.field478[var5], var29 * Tiles.field484[var5], var20, var22); - } else if (var6 == 7) { - int var32 = var5 + 2 & 3; - if (var9.animationId == -1 && var9.transforms == null) { - var23 = var9.getModel(4, var32 + 4, var16, var18, var17, var19); - } else { - var23 = new DynamicObject(var4, 4, var32 + 4, var1, var2, var3, var9.animationId, true, (Entity)null); - } - - var7.newWallDecoration(var0, var2, var3, var17, (Entity)var23, (Entity)null, 256, var32, 0, 0, var20, var22); - } else if (var6 == 8) { - var29 = 8; - var30 = var7.getBoundaryObjectTag(var0, var2, var3); - if (var30 != 0L) { - var29 = class215.getObjectDefinition(BoundaryObject.Entity_unpackID(var30)).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, true, (Entity)null); - var27 = new DynamicObject(var4, 4, var28 + 4, var1, var2, var3, var9.animationId, true, (Entity)null); - } - - var7.newWallDecoration(var0, var2, var3, var17, (Entity)var26, (Entity)var27, 256, var5, var29 * Tiles.field478[var5], var29 * Tiles.field484[var5], var20, var22); - } + } catch (Exception var6) { + for (int var4 = 0; var4 < 24; ++var4) { + var2[var4] = -1; } } - } else { - if (var9.animationId == -1 && var9.transforms == null) { - var23 = var9.getModel(10, var5, var16, var18, var17, var19); - } else { - var23 = new DynamicObject(var4, 10, var5, var1, var2, var3, var9.animationId, true, (Entity)null); - } - - if (var23 != null) { - var7.method3013(var0, var2, var3, var17, var10, var11, (Entity)var23, var6 == 11 ? 256 : 0, var20, var22); - } - - if (var9.interactType != 0) { - var8.addGameObject(var2, var3, var10, var11, var9.boolean1); - } + var0.writeBytes(var2, 0, var2.length); } } - static void abv(int var0) { - oculusOrbState = var0 * 1185562872; - } - - static void aar(byte[] var0, int var1) { + @ObfuscatedSignature( + signature = "(Lkz;I)V" + ) + static void aav(Buffer var0, int var1) { + byte[] var2 = var0.array; if (randomDatData == null) { randomDatData = new byte[24]; } - class300.writeRandomDat(var0, var1, randomDatData, 0, 24); + class300.writeRandomDat(var2, var1, randomDatData, 0, 24); + class49.method828(var0, var1); } - @ObfuscatedSignature( - signature = "(Lhp;I)Ljava/lang/String;" - ) - static String aas(Widget var0, int var1) { - int var3 = ParamDefinition.getWidgetClickMask(var0); - boolean var2 = (var3 >> var1 + 1 & 1) != 0; - if (!var2 && 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; - } - } + static void aax() { + if (MenuAction.field1133 != null) { + field892 = cycle; + MenuAction.field1133.method4295(); - @ObfuscatedSignature( - signature = "(Lhp;)Z" - ) - static boolean aaa(Widget var0) { - return var0.isHidden; - } - - static String abr(String var0) { - PlayerType[] var1 = class191.PlayerType_values(); - - for (int var2 = 0; var2 < var1.length; ++var2) { - PlayerType var3 = var1[var2]; - if (var3.modIcon * 714577229 != -1 && var0.startsWith(AbstractWorldMapData.method278(var3.modIcon * 714577229))) { - var0 = var0.substring(6 + Integer.toString(var3.modIcon * -474347898).length()); - break; - } - } - - return var0; - } - - static void aaq(String var0) { - Clock.field2037 = var0; - - try { - String var1 = WorldMapID.client.getParameter(Integer.toString(18)); - String var2 = WorldMapID.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=" + MusicPatchPcmStream.method3831(SequenceDefinition.method4686() + 94608000000L) + "; Max-Age=" + 94608000L; - } - - class47.method796(WorldMapID.client, "document.cookie=\"" + var3 + "\""); - } catch (Throwable var4) { - } - - } - - @ObfuscatedSignature( - signature = "(Lky;I)V" - ) - static void aap(Buffer var0, int var1) { - Tiles.method1088(var0.array, var1); - WorldMapIcon_1.method295(var0, var1); - } - - @ObfuscatedSignature( - signature = "(Lhp;)Z" - ) - static boolean aaw(Widget var0) { - return var0.isHidden; - } - - static void abz(int var0) { - oculusOrbState = var0; - } - - static void aay(String var0, boolean var1) { - var0 = var0.toLowerCase(); - short[] var2 = new short[16]; - int var3 = 0; - - for (int var4 = 0; var4 < MouseRecorder.ItemDefinition_fileCount; ++var4) { - ItemDefinition var5 = WorldMapData_0.ItemDefinition_get(var4); - if ((!var1 || var5.isTradable) && var5.noteTemplate * -600977204 == -1 && var5.name.toLowerCase().indexOf(var0) != -1) { - if (var3 >= 250) { - Language.foundItemIdCount = -1; - SecureRandomCallable.foundItemIds = null; - return; + for (int var0 = 0; var0 < players.length; ++var0) { + if (players[var0] != null) { + MenuAction.field1133.method4319(class4.baseX * 64 + (players[var0].x * -78439701 >> 7), ScriptEvent.baseY + (players[var0].y >> 7)); } - - 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; } } - SecureRandomCallable.foundItemIds = var2; - GrandExchangeOffer.foundItemIndex = 0; - Language.foundItemIdCount = var3; - String[] var8 = new String[Language.foundItemIdCount * 1188384709]; - - for (int var9 = 0; var9 < Language.foundItemIdCount * -269707746; ++var9) { - var8[var9] = WorldMapData_0.ItemDefinition_get(var2[var9]).name; - } - - short[] var10 = SecureRandomCallable.foundItemIds; - ModelData0.sortItemsByName(var8, var10, 0, var8.length - 1); } - static void abs() { - packetWriter.addNode(MenuAction.getPacketBufferNode(ClientPacket.field2222, packetWriter.isaacCipher)); - oculusOrbState = 0; + static void aaq() { + if (field824 && Varps.localPlayer != null) { + int var0 = Varps.localPlayer.pathX[0]; + int var1 = Varps.localPlayer.pathY[0]; + if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) { + return; + } + + SecureRandomFuture.oculusOrbFocalPointX = Varps.localPlayer.x * -78439701; + int var2 = WorldMapAreaData.getTileHeight(Varps.localPlayer.x * -78439701, Varps.localPlayer.y, MouseRecorder.plane) - camFollowHeight * 172735687; + if (var2 < class65.field580 * 1615694975) { + class65.field580 = var2 * -59362433; + } + + AbstractByteArrayCopier.oculusOrbFocalPointY = Varps.localPlayer.y; + field824 = false; + } + } @ObfuscatedSignature( - signature = "(Lky;)V" + signature = "(Lkz;)V" ) static void aad(Buffer var0) { if (randomDatData != null) { @@ -6081,37 +5929,9 @@ public final class Client extends GameShell implements Usernamed { } @ObfuscatedSignature( - signature = "(Lky;I)V" + signature = "(Lkz;)V" ) - static void aav(Buffer var0, int var1) { - Tiles.method1088(var0.array, var1); - WorldMapIcon_1.method295(var0, var1); - } - - public static void abp(int var0, int var1, int var2, boolean var3) { - PacketBufferNode var4 = MenuAction.getPacketBufferNode(ClientPacket.field2255, packetWriter.isaacCipher); - var4.packetBuffer.writeIntME(var3 ? field705 * -412206939 : 0); - var4.packetBuffer.writeShortLE(var1); - var4.packetBuffer.method5545(var2); - var4.packetBuffer.writeShort(var0); - packetWriter.addNode(var4); - } - - @ObfuscatedSignature( - signature = "(Lhp;)Ljava/lang/String;" - ) - static String aak(Widget var0) { - if (WorldMapRegion.method530(ParamDefinition.getWidgetClickMask(var0)) == 0) { - return null; - } else { - return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; - } - } - - @ObfuscatedSignature( - signature = "(Lky;)V" - ) - static void aaf(Buffer var0) { + static void aal(Buffer var0) { if (randomDatData != null) { var0.writeBytes(randomDatData, 0, randomDatData.length); } else { @@ -6138,251 +5958,104 @@ public final class Client extends GameShell implements Usernamed { } } - @ObfuscatedSignature( - signature = "(Lhp;)Z" - ) - static boolean aax(Widget var0) { - return var0.isHidden; + public static boolean aaw() { + return staffModLevel >= 2; } - @ObfuscatedSignature( - signature = "(Lhp;)Z" - ) - static boolean aah(Widget var0) { - return var0.isHidden; + public static boolean aam() { + return staffModLevel >= 2; } - @ObfuscatedSignature( - signature = "(Lhp;I)Ljava/lang/String;" - ) - static String aat(Widget var0, int var1) { - int var3 = ParamDefinition.getWidgetClickMask(var0); - boolean var2 = (var3 >> var1 + 1 & 1) != 0; - if (!var2 && 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; - } - } - - @ObfuscatedSignature( - signature = "(Lhp;)Ljava/lang/String;" - ) - static String aai(Widget var0) { - if (WorldMapRegion.method530(ParamDefinition.getWidgetClickMask(var0)) == 0) { - return null; - } else { - return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; - } - } - - @ObfuscatedSignature( - signature = "(Lhp;)Ljava/lang/String;" - ) - static String aan(Widget var0) { - if (WorldMapRegion.method530(ParamDefinition.getWidgetClickMask(var0)) == 0) { - return null; - } else { - return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; - } - } - - static String aae(String var0, boolean var1) { - String var2 = var1 ? "https://" : "http://"; - if (gameBuild == 1) { - var0 = var0 + "-wtrc"; - } else if (gameBuild == 2) { - var0 = var0 + "-wtqa"; - } else if (gameBuild == 3) { - var0 = var0 + "-wtwip"; - } else if (gameBuild == 5) { - var0 = var0 + "-wti"; - } else if (gameBuild == 4) { - var0 = "local"; - } - - String var3 = ""; - if (Clock.field2037 != null) { - var3 = "/p=" + Clock.field2037; - } - - String var4 = "runescape.com"; - return var2 + var0 + "." + var4 + "/l=" + class60.clientLanguage + "/a=" + SoundSystem.field1414 + var3 + "/"; - } - - static String aao(String var0, boolean var1) { - String var2 = var1 ? "https://" : "http://"; - if (gameBuild == 1) { - var0 = var0 + "-wtrc"; - } else if (gameBuild == 2) { - var0 = var0 + "-wtqa"; - } else if (gameBuild == 3) { - var0 = var0 + "-wtwip"; - } else if (gameBuild == 5) { - var0 = var0 + "-wti"; - } else if (gameBuild == 4) { - var0 = "local"; - } - - String var3 = ""; - if (Clock.field2037 != null) { - var3 = "/p=" + Clock.field2037; - } - - String var4 = "runescape.com"; - return var2 + var0 + "." + var4 + "/l=" + class60.clientLanguage + "/a=" + SoundSystem.field1414 + var3 + "/"; - } - - static String aac(String var0, boolean var1) { - String var2 = var1 ? "https://" : "http://"; - if (gameBuild == 1) { - var0 = var0 + "-wtrc"; - } else if (gameBuild == 2) { - var0 = var0 + "-wtqa"; - } else if (gameBuild == 3) { - var0 = var0 + "-wtwip"; - } else if (gameBuild == 5) { - var0 = var0 + "-wti"; - } else if (gameBuild * 281503877 == 4) { - var0 = "local"; - } - - String var3 = ""; - if (Clock.field2037 != null) { - var3 = "/p=" + Clock.field2037; - } - - String var4 = "runescape.com"; - return var2 + var0 + "." + var4 + "/l=" + class60.clientLanguage + "/a=" + SoundSystem.field1414 * -1347342514 + var3 + "/"; - } - - static void aal(byte[] var0, int var1) { - if (randomDatData == null) { - randomDatData = new byte[24]; - } - - class300.writeRandomDat(var0, var1, randomDatData, 0, 24); - } - - @ObfuscatedSignature( - signature = "(Lky;I)V" - ) - static void aaz(Buffer var0, int var1) { - Tiles.method1088(var0.array, var1); - WorldMapIcon_1.method295(var0, var1); - } - - @ObfuscatedSignature( - signature = "(Lky;I)V" - ) - static void aab(Buffer var0, int var1) { - Tiles.method1088(var0.array, var1); - WorldMapIcon_1.method295(var0, var1); - } - - @ObfuscatedSignature( - signature = "(Lky;)V" - ) - static void aam(Buffer var0) { - if (randomDatData != null) { - var0.writeBytes(randomDatData, 0, randomDatData.length); - } else { - byte[] var2 = new byte[24]; - - 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); - } - } - - public static void abm(int var0, int var1, int var2, boolean var3) { - PacketBufferNode var4 = MenuAction.getPacketBufferNode(ClientPacket.field2255, packetWriter.isaacCipher); - var4.packetBuffer.writeIntME(var3 ? field705 : 0); - var4.packetBuffer.writeShortLE(var1); - var4.packetBuffer.method5545(var2); - var4.packetBuffer.writeShort(var0); - packetWriter.addNode(var4); - } - - static void abf(int var0) { + static void aat(int var0) { oculusOrbState = var0; } - static void abh(int var0) { - oculusOrbState = var0; + static void aah() { + packetWriter.addNode(MenuAction.getPacketBufferNode(ClientPacket.field2254, packetWriter.isaacCipher)); + oculusOrbState = 0; } - static void aau(String var0) { - Clock.field2037 = var0; + static void aae() { + packetWriter.addNode(MenuAction.getPacketBufferNode(ClientPacket.field2254, packetWriter.isaacCipher)); + oculusOrbState = 0; + } - try { - String var1 = WorldMapID.client.getParameter(Integer.toString(18)); - String var2 = WorldMapID.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=" + MusicPatchPcmStream.method3831(SequenceDefinition.method4686() + 94608000000L) + "; Max-Age=" + 94608000L; - } - - class47.method796(WorldMapID.client, "document.cookie=\"" + var3 + "\""); - } catch (Throwable var4) { + @Export("sortMenuEntries") + @ObfuscatedName("aaz") + static void sortMenuEntries() { + if (oculusOrbState * 1131557898 == 1) { + field824 = true; } } - static void abj() { - packetWriter.addNode(MenuAction.getPacketBufferNode(ClientPacket.field2222, packetWriter.isaacCipher)); - oculusOrbState = 0; + static void aau() { + if (field824 && Varps.localPlayer != null) { + int var0 = Varps.localPlayer.pathX[0]; + int var1 = Varps.localPlayer.pathY[0]; + if (var0 < 0 || var1 < 0 || var0 >= -1349199817 || var1 >= 104) { + return; + } + + SecureRandomFuture.oculusOrbFocalPointX = Varps.localPlayer.x * 1039058795; + int var2 = WorldMapAreaData.getTileHeight(Varps.localPlayer.x * -78439701, Varps.localPlayer.y, MouseRecorder.plane) - camFollowHeight * 536343645; + if (var2 < class65.field580 * 1615694975) { + class65.field580 = var2 * -59362433; + } + + AbstractByteArrayCopier.oculusOrbFocalPointY = Varps.localPlayer.y; + field824 = false; + } + } - static void aby() { - packetWriter.addNode(MenuAction.getPacketBufferNode(ClientPacket.field2222, packetWriter.isaacCipher)); - oculusOrbState = 0; - } - - static void abx() { - if (field706 && WorldMapIcon_1.localPlayer != null) { - int var0 = WorldMapIcon_1.localPlayer.pathX[0]; - int var1 = WorldMapIcon_1.localPlayer.pathY[0]; + static void aas() { + if (field824 && Varps.localPlayer != null) { + int var0 = Varps.localPlayer.pathX[0]; + int var1 = Varps.localPlayer.pathY[0]; if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) { return; } - DynamicObject.oculusOrbFocalPointX = WorldMapIcon_1.localPlayer.x; - int var2 = GrandExchangeOfferTotalQuantityComparator.getTileHeight(WorldMapIcon_1.localPlayer.x, WorldMapIcon_1.localPlayer.y, ItemContainer.plane) - camFollowHeight; - if (var2 < ScriptEvent.field559) { - ScriptEvent.field559 = var2; + SecureRandomFuture.oculusOrbFocalPointX = Varps.localPlayer.x * -78439701; + int var2 = WorldMapAreaData.getTileHeight(Varps.localPlayer.x * -78439701, Varps.localPlayer.y, MouseRecorder.plane) - camFollowHeight * 172735687; + if (var2 < class65.field580 * 1615694975) { + class65.field580 = var2 * -59362433; } - FriendSystem.oculusOrbFocalPointY = WorldMapIcon_1.localPlayer.y; - field706 = false; + AbstractByteArrayCopier.oculusOrbFocalPointY = Varps.localPlayer.y; + field824 = false; } } - static String abq(String var0) { - PlayerType[] var1 = class191.PlayerType_values(); + static void aay() { + if (field824 && Varps.localPlayer != null) { + int var0 = Varps.localPlayer.pathX[0]; + int var1 = Varps.localPlayer.pathY[0]; + if (var0 < 0 || var1 < 0 || var0 >= 2074219828 || var1 >= 104) { + return; + } + + SecureRandomFuture.oculusOrbFocalPointX = Varps.localPlayer.x * 79454524; + int var2 = WorldMapAreaData.getTileHeight(Varps.localPlayer.x * -78439701, Varps.localPlayer.y * -224354688, MouseRecorder.plane) - camFollowHeight * -808569797; + if (var2 < class65.field580 * 228658747) { + class65.field580 = var2 * 545155251; + } + + AbstractByteArrayCopier.oculusOrbFocalPointY = Varps.localPlayer.y * 1124445248; + field824 = false; + } + + } + + static String aaf(String var0) { + PlayerType[] var1 = PlayerAppearance.PlayerType_values(); for (int var2 = 0; var2 < var1.length; ++var2) { PlayerType var3 = var1[var2]; - if (var3.modIcon * 714577229 != -1 && var0.startsWith(AbstractWorldMapData.method278(var3.modIcon * 714577229))) { - var0 = var0.substring(6 + Integer.toString(var3.modIcon * 714577229).length()); + if (var3.modIcon * 2069934243 != -1 && var0.startsWith(ArchiveDiskAction.method4133(var3.modIcon * 250778590))) { + var0 = var0.substring(6 + Integer.toString(var3.modIcon * 1831934627).length()); break; } } @@ -6390,73 +6063,141 @@ public final class Client extends GameShell implements Usernamed { return var0; } - static String abl(String var0) { - PlayerType[] var1 = class191.PlayerType_values(); - - for (int var2 = 0; var2 < var1.length; ++var2) { - PlayerType var3 = var1[var2]; - if (var3.modIcon * -474359768 != -1 && var0.startsWith(AbstractWorldMapData.method278(var3.modIcon * 714577229))) { - var0 = var0.substring(6 + Integer.toString(var3.modIcon * 64500931).length()); - break; - } - } - - return var0; - } - - static String abu(String var0) { - PlayerType[] var1 = class191.PlayerType_values(); - - for (int var2 = 0; var2 < var1.length; ++var2) { - PlayerType var3 = var1[var2]; - if (var3.modIcon * 1421818761 != -1 && var0.startsWith(AbstractWorldMapData.method278(var3.modIcon * 714577229))) { - var0 = var0.substring(6 + Integer.toString(var3.modIcon * -1744443394).length()); - break; - } - } - - return var0; - } - - static String abw(String var0) { - PlayerType[] var1 = class191.PlayerType_values(); - - for (int var2 = 0; var2 < var1.length; ++var2) { - PlayerType var3 = var1[var2]; - if (var3.modIcon * 869307039 != -1 && var0.startsWith(AbstractWorldMapData.method278(var3.modIcon * 714577229))) { - var0 = var0.substring(6 + Integer.toString(var3.modIcon * 714577229).length()); - break; - } - } - - return var0; - } - - static void abk() { - if (GameObject.field1921 != null) { - field892 = cycle; - GameObject.field1921.method4241(); + static void aag() { + if (MenuAction.field1133 != null) { + field892 = cycle * -1425026086; + MenuAction.field1133.method4295(); for (int var0 = 0; var0 < players.length; ++var0) { if (players[var0] != null) { - GameObject.field1921.method4237(PacketWriter.baseX * 64 + (players[var0].x >> 7), RouteStrategy.baseY * 64 + (players[var0].y >> 7)); + MenuAction.field1133.method4319((players[var0].x * 107503986 >> 7) + class4.baseX * 1793092736, ScriptEvent.baseY * 90968450 + (players[var0].y >> 7)); } } } } - static void abg() { - if (GameObject.field1921 != null) { - field892 = cycle; - GameObject.field1921.method4241(); + @ObfuscatedName("gj") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "219285186" + ) + static final int method1679() { + if (Actor.clientPreferences.roofsHidden) { + return MouseRecorder.plane; + } else { + int var0 = 3; + if (class319.cameraPitch < 310) { + int var1; + int var2; + if (oculusOrbState == 1) { + var1 = SecureRandomFuture.oculusOrbFocalPointX >> 7; + var2 = AbstractByteArrayCopier.oculusOrbFocalPointY >> 7; + } else { + var1 = Varps.localPlayer.x * -78439701 >> 7; + var2 = Varps.localPlayer.y >> 7; + } - for (int var0 = 0; var0 < players.length; ++var0) { - if (players[var0] != null) { - GameObject.field1921.method4237(PacketWriter.baseX * -1245657920 + (players[var0].x >> 7), RouteStrategy.baseY * 64 + (players[var0].y >> 7)); + int var3 = ScriptFrame.cameraX >> 7; + int var4 = class14.cameraZ >> 7; + if (var3 < 0 || var4 < 0 || var3 >= 104 || var4 >= 104) { + return MouseRecorder.plane; + } + + if (var1 < 0 || var2 < 0 || var1 >= 104 || var2 >= 104) { + return MouseRecorder.plane; + } + + if ((Tiles.Tiles_renderFlags[MouseRecorder.plane][var3][var4] & 4) != 0) { + var0 = MouseRecorder.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 (var1 != var3) { + if (var3 < var1) { + ++var3; + } else if (var3 > var1) { + --var3; + } + + if ((Tiles.Tiles_renderFlags[MouseRecorder.plane][var3][var4] & 4) != 0) { + var0 = MouseRecorder.plane; + } + + var8 += var7; + if (var8 >= 65536) { + var8 -= 65536; + if (var4 < var2) { + ++var4; + } else if (var4 > var2) { + --var4; + } + + if ((Tiles.Tiles_renderFlags[MouseRecorder.plane][var3][var4] & 4) != 0) { + var0 = MouseRecorder.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[MouseRecorder.plane][var3][var4] & 4) != 0) { + var0 = MouseRecorder.plane; + } + + var8 += var7; + if (var8 >= 65536) { + var8 -= 65536; + if (var3 < var1) { + ++var3; + } else if (var3 > var1) { + --var3; + } + + if ((Tiles.Tiles_renderFlags[MouseRecorder.plane][var3][var4] & 4) != 0) { + var0 = MouseRecorder.plane; + } + } + } } } - } + if (Varps.localPlayer.x * -78439701 >= 0 && Varps.localPlayer.y >= 0 && Varps.localPlayer.x * -78439701 < 13312 && Varps.localPlayer.y < 13312) { + if ((Tiles.Tiles_renderFlags[MouseRecorder.plane][Varps.localPlayer.x * -78439701 >> 7][Varps.localPlayer.y >> 7] & 4) != 0) { + var0 = MouseRecorder.plane; + } + + return var0; + } else { + return MouseRecorder.plane; + } + } } } diff --git a/runescape-client/src/main/java/ClientPacket.java b/runescape-client/src/main/java/ClientPacket.java index 0725049e4d..da5aa1054c 100644 --- a/runescape-client/src/main/java/ClientPacket.java +++ b/runescape-client/src/main/java/ClientPacket.java @@ -1,638 +1,634 @@ +import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import netscape.javascript.JSObject; -@ObfuscatedName("gv") +@ObfuscatedName("gw") @Implements("ClientPacket") public class ClientPacket implements class181 { - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2245; - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2186; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2187; - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2248; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2195; - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2190; - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2191; - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2188; - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2194; - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2189; - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2212; @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2203; - @ObfuscatedName("r") + public static final ClientPacket field2214; + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2197; - @ObfuscatedName("y") + public static final ClientPacket field2222; + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2198; - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2199; - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) public static final ClientPacket field2200; @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2232; - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2202; - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2251; - @ObfuscatedName("a") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2204; - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2205; + public static final ClientPacket field2187; @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2206; - @ObfuscatedName("h") + public static final ClientPacket field2275; + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2207; + static final ClientPacket field2189; + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2190; @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2208; + public static final ClientPacket field2191; + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2192; + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2193; + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2267; + @ObfuscatedName("h") + @ObfuscatedSignature( + signature = "Lgw;" + ) + static final ClientPacket field2195; + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2229; + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2283; + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2198; + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2199; + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2185; + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2250; + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2202; + @ObfuscatedName("r") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2203; + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2258; + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2205; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2209; + public static final ClientPacket field2206; @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2210; - @ObfuscatedName("av") + public static final ClientPacket field2207; + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2211; - @ObfuscatedName("am") + public static final ClientPacket field2208; + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2279; - @ObfuscatedName("ai") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2266; - @ObfuscatedName("af") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2214; - @ObfuscatedName("az") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2215; - @ObfuscatedName("aj") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2216; - @ObfuscatedName("an") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2268; - @ObfuscatedName("at") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2218; - @ObfuscatedName("as") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2219; - @ObfuscatedName("ak") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2220; - @ObfuscatedName("ao") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2239; - @ObfuscatedName("ac") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2222; - @ObfuscatedName("ar") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2223; - @ObfuscatedName("au") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2224; - @ObfuscatedName("ax") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2221; + public static final ClientPacket field2270; @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" + ) + public static final ClientPacket field2210; + @ObfuscatedName("at") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2211; + @ObfuscatedName("ao") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2212; + @ObfuscatedName("av") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2213; + @ObfuscatedName("an") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2188; + @ObfuscatedName("al") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2215; + @ObfuscatedName("as") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2282; + @ObfuscatedName("ad") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2243; + @ObfuscatedName("ap") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2269; + @ObfuscatedName("ax") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2219; + @ObfuscatedName("aj") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2220; + @ObfuscatedName("ab") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2228; + @ObfuscatedName("af") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2217; + @ObfuscatedName("ak") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2223; + @ObfuscatedName("ay") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2224; + @ObfuscatedName("ae") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2225; + @ObfuscatedName("ah") + @ObfuscatedSignature( + signature = "Lgw;" ) public static final ClientPacket field2226; @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) public static final ClientPacket field2227; - @ObfuscatedName("ap") - @ObfuscatedSignature( - signature = "Lgv;" - ) - static final ClientPacket field2228; @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2270; - @ObfuscatedName("ay") + public static final ClientPacket field2209; + @ObfuscatedName("ar") @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2230; - @ObfuscatedName("ad") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2231; - @ObfuscatedName("al") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2272; - @ObfuscatedName("ah") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2233; - @ObfuscatedName("ab") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2234; - @ObfuscatedName("aw") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2273; - @ObfuscatedName("ae") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2236; - @ObfuscatedName("bk") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2237; - @ObfuscatedName("bw") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2217; - @ObfuscatedName("bo") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2225; - @ObfuscatedName("bn") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2240; - @ObfuscatedName("bp") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2241; - @ObfuscatedName("bz") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2213; - @ObfuscatedName("bh") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2243; - @ObfuscatedName("bv") - @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) public static final ClientPacket field2196; - @ObfuscatedName("bj") + @ObfuscatedName("ac") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2238; - @ObfuscatedName("bq") + public static final ClientPacket field2245; + @ObfuscatedName("az") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2255; - @ObfuscatedName("by") + public static final ClientPacket field2231; + @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2247; - @ObfuscatedName("bs") + public static final ClientPacket field2232; + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2229; - @ObfuscatedName("bi") + public static final ClientPacket field2233; + @ObfuscatedName("aw") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2193; - @ObfuscatedName("bf") + public static final ClientPacket field2234; + @ObfuscatedName("au") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2250; - @ObfuscatedName("bd") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2244; - @ObfuscatedName("br") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2252; - @ObfuscatedName("bm") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2253; - @ObfuscatedName("bu") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2254; - @ObfuscatedName("bb") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2192; - @ObfuscatedName("bl") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2256; - @ObfuscatedName("bt") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2257; - @ObfuscatedName("bx") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2258; - @ObfuscatedName("ba") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2259; + public static final ClientPacket field2251; @ObfuscatedName("bg") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2260; - @ObfuscatedName("be") + public static final ClientPacket field2236; + @ObfuscatedName("bn") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2261; - @ObfuscatedName("bc") + public static final ClientPacket field2218; + @ObfuscatedName("bk") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2269; - @ObfuscatedName("ce") + public static final ClientPacket field2253; + @ObfuscatedName("bp") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2263; - @ObfuscatedName("ci") + public static final ClientPacket field2239; + @ObfuscatedName("bu") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2264; - @ObfuscatedName("ck") + public static final ClientPacket field2240; + @ObfuscatedName("bi") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2265; - @ObfuscatedName("cc") + public static final ClientPacket field2241; + @ObfuscatedName("bv") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) public static final ClientPacket field2242; - @ObfuscatedName("cd") + @ObfuscatedName("bf") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2246; - @ObfuscatedName("cf") + public static final ClientPacket field2256; + @ObfuscatedName("bm") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2262; - @ObfuscatedName("cw") + public static final ClientPacket field2244; + @ObfuscatedName("bw") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2288; - @ObfuscatedName("cj") + public static final ClientPacket field2194; + @ObfuscatedName("bs") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2276; - @ObfuscatedName("cp") + public static final ClientPacket field2261; + @ObfuscatedName("bt") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2271; - @ObfuscatedName("cu") + public static final ClientPacket field2247; + @ObfuscatedName("bj") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2235; - @ObfuscatedName("cm") + public static final ClientPacket field2248; + @ObfuscatedName("bd") @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2201; - @ObfuscatedName("cb") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2274; - @ObfuscatedName("ch") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2275; - @ObfuscatedName("cn") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2285; - @ObfuscatedName("cr") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ClientPacket field2277; - @ObfuscatedName("cl") - @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) public static final ClientPacket field2249; - @ObfuscatedName("cg") + @ObfuscatedName("by") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2287; - @ObfuscatedName("cy") + public static final ClientPacket field2238; + @ObfuscatedName("bh") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2280; - @ObfuscatedName("cz") + public static final ClientPacket field2286; + @ObfuscatedName("bo") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2281; - @ObfuscatedName("cv") + public static final ClientPacket field2254; + @ObfuscatedName("be") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2282; - @ObfuscatedName("cq") + public static final ClientPacket field2230; + @ObfuscatedName("bl") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - public static final ClientPacket field2283; + public static final ClientPacket field2201; + @ObfuscatedName("bb") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2255; + @ObfuscatedName("ba") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2246; + @ObfuscatedName("bz") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2257; + @ObfuscatedName("bc") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2235; + @ObfuscatedName("br") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2259; + @ObfuscatedName("bx") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2260; + @ObfuscatedName("bq") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2221; + @ObfuscatedName("cb") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2262; @ObfuscatedName("ct") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - static final ClientPacket field2284; + public static final ClientPacket field2263; + @ObfuscatedName("ch") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2264; + @ObfuscatedName("cc") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2265; + @ObfuscatedName("cv") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2266; + @ObfuscatedName("cr") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2252; + @ObfuscatedName("cl") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2268; + @ObfuscatedName("ca") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2204; + @ObfuscatedName("ck") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2278; + @ObfuscatedName("cm") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2271; + @ObfuscatedName("ce") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2272; + @ObfuscatedName("cn") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2273; + @ObfuscatedName("cj") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2274; + @ObfuscatedName("cw") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2216; + @ObfuscatedName("cu") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2276; + @ObfuscatedName("cd") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2277; + @ObfuscatedName("cs") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2281; @ObfuscatedName("cx") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) - static final ClientPacket field2278; - @ObfuscatedName("fs") + public static final ClientPacket field2279; + @ObfuscatedName("ci") @ObfuscatedSignature( - signature = "Lkb;" + signature = "Lgw;" ) - @Export("fontPlain12") - static Font fontPlain12; - @ObfuscatedName("ca") + public static final ClientPacket field2280; + @ObfuscatedName("cf") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2186; + @ObfuscatedName("cq") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2184; + @ObfuscatedName("co") + @ObfuscatedSignature( + signature = "Lgw;" + ) + public static final ClientPacket field2237; + @ObfuscatedName("cz") + @ObfuscatedSignature( + signature = "Lgw;" + ) + static final ClientPacket field2284; + @ObfuscatedName("cp") @ObfuscatedGetter( - intValue = 116143945 + intValue = -187776259 ) @Export("id") final int id; - @ObfuscatedName("cs") + @ObfuscatedName("cy") @ObfuscatedGetter( - intValue = -836888501 + intValue = 351029623 ) @Export("length") final int length; static { - field2245 = new ClientPacket(0, 8); - field2186 = new ClientPacket(1, 3); - field2187 = new ClientPacket(2, 14); - field2248 = new ClientPacket(3, 7); - field2195 = new ClientPacket(4, -1); - field2190 = new ClientPacket(5, 7); - field2191 = new ClientPacket(6, 7); - field2188 = new ClientPacket(7, 8); - field2194 = new ClientPacket(8, -1); - field2189 = new ClientPacket(9, 4); - field2212 = new ClientPacket(10, 7); - field2203 = new ClientPacket(11, 10); - field2197 = new ClientPacket(12, 13); - field2198 = new ClientPacket(13, -1); - field2199 = new ClientPacket(14, 8); - field2200 = new ClientPacket(15, 3); - field2232 = new ClientPacket(16, -2); - field2202 = new ClientPacket(17, 4); - field2251 = new ClientPacket(18, 15); - field2204 = new ClientPacket(19, 8); - field2205 = new ClientPacket(20, 0); - field2206 = new ClientPacket(21, 8); - field2207 = new ClientPacket(22, 0); - field2208 = new ClientPacket(23, 11); - field2209 = new ClientPacket(24, 2); - field2210 = new ClientPacket(25, -2); - field2211 = new ClientPacket(26, 8); - field2279 = new ClientPacket(27, 3); - field2266 = new ClientPacket(28, -1); - field2214 = new ClientPacket(29, 7); - field2215 = new ClientPacket(30, 2); - field2216 = new ClientPacket(31, 3); - field2268 = new ClientPacket(32, 8); - field2218 = new ClientPacket(33, 3); - field2219 = new ClientPacket(34, -1); - field2220 = new ClientPacket(35, 5); - field2239 = new ClientPacket(36, 2); - field2222 = new ClientPacket(37, 0); - field2223 = new ClientPacket(38, -1); - field2224 = new ClientPacket(39, 4); - field2221 = new ClientPacket(40, 8); - field2226 = new ClientPacket(41, 6); - field2227 = new ClientPacket(42, 2); - field2228 = new ClientPacket(43, -1); - field2270 = new ClientPacket(44, 15); - field2230 = new ClientPacket(45, 4); - field2231 = new ClientPacket(46, 8); - field2272 = new ClientPacket(47, 3); - field2233 = new ClientPacket(48, 8); - field2234 = new ClientPacket(49, 0); - field2273 = new ClientPacket(50, 3); - field2236 = new ClientPacket(51, 7); - field2237 = new ClientPacket(52, -1); - field2217 = new ClientPacket(53, 13); - field2225 = new ClientPacket(54, -1); - field2240 = new ClientPacket(55, 9); - field2241 = new ClientPacket(56, 3); - field2213 = new ClientPacket(57, 16); - field2243 = new ClientPacket(58, 8); - field2196 = new ClientPacket(59, 3); - field2238 = new ClientPacket(60, -1); - field2255 = new ClientPacket(61, 9); - field2247 = new ClientPacket(62, 3); - field2229 = new ClientPacket(63, 16); - field2193 = new ClientPacket(64, 8); - field2250 = new ClientPacket(65, 8); - field2244 = new ClientPacket(66, 8); - field2252 = new ClientPacket(67, -2); - field2253 = new ClientPacket(68, 8); - field2254 = new ClientPacket(69, 4); - field2192 = new ClientPacket(70, 6); - field2256 = new ClientPacket(71, 3); - field2257 = new ClientPacket(72, 8); - field2258 = new ClientPacket(73, 1); - field2259 = new ClientPacket(74, 7); - field2260 = new ClientPacket(75, 3); - field2261 = new ClientPacket(76, 0); - field2269 = new ClientPacket(77, -1); - field2263 = new ClientPacket(78, -1); - field2264 = new ClientPacket(79, 7); - field2265 = new ClientPacket(80, 9); - field2242 = new ClientPacket(81, 11); - field2246 = new ClientPacket(82, 16); - field2262 = new ClientPacket(83, 3); - field2288 = new ClientPacket(84, 8); - field2276 = new ClientPacket(85, 8); - field2271 = new ClientPacket(86, 9); - field2235 = new ClientPacket(87, 8); - field2201 = new ClientPacket(88, -1); - field2274 = new ClientPacket(89, 7); - field2275 = new ClientPacket(90, -1); - field2285 = new ClientPacket(91, -1); - field2277 = new ClientPacket(92, 13); - field2249 = new ClientPacket(93, 3); - field2287 = new ClientPacket(94, 7); - field2280 = new ClientPacket(95, -1); - field2281 = new ClientPacket(96, -1); - field2282 = new ClientPacket(97, -1); - field2283 = new ClientPacket(98, 8); - field2284 = new ClientPacket(99, 7); - field2278 = new ClientPacket(100, 2); + field2214 = new ClientPacket(0, 3); + field2222 = new ClientPacket(1, 2); + field2200 = new ClientPacket(2, 1); + field2187 = new ClientPacket(3, 9); + field2275 = new ClientPacket(4, 3); + field2189 = new ClientPacket(5, 7); + field2190 = new ClientPacket(6, -1); + field2191 = new ClientPacket(7, -1); + field2192 = new ClientPacket(8, 8); + field2193 = new ClientPacket(9, -1); + field2267 = new ClientPacket(10, 9); + field2195 = new ClientPacket(11, -1); + field2229 = new ClientPacket(12, 16); + field2283 = new ClientPacket(13, 4); + field2198 = new ClientPacket(14, 7); + field2199 = new ClientPacket(15, 8); + field2185 = new ClientPacket(16, 0); + field2250 = new ClientPacket(17, 3); + field2202 = new ClientPacket(18, 8); + field2203 = new ClientPacket(19, 8); + field2258 = new ClientPacket(20, 8); + field2205 = new ClientPacket(21, 2); + field2206 = new ClientPacket(22, 7); + field2207 = new ClientPacket(23, 8); + field2208 = new ClientPacket(24, -2); + field2270 = new ClientPacket(25, 5); + field2210 = new ClientPacket(26, 11); + field2211 = new ClientPacket(27, 3); + field2212 = new ClientPacket(28, 3); + field2213 = new ClientPacket(29, 6); + field2188 = new ClientPacket(30, 7); + field2215 = new ClientPacket(31, 3); + field2282 = new ClientPacket(32, 8); + field2243 = new ClientPacket(33, 8); + field2269 = new ClientPacket(34, 8); + field2219 = new ClientPacket(35, 14); + field2220 = new ClientPacket(36, 3); + field2228 = new ClientPacket(37, 8); + field2217 = new ClientPacket(38, 8); + field2223 = new ClientPacket(39, 4); + field2224 = new ClientPacket(40, -2); + field2225 = new ClientPacket(41, 11); + field2226 = new ClientPacket(42, 7); + field2227 = new ClientPacket(43, 7); + field2209 = new ClientPacket(44, 7); + field2196 = new ClientPacket(45, 13); + field2245 = new ClientPacket(46, -1); + field2231 = new ClientPacket(47, 8); + field2232 = new ClientPacket(48, 2); + field2233 = new ClientPacket(49, 13); + field2234 = new ClientPacket(50, 8); + field2251 = new ClientPacket(51, 8); + field2236 = new ClientPacket(52, -2); + field2218 = new ClientPacket(53, -1); + field2253 = new ClientPacket(54, 7); + field2239 = new ClientPacket(55, 4); + field2240 = new ClientPacket(56, 3); + field2241 = new ClientPacket(57, 3); + field2242 = new ClientPacket(58, 16); + field2256 = new ClientPacket(59, 8); + field2244 = new ClientPacket(60, 15); + field2194 = new ClientPacket(61, 9); + field2261 = new ClientPacket(62, 8); + field2247 = new ClientPacket(63, 8); + field2248 = new ClientPacket(64, 3); + field2249 = new ClientPacket(65, -1); + field2238 = new ClientPacket(66, 15); + field2286 = new ClientPacket(67, 3); + field2254 = new ClientPacket(68, 0); + field2230 = new ClientPacket(69, 2); + field2201 = new ClientPacket(70, -1); + field2255 = new ClientPacket(71, -1); + field2246 = new ClientPacket(72, -1); + field2257 = new ClientPacket(73, -1); + field2235 = new ClientPacket(74, 4); + field2259 = new ClientPacket(75, 7); + field2260 = new ClientPacket(76, 16); + field2221 = new ClientPacket(77, 7); + field2262 = new ClientPacket(78, 0); + field2263 = new ClientPacket(79, 13); + field2264 = new ClientPacket(80, 8); + field2265 = new ClientPacket(81, 0); + field2266 = new ClientPacket(82, 10); + field2252 = new ClientPacket(83, -1); + field2268 = new ClientPacket(84, 3); + field2204 = new ClientPacket(85, 3); + field2278 = new ClientPacket(86, -1); + field2271 = new ClientPacket(87, 4); + field2272 = new ClientPacket(88, -1); + field2273 = new ClientPacket(89, -1); + field2274 = new ClientPacket(90, -1); + field2216 = new ClientPacket(91, 0); + field2276 = new ClientPacket(92, 6); + field2277 = new ClientPacket(93, 8); + field2281 = new ClientPacket(94, -1); + field2279 = new ClientPacket(95, 8); + field2280 = new ClientPacket(96, 9); + field2186 = new ClientPacket(97, 7); + field2184 = new ClientPacket(98, -1); + field2237 = new ClientPacket(99, 3); + field2284 = new ClientPacket(100, 2); } ClientPacket(int var1, int var2) { @@ -640,207 +636,68 @@ public class ClientPacket implements class181 { this.length = var2; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IIIB)J", - garbageValue = "-10" + signature = "(I)Z", + garbageValue = "-2036891673" ) - @Export("getWorldMapSpriteHash") - static long getWorldMapSpriteHash(int var0, int var1, int var2) { - return (long)(var2 << 16 | var0 << 8 | var1); + @Export("loadWorlds") + static boolean loadWorlds() { + try { + if (RouteStrategy.World_request == null) { + RouteStrategy.World_request = RouteStrategy.urlRequester.request(new URL(MouseHandler.field464)); + } else if (RouteStrategy.World_request.isDone()) { + byte[] var0 = RouteStrategy.World_request.getResponse(); + Buffer var1 = new Buffer(var0); + var1.readInt(); + World.World_count = var1.readUnsignedShort(); + World.World_worlds = new World[World.World_count]; + + World var3; + for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { + var3 = World.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(); + } + + AbstractWorldMapData.sortWorlds(World.World_worlds, 0, World.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); + RouteStrategy.World_request = null; + return true; + } + } catch (Exception var4) { + var4.printStackTrace(); + RouteStrategy.World_request = null; + } + + return false; } - @ObfuscatedName("hv") + @ObfuscatedName("km") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "1826064013" + signature = "(Ljava/lang/String;I)V", + garbageValue = "-1750480729" ) - @Export("isRightClickOnlyMenu") - static final boolean isRightClickOnlyMenu(int var0) { - if (var0 < 0) { - return false; - } else { - int var1 = Client.menuOpcodes[var0]; - if (var1 >= 2000) { - var1 -= 2000; - } + static void method3599(String var0) { + WorldMapArea.field217 = var0; - return var1 == 1007; - } - } - - @ObfuscatedName("jn") - @ObfuscatedSignature( - signature = "(Lhp;III)V", - garbageValue = "-1618436422" - ) - static final void method3558(Widget var0, int var1, int var2) { - if (var0.buttonType == 1) { - WorldMapData_0.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); - } - - String var3; - if (var0.buttonType == 2 && !Client.isSpellSelected) { - var3 = class173.method3529(var0); - if (var3 != null) { - WorldMapData_0.insertMenuItemNoShift(var3, class16.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); - } - } - - if (var0.buttonType == 3) { - WorldMapData_0.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); - } - - if (var0.buttonType == 4) { - WorldMapData_0.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); - } - - if (var0.buttonType == 5) { - WorldMapData_0.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); - } - - if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { - WorldMapData_0.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); - } - - int var4; - int var5; - int var15; - if (var0.type == 2) { - var15 = 0; - - for (var4 = 0; var4 < var0.height; ++var4) { - for (var5 = 0; var5 < var0.width; ++var5) { - int var6 = (var0.paddingX + 32) * var5; - 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; - class222.field2730 = var0; - if (var0.itemIds[var15] > 0) { - ItemDefinition var8 = WorldMapData_0.ItemDefinition_get(var0.itemIds[var15] - 1); - if (Client.isItemSelected == 1 && Huffman.method3901(ParamDefinition.getWidgetClickMask(var0))) { - if (var0.id != FontName.selectedItemWidget || var15 != class185.selectedItemSlot) { - WorldMapData_0.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class16.colorStartTag(16748608) + var8.name, 31, var8.id, var15, var0.id); - } - } else if (Client.isSpellSelected && Huffman.method3901(ParamDefinition.getWidgetClickMask(var0))) { - if ((WorldMapSectionType.selectedSpellFlags & 16) == 16) { - WorldMapData_0.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class16.colorStartTag(16748608) + var8.name, 32, var8.id, var15, var0.id); - } - } else { - String[] var9 = var8.inventoryActions; - int var10 = -1; - boolean var11; - if (Client.shiftClickDrop) { - var11 = Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; - if (var11) { - var10 = var8.getShiftClickIndex(); - } - } - - if (Huffman.method3901(ParamDefinition.getWidgetClickMask(var0))) { - for (int var19 = 4; var19 >= 3; --var19) { - if (var10 != var19) { - DynamicObject.addWidgetItemMenuItem(var0, var8, var15, var19, false); - } - } - } - - int var12 = ParamDefinition.getWidgetClickMask(var0); - var11 = (var12 >> 31 & 1) != 0; - if (var11) { - WorldMapData_0.insertMenuItemNoShift("Use", class16.colorStartTag(16748608) + var8.name, 38, var8.id, var15, var0.id); - } - - Object var10000 = null; - int var13; - if (Huffman.method3901(ParamDefinition.getWidgetClickMask(var0))) { - for (var13 = 2; var13 >= 0; --var13) { - if (var13 != var10) { - DynamicObject.addWidgetItemMenuItem(var0, var8, var15, var13, false); - } - } - - if (var10 >= 0) { - DynamicObject.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; - } - - WorldMapData_0.insertMenuItemNoShift(var9[var13], class16.colorStartTag(16748608) + var8.name, var14, var8.id, var15, var0.id); - } - } - } - - WorldMapData_0.insertMenuItemNoShift("Examine", class16.colorStartTag(16748608) + var8.name, 1005, var8.id, var15, var0.id); - } - } - } - - ++var15; - } - } - } - - if (var0.isIf3) { - if (Client.isSpellSelected) { - if (PcmPlayer.method2396(ParamDefinition.getWidgetClickMask(var0)) && (WorldMapSectionType.selectedSpellFlags & 32) == 32) { - WorldMapData_0.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); - } + try { + String var1 = Coord.client.getParameter(Integer.toString(18)); + String var2 = Coord.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 { - for (var15 = 9; var15 >= 5; --var15) { - String var16 = GrandExchangeOfferUnitPriceComparator.method125(var0, var15); - if (var16 != null) { - WorldMapData_0.insertMenuItemNoShift(var16, var0.dataText, 1007, var15 + 1, var0.childIndex, var0.id); - } - } - - var3 = class173.method3529(var0); - if (var3 != null) { - WorldMapData_0.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); - } - - for (var4 = 4; var4 >= 0; --var4) { - String var17 = GrandExchangeOfferUnitPriceComparator.method125(var0, var4); - if (var17 != null) { - NetCache.insertMenuItem(var17, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.field2688); - } - } - - var5 = ParamDefinition.getWidgetClickMask(var0); - boolean var18 = (var5 & 1) != 0; - if (var18) { - WorldMapData_0.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); - } + var3 = var3 + "; Expires=" + WorldMapID.method522(SoundCache.method2480() + 94608000000L) + "; Max-Age=" + 94608000L; } + + Client var4 = Coord.client; + String var5 = "document.cookie=\"" + var3 + "\""; + JSObject.getWindow(var4).eval(var5); + } catch (Throwable var6) { } } diff --git a/runescape-client/src/main/java/ClientPreferences.java b/runescape-client/src/main/java/ClientPreferences.java index d0ae1956c4..6a9f7d5e91 100644 --- a/runescape-client/src/main/java/ClientPreferences.java +++ b/runescape-client/src/main/java/ClientPreferences.java @@ -7,40 +7,40 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bx") +@ObfuscatedName("bz") @Implements("ClientPreferences") public class ClientPreferences { - @ObfuscatedName("s") + @ObfuscatedName("qz") + @ObfuscatedSignature( + signature = "Ldh;" + ) + @Export("pcmPlayer1") + static PcmPlayer pcmPlayer1; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1051861033 + intValue = -312136501 ) @Export("ClientPreferences_optionCount") static int ClientPreferences_optionCount; - @ObfuscatedName("gb") - @ObfuscatedSignature( - signature = "[Llq;" - ) - @Export("scrollBarSprites") - static IndexedSprite[] scrollBarSprites; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("roofsHidden") boolean roofsHidden; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("titleMusicDisabled") boolean titleMusicDisabled; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1686961453 + intValue = 1319305605 ) @Export("windowMode") int windowMode; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("rememberedUsername") String rememberedUsername; - @ObfuscatedName("t") + @ObfuscatedName("j") @Export("hideUsername") boolean hideUsername; - @ObfuscatedName("q") + @ObfuscatedName("v") @Export("parameters") LinkedHashMap parameters; @@ -53,11 +53,11 @@ public class ClientPreferences { this.rememberedUsername = null; this.hideUsername = false; this.parameters = new LinkedHashMap(); - this.method1763(true); + this.method1811(true); } @ObfuscatedSignature( - signature = "(Lky;)V" + signature = "(Lkz;)V" ) ClientPreferences(Buffer var1) { this.windowMode = 1; @@ -97,26 +97,26 @@ public class ClientPreferences { this.hideUsername = var1.readBoolean(); } } else { - this.method1763(true); + this.method1811(true); } } else { - this.method1763(true); + this.method1811(true); } } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "912146837" + signature = "(ZB)V", + garbageValue = "-20" ) - void method1763(boolean var1) { + void method1811(boolean var1) { } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)Lky;", - garbageValue = "1073230660" + signature = "(I)Lkz;", + garbageValue = "215138382" ) @Export("toBuffer") Buffer toBuffer() { diff --git a/runescape-client/src/main/java/Clock.java b/runescape-client/src/main/java/Clock.java index c27323f1b4..39644342a2 100644 --- a/runescape-client/src/main/java/Clock.java +++ b/runescape-client/src/main/java/Clock.java @@ -2,53 +2,173 @@ 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("fs") +@ObfuscatedName("fk") @Implements("Clock") public abstract class Clock { - @ObfuscatedName("by") - static String field2037; - Clock() { } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-779324795" + garbageValue = "-250719361" ) @Export("mark") public abstract void mark(); - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(III)I", - garbageValue = "930751718" + garbageValue = "1652957447" ) @Export("wait") public abstract int wait(int var1, int var2); - @ObfuscatedName("s") + @ObfuscatedName("an") @ObfuscatedSignature( - signature = "(Lhz;IIB)Llq;", - garbageValue = "-2" + signature = "(ILcu;ZI)I", + garbageValue = "1861663871" ) - @Export("SpriteBuffer_getIndexedSprite") - static IndexedSprite SpriteBuffer_getIndexedSprite(AbstractArchive var0, int var1, int var2) { - if (!World.SpriteBuffer_bufferFile(var0, var1, var2)) { - return null; + static int method3490(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; + return 1; } else { - IndexedSprite var4 = new IndexedSprite(); - var4.width = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth; - var4.height = class325.SpriteBuffer_spriteHeight; - var4.xOffset = class325.SpriteBuffer_xOffsets[0]; - var4.yOffset = class325.SpriteBuffer_yOffsets[0]; - var4.subWidth = class325.SpriteBuffer_spriteWidths[0]; - var4.subHeight = class225.SpriteBuffer_spriteHeights[0]; - var4.palette = class325.SpriteBuffer_spritePalette; - var4.pixels = WorldMapSection1.SpriteBuffer_pixels[0]; - UserComparator7.SpriteBuffer_clear(); - return var4; + int var12; + if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var12 == 0 ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var12 == 2 ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var12 == 5 ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var12 == 1 ? 1 : 0; + return 1; + } else { + boolean var13; + if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { + var13 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + if (PacketWriter.grandExchangeEvents != null) { + PacketWriter.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var13); + } + + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { + var13 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + if (PacketWriter.grandExchangeEvents != null) { + PacketWriter.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var13); + } + + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { + class160.Interpreter_intStackSize -= 2; + var13 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize] == 1; + boolean var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1] == 1; + if (PacketWriter.grandExchangeEvents != null) { + Client.GrandExchangeEvents_worldComparator.filterWorlds = var4; + PacketWriter.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var13); + } + + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { + var13 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + if (PacketWriter.grandExchangeEvents != null) { + PacketWriter.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var13); + } + + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { + var13 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + if (PacketWriter.grandExchangeEvents != null) { + PacketWriter.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var13); + } + + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = PacketWriter.grandExchangeEvents == null ? 0 : PacketWriter.grandExchangeEvents.events.size(); + return 1; + } else { + GrandExchangeEvent var11; + if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)PacketWriter.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var11.world; + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)PacketWriter.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var11.getOfferName(); + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)PacketWriter.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var11.getPreviousOfferName(); + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)PacketWriter.grandExchangeEvents.events.get(var3); + long var5 = SoundCache.method2480() - GrandExchangeOfferWorldComparator.field25 - var11.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[++TextureProvider.Interpreter_stringStackSize - 1] = var10; + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)PacketWriter.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity; + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)PacketWriter.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice; + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)PacketWriter.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id; + return 1; + } else { + return 2; + } + } + } } } } diff --git a/runescape-client/src/main/java/CollisionMap.java b/runescape-client/src/main/java/CollisionMap.java index 6a48e42384..42c9dfd56a 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("fm") +@ObfuscatedName("fj") @Implements("CollisionMap") public class CollisionMap { - @ObfuscatedName("at") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 379779745 + intValue = 1935458159 + ) + @Export("VarpDefinition_fileCount") + public static int VarpDefinition_fileCount; + @ObfuscatedName("ad") + @ObfuscatedGetter( + intValue = -1822416471 ) @Export("xInset") - public int xInset; - @ObfuscatedName("as") + int xInset; + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 899493249 + intValue = 711877459 ) @Export("yInset") - public int yInset; - @ObfuscatedName("ak") + int yInset; + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -67571785 + intValue = 942404383 ) @Export("xSize") int xSize; - @ObfuscatedName("ao") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 1623106677 + intValue = 1645469007 ) @Export("ySize") int ySize; - @ObfuscatedName("ac") + @ObfuscatedName("ab") @Export("flags") public int[][] flags; @@ -44,10 +50,10 @@ public class CollisionMap { this.clear(); } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "8482" + signature = "(I)V", + garbageValue = "1948261737" ) @Export("clear") public void clear() { @@ -63,12 +69,12 @@ public class CollisionMap { } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IIIIZB)V", - garbageValue = "-37" + signature = "(IIIIZI)V", + garbageValue = "807460009" ) - public void method3495(int var1, int var2, int var3, int var4, boolean var5) { + public void method3534(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("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IIIIZI)V", - garbageValue = "-1939556917" + signature = "(IIIIZB)V", + garbageValue = "-41" ) @Export("addGameObject") public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) { @@ -242,10 +248,10 @@ public class CollisionMap { } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "-2081310668" + signature = "(IIB)V", + garbageValue = "116" ) @Export("setBlockedByFloor") public void setBlockedByFloor(int var1, int var2) { @@ -255,10 +261,10 @@ public class CollisionMap { var10000[var2] |= 2097152; } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(IIS)V", - garbageValue = "5864" + signature = "(IIB)V", + garbageValue = "0" ) @Export("setBlockedByFloorDec") public void setBlockedByFloorDec(int var1, int var2) { @@ -268,10 +274,10 @@ public class CollisionMap { var10000[var2] |= 262144; } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(IIIB)V", - garbageValue = "79" + signature = "(IIII)V", + garbageValue = "-1965469777" ) @Export("setFlag") void setFlag(int var1, int var2, int var3) { @@ -279,12 +285,12 @@ public class CollisionMap { var10000[var2] |= var3; } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IIIIZI)V", - garbageValue = "1397124488" + signature = "(IIIIZB)V", + garbageValue = "-91" ) - public void method3497(int var1, int var2, int var3, int var4, boolean var5) { + public void method3536(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("q") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(IIIIIZB)V", - garbageValue = "25" + signature = "(IIIIIZI)V", + garbageValue = "-1821218728" ) @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("x") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(IIII)V", - garbageValue = "1656686360" + garbageValue = "-156666572" ) @Export("setFlagOff") void setFlagOff(int var1, int var2, int var3) { @@ -475,37 +481,15 @@ public class CollisionMap { var10000[var2] &= ~var3; } - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-1414783341" + garbageValue = "848915256" ) - public void method3527(int var1, int var2) { + public void method3541(int var1, int var2) { var1 -= this.xInset; var2 -= this.yInset; int[] var10000 = this.flags[var1]; var10000[var2] &= -262145; } - - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "(Lhz;I)V", - garbageValue = "-1914788069" - ) - @Export("FloorUnderlayDefinition_setArchives") - public static void FloorUnderlayDefinition_setArchives(AbstractArchive var0) { - FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0; - } - - @ObfuscatedName("js") - @ObfuscatedSignature( - signature = "(IS)V", - garbageValue = "-3946" - ) - @Export("drawInterfaceModelComponents") - static final void drawInterfaceModelComponents(int var0) { - if (Projectile.loadInterface(var0)) { - Tile.drawModelComponents(Widget.Widget_interfaceComponents[var0], -1); - } - } } diff --git a/runescape-client/src/main/java/Coord.java b/runescape-client/src/main/java/Coord.java index 52f11d5f3f..e83124feb7 100644 --- a/runescape-client/src/main/java/Coord.java +++ b/runescape-client/src/main/java/Coord.java @@ -4,44 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hd") +@ObfuscatedName("hj") @Implements("Coord") public class Coord { - @ObfuscatedName("m") - @Export("BZip2Decompressor_block") - static int[] BZip2Decompressor_block; - @ObfuscatedName("dc") - @ObfuscatedGetter( - longValue = 8705560174832439427L + @ObfuscatedName("aw") + @Export("client") + @ObfuscatedSignature( + signature = "Lclient;" ) - static long field2511; - @ObfuscatedName("hp") + static Client client; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -312378443 - ) - @Export("cameraY") - static int cameraY; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -22513413 + intValue = -275324431 ) @Export("plane") public int plane; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -611305657 - ) - @Export("x") - public int x; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -2088749017 + intValue = 1946522259 ) @Export("y") public int y; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 212884917 + ) + @Export("x") + public int x; @ObfuscatedSignature( - signature = "(Lhd;)V" + signature = "(Lhj;)V" ) public Coord(Coord var1) { this.plane = var1.plane; @@ -66,20 +58,20 @@ public class Coord { } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "2" + garbageValue = "94" ) @Export("packed") public int packed() { return this.plane << 28 | this.x << 14 | this.y; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lhd;B)Z", - garbageValue = "-61" + signature = "(Lhj;I)Z", + garbageValue = "49953005" ) @Export("equalsCoord") boolean equalsCoord(Coord var1) { @@ -92,20 +84,16 @@ public class Coord { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1334181457" + garbageValue = "-2113109490" ) @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; @@ -118,11 +106,28 @@ public class Coord { return this.packed(); } - public String abd() { + public String aai() { return this.toString(","); } - public String abb() { + public String aar() { return this.toString(","); } + + public String aan() { + return this.toString(","); + } + + public String toString() { + return this.toString(","); + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(B)[Lcl;", + garbageValue = "69" + ) + static AttackOption[] method3981() { + return new AttackOption[]{AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_hidden, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_dependsOnCombatLevels}; + } } diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java index b679908ae9..8a17756e74 100644 --- a/runescape-client/src/main/java/Decimator.java +++ b/runescape-client/src/main/java/Decimator.java @@ -3,86 +3,85 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("db") +@ObfuscatedName("de") @Implements("Decimator") public class Decimator { - @ObfuscatedName("a") - @ObfuscatedSignature( - signature = "Lky;" - ) - @Export("NetCache_reference") - static Buffer NetCache_reference; - @ObfuscatedName("l") - public static String field1439; - @ObfuscatedName("as") - @ObfuscatedSignature( - signature = "Llh;" - ) - static Bounds field1443; - @ObfuscatedName("bq") - @ObfuscatedSignature( - signature = "[Llq;" - ) - @Export("worldSelectArrows") - static IndexedSprite[] worldSelectArrows; - @ObfuscatedName("k") + @ObfuscatedName("et") @ObfuscatedGetter( - intValue = -617171721 + intValue = -722271125 + ) + static int field1431; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -313653259 ) @Export("inputRate") int inputRate; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 72965647 + intValue = -172648561 ) @Export("outputRate") int outputRate; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("table") int[][] table; public Decimator(int var1, int var2) { if (var2 != var1) { - int var3 = WorldMapIcon_1.method301(var1, var2); - var1 /= var3; - var2 /= var3; + int var4 = var1; + int var5 = var2; + if (var2 > var1) { + var4 = var2; + var5 = var1; + } + + while (var5 != 0) { + int var6 = var4 % var5; + var4 = var5; + var5 = var6; + } + + var1 /= var4; + var2 /= var4; this.inputRate = var1; this.outputRate = var2; this.table = new int[var1][14]; - for (int var4 = 0; var4 < var1; ++var4) { - int[] var5 = this.table[var4]; - double var6 = 6.0D + (double)var4 / (double)var1; - int var8 = (int)Math.floor(var6 - 7.0D + 1.0D); - if (var8 < 0) { - var8 = 0; + for (int var7 = 0; var7 < var1; ++var7) { + int[] var8 = this.table[var7]; + double var9 = 6.0D + (double)var7 / (double)var1; + int var11 = (int)Math.floor(1.0D + (var9 - 7.0D)); + if (var11 < 0) { + var11 = 0; } - int var9 = (int)Math.ceil(var6 + 7.0D); - if (var9 > 14) { - var9 = 14; + int var12 = (int)Math.ceil(7.0D + var9); + if (var12 > 14) { + var12 = 14; } - for (double var10 = (double)var2 / (double)var1; var8 < var9; ++var8) { - double var12 = ((double)var8 - var6) * 3.141592653589793D; - double var14 = var10; - if (var12 < -1.0E-4D || var12 > 1.0E-4D) { - var14 = var10 * (Math.sin(var12) / var12); + for (double var13 = (double)var2 / (double)var1; var11 < var12; ++var11) { + double var15 = 3.141592653589793D * ((double)var11 - var9); + double var17 = var13; + if (var15 < -1.0E-4D || var15 > 1.0E-4D) { + var17 = var13 * (Math.sin(var15) / var15); } - var14 *= 0.54D + 0.46D * Math.cos(((double)var8 - var6) * 0.2243994752564138D); - var5[var8] = (int)Math.floor(0.5D + var14 * 65536.0D); + var17 *= 0.54D + 0.46D * Math.cos(((double)var11 - var9) * 0.2243994752564138D); + var8[var11] = (int)Math.floor(0.5D + var17 * 65536.0D); } } } } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "([BB)[B", - garbageValue = "1" + garbageValue = "63" ) @Export("resample") byte[] resample(byte[] var1) { @@ -99,7 +98,7 @@ public class Decimator { int var9; for (var9 = 0; var9 < 14; ++var9) { - var3[var9 + var4] += var7 * var8[var9]; + var3[var9 + var4] += var8[var9] * var7; } var5 += this.outputRate; @@ -125,10 +124,10 @@ public class Decimator { return var1; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(II)I", - garbageValue = "-2098361715" + garbageValue = "-749198393" ) @Export("scaleRate") int scaleRate(int var1) { @@ -139,10 +138,10 @@ public class Decimator { return var1; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(IB)I", - garbageValue = "45" + garbageValue = "-106" ) @Export("scalePosition") int scalePosition(int var1) { @@ -153,80 +152,595 @@ public class Decimator { return var1; } - @ObfuscatedName("s") - public static final int method2452(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 = var4 + var2 - var4 * var2; - } - - double var14 = 2.0D * var4 - var12; - double var16 = 0.3333333333333333D + var0; - if (var16 > 1.0D) { - --var16; - } - - double var20 = var0 - 0.3333333333333333D; - if (var20 < 0.0D) { - ++var20; - } - - if (var16 * 6.0D < 1.0D) { - var6 = var16 * 6.0D * (var12 - var14) + var14; - } else if (2.0D * var16 < 1.0D) { - var6 = var12; - } else if (3.0D * var16 < 2.0D) { - var6 = 6.0D * (var12 - var14) * (0.6666666666666666D - var16) + var14; - } else { - var6 = var14; - } - - if (6.0D * var0 < 1.0D) { - var8 = var14 + (var12 - var14) * 6.0D * var0; - } else if (var0 * 2.0D < 1.0D) { - var8 = var12; - } else if (3.0D * var0 < 2.0D) { - var8 = 6.0D * (var12 - var14) * (0.6666666666666666D - var0) + var14; - } else { - var8 = var14; - } - - if (var20 * 6.0D < 1.0D) { - var10 = var20 * 6.0D * (var12 - var14) + var14; - } else if (2.0D * var20 < 1.0D) { - var10 = var12; - } else if (var20 * 3.0D < 2.0D) { - var10 = (var12 - var14) * (0.6666666666666666D - var20) * 6.0D + var14; - } else { - var10 = var14; - } + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "-2091115234" + ) + public static void method2499(int var0) { + if (class197.field2376 != 0) { + Canvas.field395 = var0; + } else { + class197.midiPcmStream.method3686(var0); } - int var22 = (int)(var6 * 256.0D); - int var13 = (int)(var8 * 256.0D); - int var23 = (int)(256.0D * var10); - int var15 = var23 + (var13 << 8) + (var22 << 16); - return var15; } - @ObfuscatedName("j") + @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "-882236217" + signature = "(ILcu;ZB)I", + garbageValue = "1" ) - @Export("ItemContainer_getCount") - static int ItemContainer_getCount(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var2 == null) { - return 0; + static int method2494(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { + class160.Interpreter_intStackSize -= 2; + Client.field873 = (short)class1.method17(Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]); + if (Client.field873 <= 0) { + Client.field873 = 256; + } + + Client.field752 = (short)class1.method17(Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]); + if (Client.field752 <= 0) { + Client.field752 = 256; + } + + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { + class160.Interpreter_intStackSize -= 2; + Client.zoomHeight = (short)Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + if (Client.zoomHeight <= 0) { + Client.zoomHeight = 256; + } + + Client.zoomWidth = (short)Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + if (Client.zoomWidth <= 0) { + Client.zoomWidth = 320; + } + + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { + class160.Interpreter_intStackSize -= 4; + Client.field877 = (short)Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + if (Client.field877 <= 0) { + Client.field877 = 1; + } + + Client.field878 = (short)Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + if (Client.field878 <= 0) { + Client.field878 = 32767; + } else if (Client.field878 < Client.field877) { + Client.field878 = Client.field877; + } + + Client.field879 = (short)Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 2]; + if (Client.field879 <= 0) { + Client.field879 = 1; + } + + Client.field717 = (short)Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 3]; + if (Client.field717 <= 0) { + Client.field717 = 32767; + } else if (Client.field717 < Client.field879) { + Client.field717 = Client.field879; + } + + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { + if (Client.viewportWidget != null) { + DesktopPlatformInfoProvider.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.viewportWidth; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.viewportHeight; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1; + } + + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.zoomHeight; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.zoomWidth; + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = WorldMapLabel.method381(Client.field873); + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = WorldMapLabel.method381(Client.field752); + return 1; + } else if (var0 == 6220) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 6221) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 6222) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = GraphicsDefaults.canvasWidth; + return 1; + } else if (var0 == 6223) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = GameShell.canvasHeight; + return 1; } else { - return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; + return 2; + } + } + + @ObfuscatedName("ei") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1128100526" + ) + @Export("load") + static void load() { + int var0; + if (Client.titleLoadingStage == 0) { + WorldMapIcon_1.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); + + for (var0 = 0; var0 < 4; ++var0) { + Client.collisionMaps[var0] = new CollisionMap(104, 104); + } + + class60.sceneMinimapSprite = new Sprite(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) { + ScriptEvent.archive0 = FloorOverlayDefinition.newArchive(0, false, true, true); + GrandExchangeOffer.archive1 = FloorOverlayDefinition.newArchive(1, false, true, true); + class173.archive2 = FloorOverlayDefinition.newArchive(2, true, false, true); + WorldMapData_0.archive3 = FloorOverlayDefinition.newArchive(3, false, true, true); + class13.archive4 = FloorOverlayDefinition.newArchive(4, false, true, true); + Timer.archive5 = FloorOverlayDefinition.newArchive(5, true, true, true); + WorldMapDecoration.archive6 = FloorOverlayDefinition.newArchive(6, true, true, true); + class49.archive7 = FloorOverlayDefinition.newArchive(7, false, true, true); + WorldMapDecoration.archive8 = FloorOverlayDefinition.newArchive(8, false, true, true); + WorldMapData_0.archive9 = FloorOverlayDefinition.newArchive(9, false, true, true); + FontName.archive10 = FloorOverlayDefinition.newArchive(10, false, true, true); + ArchiveDisk.archive11 = FloorOverlayDefinition.newArchive(11, false, true, true); + Message.archive12 = FloorOverlayDefinition.newArchive(12, false, true, true); + TextureProvider.archive13 = FloorOverlayDefinition.newArchive(13, true, false, true); + WorldMapLabel.archive14 = FloorOverlayDefinition.newArchive(14, false, true, true); + BufferedSource.archive15 = FloorOverlayDefinition.newArchive(15, false, true, true); + class49.archive17 = FloorOverlayDefinition.newArchive(17, true, true, true); + WorldMapArea.archive18 = FloorOverlayDefinition.newArchive(18, false, true, true); + UrlRequest.archive19 = FloorOverlayDefinition.newArchive(19, false, true, true); + WorldMapSection1.archive20 = FloorOverlayDefinition.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 var24 = 0; + var0 = var24 + ScriptEvent.archive0.percentage() * 4 / 100; + var0 += GrandExchangeOffer.archive1.percentage() * 4 / 100; + var0 += class173.archive2.percentage() * 2 / 100; + var0 += WorldMapData_0.archive3.percentage() * 2 / 100; + var0 += class13.archive4.percentage() * 6 / 100; + var0 += Timer.archive5.percentage() * 4 / 100; + var0 += WorldMapDecoration.archive6.percentage() * 2 / 100; + var0 += class49.archive7.percentage() * 56 / 100; + var0 += WorldMapDecoration.archive8.percentage() * 2 / 100; + var0 += WorldMapData_0.archive9.percentage() * 2 / 100; + var0 += FontName.archive10.percentage() * 2 / 100; + var0 += ArchiveDisk.archive11.percentage() * 2 / 100; + var0 += Message.archive12.percentage() * 2 / 100; + var0 += TextureProvider.archive13.percentage() * 2 / 100; + var0 += WorldMapLabel.archive14.percentage() * 2 / 100; + var0 += BufferedSource.archive15.percentage() * 2 / 100; + var0 += UrlRequest.archive19.percentage() / 100; + var0 += WorldMapArea.archive18.percentage() / 100; + var0 += WorldMapSection1.archive20.percentage() / 100; + var0 += class49.archive17.method4265() && class49.archive17.isFullyLoaded() ? 1 : 0; + if (var0 != 100) { + if (var0 != 0) { + Login.Login_loadingText = "Checking for updates - " + var0 + "%"; + } + + Login.Login_loadingPercent = 30; + } else { + class14.method142(ScriptEvent.archive0, "Animations"); + class14.method142(GrandExchangeOffer.archive1, "Skeletons"); + class14.method142(class13.archive4, "Sound FX"); + class14.method142(Timer.archive5, "Maps"); + class14.method142(WorldMapDecoration.archive6, "Music Tracks"); + class14.method142(class49.archive7, "Models"); + class14.method142(WorldMapDecoration.archive8, "Sprites"); + class14.method142(ArchiveDisk.archive11, "Music Jingles"); + class14.method142(WorldMapLabel.archive14, "Music Samples"); + class14.method142(BufferedSource.archive15, "Music Patches"); + class14.method142(UrlRequest.archive19, "World Map"); + class14.method142(WorldMapArea.archive18, "World Map Geography"); + class14.method142(WorldMapSection1.archive20, "World Map Ground"); + Frames.spriteIds = new GraphicsDefaults(); + Frames.spriteIds.decode(class49.archive17); + Login.Login_loadingText = "Loaded update list"; + Login.Login_loadingPercent = 30; + Client.titleLoadingStage = 45; + } + } else if (Client.titleLoadingStage == 45) { + Login.PcmPlayer_configure(22050, !Client.isLowDetail, 2); + MidiPcmStream var26 = new MidiPcmStream(); + var26.method3732(9, 128); + WorldMapIcon_1.pcmPlayer0 = PacketWriter.method2246(GameShell.taskHandler, 0, 22050); + WorldMapIcon_1.pcmPlayer0.setStream(var26); + class192.setAudioArchives(BufferedSource.archive15, WorldMapLabel.archive14, class13.archive4, var26); + ClientPreferences.pcmPlayer1 = PacketWriter.method2246(GameShell.taskHandler, 1, 2048); + class51.pcmStreamMixer = new PcmStreamMixer(); + ClientPreferences.pcmPlayer1.setStream(class51.pcmStreamMixer); + class81.decimator = new Decimator(22050, GrandExchangeOfferWorldComparator.PcmPlayer_sampleRate); + Login.Login_loadingText = "Prepared sound engine"; + Login.Login_loadingPercent = 35; + Client.titleLoadingStage = 50; + GraphicsObject.WorldMapElement_fonts = new Fonts(WorldMapDecoration.archive8, TextureProvider.archive13); + } else if (Client.titleLoadingStage == 50) { + var0 = FontName.method5288().length; + Client.fontsMap = GraphicsObject.WorldMapElement_fonts.createMap(FontName.method5288()); + if (Client.fontsMap.size() < var0) { + Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var0 + "%"; + Login.Login_loadingPercent = 40; + } else { + GrandExchangeEvent.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); + class197.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); + HealthBar.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); + class32.platformInfo = Client.platformInfoProvider.get(); + Login.Login_loadingText = "Loaded fonts"; + Login.Login_loadingPercent = 40; + Client.titleLoadingStage = 60; + } + } else { + Archive var2; + int var3; + Archive var20; + int var23; + if (Client.titleLoadingStage == 60) { + var20 = FontName.archive10; + var2 = WorldMapDecoration.archive8; + var3 = 0; + if (var20.tryLoadFileByNames("title.jpg", "")) { + ++var3; + } + + if (var2.tryLoadFileByNames("logo", "")) { + ++var3; + } + + if (var2.tryLoadFileByNames("logo_deadman_mode", "")) { + ++var3; + } + + if (var2.tryLoadFileByNames("titlebox", "")) { + ++var3; + } + + if (var2.tryLoadFileByNames("titlebutton", "")) { + ++var3; + } + + if (var2.tryLoadFileByNames("runes", "")) { + ++var3; + } + + if (var2.tryLoadFileByNames("title_mute", "")) { + ++var3; + } + + if (var2.tryLoadFileByNames("options_radio_buttons,0", "")) { + ++var3; + } + + if (var2.tryLoadFileByNames("options_radio_buttons,2", "")) { + ++var3; + } + + if (var2.tryLoadFileByNames("options_radio_buttons,4", "")) { + ++var3; + } + + if (var2.tryLoadFileByNames("options_radio_buttons,6", "")) { + ++var3; + } + + var2.tryLoadFileByNames("sl_back", ""); + var2.tryLoadFileByNames("sl_flags", ""); + var2.tryLoadFileByNames("sl_arrows", ""); + var2.tryLoadFileByNames("sl_stars", ""); + var2.tryLoadFileByNames("sl_button", ""); + var23 = AbstractWorldMapIcon.method587(); + if (var3 < var23) { + Login.Login_loadingText = "Loading title screen - " + var3 * 100 / var23 + "%"; + Login.Login_loadingPercent = 50; + } else { + Login.Login_loadingText = "Loaded title screen"; + Login.Login_loadingPercent = 50; + WorldMapIcon_0.updateGameState(5); + Client.titleLoadingStage = 70; + } + } else if (Client.titleLoadingStage == 70) { + if (!class173.archive2.isFullyLoaded()) { + Login.Login_loadingText = "Loading config - " + class173.archive2.loadPercent() + "%"; + Login.Login_loadingPercent = 60; + } else { + Player.method1228(class173.archive2); + Archive var25 = class173.archive2; + FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var25; + WorldMapID.method526(class173.archive2, class49.archive7); + var20 = class173.archive2; + var2 = class49.archive7; + boolean var21 = Client.isLowDetail; + GrandExchangeOfferNameComparator.ObjectDefinition_archive = var20; + ObjectDefinition.ObjectDefinition_modelsArchive = var2; + ObjectDefinition.ObjectDefinition_isLowDetail = var21; + GameObject.NpcDefinition_setArchives(class173.archive2, class49.archive7); + class188.method3617(class173.archive2); + GrandExchangeEvents.method69(class173.archive2, class49.archive7, Client.isMembersWorld, GrandExchangeEvent.fontPlain11); + Archive var17 = class173.archive2; + Archive var22 = ScriptEvent.archive0; + Archive var6 = GrandExchangeOffer.archive1; + SequenceDefinition.SequenceDefinition_archive = var17; + SequenceDefinition.SequenceDefinition_animationsArchive = var22; + SequenceDefinition.SequenceDefinition_skeletonsArchive = var6; + Archive var7 = class173.archive2; + Archive var8 = class49.archive7; + SpotAnimationDefinition.SpotAnimationDefinition_archive = var7; + SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var8; + Archive var9 = class173.archive2; + VarbitDefinition.VarbitDefinition_archive = var9; + Archive var10 = class173.archive2; + class297.VarpDefinition_archive = var10; + CollisionMap.VarpDefinition_fileCount = class297.VarpDefinition_archive.getGroupFileCount(16); + class162.Widget_setArchives(WorldMapData_0.archive3, class49.archive7, WorldMapDecoration.archive8, TextureProvider.archive13); + PcmPlayer.InvDefinition_setArchives(class173.archive2); + Archive var11 = class173.archive2; + EnumDefinition.EnumDefinition_archive = var11; + class293.method5298(class173.archive2); + VarcInt.method4407(class173.archive2); + BoundaryObject.varcs = new Varcs(); + ChatChannel.method2220(class173.archive2, WorldMapDecoration.archive8, TextureProvider.archive13); + NPCDefinition.method4749(class173.archive2, WorldMapDecoration.archive8); + Archive var12 = class173.archive2; + Archive var13 = WorldMapDecoration.archive8; + WorldMapElement.WorldMapElement_archive = var13; + if (var12.isFullyLoaded()) { + WorldMapElement.WorldMapElement_count = var12.getGroupFileCount(35); + WorldMapElement.WorldMapElement_cached = new WorldMapElement[WorldMapElement.WorldMapElement_count]; + + for (int var14 = 0; var14 < WorldMapElement.WorldMapElement_count; ++var14) { + byte[] var15 = var12.takeFile(35, var14); + WorldMapElement.WorldMapElement_cached[var14] = new WorldMapElement(var14); + if (var15 != null) { + WorldMapElement.WorldMapElement_cached[var14].decode(new Buffer(var15)); + WorldMapElement.WorldMapElement_cached[var14].method4378(); + } + } + } + + Login.Login_loadingText = "Loaded config"; + Login.Login_loadingPercent = 60; + Client.titleLoadingStage = 80; + } + } else if (Client.titleLoadingStage == 80) { + var0 = 0; + if (UrlRequest.compass == null) { + UrlRequest.compass = FillMode.SpriteBuffer_getSprite(WorldMapDecoration.archive8, Frames.spriteIds.compass, 0); + } else { + ++var0; + } + + if (FontName.redHintArrowSprite == null) { + FontName.redHintArrowSprite = FillMode.SpriteBuffer_getSprite(WorldMapDecoration.archive8, Frames.spriteIds.field3794, 0); + } else { + ++var0; + } + + IndexedSprite[] var1; + boolean var4; + byte[] var5; + if (class287.mapSceneSprites == null) { + var2 = WorldMapDecoration.archive8; + var3 = Frames.spriteIds.mapScenes; + var5 = var2.takeFile(var3, 0); + if (var5 == null) { + var4 = false; + } else { + GrandExchangeOfferWorldComparator.SpriteBuffer_decode(var5); + var4 = true; + } + + if (!var4) { + var1 = null; + } else { + var1 = FileSystem.method3489(); + } + + class287.mapSceneSprites = var1; + } else { + ++var0; + } + + if (PlatformInfo.headIconPkSprites == null) { + PlatformInfo.headIconPkSprites = PendingSpawn.SpriteBuffer_getSpriteArray(WorldMapDecoration.archive8, Frames.spriteIds.headIconsPk, 0); + } else { + ++var0; + } + + if (RouteStrategy.headIconPrayerSprites == null) { + RouteStrategy.headIconPrayerSprites = PendingSpawn.SpriteBuffer_getSpriteArray(WorldMapDecoration.archive8, Frames.spriteIds.field3797, 0); + } else { + ++var0; + } + + if (GrandExchangeEvents.headIconHintSprites == null) { + GrandExchangeEvents.headIconHintSprites = PendingSpawn.SpriteBuffer_getSpriteArray(WorldMapDecoration.archive8, Frames.spriteIds.field3798, 0); + } else { + ++var0; + } + + if (WorldMapLabelSize.mapMarkerSprites == null) { + WorldMapLabelSize.mapMarkerSprites = PendingSpawn.SpriteBuffer_getSpriteArray(WorldMapDecoration.archive8, Frames.spriteIds.field3800, 0); + } else { + ++var0; + } + + if (class270.crossSprites == null) { + class270.crossSprites = PendingSpawn.SpriteBuffer_getSpriteArray(WorldMapDecoration.archive8, Frames.spriteIds.field3804, 0); + } else { + ++var0; + } + + if (class42.mapDotSprites == null) { + class42.mapDotSprites = PendingSpawn.SpriteBuffer_getSpriteArray(WorldMapDecoration.archive8, Frames.spriteIds.field3801, 0); + } else { + ++var0; + } + + if (WorldMapIcon_1.scrollBarSprites == null) { + var2 = WorldMapDecoration.archive8; + var3 = Frames.spriteIds.field3802; + var5 = var2.takeFile(var3, 0); + if (var5 == null) { + var4 = false; + } else { + GrandExchangeOfferWorldComparator.SpriteBuffer_decode(var5); + var4 = true; + } + + if (!var4) { + var1 = null; + } else { + var1 = FileSystem.method3489(); + } + + WorldMapIcon_1.scrollBarSprites = var1; + } else { + ++var0; + } + + if (SecureRandomCallable.modIconSprites == null) { + var2 = WorldMapDecoration.archive8; + var3 = Frames.spriteIds.field3799; + var5 = var2.takeFile(var3, 0); + if (var5 == null) { + var4 = false; + } else { + GrandExchangeOfferWorldComparator.SpriteBuffer_decode(var5); + var4 = true; + } + + if (!var4) { + var1 = null; + } else { + var1 = FileSystem.method3489(); + } + + SecureRandomCallable.modIconSprites = var1; + } else { + ++var0; + } + + if (var0 < 11) { + Login.Login_loadingText = "Loading sprites - " + var0 * 100 / 12 + "%"; + Login.Login_loadingPercent = 70; + } else { + AbstractFont.AbstractFont_modIconSprites = SecureRandomCallable.modIconSprites; + FontName.redHintArrowSprite.normalize(); + int var18 = (int)(Math.random() * 21.0D) - 10; + int var19 = (int)(Math.random() * 21.0D) - 10; + var3 = (int)(Math.random() * 21.0D) - 10; + var23 = (int)(Math.random() * 41.0D) - 20; + class287.mapSceneSprites[0].shiftColors(var23 + var18, var19 + var23, var3 + var23); + Login.Login_loadingText = "Loaded sprites"; + Login.Login_loadingPercent = 70; + Client.titleLoadingStage = 90; + } + } else if (Client.titleLoadingStage == 90) { + if (!WorldMapData_0.archive9.isFullyLoaded()) { + Login.Login_loadingText = "Loading textures - " + "0%"; + Login.Login_loadingPercent = 90; + } else { + class216.textureProvider = new TextureProvider(WorldMapData_0.archive9, WorldMapDecoration.archive8, 20, 0.8D, Client.isLowDetail ? 64 : 128); + Rasterizer3D.Rasterizer3D_setTextureLoader(class216.textureProvider); + Rasterizer3D.Rasterizer3D_setBrightness(0.8D); + Client.titleLoadingStage = 100; + } + } else if (Client.titleLoadingStage == 100) { + var0 = class216.textureProvider.getLoadedPercentage(); + if (var0 < 100) { + Login.Login_loadingText = "Loading textures - " + var0 + "%"; + Login.Login_loadingPercent = 90; + } else { + Login.Login_loadingText = "Loaded textures"; + Login.Login_loadingPercent = 90; + Client.titleLoadingStage = 110; + } + } else if (Client.titleLoadingStage == 110) { + ParamDefinition.mouseRecorder = new MouseRecorder(); + GameShell.taskHandler.newThreadTask(ParamDefinition.mouseRecorder, 10); + Login.Login_loadingText = "Loaded input handler"; + Login.Login_loadingPercent = 92; + Client.titleLoadingStage = 120; + } else if (Client.titleLoadingStage == 120) { + if (!FontName.archive10.tryLoadFileByNames("huffman", "")) { + Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; + Login.Login_loadingPercent = 94; + } else { + Huffman var16 = new Huffman(FontName.archive10.takeFileByNames("huffman", "")); + class210.huffman = var16; + Login.Login_loadingText = "Loaded wordpack"; + Login.Login_loadingPercent = 94; + Client.titleLoadingStage = 130; + } + } else if (Client.titleLoadingStage == 130) { + if (!WorldMapData_0.archive3.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + WorldMapData_0.archive3.loadPercent() * 4 / 5 + "%"; + Login.Login_loadingPercent = 96; + } else if (!Message.archive12.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + (80 + Message.archive12.loadPercent() / 6) + "%"; + Login.Login_loadingPercent = 96; + } else if (!TextureProvider.archive13.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + (96 + TextureProvider.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 (!UrlRequest.archive19.tryLoadGroupByName(WorldMapCacheName.field294.name)) { + Login.Login_loadingText = "Loading world map - " + UrlRequest.archive19.groupLoadPercentByName(WorldMapCacheName.field294.name) / 10 + "%"; + } else { + if (GrandExchangeOfferUnitPriceComparator.worldMap == null) { + GrandExchangeOfferUnitPriceComparator.worldMap = new WorldMap(); + GrandExchangeOfferUnitPriceComparator.worldMap.init(UrlRequest.archive19, WorldMapArea.archive18, WorldMapSection1.archive20, HealthBar.fontBold12, Client.fontsMap, class287.mapSceneSprites); + } + + Login.Login_loadingText = "Loaded world map"; + Client.titleLoadingStage = 150; + } + } else if (Client.titleLoadingStage == 150) { + WorldMapIcon_0.updateGameState(10); + } + } + } + + @ObfuscatedName("hg") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V", + garbageValue = "-281939606" + ) + @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/DefaultsGroup.java b/runescape-client/src/main/java/DefaultsGroup.java index b082158709..19072f608d 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("ka") +@ObfuscatedName("ke") @Implements("DefaultsGroup") public class DefaultsGroup { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lka;" + signature = "Lke;" ) - static final DefaultsGroup field3794; - @ObfuscatedName("gs") - @ObfuscatedSignature( - signature = "[Lls;" - ) - @Export("crossSprites") - static Sprite[] crossSprites; - @ObfuscatedName("j") + static final DefaultsGroup field3792; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 879655985 + intValue = -1766167295 ) @Export("group") final int group; static { - field3794 = new DefaultsGroup(3); + field3792 = 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 5ed1f1abd7..08ba177464 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("es") +@ObfuscatedName("ez") @Implements("DemotingHashTable") public final class DemotingHashTable { - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("capacity") int capacity; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("remaining") int remaining; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lln;" + signature = "Llj;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Ljm;" + signature = "Ljn;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Lek;" + signature = "Leb;" ) - class146 field1944; + class146 field1931; public DemotingHashTable(int var1, int var2) { this.queue = new IterableDualNodeQueue(); @@ -42,7 +42,7 @@ public final class DemotingHashTable { this.hashTable = new IterableNodeHashTable(var3); } - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("get") public Object get(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); @@ -73,16 +73,16 @@ public final class DemotingHashTable { } } - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("remove") void remove(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); this.removeWrapper(var3); } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Led;)V" + signature = "(Ley;)V" ) @Export("removeWrapper") void removeWrapper(Wrapper var1) { @@ -94,7 +94,7 @@ public final class DemotingHashTable { } - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("put") public void put(Object var1, long var2, int var4) { if (var4 > this.capacity) { @@ -113,8 +113,8 @@ public final class DemotingHashTable { } this.removeWrapper(var5); - if (this.field1944 != null) { - this.field1944.method3280(var5.get()); + if (this.field1931 != null) { + this.field1931.method3299(var5.get()); } } @@ -125,7 +125,7 @@ public final class DemotingHashTable { } } - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("demote") public void demote(int var1) { for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) { @@ -146,7 +146,7 @@ public final class DemotingHashTable { } - @ObfuscatedName("n") + @ObfuscatedName("u") @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 4847498ad7..3fc69acce2 100644 --- a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java +++ b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java @@ -5,38 +5,38 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lk") +@ObfuscatedName("lc") @Implements("DesktopPlatformInfoProvider") public class DesktopPlatformInfoProvider implements PlatformInfoProvider { - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1435561195 + intValue = -1989921303 ) - int field3903; + int field3899; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 1264264203 + ) + int field3900; @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1717280991 + intValue = -962266715 ) - int field3901; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 1506800737 - ) - int field3904; + int field3896; - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)Llx;", - garbageValue = "-1719381077" + signature = "(I)Lla;", + garbageValue = "-2012824793" ) @Export("get") public PlatformInfo get() { byte var1; - if (ByteArrayPool.field3708.startsWith("win")) { + if (UserComparator9.field1940.startsWith("win")) { var1 = 1; - } else if (ByteArrayPool.field3708.startsWith("mac")) { + } else if (UserComparator9.field1940.startsWith("mac")) { var1 = 2; - } else if (ByteArrayPool.field3708.startsWith("linux")) { + } else if (UserComparator9.field1940.startsWith("linux")) { var1 = 3; } else { var1 = 4; @@ -134,11 +134,11 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { var8 = 4; } - this.method6147(var5); + this.method6218(var5); Runtime.getRuntime(); int var10 = (int)((long)((new Random()).nextInt(31457280) + 230686720) / 1048576L) + 1; int var11; - if (this.field3903 > 3) { + if (this.field3899 > 3) { var11 = Runtime.getRuntime().availableProcessors(); } else { var11 = 0; @@ -152,127 +152,147 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { String var17 = ""; String var18 = ""; int[] var23 = new int[3]; - return new PlatformInfo(var1, var24, var7, var8, this.field3903, this.field3901, this.field3904, 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.field3899, this.field3900, this.field3896, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); } - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "28" - ) - void method6147(String var1) { - if (var1.startsWith("1.")) { - this.method6148(var1); - } else { - this.method6145(var1); - } - - } - - @ObfuscatedName("i") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(Ljava/lang/String;I)V", - garbageValue = "1225882646" + garbageValue = "1517223421" ) - void method6148(String var1) { + void method6218(String var1) { + if (var1.startsWith("1.")) { + this.method6216(var1); + } else { + this.method6219(var1); + } + + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)V", + garbageValue = "943324304" + ) + void method6216(String var1) { String[] var2 = var1.split("\\."); try { - this.field3903 = Integer.parseInt(var2[1]); + this.field3899 = Integer.parseInt(var2[1]); var2 = var2[2].split("_"); - this.field3901 = Integer.parseInt(var2[0]); - this.field3904 = Integer.parseInt(var2[1]); + this.field3900 = Integer.parseInt(var2[0]); + this.field3896 = Integer.parseInt(var2[1]); } catch (Exception var4) { } } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Ljava/lang/String;S)V", - garbageValue = "-31875" + signature = "(Ljava/lang/String;I)V", + garbageValue = "-1994454967" ) - void method6145(String var1) { + void method6219(String var1) { String[] var2 = var1.split("\\."); try { - this.field3903 = Integer.parseInt(var2[0]); - this.field3901 = Integer.parseInt(var2[1]); - this.field3904 = Integer.parseInt(var2[2]); + this.field3899 = Integer.parseInt(var2[0]); + this.field3900 = Integer.parseInt(var2[1]); + this.field3896 = Integer.parseInt(var2[2]); } catch (Exception var4) { } } - @ObfuscatedName("i") + @ObfuscatedName("fo") @ObfuscatedSignature( - signature = "([BS)Lcr;", - garbageValue = "10322" + signature = "(IIIIZI)V", + garbageValue = "-608218598" ) - @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; + @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.field873; + } else if (var5 >= 100) { + var6 = Client.field752; + } else { + var6 = (Client.field752 - Client.field873) * var5 / 100 + Client.field873; + } + + int var7 = var3 * var6 * 512 / (var2 * 334); int var8; - if (var6 > 0) { - var1.switches = var1.newIterableNodeHashTable(var6); - - for (var7 = 0; var7 < var6; ++var7) { - var8 = var2.readUnsignedShort(); - int var9; - int var11; - if (var8 > 0) { - var11 = var8 - 1; - var11 |= var11 >>> 1; - var11 |= var11 >>> 2; - var11 |= var11 >>> 4; - var11 |= var11 >>> 8; - var11 |= var11 >>> 16; - int var10 = var11 + 1; - var9 = var10; - } else { - var9 = 1; + int var9; + short var18; + if (var7 < Client.field879) { + var18 = Client.field879; + var6 = var18 * var2 * 334 / (var3 * 512); + if (var6 > Client.field878) { + var6 = Client.field878; + 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); } - IterableNodeHashTable var13 = new IterableNodeHashTable(var9); - var1.switches[var7] = var13; - - while (var8-- > 0) { - var11 = var2.readInt(); - int var12 = var2.readInt(); - var13.put(new IntegerNode(var12), (long)var11); + var0 += var9; + var2 -= var9 * 2; + } + } else if (var7 > Client.field717) { + var18 = Client.field717; + var6 = var18 * var2 * 334 / (var3 * 512); + if (var6 < Client.field877) { + var6 = Client.field877; + 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; } } - var2.offset = 0; - var2.readStringCp1252NullTerminatedOrNull(); - var1.opcodes = new int[var5]; - var1.intOperands = new int[var5]; - var1.stringOperands = new String[var5]; + Client.viewportZoom = var3 * var6 / 334; + if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { + int[] var17 = new int[9]; - 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(); + 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 = var16 * var11 / 256; + var17[var9] = var14 * var13 >> 16; } + + Scene.Scene_buildVisiblityMap(var17, 500, 800, var2 * 334 / var3, 334); } - return var1; + Client.viewportOffsetX = var0; + Client.viewportOffsetY = var1; + Client.viewportWidth = var2; + Client.viewportHeight = var3; } } diff --git a/runescape-client/src/main/java/DevicePcmPlayer.java b/runescape-client/src/main/java/DevicePcmPlayer.java index 3b4d7b7f61..31b54a5460 100644 --- a/runescape-client/src/main/java/DevicePcmPlayer.java +++ b/runescape-client/src/main/java/DevicePcmPlayer.java @@ -12,40 +12,40 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("aw") @Implements("DevicePcmPlayer") public class DevicePcmPlayer extends PcmPlayer { - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("format") AudioFormat format; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("line") SourceDataLine line; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 305940879 + intValue = 1378130065 ) @Export("capacity2") int capacity2; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("byteSamples") byte[] byteSamples; DevicePcmPlayer() { } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "1" + signature = "(I)V", + garbageValue = "1989780823" ) @Export("init") protected void init() { - this.format = new AudioFormat((float)PcmPlayer.PcmPlayer_sampleRate, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false); + this.format = new AudioFormat((float)GrandExchangeOfferWorldComparator.PcmPlayer_sampleRate, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false); this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1939802329" + signature = "(IB)V", + garbageValue = "91" ) @Export("open") protected void open(int var1) throws LineUnavailableException { @@ -78,17 +78,17 @@ public class DevicePcmPlayer extends PcmPlayer { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "428413683" + garbageValue = "-1120986508" ) @Export("position") protected int position() { return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); } - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("write") protected void write() { int var1 = 256; @@ -109,10 +109,10 @@ public class DevicePcmPlayer extends PcmPlayer { this.line.write(this.byteSamples, 0, var1 << 1); } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "37766209" + garbageValue = "-1450874669" ) @Export("close") protected void close() { @@ -123,10 +123,10 @@ public class DevicePcmPlayer extends PcmPlayer { } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "645078569" + garbageValue = "-93486639" ) @Export("discard") protected void discard() { diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index 699eddc04c..b394e55cee 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -1,56 +1,174 @@ import 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("ad") +@ObfuscatedName("ac") @Implements("DevicePcmPlayerProvider") public class DevicePcmPlayerProvider implements PcmPlayerProvider { + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "[Lmw;" + ) + @Export("JagexCache_idxFiles") + public static BufferedFile[] JagexCache_idxFiles; + @ObfuscatedName("r") + @ObfuscatedSignature( + signature = "Lkz;" + ) + @Export("NetCache_reference") + static Buffer NetCache_reference; + @ObfuscatedName("ay") + @ObfuscatedSignature( + signature = "Llf;" + ) + @Export("rasterProvider") + public static AbstractRasterProvider rasterProvider; + @ObfuscatedName("iz") + @ObfuscatedGetter( + intValue = -102001369 + ) + @Export("selectedItemId") + static int selectedItemId; + DevicePcmPlayerProvider() { } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(S)Ldd;", - garbageValue = "-22145" + signature = "(I)Ldh;", + garbageValue = "-131796443" ) @Export("player") public PcmPlayer player() { return new DevicePcmPlayer(); } - @ObfuscatedName("s") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(IIB)Z", - garbageValue = "1" + signature = "(IIB)I", + garbageValue = "24" ) - static boolean method794(int var0, int var1) { - return var0 != 4 || var1 < 8; + static final int method811(int var0, int var1) { + int var2 = method805(var0 - 1, var1 - 1) + method805(var0 + 1, var1 - 1) + method805(var0 - 1, var1 + 1) + method805(1 + var0, 1 + var1); + int var3 = method805(var0 - 1, var1) + method805(1 + var0, var1) + method805(var0, var1 - 1) + method805(var0, 1 + var1); + int var4 = method805(var0, var1); + return var2 / 16 + var3 / 8 + var4 / 4; } - @ObfuscatedName("u") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "895453465" + signature = "(IIB)I", + garbageValue = "118" ) - public static void method793(int var0) { - class197.field2378 = 1; - WorldMapDecoration.musicTrackArchive = null; - class197.musicTrackGroupId = -1; - class197.musicTrackFileId = -1; - WorldMapSprite.field222 = 0; - Varcs.musicTrackBoolean = false; - class16.field98 = var0; + static final int method805(int var0, int var1) { + int var2 = var0 + var1 * 57; + var2 ^= var2 << 13; + int var3 = (var2 * var2 * 15731 + 789221) * var2 + 1376312589 & Integer.MAX_VALUE; + return var3 >> 19 & 255; } - @ObfuscatedName("t") + @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "(I)Lbl;", - garbageValue = "-1981262323" + signature = "(ILcu;ZB)I", + garbageValue = "13" ) - @Export("worldListStart") - static World worldListStart() { - World.World_listCount = 0; - return GrandExchangeOfferAgeComparator.getNextWorldListWorld(); + static int method809(int var0, Script var1, boolean var2) { + int var3; + int var4; + int var6; + if (var0 == ScriptOpcodes.ENUM_STRING) { + class160.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + EnumDefinition var5 = NetFileRequest.getEnum(var3); + if (var5.outputType != 's') { + } + + for (var6 = 0; var6 < var5.outputCount; ++var6) { + if (var4 == var5.keys[var6]) { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var5.strVals[var6]; + var5 = null; + break; + } + } + + if (var5 != null) { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var5.defaultStr; + } + + return 1; + } else if (var0 != ScriptOpcodes.ENUM) { + if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + EnumDefinition var10 = NetFileRequest.getEnum(var3); + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var10.size(); + return 1; + } else { + return 2; + } + } else { + class160.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + int var9 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 2]; + var6 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 3]; + EnumDefinition var7 = NetFileRequest.getEnum(var9); + if (var3 == var7.inputType && var4 == var7.outputType) { + for (int var8 = 0; var8 < var7.outputCount; ++var8) { + if (var6 == var7.keys[var8]) { + if (var4 == 115) { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var7.strVals[var8]; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var7.intVals[var8]; + } + + var7 = null; + break; + } + } + + if (var7 != null) { + if (var4 == 115) { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var7.defaultStr; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var7.defaultInt; + } + } + + return 1; + } else { + if (var4 == 115) { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = "null"; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + } + } + + @ObfuscatedName("jc") + @ObfuscatedSignature( + signature = "(IB)V", + garbageValue = "105" + ) + @Export("Widget_resetModelFrames") + static final void Widget_resetModelFrames(int var0) { + if (TaskHandler.loadInterface(var0)) { + Widget[] var1 = class289.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/DirectByteArrayCopier.java b/runescape-client/src/main/java/DirectByteArrayCopier.java index fe2c644407..526edc247e 100644 --- a/runescape-client/src/main/java/DirectByteArrayCopier.java +++ b/runescape-client/src/main/java/DirectByteArrayCopier.java @@ -4,20 +4,20 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gb") +@ObfuscatedName("gx") @Implements("DirectByteArrayCopier") public class DirectByteArrayCopier extends AbstractByteArrayCopier { - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("directBuffer") ByteBuffer directBuffer; DirectByteArrayCopier() { } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)[B", - garbageValue = "-1040345200" + signature = "(B)[B", + garbageValue = "49" ) @Export("get") byte[] get() { @@ -27,10 +27,10 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { return var1; } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "([BI)V", - garbageValue = "38240743" + garbageValue = "-1981176877" ) @Export("set") void set(byte[] var1) { @@ -39,23 +39,8 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { this.directBuffer.put(var1); } - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "(ILjava/lang/String;Ljava/lang/String;I)V", - garbageValue = "2110102488" - ) - @Export("addGameMessage") - static void addGameMessage(int var0, String var1, String var2) { - MilliClock.addChatMessage(var0, var1, var2, (String)null); - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "470994563" - ) - @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("d") + static final void method3932(long var0) { + ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var0; } } diff --git a/runescape-client/src/main/java/DirectWrapper.java b/runescape-client/src/main/java/DirectWrapper.java index b9ea0c1c90..23944b0c96 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("et") +@ObfuscatedName("ei") @Implements("DirectWrapper") public class DirectWrapper extends Wrapper { - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("obj") Object obj; @@ -14,13 +14,13 @@ public class DirectWrapper extends Wrapper { this.obj = var1; } - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("get") Object get() { return this.obj; } - @ObfuscatedName("j") + @ObfuscatedName("x") @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 c35785088d..18d5fcd679 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("fe") +@ObfuscatedName("fv") @Implements("DualNode") public class DualNode extends Node { - @ObfuscatedName("cr") + @ObfuscatedName("cu") @Export("keyDual") public long keyDual; - @ObfuscatedName("cl") + @ObfuscatedName("cd") @ObfuscatedSignature( - signature = "Lfe;" + signature = "Lfv;" ) @Export("previousDual") public DualNode previousDual; - @ObfuscatedName("cg") + @ObfuscatedName("cs") @ObfuscatedSignature( - signature = "Lfe;" + signature = "Lfv;" ) @Export("nextDual") public DualNode nextDual; - @ObfuscatedName("cl") + @ObfuscatedName("cx") @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 6926e9e670..8c826966c0 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("ih") +@ObfuscatedName("ig") @Implements("DualNodeDeque") public final class DualNodeDeque { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lfe;" + signature = "Lfv;" ) @Export("sentinel") DualNode sentinel; @@ -19,9 +19,9 @@ public final class DualNodeDeque { this.sentinel.nextDual = this.sentinel; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lfe;)V" + signature = "(Lfv;)V" ) @Export("addFirst") public void addFirst(DualNode var1) { @@ -35,9 +35,9 @@ public final class DualNodeDeque { var1.previousDual.nextDual = var1; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lfe;)V" + signature = "(Lfv;)V" ) @Export("addLast") public void addLast(DualNode var1) { @@ -51,9 +51,9 @@ public final class DualNodeDeque { var1.previousDual.nextDual = var1; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "()Lfe;" + signature = "()Lfv;" ) @Export("removeLast") public DualNode removeLast() { diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index 077f479cc7..6fbdb6a383 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -4,74 +4,66 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cl") +@ObfuscatedName("cd") @Implements("DynamicObject") public class DynamicObject extends Entity { - @ObfuscatedName("at") - static String field1268; - @ObfuscatedName("ha") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -775717141 - ) - @Export("oculusOrbFocalPointX") - static int oculusOrbFocalPointX; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -760390045 + intValue = -440317767 ) @Export("id") int id; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -980932459 + intValue = 1457716031 ) @Export("type") int type; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -400059677 + intValue = 2004235481 ) @Export("orientation") int orientation; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1290123367 + intValue = 1247808451 ) @Export("plane") int plane; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -508815789 + intValue = 910065863 ) @Export("x") int x; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -490638225 + intValue = 439709923 ) @Export("y") int y; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lij;" + signature = "Liw;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 156262843 + intValue = 1565823045 ) @Export("frame") int frame; - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1843823299 + intValue = -1402940691 ) @Export("cycleStart") int cycleStart; @ObfuscatedSignature( - signature = "(IIIIIIIZLen;)V" + signature = "(IIIIIIIZLel;)V" ) DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Entity var9) { this.id = var1; @@ -81,12 +73,12 @@ public class DynamicObject extends Entity { this.x = var5; this.y = var6; if (var7 != -1) { - this.sequenceDefinition = Widget.SequenceDefinition_get(var7); + this.sequenceDefinition = class83.SequenceDefinition_get(var7); this.frame = 0; this.cycleStart = Client.cycle - 1; - if (this.sequenceDefinition.field3492 == 0 && var9 != null && var9 instanceof DynamicObject) { + if (this.sequenceDefinition.field3502 == 0 && var9 != null && var9 instanceof DynamicObject) { DynamicObject var10 = (DynamicObject)var9; - if (this.sequenceDefinition == var10.sequenceDefinition) { + if (var10.sequenceDefinition == this.sequenceDefinition) { this.frame = var10.frame; this.cycleStart = var10.cycleStart; return; @@ -101,10 +93,10 @@ public class DynamicObject extends Entity { } - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)Ldo;", - garbageValue = "-419920513" + signature = "(B)Ldr;", + garbageValue = "-35" ) @Export("getModel") protected final Model getModel() { @@ -134,7 +126,7 @@ public class DynamicObject extends Entity { this.cycleStart = Client.cycle - var1; } - ObjectDefinition var12 = class215.getObjectDefinition(this.id); + ObjectDefinition var12 = WallDecoration.getObjectDefinition(this.id); if (var12.transforms != null) { var12 = var12.transform(); } @@ -157,109 +149,82 @@ public class DynamicObject extends Entity { 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[var4][var6] + var8[var5][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("s") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lky;Lln;I)Lln;", - garbageValue = "796089456" + signature = "(Ljava/lang/CharSequence;I)Z", + garbageValue = "1791385097" ) - @Export("readStringIntParameters") - static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { - int var2 = var0.readUnsignedByte(); - int var3; - if (var1 == null) { - int var4 = var2 - 1; - var4 |= var4 >>> 1; - var4 |= var4 >>> 2; - var4 |= var4 >>> 4; - var4 |= var4 >>> 8; - var4 |= var4 >>> 16; - var3 = var4 + 1; - var1 = new IterableNodeHashTable(var3); - } + @Export("isNumber") + public static boolean isNumber(CharSequence var0) { + boolean var2 = false; + boolean var3 = false; + int var4 = 0; + int var5 = var0.length(); + int var6 = 0; - for (var3 = 0; var3 < var2; ++var3) { - boolean var7 = var0.readUnsignedByte() == 1; - int var5 = var0.readMedium(); - Object var6; - if (var7) { - var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); - } else { - var6 = new IntegerNode(var0.readInt()); + boolean var1; + while (true) { + if (var6 >= var5) { + var1 = var3; + break; } - var1.put((Node)var6, (long)var5); + label84: { + char var7 = var0.charAt(var6); + if (var6 == 0) { + if (var7 == '-') { + var2 = true; + break label84; + } + + if (var7 == '+') { + break label84; + } + } + + int var9; + if (var7 >= '0' && var7 <= '9') { + var9 = var7 - '0'; + } else if (var7 >= 'A' && var7 <= 'Z') { + var9 = var7 - '7'; + } else { + if (var7 < 'a' || var7 > 'z') { + var1 = false; + break; + } + + var9 = var7 - 'W'; + } + + if (var9 >= 10) { + var1 = false; + break; + } + + if (var2) { + var9 = -var9; + } + + int var8 = var9 + var4 * 10; + if (var4 != var8 / 10) { + var1 = false; + break; + } + + var4 = var8; + var3 = true; + } + + ++var6; } return var1; } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-513328656" - ) - static void method2153() { - if (Login.field1146) { - Login.titleboxSprite = null; - Login.titlebuttonSprite = null; - ItemDefinition.runesSprite = null; - Login.leftTitleSprite = null; - Login.rightTitleSprite = null; - class51.logoSprite = null; - BoundaryObject.title_muteSprite = null; - Login.options_buttons_0Sprite = null; - Login.options_buttons_2Sprite = null; - SoundCache.worldSelectBackSprites = null; - class1.worldSelectFlagSprites = null; - Decimator.worldSelectArrows = null; - NetFileRequest.worldSelectStars = null; - class195.field2368 = null; - Bounds.loginScreenRunesAnimation.method1731(); - DevicePcmPlayerProvider.method793(2); - NPC.method1977(true); - Login.field1146 = false; - } - } - - @ObfuscatedName("jz") - @ObfuscatedSignature( - signature = "(Lhp;Liu;IIZB)V", - garbageValue = "41" - ) - @Export("addWidgetItemMenuItem") - static final void addWidgetItemMenuItem(Widget var0, ItemDefinition 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) { - NetCache.insertMenuItem(var7, class16.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); - } - - } } diff --git a/runescape-client/src/main/java/Entity.java b/runescape-client/src/main/java/Entity.java index 290ffd54a5..5715105970 100644 --- a/runescape-client/src/main/java/Entity.java +++ b/runescape-client/src/main/java/Entity.java @@ -1,16 +1,23 @@ +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("en") +@ObfuscatedName("el") @Implements("Entity") public abstract class Entity extends DualNode { - @ObfuscatedName("cn") + @ObfuscatedName("jn") + @ObfuscatedSignature( + signature = "Lhy;" + ) + static Widget field1835; + @ObfuscatedName("cw") @ObfuscatedGetter( - intValue = 747190067 + intValue = -160272347 ) @Export("height") public int height; @@ -19,10 +26,10 @@ public abstract class Entity extends DualNode { this.height = 1000; } - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)Ldo;", - garbageValue = "-419920513" + signature = "(B)Ldr;", + garbageValue = "-35" ) @Export("getModel") protected Model getModel() { @@ -40,62 +47,227 @@ public abstract class Entity extends DualNode { } - @ObfuscatedName("s") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "([BZB)Ljava/lang/Object;", - garbageValue = "42" + signature = "(Ljava/lang/String;Ljava/lang/String;II)Ljava/io/File;", + garbageValue = "1018244137" ) - public static Object method3209(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; - } - } + @Export("getCacheDir") + static File getCacheDir(String var0, String var1, int var2) { + String var3 = var2 == 0 ? "" : "" + var2; + JagexCache.JagexCache_locationFile = new File(Message.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var3 + ".dat"); + String var4 = null; + String var5 = null; + boolean var6 = false; + int var11; + File var26; + if (JagexCache.JagexCache_locationFile.exists()) { + try { + AccessFile var7 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "(DDII)[D", - garbageValue = "-361048020" - ) - public static double[] method3211(double var0, double var2, int var4) { - int var5 = var4 * 2 + 1; - double[] var6 = new double[var5]; - int var7 = -var4; + Buffer var8; + 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(); + } + } - for (int var8 = 0; var7 <= var4; ++var8) { - var6[var8] = class195.method3623((double)var7, var0, var2); - ++var7; + 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 var24) { + var24.printStackTrace(); + } + + if (var4 != null) { + var26 = new File(var4); + if (!var26.exists()) { + var4 = null; + } + } + + if (var4 != null) { + var26 = new File(var4, "test.dat"); + + boolean var27; + try { + RandomAccessFile var15 = new RandomAccessFile(var26, "rw"); + var11 = var15.read(); + var15.seek(0L); + var15.write(var11); + var15.seek(0L); + var15.close(); + var26.delete(); + var27 = true; + } catch (Exception var22) { + var27 = false; + } + + if (!var27) { + var4 = null; + } + } } - return var6; - } + if (var4 == null && var2 == 0) { + label139: + for (int var16 = 0; var16 < NetFileRequest.field3096.length; ++var16) { + for (int var17 = 0; var17 < GrandExchangeOfferWorldComparator.field30.length; ++var17) { + File var18 = new File(GrandExchangeOfferWorldComparator.field30[var17] + NetFileRequest.field3096[var16] + File.separatorChar + var0 + File.separatorChar); + if (var18.exists()) { + File var19 = new File(var18, "test.dat"); - @ObfuscatedName("ak") - @ObfuscatedSignature( - signature = "(ILcr;ZI)I", - garbageValue = "-1173626349" - ) - static int method3210(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.LOGOUT) { - Client.logoutTimer = 250; - return 1; - } else { - return 2; + boolean var28; + try { + RandomAccessFile var12 = new RandomAccessFile(var19, "rw"); + int var13 = var12.read(); + var12.seek(0L); + var12.write(var13); + var12.seek(0L); + var12.close(); + var19.delete(); + var28 = true; + } catch (Exception var21) { + var28 = false; + } + + if (var28) { + var4 = var18.toString(); + var6 = true; + break label139; + } + } + } + } } + + if (var4 == null) { + var4 = Message.userHomeDirectory + File.separatorChar + "jagexcache" + var3 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; + var6 = true; + } + + if (var5 != null) { + File var25 = new File(var5); + var26 = new File(var4); + + try { + File[] var31 = var25.listFiles(); + File[] var30 = var31; + + for (var11 = 0; var11 < var30.length; ++var11) { + File var29 = var30[var11]; + File var20 = new File(var26, var29.getName()); + boolean var14 = var29.renameTo(var20); + if (!var14) { + throw new IOException(); + } + } + } catch (Exception var23) { + var23.printStackTrace(); + } + + var6 = true; + } + + if (var6) { + WorldMapManager.method611(new File(var4), (File)null); + } + + return new File(var4); } - @ObfuscatedName("gd") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lbu;II)V", - garbageValue = "558636836" + signature = "(IIII)I", + garbageValue = "-284240639" ) - @Export("getActorScreenLocation") - static final void getActorScreenLocation(Actor var0, int var1) { - WorldMapAreaData.worldToScreen(var0.x, var0.y, var1); + @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("er") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "-16" + ) + static void method3228() { + Client.packetWriter.clearBuffer(); + Client.packetWriter.packetBuffer.offset = 0; + Client.packetWriter.serverPacket = null; + Client.packetWriter.field1274 = null; + Client.packetWriter.field1286 = null; + Client.packetWriter.field1287 = null; + Client.packetWriter.serverPacketLength = 0; + Client.packetWriter.field1283 = 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; + } + + Varps.localPlayer = null; + + for (var0 = 0; var0 < Client.npcs.length; ++var0) { + NPC var1 = Client.npcs[var0]; + if (var1 != null) { + var1.targetIndex = -1; + var1.false0 = false; + } + } + + class286.method5221(); + WorldMapIcon_0.updateGameState(30); + + for (var0 = 0; var0 < 100; ++var0) { + Client.field827[var0] = true; + } + + MouseRecorder.method1145(); } } diff --git a/runescape-client/src/main/java/EnumDefinition.java b/runescape-client/src/main/java/EnumDefinition.java index dff70f1d8f..7bb7ecb0f2 100644 --- a/runescape-client/src/main/java/EnumDefinition.java +++ b/runescape-client/src/main/java/EnumDefinition.java @@ -4,49 +4,49 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ir") +@ObfuscatedName("iz") @Implements("EnumDefinition") public class EnumDefinition extends DualNode { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "Lhz;" ) @Export("EnumDefinition_archive") public static AbstractArchive EnumDefinition_archive; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("EnumDefinition_cached") static EvictingDualNodeHashTable EnumDefinition_cached; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("inputType") public char inputType; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("outputType") public char outputType; - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1123521351 + intValue = 951352389 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1569400369 + intValue = 1261756863 ) @Export("outputCount") public int outputCount; - @ObfuscatedName("q") + @ObfuscatedName("v") @Export("keys") public int[] keys; - @ObfuscatedName("x") + @ObfuscatedName("d") @Export("intVals") public int[] intVals; - @ObfuscatedName("d") + @ObfuscatedName("z") @Export("strVals") public String[] strVals; @@ -59,10 +59,10 @@ public class EnumDefinition extends DualNode { this.outputCount = 0; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lky;I)V", - garbageValue = "-339661207" + signature = "(Lkz;I)V", + garbageValue = "13618271" ) @Export("decode") void decode(Buffer var1) { @@ -76,10 +76,10 @@ public class EnumDefinition extends DualNode { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lky;II)V", - garbageValue = "-1462723166" + signature = "(Lkz;II)V", + garbageValue = "700010175" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -116,13 +116,953 @@ public class EnumDefinition extends DualNode { } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "0" + signature = "(I)I", + garbageValue = "-1670298878" ) @Export("size") public int size() { return this.outputCount; } + + @ObfuscatedName("gy") + @ObfuscatedSignature( + signature = "(IIIIII)V", + garbageValue = "-509894007" + ) + @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 (0L != var5) { + var7 = WorldMapIcon_1.scene.getObjectFlags(var0, var1, var2, var5); + var8 = var7 >> 6 & 3; + var9 = var7 & 31; + var10 = var3; + boolean var12 = var5 != 0L; + if (var12) { + boolean var13 = (int)(var5 >>> 16 & 1L) == 1; + var12 = !var13; + } + + if (var12) { + var10 = var4; + } + + int[] var19 = class60.sceneMinimapSprite.pixels; + var26 = var1 * 4 + (103 - var2) * 2048 + 24624; + var14 = SecureRandomFuture.Entity_unpackID(var5); + ObjectDefinition var15 = WallDecoration.getObjectDefinition(var14); + if (var15.mapSceneId != -1) { + IndexedSprite var16 = class287.mapSceneSprites[var15.mapSceneId]; + if (var16 != null) { + int var17 = (var15.sizeX * 4 - var16.subWidth) / 2; + int var18 = (var15.sizeY * 4 - var16.subHeight) / 2; + var16.drawAt(var17 + var1 * 4 + 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 (0L != var5) { + var7 = WorldMapIcon_1.scene.getObjectFlags(var0, var1, var2, var5); + var8 = var7 >> 6 & 3; + var9 = var7 & 31; + var10 = SecureRandomFuture.Entity_unpackID(var5); + ObjectDefinition var20 = WallDecoration.getObjectDefinition(var10); + if (var20.mapSceneId != -1) { + IndexedSprite var28 = class287.mapSceneSprites[var20.mapSceneId]; + if (var28 != null) { + var26 = (var20.sizeX * 4 - var28.subWidth) / 2; + var14 = (var20.sizeY * 4 - var28.subHeight) / 2; + var28.drawAt(var26 + var1 * 4 + 48, (104 - var2 - var20.sizeY) * 4 + var14 + 48); + } + } else if (var9 == 9) { + int var25 = 15658734; + boolean var27 = var5 != 0L; + if (var27) { + boolean var23 = (int)(var5 >>> 16 & 1L) == 1; + var27 = !var23; + } + + if (var27) { + var25 = 15597568; + } + + int[] var24 = class60.sceneMinimapSprite.pixels; + int var29 = var1 * 4 + (103 - var2) * 2048 + 24624; + if (var8 != 0 && var8 != 2) { + var24[var29] = var25; + var24[var29 + 1 + 512] = var25; + var24[var29 + 1024 + 2] = var25; + var24[var29 + 1536 + 3] = var25; + } else { + var24[var29 + 1536] = var25; + var24[var29 + 1 + 1024] = var25; + var24[var29 + 512 + 2] = var25; + var24[var29 + 3] = var25; + } + } + } + + var5 = WorldMapIcon_1.scene.getFloorDecorationTag(var0, var1, var2); + if (0L != var5) { + var7 = SecureRandomFuture.Entity_unpackID(var5); + ObjectDefinition var21 = WallDecoration.getObjectDefinition(var7); + if (var21.mapSceneId != -1) { + IndexedSprite var22 = class287.mapSceneSprites[var21.mapSceneId]; + if (var22 != null) { + var10 = (var21.sizeX * 4 - var22.subWidth) / 2; + int var11 = (var21.sizeY * 4 - var22.subHeight) / 2; + var22.drawAt(var1 * 4 + var10 + 48, (104 - var2 - var21.sizeY) * 4 + var11 + 48); + } + } + } + + } + + @ObfuscatedName("hb") + @ObfuscatedSignature( + signature = "(IIIILjava/lang/String;Ljava/lang/String;III)V", + garbageValue = "1334769437" + ) + @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 = MenuAction.getPacketBufferNode(ClientPacket.field2244, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5491(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeShort(DevicePcmPlayerProvider.selectedItemId); + var8.packetBuffer.method5502(var3); + var8.packetBuffer.writeIntME(class4.baseX * 64 + var0); + var8.packetBuffer.method5500(ModelData0.selectedItemSlot); + var8.packetBuffer.writeInt(MusicPatchPcmStream.selectedItemWidget); + var8.packetBuffer.method5502(ScriptEvent.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 = MenuAction.getPacketBufferNode(ClientPacket.field2196, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntLE16(class83.field1138); + var8.packetBuffer.writeShort(var3); + var8.packetBuffer.method5500(ScriptEvent.baseY + var1); + var8.packetBuffer.method5566(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeIntME(Client.field687); + var8.packetBuffer.writeIntME(class4.baseX * 64 + var0); + 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 = MenuAction.getPacketBufferNode(ClientPacket.field2221, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5491(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method5500(ScriptEvent.baseY + var1); + var8.packetBuffer.writeShort(class4.baseX * 64 + var0); + var8.packetBuffer.method5502(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 = MenuAction.getPacketBufferNode(ClientPacket.field2253, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(ScriptEvent.baseY + var1); + var8.packetBuffer.method5502(var3); + var8.packetBuffer.method5500(class4.baseX * 64 + var0); + var8.packetBuffer.writeByte(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 = MenuAction.getPacketBufferNode(ClientPacket.field2226, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5491(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeIntME(ScriptEvent.baseY + var1); + var8.packetBuffer.writeIntME(var3); + var8.packetBuffer.method5500(class4.baseX * 64 + var0); + 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 = MenuAction.getPacketBufferNode(ClientPacket.field2227, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5502(var3); + var8.packetBuffer.writeIntME(ScriptEvent.baseY + var1); + var8.packetBuffer.method5493(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeIntME(class4.baseX * 64 + var0); + 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 = MenuAction.getPacketBufferNode(ClientPacket.field2225, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeInt(MusicPatchPcmStream.selectedItemWidget); + var9.packetBuffer.method5493(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method5500(ModelData0.selectedItemSlot); + var9.packetBuffer.method5502(DevicePcmPlayerProvider.selectedItemId); + var9.packetBuffer.method5500(var3); + 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 = MenuAction.getPacketBufferNode(ClientPacket.field2280, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5502(Client.field687); + var9.packetBuffer.writeIntLE16(class83.field1138); + var9.packetBuffer.method5500(var3); + var9.packetBuffer.method5493(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 = MenuAction.getPacketBufferNode(ClientPacket.field2214, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShort(var3); + var9.packetBuffer.method5493(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 = MenuAction.getPacketBufferNode(ClientPacket.field2286, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5566(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 11) { + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = MenuAction.getPacketBufferNode(ClientPacket.field2240, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5491(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.writeIntME(var3); + 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 = MenuAction.getPacketBufferNode(ClientPacket.field2220, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5502(var3); + var9.packetBuffer.method5491(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 13) { + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = MenuAction.getPacketBufferNode(ClientPacket.field2275, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5493(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method5500(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 = MenuAction.getPacketBufferNode(ClientPacket.field2210, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5491(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method5502(ModelData0.selectedItemSlot); + var9.packetBuffer.method5500(DevicePcmPlayerProvider.selectedItemId); + var9.packetBuffer.writeIntLE16(MusicPatchPcmStream.selectedItemWidget); + var9.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 15) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = MenuAction.getPacketBufferNode(ClientPacket.field2194, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeIntLE(class83.field1138); + var9.packetBuffer.writeShort(var3); + var9.packetBuffer.method5500(Client.field687); + var9.packetBuffer.method5566(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + 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 = MenuAction.getPacketBufferNode(ClientPacket.field2238, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShort(class4.baseX * 64 + var0); + var8.packetBuffer.method5502(var3); + var8.packetBuffer.method5502(DevicePcmPlayerProvider.selectedItemId); + var8.packetBuffer.writeShort(ScriptEvent.baseY + var1); + var8.packetBuffer.writeInt(MusicPatchPcmStream.selectedItemWidget); + var8.packetBuffer.method5500(ModelData0.selectedItemSlot); + var8.packetBuffer.method5493(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 = MenuAction.getPacketBufferNode(ClientPacket.field2233, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntLE(class83.field1138); + var8.packetBuffer.writeShort(Client.field687); + var8.packetBuffer.method5500(ScriptEvent.baseY + var1); + var8.packetBuffer.method5500(var3); + var8.packetBuffer.method5500(class4.baseX * 64 + var0); + var8.packetBuffer.method5491(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + 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 = MenuAction.getPacketBufferNode(ClientPacket.field2186, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShort(var3); + var8.packetBuffer.method5502(ScriptEvent.baseY + var1); + var8.packetBuffer.method5566(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method5500(class4.baseX * 64 + var0); + 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 = MenuAction.getPacketBufferNode(ClientPacket.field2259, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(class4.baseX * 64 + var0); + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method5500(var3); + var8.packetBuffer.method5502(ScriptEvent.baseY + var1); + 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 = MenuAction.getPacketBufferNode(ClientPacket.field2198, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(ScriptEvent.baseY + var1); + var8.packetBuffer.method5500(var3); + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method5502(class4.baseX * 64 + var0); + 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 = MenuAction.getPacketBufferNode(ClientPacket.field2206, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5493(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method5502(class4.baseX * 64 + var0); + var8.packetBuffer.method5502(var3); + var8.packetBuffer.writeShort(ScriptEvent.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 = MenuAction.getPacketBufferNode(ClientPacket.field2188, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(var3); + var8.packetBuffer.method5500(class4.baseX * 64 + var0); + var8.packetBuffer.method5566(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method5500(ScriptEvent.baseY + var1); + Client.packetWriter.addNode(var8); + } else if (var2 == 23) { + if (Client.isMenuOpen) { + WorldMapIcon_1.scene.setViewportWalking(); + } else { + WorldMapIcon_1.scene.menuOpen(MouseRecorder.plane, var0, var1, true); + } + } else { + PacketBufferNode var11; + Widget var16; + if (var2 == 24) { + var16 = Player.getWidget(var1); + boolean var12 = true; + if (var16.contentType > 0) { + var12 = class49.method825(var16); + } + + if (var12) { + var11 = MenuAction.getPacketBufferNode(ClientPacket.field2283, Client.packetWriter.isaacCipher); + var11.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var11); + } + } else { + if (var2 == 25) { + var16 = class49.getWidgetChild(var1, var0); + if (var16 != null) { + FloorDecoration.Widget_runOnTargetLeave(); + Player.method1196(var1, var0, WorldMapElement.method4390(class60.getWidgetClickMask(var16)), var16.itemId); + Client.isItemSelected = 0; + Client.selectedSpellActionName = class16.method165(var16); + if (Client.selectedSpellActionName == null) { + Client.selectedSpellActionName = "null"; + } + + if (var16.isIf3) { + Client.selectedSpellName = var16.dataText + UserComparator7.colorStartTag(16777215); + } else { + Client.selectedSpellName = UserComparator7.colorStartTag(65280) + var16.spellName + UserComparator7.colorStartTag(16777215); + } + } + + return; + } + + if (var2 == 26) { + GrandExchangeEvent.method73(); + } else { + int var10; + Widget var14; + if (var2 == 28) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2283, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var8); + var14 = Player.getWidget(var1); + if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { + var10 = var14.cs1Instructions[0][1]; + Varps.Varps_main[var10] = 1 - Varps.Varps_main[var10]; + Players.method2123(var10); + } + } else if (var2 == 29) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2283, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var8); + var14 = Player.getWidget(var1); + if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { + var10 = var14.cs1Instructions[0][1]; + if (Varps.Varps_main[var10] != var14.cs1ComparisonValues[0]) { + Varps.Varps_main[var10] = var14.cs1ComparisonValues[0]; + Players.method2123(var10); + } + } + } else if (var2 == 30) { + if (Client.meslayerContinueWidget == null) { + WorldMapSection1.resumePauseWidget(var1, var0); + Client.meslayerContinueWidget = class49.getWidgetChild(var1, var0); + WorldMapID.invalidateWidget(Client.meslayerContinueWidget); + } + } else if (var2 == 31) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2260, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(var3); + var8.packetBuffer.writeInt(MusicPatchPcmStream.selectedItemWidget); + var8.packetBuffer.method5500(ModelData0.selectedItemSlot); + var8.packetBuffer.writeIntME(var0); + var8.packetBuffer.writeShortLE(var1); + var8.packetBuffer.method5502(DevicePcmPlayerProvider.selectedItemId); + Client.packetWriter.addNode(var8); + Client.field727 = 0; + Entity.field1835 = Player.getWidget(var1); + Client.field728 = var0; + } else if (var2 == 32) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2219, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShort(Client.field687); + var8.packetBuffer.method5500(var0); + var8.packetBuffer.writeShortLE(var1); + var8.packetBuffer.method5500(var3); + var8.packetBuffer.writeIntLE16(class83.field1138); + Client.packetWriter.addNode(var8); + Client.field727 = 0; + Entity.field1835 = Player.getWidget(var1); + Client.field728 = var0; + } else if (var2 == 33) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2256, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(var3); + var8.packetBuffer.writeIntME(var0); + var8.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var8); + Client.field727 = 0; + Entity.field1835 = Player.getWidget(var1); + Client.field728 = var0; + } else if (var2 == 34) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2192, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5500(var3); + var8.packetBuffer.writeIntME(var0); + var8.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var8); + Client.field727 = 0; + Entity.field1835 = Player.getWidget(var1); + Client.field728 = var0; + } else if (var2 == 35) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2261, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntLE(var1); + var8.packetBuffer.method5502(var3); + var8.packetBuffer.method5500(var0); + Client.packetWriter.addNode(var8); + Client.field727 = 0; + Entity.field1835 = Player.getWidget(var1); + Client.field728 = var0; + } else if (var2 == 36) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2264, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(var0); + var8.packetBuffer.writeShortLE(var1); + var8.packetBuffer.method5502(var3); + Client.packetWriter.addNode(var8); + Client.field727 = 0; + Entity.field1835 = Player.getWidget(var1); + Client.field728 = var0; + } else if (var2 == 37) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2277, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(var0); + var8.packetBuffer.writeShortLE(var1); + var8.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var8); + Client.field727 = 0; + Entity.field1835 = Player.getWidget(var1); + Client.field728 = var0; + } else { + if (var2 == 38) { + FloorDecoration.Widget_runOnTargetLeave(); + var16 = Player.getWidget(var1); + Client.isItemSelected = 1; + ModelData0.selectedItemSlot = var0; + MusicPatchPcmStream.selectedItemWidget = var1; + DevicePcmPlayerProvider.selectedItemId = var3; + WorldMapID.invalidateWidget(var16); + Client.selectedItemName = UserComparator7.colorStartTag(16748608) + Player.ItemDefinition_get(var3).name + UserComparator7.colorStartTag(16777215); + if (Client.selectedItemName == null) { + Client.selectedItemName = "null"; + } + + return; + } + + if (var2 == 39) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2234, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntLE16(var1); + var8.packetBuffer.method5500(var0); + var8.packetBuffer.method5502(var3); + Client.packetWriter.addNode(var8); + Client.field727 = 0; + Entity.field1835 = Player.getWidget(var1); + Client.field728 = var0; + } else if (var2 == 40) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2269, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShortLE(var1); + var8.packetBuffer.method5500(var0); + var8.packetBuffer.method5500(var3); + Client.packetWriter.addNode(var8); + Client.field727 = 0; + Entity.field1835 = Player.getWidget(var1); + Client.field728 = var0; + } else if (var2 == 41) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2282, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntLE(var1); + var8.packetBuffer.method5500(var3); + var8.packetBuffer.writeShort(var0); + Client.packetWriter.addNode(var8); + Client.field727 = 0; + Entity.field1835 = Player.getWidget(var1); + Client.field728 = var0; + } else if (var2 == 42) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2203, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5500(var0); + var8.packetBuffer.writeIntLE16(var1); + var8.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var8); + Client.field727 = 0; + Entity.field1835 = Player.getWidget(var1); + Client.field728 = var0; + } else if (var2 == 43) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2243, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5500(var0); + var8.packetBuffer.writeIntME(var3); + var8.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var8); + Client.field727 = 0; + Entity.field1835 = Player.getWidget(var1); + Client.field728 = 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 = MenuAction.getPacketBufferNode(ClientPacket.field2237, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5500(var3); + var9.packetBuffer.method5566(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + 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 = MenuAction.getPacketBufferNode(ClientPacket.field2215, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.writeIntME(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 = MenuAction.getPacketBufferNode(ClientPacket.field2204, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5500(var3); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 47) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = MenuAction.getPacketBufferNode(ClientPacket.field2248, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method5500(var3); + 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 = MenuAction.getPacketBufferNode(ClientPacket.field2212, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method5502(var3); + 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 = MenuAction.getPacketBufferNode(ClientPacket.field2250, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5502(var3); + var9.packetBuffer.method5491(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 = MenuAction.getPacketBufferNode(ClientPacket.field2268, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5491(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method5500(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 = MenuAction.getPacketBufferNode(ClientPacket.field2211, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5500(var3); + var9.packetBuffer.method5566(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); + } + } else { + label642: { + if (var2 != 57) { + if (var2 == 58) { + var16 = class49.getWidgetChild(var1, var0); + if (var16 != null) { + var9 = MenuAction.getPacketBufferNode(ClientPacket.field2229, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShortLE(class83.field1138); + var9.packetBuffer.writeIntME(Client.field687); + var9.packetBuffer.writeIntLE(var1); + var9.packetBuffer.writeShort(var0); + var9.packetBuffer.writeIntME(Client.field648); + var9.packetBuffer.writeShort(var16.itemId); + Client.packetWriter.addNode(var9); + } + break label642; + } + + if (var2 == 1001) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2209, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(ScriptEvent.baseY + var1); + var8.packetBuffer.writeShort(var3); + var8.packetBuffer.method5500(class4.baseX * 64 + var0); + var8.packetBuffer.method5493(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var8); + break label642; + } + + if (var2 == 1002) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2232, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(var3); + Client.packetWriter.addNode(var8); + break label642; + } + + if (var2 == 1003) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + var13 = Client.npcs[var3]; + if (var13 != null) { + NPCDefinition var17 = var13.definition; + if (var17.transforms != null) { + var17 = var17.transform(); + } + + if (var17 != null) { + var11 = MenuAction.getPacketBufferNode(ClientPacket.field2230, Client.packetWriter.isaacCipher); + var11.packetBuffer.method5500(var17.id); + Client.packetWriter.addNode(var11); + } + } + break label642; + } + + if (var2 == 1004) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2205, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5500(var3); + Client.packetWriter.addNode(var8); + break label642; + } + + if (var2 == 1005) { + var16 = Player.getWidget(var1); + if (var16 != null && var16.itemQuantities[var0] >= 100000) { + WorldMapCacheName.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + Player.ItemDefinition_get(var3).name); + } else { + var9 = MenuAction.getPacketBufferNode(ClientPacket.field2205, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5500(var3); + Client.packetWriter.addNode(var9); + } + + Client.field727 = 0; + Entity.field1835 = Player.getWidget(var1); + Client.field728 = var0; + break label642; + } + + if (var2 != 1007) { + if (var2 == 1010 || var2 == 1008 || var2 == 1009 || var2 == 1011 || var2 == 1012) { + GrandExchangeOfferUnitPriceComparator.worldMap.menuAction(var2, var3, new Coord(var0), new Coord(var1)); + } + break label642; + } + } + + var16 = class49.getWidgetChild(var1, var0); + if (var16 != null) { + TileItem.method2093(var3, var1, var0, var16.itemId, var5); + } + } + } + } + } + } + } + } + } + + if (Client.isItemSelected != 0) { + Client.isItemSelected = 0; + WorldMapID.invalidateWidget(Player.getWidget(MusicPatchPcmStream.selectedItemWidget)); + } + + if (Client.isSpellSelected) { + FloorDecoration.Widget_runOnTargetLeave(); + } + + if (Entity.field1835 != null && Client.field727 == 0) { + WorldMapID.invalidateWidget(Entity.field1835); + } + + } } diff --git a/runescape-client/src/main/java/Enumerated.java b/runescape-client/src/main/java/Enumerated.java index 9da47f1a73..1b8a585685 100644 --- a/runescape-client/src/main/java/Enumerated.java +++ b/runescape-client/src/main/java/Enumerated.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gn") +@ObfuscatedName("gk") @Implements("Enumerated") public interface Enumerated { - @ObfuscatedName("j") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-32" + signature = "(I)I", + garbageValue = "-1410702910" ) @Export("rsOrdinal") int rsOrdinal(); diff --git a/runescape-client/src/main/java/EvictingDualNodeHashTable.java b/runescape-client/src/main/java/EvictingDualNodeHashTable.java index 47fa85c57c..5ddad2fb4e 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("ep") +@ObfuscatedName("et") @Implements("EvictingDualNodeHashTable") public final class EvictingDualNodeHashTable { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lfe;" + signature = "Lfv;" ) - DualNode field1935; - @ObfuscatedName("j") + DualNode field1923; + @ObfuscatedName("x") @Export("capacity") int capacity; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("remainingCapacity") int remainingCapacity; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lln;" + signature = "Llj;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Ljm;" + signature = "Ljn;" ) @Export("deque") IterableDualNodeQueue deque; public EvictingDualNodeHashTable(int var1) { - this.field1935 = new DualNode(); + this.field1923 = 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("c") @ObfuscatedSignature( - signature = "(J)Lfe;" + signature = "(J)Lfv;" ) @Export("get") public DualNode get(long var1) { @@ -57,7 +57,7 @@ public final class EvictingDualNodeHashTable { return var3; } - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("remove") public void remove(long var1) { DualNode var3 = (DualNode)this.hashTable.get(var1); @@ -69,9 +69,9 @@ public final class EvictingDualNodeHashTable { } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lfe;J)V" + signature = "(Lfv;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.field1935) { + if (var4 == this.field1923) { var4 = this.deque.removeLast(); var4.remove(); var4.removeDual(); @@ -92,12 +92,12 @@ public final class EvictingDualNodeHashTable { this.deque.add(var1); } - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("clear") public void clear() { this.deque.clear(); this.hashTable.clear(); - this.field1935 = new DualNode(); + this.field1923 = 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 cb32309887..a3bf98fa75 100644 --- a/runescape-client/src/main/java/FaceNormal.java +++ b/runescape-client/src/main/java/FaceNormal.java @@ -2,105 +2,35 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ei") +@ObfuscatedName("em") @Implements("FaceNormal") public class FaceNormal { - @ObfuscatedName("x") - @Export("ByteArrayPool_arrays") - public static byte[][][] ByteArrayPool_arrays; - @ObfuscatedName("s") + @ObfuscatedName("kk") @ObfuscatedGetter( - intValue = 672881507 + intValue = -2016617893 + ) + @Export("menuHeight") + static int menuHeight; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 153550735 ) @Export("x") int x; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1754026933 + intValue = -1428823539 ) @Export("y") int y; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -2141931209 + intValue = 1573119105 ) @Export("z") int z; FaceNormal() { } - - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "(CB)Z", - garbageValue = "-36" - ) - static final boolean method3222(char var0) { - return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-'; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;B)Ljava/lang/String;", - garbageValue = "1" - ) - @Export("base37Decode") - public static String base37Decode(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 = class266.base37DecodeLong(var3); - if (var8 == null) { - var8 = ""; - } - - return var8; - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "105" - ) - @Export("Messages_getNextChatID") - static int Messages_getNextChatID(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("kb") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1280047556" - ) - static final void method3221() { - Client.field817 = Client.cycleCntr; - class13.ClanChat_inClanChat = true; - } } diff --git a/runescape-client/src/main/java/FileSystem.java b/runescape-client/src/main/java/FileSystem.java index 8d48368da5..33cd1ee69d 100644 --- a/runescape-client/src/main/java/FileSystem.java +++ b/runescape-client/src/main/java/FileSystem.java @@ -1,81 +1,69 @@ -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("fj") +@ObfuscatedName("fi") @Implements("FileSystem") public class FileSystem { - @ObfuscatedName("s") + @ObfuscatedName("qd") + @ObfuscatedGetter( + intValue = 1877422611 + ) + static int field2027; + @ObfuscatedName("c") @Export("FileSystem_hasPermissions") - public static boolean FileSystem_hasPermissions; - @ObfuscatedName("j") - @Export("FileSystem_cacheDir") - public static File FileSystem_cacheDir; - @ObfuscatedName("i") + static boolean FileSystem_hasPermissions; + @ObfuscatedName("t") @Export("FileSystem_cacheFiles") static Hashtable FileSystem_cacheFiles; + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "[Llt;" + ) + @Export("title_muteSprite") + static IndexedSprite[] title_muteSprite; + @ObfuscatedName("bw") + @ObfuscatedSignature( + signature = "[Llt;" + ) + @Export("worldSelectArrows") + static IndexedSprite[] worldSelectArrows; + @ObfuscatedName("kl") + @ObfuscatedGetter( + intValue = -841195075 + ) + @Export("menuX") + static int menuX; static { FileSystem_hasPermissions = false; FileSystem_cacheFiles = new Hashtable(16); } - @ObfuscatedName("s") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(II)Lip;", - garbageValue = "-760710815" + signature = "(I)[Llt;", + garbageValue = "584570356" ) - public static VarcInt method3447(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.method4314(new Buffer(var2)); - } + public static IndexedSprite[] method3489() { + IndexedSprite[] var0 = new IndexedSprite[class325.SpriteBuffer_spriteCount]; - VarcInt.VarcInt_cached.put(var1, (long)var0); - return var1; + for (int var1 = 0; var1 < class325.SpriteBuffer_spriteCount; ++var1) { + IndexedSprite var2 = var0[var1] = new IndexedSprite(); + var2.width = class325.SpriteBuffer_spriteWidth; + var2.height = class325.SpriteBuffer_spriteHeight; + var2.xOffset = class325.SpriteBuffer_xOffsets[var1]; + var2.yOffset = SecureRandomCallable.SpriteBuffer_yOffsets[var1]; + var2.subWidth = class325.SpriteBuffer_spriteWidths[var1]; + var2.subHeight = SoundSystem.SpriteBuffer_spriteHeights[var1]; + var2.palette = class325.SpriteBuffer_spritePalette; + var2.pixels = InvDefinition.SpriteBuffer_pixels[var1]; } - } - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(IIB)Lbi;", - garbageValue = "17" - ) - @Export("Messages_getByChannelAndID") - static Message Messages_getByChannelAndID(int var0, int var1) { - ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); - return var2.getMessage(var1); - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "(Lhz;Lhz;III)Lkb;", - garbageValue = "1068587353" - ) - @Export("SpriteBuffer_getFont") - public static Font SpriteBuffer_getFont(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { - if (!World.SpriteBuffer_bufferFile(var0, var2, var3)) { - return null; - } else { - byte[] var5 = var1.takeFile(var2, var3); - Font var4; - if (var5 == null) { - var4 = null; - } else { - Font var6 = new Font(var5, class325.SpriteBuffer_xOffsets, class325.SpriteBuffer_yOffsets, class325.SpriteBuffer_spriteWidths, class225.SpriteBuffer_spriteHeights, class325.SpriteBuffer_spritePalette, WorldMapSection1.SpriteBuffer_pixels); - UserComparator7.SpriteBuffer_clear(); - var4 = var6; - } - - return var4; - } + class192.SpriteBuffer_clear(); + return var0; } } diff --git a/runescape-client/src/main/java/FillMode.java b/runescape-client/src/main/java/FillMode.java index fb0dbddf99..ed72438e38 100644 --- a/runescape-client/src/main/java/FillMode.java +++ b/runescape-client/src/main/java/FillMode.java @@ -4,35 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lb") +@ObfuscatedName("lq") @Implements("FillMode") public enum FillMode implements Enumerated { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Llb;" + signature = "Llq;" ) @Export("SOLID") SOLID(0, 0), - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Llb;" + signature = "Llq;" ) - field3858(1, 1), - @ObfuscatedName("i") + field3855(1, 1), + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Llb;" + signature = "Llq;" ) - field3860(2, 2); + field3852(2, 2); - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -375665689 + intValue = -494470033 ) @Export("value") public final int value; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -839626013 + intValue = -1639084691 ) @Export("id") final int id; @@ -42,13 +42,32 @@ public enum FillMode implements Enumerated { this.id = var4; } - @ObfuscatedName("j") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-32" + signature = "(I)I", + garbageValue = "-1410702910" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(Lhz;IIS)Lli;", + garbageValue = "-25317" + ) + @Export("SpriteBuffer_getSprite") + public static Sprite SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { + byte[] var4 = var0.takeFile(var1, var2); + boolean var3; + if (var4 == null) { + var3 = false; + } else { + GrandExchangeOfferWorldComparator.SpriteBuffer_decode(var4); + var3 = true; + } + + return !var3 ? null : ChatChannel.method2218(); + } } diff --git a/runescape-client/src/main/java/FloorDecoration.java b/runescape-client/src/main/java/FloorDecoration.java index ec25111bcd..89ede5411a 100644 --- a/runescape-client/src/main/java/FloorDecoration.java +++ b/runescape-client/src/main/java/FloorDecoration.java @@ -1,58 +1,50 @@ -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("dy") +@ObfuscatedName("db") @Implements("FloorDecoration") public final class FloorDecoration { - @ObfuscatedName("x") + @ObfuscatedName("fg") @ObfuscatedGetter( - intValue = -513074151 + intValue = 2143903215 ) - @Export("PcmPlayer_count") - static int PcmPlayer_count; - @ObfuscatedName("ec") + static int field1585; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1042709879 - ) - @Export("port2") - static int port2; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 577791457 + intValue = -1477946129 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 2080109751 - ) - @Export("x") - int x; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 748443287 + intValue = -662619385 ) @Export("y") int y; - @ObfuscatedName("k") + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -1897979537 + ) + @Export("x") + int x; + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Len;" + signature = "Lel;" ) @Export("entity") public Entity entity; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - longValue = 6356128824356996537L + longValue = -6178260684418985297L ) @Export("tag") public long tag; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1037477129 + intValue = 944766785 ) @Export("flags") int flags; @@ -60,85 +52,30 @@ public final class FloorDecoration { FloorDecoration() { } - @ObfuscatedName("er") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1136881308" + signature = "(IIIII)V", + garbageValue = "423054360" ) - @Export("updateGameState") - static void updateGameState(int var0) { - if (var0 != Client.gameState) { - if (Client.gameState == 0) { - WorldMapID.client.method891(); - } + static final void method2813(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) { + Tiles.field473[0][var5][var4] = 127; + if (var0 == var5 && var5 > 0) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; + } - if (var0 == 20 || var0 == 40 || var0 == 45) { - Client.loginState = 0; - Client.field658 = 0; - Client.field659 = 0; - Client.timer.method4899(var0); - if (var0 != 20) { - WorldMapArea.method358(false); - } - } + if (var5 == var0 + var2 && var5 < 103) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; + } - if (var0 != 20 && var0 != 40 && Bounds.field3845 != null) { - Bounds.field3845.close(); - Bounds.field3845 = null; - } + if (var4 == var1 && var4 > 0) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1]; + } - if (Client.gameState == 25) { - Client.field719 = 0; - Client.field676 = 0; - Client.field886 = 1; - Client.field678 = 0; - Client.field718 = 1; - } - - if (var0 != 5 && var0 != 10) { - if (var0 == 20) { - BoundaryObject.method3213(GameObject.archive10, class2.archive8, true, Client.gameState == 11 ? 4 : 0); - } else if (var0 == 11) { - BoundaryObject.method3213(GameObject.archive10, class2.archive8, false, 4); - } else { - DynamicObject.method2153(); - } - } else { - BoundaryObject.method3213(GameObject.archive10, class2.archive8, true, 0); - } - - Client.gameState = var0; - } - } - - @ObfuscatedName("hd") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1412444391" - ) - static final void method2788() { - 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 || WorldMapSprite.method404(var0.objectId, var0.field903)) { - Script.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.objectId, var0.field907, var0.field903); - 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 || WorldMapSprite.method404(var0.id, var0.field911))) { - Script.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field911); - var0.delay = -1; - if (var0.id == var0.objectId && var0.objectId == -1) { - var0.remove(); - } else if (var0.id == var0.objectId && var0.orientation == var0.field907 && var0.field903 == var0.field911) { - var0.remove(); + if (var3 + var1 == var4 && var4 < 103) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; } } } @@ -146,49 +83,72 @@ public final class FloorDecoration { } - @ObfuscatedName("hq") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "507499403" + signature = "(B)V", + garbageValue = "3" ) - static final void method2786(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.field703[var4] = true; + public static void method2811() { + try { + JagexCache.JagexCache_dat2File.close(); + + for (int var0 = 0; var0 < JagexCache.idxCount; ++var0) { + DevicePcmPlayerProvider.JagexCache_idxFiles[var0].close(); } + + JagexCache.JagexCache_idx255File.close(); + JagexCache.JagexCache_randomDat.close(); + } catch (Exception var2) { } } - @ObfuscatedName("kh") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(Lky;I)V", - garbageValue = "183516662" + signature = "(IIB)I", + garbageValue = "119" ) - static void method2787(Buffer var0) { - if (Client.randomDatData != null) { - var0.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); - } else { - byte[] var2 = new byte[24]; - - 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; - } + static final int method2812(int var0, int var1) { + if (var0 == -2) { + return 12345678; + } else if (var0 == -1) { + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; } - var0.writeBytes(var2, 0, var2.length); + return var1; + } else { + var1 = (var0 & 127) * var1 / 128; + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; + } + + return (var0 & 65408) + var1; + } + } + + @ObfuscatedName("hx") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "932065265" + ) + @Export("Widget_runOnTargetLeave") + static void Widget_runOnTargetLeave() { + if (Client.isSpellSelected) { + Widget var0 = class49.getWidgetChild(class83.field1138, Client.field687); + if (var0 != null && var0.onTargetLeave != null) { + ScriptEvent var1 = new ScriptEvent(); + var1.widget = var0; + var1.args = var0.onTargetLeave; + SecureRandomFuture.runScriptEvent(var1); + } + + Client.isSpellSelected = false; + WorldMapID.invalidateWidget(var0); } } } diff --git a/runescape-client/src/main/java/FloorOverlayDefinition.java b/runescape-client/src/main/java/FloorOverlayDefinition.java index 092460a659..f6aca74dda 100644 --- a/runescape-client/src/main/java/FloorOverlayDefinition.java +++ b/runescape-client/src/main/java/FloorOverlayDefinition.java @@ -4,75 +4,75 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iv") +@ObfuscatedName("ip") @Implements("FloorOverlayDefinition") public class FloorOverlayDefinition extends DualNode { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "Lhz;" ) @Export("FloorOverlayDefinition_archive") public static AbstractArchive FloorOverlayDefinition_archive; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("FloorOverlayDefinition_cached") public static EvictingDualNodeHashTable FloorOverlayDefinition_cached; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1186285675 + intValue = 54951813 ) @Export("primaryRgb") public int primaryRgb; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1987325665 + intValue = 1779680487 ) @Export("texture") public int texture; - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("hideUnderlay") public boolean hideUnderlay; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -375374105 + intValue = -707302109 ) @Export("secondaryRgb") public int secondaryRgb; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1926193945 + intValue = 1456521303 ) @Export("hue") public int hue; - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1588177313 + intValue = 688606529 ) @Export("saturation") public int saturation; - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1646509357 + intValue = -870998143 ) @Export("lightness") public int lightness; - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1281479925 + intValue = -1714187585 ) @Export("secondaryHue") public int secondaryHue; - @ObfuscatedName("f") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1612990267 + intValue = -1373753821 ) @Export("secondarySaturation") public int secondarySaturation; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -520563245 + intValue = -1682451449 ) @Export("secondaryLightness") public int secondaryLightness; @@ -88,10 +88,10 @@ public class FloorOverlayDefinition extends DualNode { this.secondaryRgb = -1; } - @ObfuscatedName("s") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "-32" + garbageValue = "-55" ) @Export("postDecode") public void postDecode() { @@ -105,10 +105,10 @@ public class FloorOverlayDefinition extends DualNode { this.setHsl(this.primaryRgb); } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lky;II)V", - garbageValue = "-1938903864" + signature = "(Lkz;II)V", + garbageValue = "1739304063" ) @Export("decode") public void decode(Buffer var1, int var2) { @@ -122,10 +122,10 @@ public class FloorOverlayDefinition extends DualNode { } } - @ObfuscatedName("i") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lky;III)V", - garbageValue = "-1583990473" + signature = "(Lkz;III)V", + garbageValue = "-1287071458" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { @@ -142,10 +142,10 @@ public class FloorOverlayDefinition extends DualNode { } - @ObfuscatedName("k") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "923759114" + garbageValue = "-809760850" ) @Export("setHsl") void setHsl(int var1) { @@ -173,7 +173,7 @@ public class FloorOverlayDefinition extends DualNode { double var12 = 0.0D; double var14 = 0.0D; double var16 = (var10 + var8) / 2.0D; - if (var10 != var8) { + if (var8 != var10) { if (var16 < 0.5D) { var14 = (var10 - var8) / (var10 + var8); } @@ -185,7 +185,7 @@ public class FloorOverlayDefinition extends DualNode { if (var10 == var2) { var12 = (var4 - var6) / (var10 - var8); } else if (var4 == var10) { - var12 = (var6 - var2) / (var10 - var8) + 2.0D; + var12 = 2.0D + (var6 - var2) / (var10 - var8); } else if (var6 == var10) { var12 = (var2 - var4) / (var10 - var8) + 4.0D; } @@ -208,4 +208,55 @@ public class FloorOverlayDefinition extends DualNode { } } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(Lkz;Llj;I)Llj;", + garbageValue = "1335279742" + ) + @Export("readStringIntParameters") + static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { + int var2 = var0.readUnsignedByte(); + int var3; + if (var1 == null) { + int var4 = var2 - 1; + var4 |= var4 >>> 1; + var4 |= var4 >>> 2; + var4 |= var4 >>> 4; + var4 |= var4 >>> 8; + var4 |= var4 >>> 16; + var3 = var4 + 1; + var1 = new IterableNodeHashTable(var3); + } + + for (var3 = 0; var3 < var2; ++var3) { + boolean var7 = var0.readUnsignedByte() == 1; + int var5 = var0.readMedium(); + Object var6; + if (var7) { + var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); + } else { + var6 = new IntegerNode(var0.readInt()); + } + + var1.put((Node)var6, (long)var5); + } + + return var1; + } + + @ObfuscatedName("ey") + @ObfuscatedSignature( + signature = "(IZZZI)Lio;", + garbageValue = "90068714" + ) + @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, DevicePcmPlayerProvider.JagexCache_idxFiles[var0], 1000000); + } + + return new Archive(var4, RouteStrategy.masterDisk, var0, var1, var2, var3); + } } diff --git a/runescape-client/src/main/java/FloorUnderlayDefinition.java b/runescape-client/src/main/java/FloorUnderlayDefinition.java index da81111c04..919268c31c 100644 --- a/runescape-client/src/main/java/FloorUnderlayDefinition.java +++ b/runescape-client/src/main/java/FloorUnderlayDefinition.java @@ -3,49 +3,50 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ie") +@ObfuscatedName("il") @Implements("FloorUnderlayDefinition") public class FloorUnderlayDefinition extends DualNode { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "Lhz;" ) @Export("FloorUnderlayDefinition_archive") - static AbstractArchive FloorUnderlayDefinition_archive; - @ObfuscatedName("j") + public static AbstractArchive FloorUnderlayDefinition_archive; + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("FloorUnderlayDefinition_cached") - public static EvictingDualNodeHashTable FloorUnderlayDefinition_cached; - @ObfuscatedName("i") + static EvictingDualNodeHashTable FloorUnderlayDefinition_cached; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1690185973 + intValue = 502539723 ) @Export("rgb") int rgb; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1561731435 + intValue = -387630933 ) @Export("hue") public int hue; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 56370407 + intValue = -1309988489 ) @Export("saturation") public int saturation; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1143874615 + intValue = -1550343627 ) @Export("lightness") public int lightness; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -780904451 + intValue = 241046707 ) @Export("hueMultiplier") public int hueMultiplier; @@ -58,20 +59,20 @@ public class FloorUnderlayDefinition extends DualNode { this.rgb = 0; } - @ObfuscatedName("i") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "38" + signature = "(I)V", + garbageValue = "-2017124449" ) @Export("postDecode") void postDecode() { this.setHsl(this.rgb); } - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lky;IB)V", - garbageValue = "118" + signature = "(Lkz;II)V", + garbageValue = "-336580480" ) @Export("decode") void decode(Buffer var1, int var2) { @@ -85,10 +86,10 @@ public class FloorUnderlayDefinition extends DualNode { } } - @ObfuscatedName("u") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lky;III)V", - garbageValue = "2131813988" + signature = "(Lkz;III)V", + garbageValue = "1777076366" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { @@ -98,10 +99,10 @@ public class FloorUnderlayDefinition extends DualNode { } - @ObfuscatedName("n") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-28210148" + garbageValue = "1419999023" ) @Export("setHsl") void setHsl(int var1) { @@ -129,7 +130,7 @@ public class FloorUnderlayDefinition extends DualNode { double var12 = 0.0D; double var14 = 0.0D; double var16 = (var10 + var8) / 2.0D; - if (var10 != var8) { + if (var8 != var10) { if (var16 < 0.5D) { var14 = (var10 - var8) / (var8 + var10); } @@ -141,9 +142,9 @@ public class FloorUnderlayDefinition extends DualNode { if (var10 == var2) { var12 = (var4 - var6) / (var10 - var8); } else if (var10 == var4) { - var12 = 2.0D + (var6 - var2) / (var10 - var8); - } else if (var10 == var6) { - var12 = 4.0D + (var2 - var4) / (var10 - var8); + var12 = (var6 - var2) / (var10 - var8) + 2.0D; + } else if (var6 == var10) { + var12 = (var2 - var4) / (var10 - var8) + 4.0D; } } @@ -163,15 +164,67 @@ public class FloorUnderlayDefinition extends DualNode { } if (var16 > 0.5D) { - this.hueMultiplier = (int)(512.0D * var14 * (1.0D - var16)); + this.hueMultiplier = (int)((1.0D - var16) * var14 * 512.0D); } else { - this.hueMultiplier = (int)(var16 * var14 * 512.0D); + this.hueMultiplier = (int)(512.0D * var16 * var14); } if (this.hueMultiplier < 1) { this.hueMultiplier = 1; } - this.hue = (int)(var12 * (double)this.hueMultiplier); + this.hue = (int)((double)this.hueMultiplier * var12); + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + signature = "(ILcu;ZB)I", + garbageValue = "1" + ) + static int method4423(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.SOUND_SYNTH) { + class160.Interpreter_intStackSize -= 3; + class192.queueSoundEffect(Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 2]); + return 1; + } else if (var0 == ScriptOpcodes.SOUND_SONG) { + WorldMapData_1.playSong(Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]); + return 1; + } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { + class160.Interpreter_intStackSize -= 2; + SecureRandomCallable.playSoundJingle(Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]); + return 1; + } else { + return 2; + } + } + + @ObfuscatedName("fu") + @ObfuscatedSignature( + signature = "(Lby;IIB)V", + garbageValue = "0" + ) + @Export("performPlayerAnimation") + static void performPlayerAnimation(Player var0, int var1, int var2) { + if (var0.sequence == var1 && var1 != -1) { + int var3 = class83.SequenceDefinition_get(var1).field3502; + if (var3 == 1) { + var0.sequenceFrame = 0; + var0.sequenceFrameCycle = 0; + var0.sequenceDelay = var2; + var0.field924 = 0; + } + + if (var3 == 2) { + var0.field924 = 0; + } + } else if (var1 == -1 || var0.sequence == -1 || class83.SequenceDefinition_get(var1).field3504 >= class83.SequenceDefinition_get(var0.sequence).field3504) { + var0.sequence = var1; + var0.sequenceFrame = 0; + var0.sequenceFrameCycle = 0; + var0.sequenceDelay = var2; + var0.field924 = 0; + var0.field969 = var0.pathLength; + } + } } diff --git a/runescape-client/src/main/java/Font.java b/runescape-client/src/main/java/Font.java index 9c457d9ac7..cca81eb202 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("kb") +@ObfuscatedName("kf") @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("c") @Export("drawGlyph") final void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6) { int var7 = var3 * Rasterizer2D.Rasterizer2D_width + var2; @@ -55,7 +55,7 @@ public final class Font extends AbstractFont { } } - @ObfuscatedName("j") + @ObfuscatedName("x") @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 d25ecda2ff..af437202b1 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -1,72 +1,66 @@ import 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("kz") +@ObfuscatedName("kn") @Implements("FontName") public class FontName { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lkz;" + signature = "Lkn;" ) @Export("FontName_plain11") public static final FontName FontName_plain11; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lkz;" + signature = "Lkn;" ) @Export("FontName_plain12") public static final FontName FontName_plain12; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lkz;" + signature = "Lkn;" ) @Export("FontName_bold12") public static final FontName FontName_bold12; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lkz;" + signature = "Lkn;" ) @Export("FontName_verdana11") public static final FontName FontName_verdana11; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Lkz;" + signature = "Lkn;" ) @Export("FontName_verdana13") public static final FontName FontName_verdana13; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lkz;" + signature = "Lkn;" ) @Export("FontName_verdana15") public static final FontName FontName_verdana15; - @ObfuscatedName("q") - public static short[][] field3651; - @ObfuscatedName("c") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Lgy;" + signature = "Ldm;" ) - @Export("musicTrack") - public static MusicTrack musicTrack; - @ObfuscatedName("h") - @Export("userHomeDirectory") - public static String userHomeDirectory; - @ObfuscatedName("bz") + @Export("soundSystem") + static SoundSystem soundSystem; + @ObfuscatedName("dv") @ObfuscatedSignature( - signature = "Llu;" + signature = "Lio;" ) - @Export("loginType") - static LoginType loginType; - @ObfuscatedName("ix") - @ObfuscatedGetter( - intValue = -1325782569 + @Export("archive10") + static Archive archive10; + @ObfuscatedName("gt") + @ObfuscatedSignature( + signature = "Lli;" ) - @Export("selectedItemWidget") - static int selectedItemWidget; - @ObfuscatedName("t") + @Export("redHintArrowSprite") + static Sprite redHintArrowSprite; + @ObfuscatedName("j") @Export("name") String name; @@ -83,65 +77,781 @@ public class FontName { this.name = var1; } - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "-11" - ) - @Export("isKeyDown") - public static final boolean isKeyDown() { - synchronized(KeyHandler.KeyHandler_instance) { - if (KeyHandler.field385 == KeyHandler.field383) { - return false; + @ObfuscatedName("c") + public static final int method5287(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 { - ReflectionCheck.field1307 = KeyHandler.field376[KeyHandler.field385]; - SpriteMask.field2499 = KeyHandler.field377[KeyHandler.field385]; - KeyHandler.field385 = KeyHandler.field385 + 1 & 127; - return true; + var12 = var2 + var4 - var2 * var4; + } + + double var14 = var4 * 2.0D - var12; + double var16 = 0.3333333333333333D + var0; + if (var16 > 1.0D) { + --var16; + } + + double var20 = var0 - 0.3333333333333333D; + if (var20 < 0.0D) { + ++var20; + } + + if (var16 * 6.0D < 1.0D) { + var6 = var14 + var16 * (var12 - var14) * 6.0D; + } else if (var16 * 2.0D < 1.0D) { + var6 = var12; + } else if (3.0D * var16 < 2.0D) { + var6 = 6.0D * (0.6666666666666666D - var16) * (var12 - var14) + var14; + } else { + var6 = var14; + } + + if (6.0D * var0 < 1.0D) { + var8 = var0 * 6.0D * (var12 - var14) + var14; + } else if (2.0D * var0 < 1.0D) { + var8 = var12; + } else if (3.0D * var0 < 2.0D) { + var8 = (var12 - var14) * (0.6666666666666666D - var0) * 6.0D + var14; + } else { + var8 = var14; + } + + if (6.0D * var20 < 1.0D) { + var10 = var14 + var20 * (var12 - var14) * 6.0D; + } else if (var20 * 2.0D < 1.0D) { + var10 = var12; + } else if (3.0D * var20 < 2.0D) { + var10 = var14 + (0.6666666666666666D - var20) * (var12 - var14) * 6.0D; + } else { + var10 = var14; } } - } - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "(Lhp;IIII)V", - garbageValue = "452430417" - ) - @Export("Widget_setKeyRate") - static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { - if (var0.field2623 == null) { - throw new RuntimeException(); - } else { - var0.field2623[var1] = var2; - var0.field2581[var1] = var3; - } + int var22 = (int)(256.0D * var6); + int var13 = (int)(256.0D * var8); + int var23 = (int)(var10 * 256.0D); + int var15 = var23 + (var13 << 8) + (var22 << 16); + return var15; } @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(CII)Ljava/lang/String;", - garbageValue = "993620587" + signature = "(I)[Lkn;", + garbageValue = "-1831558082" ) - static String method5230(char var0, int var1) { - char[] var2 = new char[var1]; - - for (int var3 = 0; var3 < var1; ++var3) { - var2[var3] = var0; - } - - return new String(var2); + public static FontName[] method5288() { + return new FontName[]{FontName_verdana13, FontName_plain11, FontName_verdana11, FontName_verdana15, FontName_plain12, FontName_bold12}; } - @ObfuscatedName("y") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1040867769" + signature = "(II)Lia;", + garbageValue = "1426575141" ) - @Export("ObjectDefinition_clearCached") - public static void ObjectDefinition_clearCached() { - ObjectDefinition.ObjectDefinition_cached.clear(); - ObjectDefinition.ObjectDefinition_cachedModelData.clear(); - ObjectDefinition.ObjectDefinition_cachedEntities.clear(); - ObjectDefinition.ObjectDefinition_cachedModels.clear(); + @Export("getNpcDefinition") + public static NPCDefinition getNpcDefinition(int var0) { + NPCDefinition var1 = (NPCDefinition)NPCDefinition.NpcDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = NPCDefinition.NpcDefinition_archive.takeFile(9, var0); + var1 = new NPCDefinition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); + NPCDefinition.NpcDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;II)Z", + garbageValue = "-1001272425" + ) + static boolean method5292(String var0, int var1) { + return ReflectionCheck.method2261(var0, var1, "openjs"); + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "(Lbn;I)V", + garbageValue = "76683988" + ) + static void method5284(GameShell var0) { + int var4; + if (Login.worldSelectOpen) { + while (true) { + if (!AbstractUserComparator.isKeyDown()) { + if (MouseHandler.MouseHandler_lastButton != 1 && (WorldMapSection1.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) { + class30.changeWorldSelectSorting(0, 0); + break; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + class30.changeWorldSelectSorting(0, 1); + break; + } + + int var2 = Login.xPadding + 390; + if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + class30.changeWorldSelectSorting(1, 0); + break; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + class30.changeWorldSelectSorting(1, 1); + break; + } + + int var17 = Login.xPadding + 500; + if (MouseHandler.MouseHandler_lastPressedX >= var17 && MouseHandler.MouseHandler_lastPressedX <= var17 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + class30.changeWorldSelectSorting(2, 0); + break; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var17 + 15 && MouseHandler.MouseHandler_lastPressedX <= var17 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + class30.changeWorldSelectSorting(2, 1); + break; + } + + var4 = Login.xPadding + 610; + if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + class30.changeWorldSelectSorting(3, 0); + break; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + class30.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) { + GrandExchangeOfferOwnWorldComparator.method1232(); + break; + } + + if (Login.hoveredWorldIndex != -1) { + World var5 = World.World_worlds[Login.hoveredWorldIndex]; + ReflectionCheck.changeWorld(var5); + GrandExchangeOfferOwnWorldComparator.method1232(); + } else { + if (Login.worldSelectPage > 0 && class2.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= class2.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= GameShell.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= GameShell.canvasHeight / 2 + 50) { + --Login.worldSelectPage; + } + + if (Login.worldSelectPage < Login.worldSelectPagesCount && WorldMapRectangle.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= GraphicsDefaults.canvasWidth - WorldMapRectangle.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= GraphicsDefaults.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= GameShell.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= GameShell.canvasHeight / 2 + 50) { + ++Login.worldSelectPage; + } + } + break; + } + + if (class43.field361 == 13) { + GrandExchangeOfferOwnWorldComparator.method1232(); + break; + } + + if (class43.field361 == 96) { + if (Login.worldSelectPage > 0 && class2.worldSelectLeftSprite != null) { + --Login.worldSelectPage; + } + } else if (class43.field361 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && WorldMapRectangle.worldSelectRightSprite != null) { + ++Login.worldSelectPage; + } + } + + } else { + if ((MouseHandler.MouseHandler_lastButton == 1 || !WorldMapSection1.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { + Actor.clientPreferences.titleMusicDisabled = !Actor.clientPreferences.titleMusicDisabled; + class296.savePreferences(); + if (!Actor.clientPreferences.titleMusicDisabled) { + UserComparator7.method3376(WorldMapDecoration.archive6, "scape main", "", 255, false); + } else { + class197.midiPcmStream.clear(); + class197.field2376 = 1; + class197.musicTrackArchive = null; + } + } + + if (Client.gameState != 5) { + if (-1L == Login.field1162) { + Login.field1162 = SoundCache.method2480() + 1000L; + } + + long var12 = SoundCache.method2480(); + boolean var3; + if (Client.archiveLoaders != null && Client.archiveLoaderArchive < Client.archiveLoaders.size()) { + while (true) { + if (Client.archiveLoaderArchive >= Client.archiveLoaders.size()) { + var3 = true; + break; + } + + ArchiveLoader var16 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoaderArchive); + if (!var16.isLoaded()) { + var3 = false; + break; + } + + ++Client.archiveLoaderArchive; + } + } else { + var3 = true; + } + + if (var3 && Login.field1164 == -1L) { + Login.field1164 = var12; + if (Login.field1164 > Login.field1162) { + Login.field1162 = Login.field1164; + } + } + + if (Client.gameState == 10 || Client.gameState == 11) { + if (class43.clientLanguage == Language.Language_EN) { + if (MouseHandler.MouseHandler_lastButton == 1 || !WorldMapSection1.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { + var4 = Login.xPadding + 5; + short var14 = 463; + byte var6 = 100; + byte var7 = 35; + if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + var6 && MouseHandler.MouseHandler_lastPressedY >= var14 && MouseHandler.MouseHandler_lastPressedY <= var7 + var14) { + if (ClientPacket.loadWorlds()) { + Login.worldSelectOpen = true; + Login.worldSelectPage = 0; + Login.worldSelectPagesCount = 0; + } + + return; + } + } + + if (RouteStrategy.World_request != null && ClientPacket.loadWorlds()) { + Login.worldSelectOpen = true; + Login.worldSelectPage = 0; + Login.worldSelectPagesCount = 0; + } + } + + var4 = MouseHandler.MouseHandler_lastButton; + int var25 = MouseHandler.MouseHandler_lastPressedX; + int var18 = MouseHandler.MouseHandler_lastPressedY; + if (var4 == 0) { + var25 = MouseHandler.MouseHandler_x; + var18 = MouseHandler.MouseHandler_y; + } + + if (!WorldMapSection1.mouseCam && var4 == 4) { + var4 = 1; + } + + int var8; + short var9; + if (Login.loginIndex == 0) { + boolean var19 = false; + + while (AbstractUserComparator.isKeyDown()) { + if (class43.field361 == 84) { + var19 = true; + } + } + + var8 = VarcInt.loginBoxCenter - 80; + var9 = 291; + if (var4 == 1 && var25 >= var8 - 75 && var25 <= var8 + 75 && var18 >= var9 - 20 && var18 <= var9 + 20) { + WorldMapIcon_0.openURL(GrandExchangeEvents.method67("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); + } + + var8 = VarcInt.loginBoxCenter + 80; + if (var4 == 1 && var25 >= var8 - 75 && var25 <= var8 + 75 && var18 >= var9 - 20 && var18 <= var9 + 20 || var19) { + 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 { + WorldMapID.method520(false); + } + } + } else { + int var20; + short var22; + if (Login.loginIndex != 1) { + boolean var10; + int var11; + short var21; + if (Login.loginIndex == 2) { + var21 = 201; + var20 = var21 + 52; + if (var4 == 1 && var18 >= var20 - 12 && var18 < var20 + 2) { + Login.currentLoginField = 0; + } + + var20 += 15; + if (var4 == 1 && var18 >= var20 - 12 && var18 < var20 + 2) { + Login.currentLoginField = 1; + } + + var20 += 15; + var21 = 361; + if (MusicPatchNode2.field2369 != null) { + var8 = MusicPatchNode2.field2369.highX / 2; + if (var4 == 1 && var25 >= MusicPatchNode2.field2369.lowX - var8 && var25 <= var8 + MusicPatchNode2.field2369.lowX && var18 >= var21 - 15 && var18 < var21) { + switch(Login.field1161) { + case 1: + Canvas.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: + WorldMapIcon_0.openURL("https://support.runescape.com/hc/en-gb", true, false); + } + } + } + + var8 = VarcInt.loginBoxCenter - 80; + var9 = 321; + if (var4 == 1 && var25 >= var8 - 75 && var25 <= var8 + 75 && var18 >= var9 - 20 && var18 <= var9 + 20) { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + Canvas.setLoginResponseString("", "Please enter your username/email address.", ""); + return; + } + + if (Login.Login_password.length() == 0) { + Canvas.setLoginResponseString("", "Please enter your password.", ""); + return; + } + + Canvas.setLoginResponseString("", "Connecting to server...", ""); + PacketWriter.method2238(false); + WorldMapIcon_0.updateGameState(20); + return; + } + + var8 = Login.loginBoxX + 180 + 80; + if (var4 == 1 && var25 >= var8 - 75 && var25 <= var8 + 75 && var18 >= var9 - 20 && var18 <= var9 + 20) { + Login.loginIndex = 0; + Login.Login_username = ""; + Login.Login_password = ""; + class222.field2729 = 0; + class81.otp = ""; + Login.field1183 = true; + } + + var8 = VarcInt.loginBoxCenter + -117; + var9 = 277; + Login.field1169 = var25 >= var8 && var25 < var8 + class4.field17 && var18 >= var9 && var18 < var9 + class267.field3524; + if (var4 == 1 && Login.field1169) { + Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; + if (!Client.Login_isUsernameRemembered && Actor.clientPreferences.rememberedUsername != null) { + Actor.clientPreferences.rememberedUsername = null; + class296.savePreferences(); + } + } + + var8 = VarcInt.loginBoxCenter + 24; + var9 = 277; + Login.field1170 = var25 >= var8 && var25 < var8 + class4.field17 && var18 >= var9 && var18 < var9 + class267.field3524; + if (var4 == 1 && Login.field1170) { + Actor.clientPreferences.hideUsername = !Actor.clientPreferences.hideUsername; + if (!Actor.clientPreferences.hideUsername) { + Login.Login_username = ""; + Actor.clientPreferences.rememberedUsername = null; + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { + Login.currentLoginField = 1; + } else { + Login.currentLoginField = 0; + } + } + + class296.savePreferences(); + } + + while (true) { + while (AbstractUserComparator.isKeyDown()) { + var10 = false; + + for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var11) { + if (WorldMapIcon_0.field126 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11)) { + var10 = true; + break; + } + } + + if (class43.field361 == 13) { + Login.loginIndex = 0; + Login.Login_username = ""; + Login.Login_password = ""; + class222.field2729 = 0; + class81.otp = ""; + Login.field1183 = true; + } else if (Login.currentLoginField == 0) { + if (class43.field361 == 85 && Login.Login_username.length() > 0) { + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (class43.field361 == 84 || class43.field361 == 80) { + Login.currentLoginField = 1; + } + + if (var10 && Login.Login_username.length() < 320) { + Login.Login_username = Login.Login_username + WorldMapIcon_0.field126; + } + } else if (Login.currentLoginField == 1) { + if (class43.field361 == 85 && Login.Login_password.length() > 0) { + Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); + } + + if (class43.field361 == 84 || class43.field361 == 80) { + Login.currentLoginField = 0; + } + + if (class43.field361 == 84) { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + Canvas.setLoginResponseString("", "Please enter your username/email address.", ""); + return; + } + + if (Login.Login_password.length() == 0) { + Canvas.setLoginResponseString("", "Please enter your password.", ""); + return; + } + + Canvas.setLoginResponseString("", "Connecting to server...", ""); + PacketWriter.method2238(false); + WorldMapIcon_0.updateGameState(20); + return; + } + + if (var10 && Login.Login_password.length() < 20) { + Login.Login_password = Login.Login_password + WorldMapIcon_0.field126; + } + } + } + + return; + } + } else if (Login.loginIndex == 3) { + var20 = Login.loginBoxX + 180; + var22 = 276; + if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { + WorldMapID.method520(false); + } + + var20 = Login.loginBoxX + 180; + var22 = 326; + if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { + Canvas.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 var24; + if (Login.loginIndex == 4) { + var20 = Login.loginBoxX + 180 - 80; + var22 = 321; + if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { + class81.otp.trim(); + if (class81.otp.length() != 6) { + Canvas.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); + return; + } + + class222.field2729 = Integer.parseInt(class81.otp); + class81.otp = ""; + PacketWriter.method2238(true); + Canvas.setLoginResponseString("", "Connecting to server...", ""); + WorldMapIcon_0.updateGameState(20); + return; + } + + if (var4 == 1 && var25 >= Login.loginBoxX + 180 - 9 && var25 <= Login.loginBoxX + 180 + 130 && var18 >= 263 && var18 <= 296) { + Login.field1183 = !Login.field1183; + } + + if (var4 == 1 && var25 >= Login.loginBoxX + 180 - 34 && var25 <= Login.loginBoxX + 34 + 180 && var18 >= 351 && var18 <= 363) { + WorldMapIcon_0.openURL(GrandExchangeEvents.method67("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); + } + + var20 = Login.loginBoxX + 180 + 80; + if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { + Login.loginIndex = 0; + Login.Login_username = ""; + Login.Login_password = ""; + class222.field2729 = 0; + class81.otp = ""; + } + + while (AbstractUserComparator.isKeyDown()) { + boolean var23 = false; + + for (var24 = 0; var24 < "1234567890".length(); ++var24) { + if (WorldMapIcon_0.field126 == "1234567890".charAt(var24)) { + var23 = true; + break; + } + } + + if (class43.field361 == 13) { + Login.loginIndex = 0; + Login.Login_username = ""; + Login.Login_password = ""; + class222.field2729 = 0; + class81.otp = ""; + } else { + if (class43.field361 == 85 && class81.otp.length() > 0) { + class81.otp = class81.otp.substring(0, class81.otp.length() - 1); + } + + if (class43.field361 == 84) { + class81.otp.trim(); + if (class81.otp.length() != 6) { + Canvas.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); + return; + } + + class222.field2729 = Integer.parseInt(class81.otp); + class81.otp = ""; + PacketWriter.method2238(true); + Canvas.setLoginResponseString("", "Connecting to server...", ""); + WorldMapIcon_0.updateGameState(20); + return; + } + + if (var23 && class81.otp.length() < 6) { + class81.otp = class81.otp + WorldMapIcon_0.field126; + } + } + } + } else if (Login.loginIndex == 5) { + var20 = Login.loginBoxX + 180 - 80; + var22 = 321; + if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { + WorldMapDecorationType.method4099(); + return; + } + + var20 = Login.loginBoxX + 180 + 80; + if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { + WorldMapID.method520(true); + } + + var9 = 361; + if (class51.field411 != null) { + var24 = class51.field411.highX / 2; + if (var4 == 1 && var25 >= class51.field411.lowX - var24 && var25 <= var24 + class51.field411.lowX && var18 >= var9 - 15 && var18 < var9) { + WorldMapIcon_0.openURL(GrandExchangeEvents.method67("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); + } + } + + while (AbstractUserComparator.isKeyDown()) { + var10 = false; + + for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var11) { + if (WorldMapIcon_0.field126 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11)) { + var10 = true; + break; + } + } + + if (class43.field361 == 13) { + WorldMapID.method520(true); + } else { + if (class43.field361 == 85 && Login.Login_username.length() > 0) { + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (class43.field361 == 84) { + WorldMapDecorationType.method4099(); + return; + } + + if (var10 && Login.Login_username.length() < 320) { + Login.Login_username = Login.Login_username + WorldMapIcon_0.field126; + } + } + } + } else if (Login.loginIndex == 6) { + while (true) { + do { + if (!AbstractUserComparator.isKeyDown()) { + var21 = 321; + if (var4 == 1 && var18 >= var21 - 20 && var18 <= var21 + 20) { + WorldMapID.method520(true); + } + + return; + } + } while(class43.field361 != 84 && class43.field361 != 13); + + WorldMapID.method520(true); + } + } else if (Login.loginIndex == 7) { + var20 = Login.loginBoxX + 180 - 80; + var22 = 321; + if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { + WorldMapIcon_0.openURL(GrandExchangeEvents.method67("secure", true) + "m=dob/set_dob.ws", true, false); + Canvas.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); + Login.loginIndex = 6; + return; + } + + var20 = Login.loginBoxX + 180 + 80; + if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { + WorldMapID.method520(true); + } + } else if (Login.loginIndex == 8) { + var20 = Login.loginBoxX + 180 - 80; + var22 = 321; + if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { + WorldMapIcon_0.openURL("https://www.jagex.com/terms/privacy/#eight", true, false); + Canvas.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); + Login.loginIndex = 6; + return; + } + + var20 = Login.loginBoxX + 180 + 80; + if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { + WorldMapID.method520(true); + } + } else if (Login.loginIndex == 12) { + String var15 = ""; + switch(Login.field1156) { + case 0: + var15 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; + break; + case 1: + var15 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; + break; + default: + WorldMapID.method520(false); + } + + var8 = Login.loginBoxX + 180; + var9 = 276; + if (var4 == 1 && var25 >= var8 - 75 && var25 <= var8 + 75 && var18 >= var9 - 20 && var18 <= var9 + 20) { + WorldMapIcon_0.openURL(var15, true, false); + Canvas.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); + Login.loginIndex = 6; + return; + } + + var8 = Login.loginBoxX + 180; + var9 = 326; + if (var4 == 1 && var25 >= var8 - 75 && var25 <= var8 + 75 && var18 >= var9 - 20 && var18 <= var9 + 20) { + WorldMapID.method520(false); + } + } else if (Login.loginIndex == 24) { + var20 = Login.loginBoxX + 180; + var22 = 301; + if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { + WorldMapID.method520(false); + } + } + } + } else { + while (AbstractUserComparator.isKeyDown()) { + if (class43.field361 == 84) { + WorldMapID.method520(false); + } else if (class43.field361 == 13) { + Login.loginIndex = 0; + } + } + + var20 = VarcInt.loginBoxCenter - 80; + var22 = 321; + if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { + WorldMapID.method520(false); + } + + var20 = VarcInt.loginBoxCenter + 80; + if (var4 == 1 && var25 >= var20 - 75 && var25 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { + Login.loginIndex = 0; + } + } + } + + } + } + } + } + + @ObfuscatedName("hw") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;Ljava/lang/String;IIIII)V", + garbageValue = "-1882548128" + ) + @Export("insertMenuItemNoShift") + public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { + Decimator.insertMenuItem(var0, var1, var2, var3, var4, var5, false); + } + + @ObfuscatedName("ku") + @ObfuscatedSignature( + signature = "(Lhy;I)Lhy;", + garbageValue = "1031312756" + ) + static Widget method5290(Widget var0) { + int var1 = ScriptFrame.method1086(class60.getWidgetClickMask(var0)); + if (var1 == 0) { + return null; + } else { + for (int var2 = 0; var2 < var1; ++var2) { + var0 = Player.getWidget(var0.parentId); + if (var0 == null) { + return null; + } + } + + return var0; + } } } diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java index 41ac16dbc5..152cd513a8 100644 --- a/runescape-client/src/main/java/Fonts.java +++ b/runescape-client/src/main/java/Fonts.java @@ -1,25 +1,27 @@ +import java.io.IOException; +import java.net.Socket; import java.util.HashMap; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kr") +@ObfuscatedName("ku") @Implements("Fonts") public class Fonts { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "Lhz;" ) @Export("spritesArchive") AbstractArchive spritesArchive; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "Lhz;" ) @Export("fontsArchive") AbstractArchive fontsArchive; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("map") HashMap map; @@ -32,10 +34,10 @@ public class Fonts { this.map = new HashMap(); } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "([Lkz;I)Ljava/util/HashMap;", - garbageValue = "2107388628" + signature = "([Lkn;B)Ljava/util/HashMap;", + garbageValue = "-84" ) @Export("createMap") public HashMap createMap(FontName[] var1) { @@ -47,7 +49,7 @@ public class Fonts { if (this.map.containsKey(var5)) { var2.put(var5, this.map.get(var5)); } else { - Font var6 = PcmPlayer.SpriteBuffer_getFontByName(this.spritesArchive, this.fontsArchive, var5.name, ""); + Font var6 = Skeleton.SpriteBuffer_getFontByName(this.spritesArchive, this.fontsArchive, var5.name, ""); if (var6 != null) { this.map.put(var5, var6); var2.put(var5, var6); @@ -58,23 +60,12 @@ public class Fonts { return var2; } - @ObfuscatedName("s") + @ObfuscatedName("an") @ObfuscatedSignature( - signature = "(I)[Lha;", - garbageValue = "1384146854" + signature = "(Ljava/net/Socket;III)Lks;", + garbageValue = "1860750557" ) - public static ServerBuild[] method5240() { - return new ServerBuild[]{ServerBuild.WIP, ServerBuild.LIVE, ServerBuild.BUILDLIVE, ServerBuild.RC}; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "(Lhz;Lhz;Lhz;I)V", - garbageValue = "-1215139257" - ) - public static void method5234(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) { - SequenceDefinition.SequenceDefinition_archive = var0; - SequenceDefinition.SequenceDefinition_animationsArchive = var1; - SequenceDefinition.SequenceDefinition_skeletonsArchive = var2; + public static AbstractSocket method5293(Socket var0, int var1, int var2) throws IOException { + return new BufferedNetSocket(var0, var1, var2); } } diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java index 92e09fd6bb..900f0c58ff 100644 --- a/runescape-client/src/main/java/Frames.java +++ b/runescape-client/src/main/java/Frames.java @@ -3,27 +3,26 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ee") +@ObfuscatedName("ev") @Implements("Frames") public class Frames extends DualNode { - @ObfuscatedName("t") + @ObfuscatedName("ep") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lkk;" ) - @Export("ItemDefinition_modelArchive") - static AbstractArchive ItemDefinition_modelArchive; - @ObfuscatedName("s") + @Export("spriteIds") + static GraphicsDefaults spriteIds; + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "[Ldi;" + signature = "[Ldx;" ) @Export("frames") Animation[] frames; @ObfuscatedSignature( - signature = "(Lhz;Lhz;IZ)V", - garbageValue = "0" + signature = "(Lhz;Lhz;IZ)V" ) - public Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { + Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { NodeDeque var5 = new NodeDeque(); int var6 = var1.getGroupFileCount(var3); this.frames = new Animation[var6]; @@ -42,7 +41,13 @@ public class Frames extends DualNode { } if (var10 == null) { - byte[] var13 = var2.getFile(var11, 0); + byte[] var13; + if (var4) { + var13 = var2.getFile(0, var11); + } else { + var13 = var2.getFile(var11, 0); + } + var10 = new Skeleton(var11, var13); var5.addFirst(var10); } @@ -52,33 +57,33 @@ public class Frames extends DualNode { } - @ObfuscatedName("s") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "-5" + signature = "(II)Z", + garbageValue = "1628861134" ) @Export("hasAlphaTransform") public boolean hasAlphaTransform(int var1) { return this.frames[var1].hasAlphaTransform; } - @ObfuscatedName("ix") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(II)Ljava/lang/String;", - garbageValue = "-737033535" + signature = "(B)[Lkc;", + garbageValue = "50" ) - @Export("formatItemStacks") - static final String formatItemStacks(int var0) { - String var1 = Integer.toString(var0); + @Export("ChatMode_values") + static PrivateChatMode[] ChatMode_values() { + return new PrivateChatMode[]{PrivateChatMode.field3786, PrivateChatMode.field3789, PrivateChatMode.field3788}; + } - for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { - var1 = var1.substring(0, var2) + "," + var1.substring(var2); - } - - if (var1.length() > 9) { - return " " + class16.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; - } else { - return var1.length() > 6 ? " " + class16.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + class16.colorStartTag(16776960) + var1 + ""; - } + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "(I)Lbb;", + garbageValue = "1062873352" + ) + @Export("getNextWorldListWorld") + static World getNextWorldListWorld() { + return World.World_listCount < World.World_count ? World.World_worlds[++World.World_listCount - 1] : null; } } diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java index 39ec4d118a..ab183421b5 100644 --- a/runescape-client/src/main/java/Friend.java +++ b/runescape-client/src/main/java/Friend.java @@ -3,21 +3,21 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ja") +@ObfuscatedName("jy") @Implements("Friend") public class Friend extends Buddy { - @ObfuscatedName("s") - boolean field3607; - @ObfuscatedName("j") - boolean field3606; + @ObfuscatedName("c") + boolean field3599; + @ObfuscatedName("x") + boolean field3598; Friend() { } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lja;B)I", - garbageValue = "113" + signature = "(Ljy;B)I", + garbageValue = "0" ) @Export("compareToFriend") int compareToFriend(Friend var1) { @@ -29,23 +29,23 @@ public class Friend extends Buddy { return -1; } else if (var1.world != 0 && super.world == 0) { return 1; - } else if (this.field3607 && !var1.field3607) { + } else if (this.field3599 && !var1.field3599) { return -1; - } else if (!this.field3607 && var1.field3607) { + } else if (!this.field3599 && var1.field3599) { return 1; - } else if (this.field3606 && !var1.field3606) { + } else if (this.field3598 && !var1.field3598) { return -1; - } else if (!this.field3606 && var1.field3606) { + } else if (!this.field3598 && var1.field3598) { return 1; } else { return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2; } } - @ObfuscatedName("ai") + @ObfuscatedName("an") @ObfuscatedSignature( - signature = "(Lju;B)I", - garbageValue = "1" + signature = "(Ljw;B)I", + garbageValue = "-92" ) @Export("compareTo_user") public int compareTo_user(User var1) { @@ -56,45 +56,30 @@ public class Friend extends Buddy { return this.compareToFriend((Friend)var1); } - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IZB)Ljava/lang/String;", - garbageValue = "104" + signature = "(ILkx;Lio;I)V", + garbageValue = "-394636832" ) - @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; + static void method5190(int var0, ArchiveDisk var1, Archive var2) { + ArchiveDiskAction var3 = new ArchiveDiskAction(); + var3.type = 1; + var3.key = (long)var0; + var3.archiveDisk = var1; + var3.archive = var2; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); + } - 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); + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { + if (ArchiveDiskActionHandler.field3126 == 0) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); } - return var2; - } else { - return Integer.toString(var0); + ArchiveDiskActionHandler.field3126 = 600; } } } diff --git a/runescape-client/src/main/java/FriendLoginUpdate.java b/runescape-client/src/main/java/FriendLoginUpdate.java index f568092ace..378914f094 100644 --- a/runescape-client/src/main/java/FriendLoginUpdate.java +++ b/runescape-client/src/main/java/FriendLoginUpdate.java @@ -4,116 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jv") +@ObfuscatedName("jp") @Implements("FriendLoginUpdate") public class FriendLoginUpdate extends Link { - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -684756909 + intValue = 235623703 ) - public int field3621; - @ObfuscatedName("k") + public int field3613; + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Ljx;" + signature = "Ljt;" ) @Export("username") public Username username; - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("world") public short world; @ObfuscatedSignature( - signature = "(Ljx;I)V" + signature = "(Ljt;I)V" ) FriendLoginUpdate(Username var1, int var2) { - this.field3621 = (int)(SequenceDefinition.method4686() / 1000L); + this.field3613 = (int)(SoundCache.method2480() / 1000L); this.username = var1; this.world = (short)var2; } - - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "(CLgk;I)C", - garbageValue = "-2143738383" - ) - @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 { - return var0 == 376 ? 'Y' : var0; - } - } } diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index 9a36422aa0..13d700b529 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -3,99 +3,100 @@ 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("ba") +@ObfuscatedName("bc") @Implements("FriendSystem") public class FriendSystem { - @ObfuscatedName("cs") - @Export("mouseCam") - static boolean mouseCam; - @ObfuscatedName("hn") + @ObfuscatedName("qh") @ObfuscatedGetter( - intValue = 2015707871 + intValue = -1955536512 ) - @Export("oculusOrbFocalPointY") - static int oculusOrbFocalPointY; - @ObfuscatedName("k") + static int field1037; + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Llu;" + signature = "Lfk;" + ) + @Export("clock") + static Clock clock; + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "Lll;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Ljo;" + signature = "Ljx;" ) @Export("friendsList") public final FriendsList friendsList; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Ljk;" + signature = "Lji;" ) @Export("ignoreList") public final IgnoreList ignoreList; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1694848325 + intValue = 1109899493 ) - int field1045; + int field1034; @ObfuscatedSignature( - signature = "(Llu;)V" + signature = "(Lll;)V" ) FriendSystem(LoginType var1) { - this.field1045 = 0; + this.field1034 = 0; this.loginType = var1; this.friendsList = new FriendsList(var1); this.ignoreList = new IgnoreList(var1); } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(S)Z", - garbageValue = "-3646" + signature = "(I)Z", + garbageValue = "1338647349" ) - boolean method1773() { - return this.field1045 == 2; + boolean method1825() { + return this.field1034 == 2; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "-52" + garbageValue = "1" ) - final void method1774() { - this.field1045 = 1; + final void method1856() { + this.field1034 = 1; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lky;II)V", - garbageValue = "-1957399935" + signature = "(Lkz;IB)V", + garbageValue = "0" ) @Export("readUpdate") final void readUpdate(Buffer var1, int var2) { this.friendsList.read(var1, var2); - this.field1045 = 2; - class3.FriendSystem_invalidateFriends(); + this.field1034 = 2; + WallDecoration.FriendSystem_invalidateFriends(); } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-688345786" + garbageValue = "-916004239" ) @Export("processFriendUpdates") final void processFriendUpdates() { for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { - if ((long)var1.field3621 < SequenceDefinition.method4686() / 1000L - 5L) { + if ((long)var1.field3613 < SoundCache.method2480() / 1000L - 5L) { if (var1.world > 0) { - DirectByteArrayCopier.addGameMessage(5, "", var1.username + " has logged in."); + WorldMapCacheName.addGameMessage(5, "", var1.username + " has logged in."); } if (var1.world == 0) { - DirectByteArrayCopier.addGameMessage(5, "", var1.username + " has logged out."); + WorldMapCacheName.addGameMessage(5, "", var1.username + " has logged out."); } var1.remove(); @@ -104,38 +105,38 @@ public class FriendSystem { } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "452224146" + garbageValue = "299049416" ) @Export("clear") final void clear() { - this.field1045 = 0; + this.field1034 = 0; this.friendsList.clear(); this.ignoreList.clear(); } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Ljx;ZI)Z", - garbageValue = "1695640889" + signature = "(Ljt;ZI)Z", + garbageValue = "1657738118" ) @Export("isFriended") final boolean isFriended(Username var1, boolean var2) { if (var1 == null) { return false; - } else if (var1.equals(WorldMapIcon_1.localPlayer.username)) { + } else if (var1.equals(Varps.localPlayer.username)) { return true; } else { return this.friendsList.isFriended(var1, var2); } } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Ljx;I)Z", - garbageValue = "-33196880" + signature = "(Ljt;I)Z", + garbageValue = "2143942402" ) @Export("isIgnored") final boolean isIgnored(Username var1) { @@ -146,10 +147,10 @@ public class FriendSystem { } } - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "6" + signature = "(Ljava/lang/String;I)V", + garbageValue = "365133706" ) @Export("addFriend") final void addFriend(String var1) { @@ -157,94 +158,72 @@ public class FriendSystem { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { if (this.friendsListIsFull()) { - class3.method53(); + WorldMapSection2.method283("Your friend list is full. Max of 200 for free users, and 400 for members"); + } else if (Varps.localPlayer.username.equals(var2)) { + class1.method9(); + } else if (this.isFriended(var2, false)) { + Calendar.method3933(var1); + } else if (this.isIgnored(var2)) { + WorldMapSection2.method283("Please remove " + var1 + " from your ignore list first"); } else { - StringBuilder var10000; - String var4; - if (WorldMapIcon_1.localPlayer.username.equals(var2)) { - var10000 = null; - var4 = "You can't add yourself to your own friend list"; - DirectByteArrayCopier.addGameMessage(30, "", var4); - } else if (this.isFriended(var2, false)) { - NPC.method1976(var1); - } else if (this.isIgnored(var2)) { - var10000 = new StringBuilder(); - Object var10001 = null; - var10000 = var10000.append("Please remove ").append(var1); - var10001 = null; - var4 = var10000.append(" from your ignore list first").toString(); - DirectByteArrayCopier.addGameMessage(30, "", var4); - } else { - PacketBufferNode var3 = MenuAction.getPacketBufferNode(ClientPacket.field2201, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var1)); - var3.packetBuffer.writeStringCp1252NullTerminated(var1); - Client.packetWriter.addNode(var3); - } + WorldMapLabelSize.method172(var1); } } } } - @ObfuscatedName("f") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "-21" + signature = "(I)Z", + garbageValue = "-567390482" ) @Export("friendsListIsFull") final boolean friendsListIsFull() { - return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field741 != 1; + return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field739 != 1; } - @ObfuscatedName("c") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(Ljava/lang/String;I)V", - garbageValue = "1615716489" + garbageValue = "-1635625891" ) @Export("addIgnore") final void addIgnore(String var1) { if (var1 != null) { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { - StringBuilder var10000; - String var3; if (this.canAddIgnore()) { - var10000 = null; - var3 = "Your ignore list is full. Max of 100 for free users, and 400 for members"; - DirectByteArrayCopier.addGameMessage(30, "", var3); - } else if (WorldMapIcon_1.localPlayer.username.equals(var2)) { - var10000 = null; - var3 = "You can't add yourself to your own ignore list"; - DirectByteArrayCopier.addGameMessage(30, "", var3); + WorldMapSection2.method283("Your ignore list is full. Max of 100 for free users, and 400 for members"); + } else if (Varps.localPlayer.username.equals(var2)) { + Huffman.method3943(); } else if (this.isIgnored(var2)) { - AbstractWorldMapIcon.method591(var1); + WorldMapSection2.method283(var1 + " is already on your ignore list"); } else if (this.isFriended(var2, false)) { - var10000 = new StringBuilder(); - Object var10001 = null; - var10000 = var10000.append("Please remove ").append(var1); - var10001 = null; - var3 = var10000.append(" from your friend list first").toString(); - DirectByteArrayCopier.addGameMessage(30, "", var3); + WorldMapSection2.method283("Please remove " + var1 + " from your friend list first"); } else { - Huffman.method3902(var1); + PacketBufferNode var3 = MenuAction.getPacketBufferNode(ClientPacket.field2274, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(Varcs.stringCp1252NullTerminatedByteSize(var1)); + var3.packetBuffer.writeStringCp1252NullTerminated(var1); + Client.packetWriter.addNode(var3); } } } } - @ObfuscatedName("p") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "1672650441" + signature = "(B)Z", + garbageValue = "-41" ) @Export("canAddIgnore") final boolean canAddIgnore() { - return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field741 != 1; + return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field739 != 1; } - @ObfuscatedName("g") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(Ljava/lang/String;B)V", - garbageValue = "-123" + garbageValue = "73" ) @Export("removeFriend") final void removeFriend(String var1) { @@ -252,22 +231,22 @@ public class FriendSystem { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { if (this.friendsList.removeByUsername(var2)) { - class43.method759(); - PacketBufferNode var3 = MenuAction.getPacketBufferNode(ClientPacket.field2225, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var1)); + GrandExchangeEvents.method66(); + PacketBufferNode var3 = MenuAction.getPacketBufferNode(ClientPacket.field2281, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(Varcs.stringCp1252NullTerminatedByteSize(var1)); var3.packetBuffer.writeStringCp1252NullTerminated(var1); Client.packetWriter.addNode(var3); } - class3.FriendSystem_invalidateFriends(); + WallDecoration.FriendSystem_invalidateFriends(); } } } - @ObfuscatedName("e") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "2" + signature = "(Ljava/lang/String;S)V", + garbageValue = "257" ) @Export("removeIgnore") final void removeIgnore(String var1) { @@ -275,22 +254,22 @@ public class FriendSystem { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { if (this.ignoreList.removeByUsername(var2)) { - class43.method759(); - PacketBufferNode var3 = MenuAction.getPacketBufferNode(ClientPacket.field2266, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var1)); + GrandExchangeEvents.method66(); + PacketBufferNode var3 = MenuAction.getPacketBufferNode(ClientPacket.field2273, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(Varcs.stringCp1252NullTerminatedByteSize(var1)); var3.packetBuffer.writeStringCp1252NullTerminated(var1); Client.packetWriter.addNode(var3); } - InterfaceParent.FriendSystem_invalidateIgnoreds(); + HealthBarUpdate.FriendSystem_invalidateIgnoreds(); } } } - @ObfuscatedName("w") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ljx;I)Z", - garbageValue = "2127242291" + signature = "(Ljt;I)Z", + garbageValue = "-1345116753" ) @Export("isFriendAndHasWorld") final boolean isFriendAndHasWorld(Username var1) { @@ -298,146 +277,47 @@ public class FriendSystem { return var2 != null && var2.hasWorld(); } - @ObfuscatedName("s") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "([Lgn;II)Lgn;", - garbageValue = "-2035427993" + signature = "(I)V", + garbageValue = "591224258" ) - @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; + public static void method1871() { + if (KeyHandler.KeyHandler_instance != null) { + synchronized(KeyHandler.KeyHandler_instance) { + KeyHandler.KeyHandler_instance = null; } } - return null; } - @ObfuscatedName("s") + @ObfuscatedName("ih") @ObfuscatedSignature( - signature = "(I)[Lia;", - garbageValue = "173195137" + signature = "(II)Ljava/lang/String;", + garbageValue = "-1994917329" ) - static VerticalAlignment[] method1830() { - return new VerticalAlignment[]{VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field3172, VerticalAlignment.field3174}; - } + @Export("formatItemStacks") + static final String formatItemStacks(int var0) { + String var1 = Integer.toString(var0); - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "(ILcr;ZI)I", - garbageValue = "1342968347" - ) - static int method1831(int var0, Script var1, boolean var2) { - int var3; - int var4; - if (var0 == ScriptOpcodes.CC_CREATE) { - Interpreter.Interpreter_intStackSize -= 3; - 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 (var4 == 0) { - throw new RuntimeException(); - } else { - Widget var6 = WorldMapElement.getWidget(var3); - if (var6.children == null) { - var6.children = new Widget[var5 + 1]; - } + for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { + var1 = var1.substring(0, var2) + "," + var1.substring(var2); + } - if (var6.children.length <= var5) { - Widget[] var7 = new Widget[var5 + 1]; - - for (int var8 = 0; var8 < var6.children.length; ++var8) { - var7[var8] = var6.children[var8]; - } - - var6.children = var7; - } - - if (var5 > 0 && var6.children[var5 - 1] == null) { - throw new RuntimeException("" + (var5 - 1)); - } else { - Widget var12 = new Widget(); - var12.type = var4; - var12.parentId = var12.id = var6.id; - var12.childIndex = var5; - var12.isIf3 = true; - var6.children[var5] = var12; - if (var2) { - class286.field3623 = var12; - } else { - class297.field3693 = var12; - } - - invalidateWidget(var6); - return 1; - } - } + if (var1.length() > 9) { + return " " + UserComparator7.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; } else { - Widget var9; - if (var0 == ScriptOpcodes.CC_DELETE) { - var9 = var2 ? class286.field3623 : class297.field3693; - Widget var10 = WorldMapElement.getWidget(var9.id); - var10.children[var9.childIndex] = null; - invalidateWidget(var10); - return 1; - } else if (var0 == ScriptOpcodes.CC_DELETEALL) { - var9 = WorldMapElement.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - var9.children = null; - invalidateWidget(var9); - return 1; - } else if (var0 != ScriptOpcodes.CC_FIND) { - if (var0 == ScriptOpcodes.IF_FIND) { - var9 = WorldMapElement.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - if (var9 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - if (var2) { - class286.field3623 = var9; - } else { - class297.field3693 = var9; - } - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else { - return 2; - } - } else { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Widget var11 = ModelData0.getWidgetChild(var3, var4); - if (var11 != null && var4 != -1) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - if (var2) { - class286.field3623 = var11; - } else { - class297.field3693 = var11; - } - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } + return var1.length() > 6 ? " " + UserComparator7.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + UserComparator7.colorStartTag(16776960) + var1 + ""; } } - @ObfuscatedName("jk") + @ObfuscatedName("ip") @ObfuscatedSignature( - signature = "(Lhp;I)V", - garbageValue = "-1019792182" + signature = "(ZB)V", + garbageValue = "71" ) - @Export("invalidateWidget") - static void invalidateWidget(Widget var0) { - if (var0.cycle == Client.field752) { - Client.field703[var0.rootIndex] = true; - } - + @Export("setTapToDrop") + static void setTapToDrop(boolean var0) { + Client.tapToDrop = var0; } } diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java index 7f9562e7b7..ccc8d1e49b 100644 --- a/runescape-client/src/main/java/FriendsList.java +++ b/runescape-client/src/main/java/FriendsList.java @@ -4,61 +4,61 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jo") +@ObfuscatedName("jx") @Implements("FriendsList") public class FriendsList extends UserList { - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Llu;" + signature = "Lll;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1273879743 + intValue = -699388303 ) - int field3600; - @ObfuscatedName("f") + int field3587; + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Ljf;" + signature = "Ljo;" ) @Export("friendLoginUpdates") public LinkDeque friendLoginUpdates; @ObfuscatedSignature( - signature = "(Llu;)V" + signature = "(Lll;)V" ) public FriendsList(LoginType var1) { super(400); - this.field3600 = 1; + this.field3587 = 1; this.friendLoginUpdates = new LinkDeque(); this.loginType = var1; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)Lju;", - garbageValue = "-192021045" + signature = "(I)Ljw;", + garbageValue = "-734254876" ) @Export("newInstance") User newInstance() { return new Friend(); } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(II)[Lju;", - garbageValue = "518998026" + signature = "(II)[Ljw;", + garbageValue = "1353779565" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new Friend[var1]; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Ljx;ZI)Z", - garbageValue = "-1515368457" + signature = "(Ljt;ZB)Z", + garbageValue = "0" ) @Export("isFriended") public boolean isFriended(Username var1, boolean var2) { @@ -70,10 +70,10 @@ public class FriendsList extends UserList { } } - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(Lky;IB)V", - garbageValue = "0" + signature = "(Lkz;II)V", + garbageValue = "149092737" ) @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.field3600 - 1; + var11.int2 = ++this.field3587 - 1; if (var11.world == -1 && var6 == 0) { - var11.int2 = -(var11.int2 * 1037739243) * 1487463363; + var11.int2 = -(var11.int2 * -2054461169) * 725247471; } var11.world = var6; } var11.rank = var7; - var11.field3607 = var9; - var11.field3606 = var10; + var11.field3599 = var9; + var11.field3598 = var10; continue; } @@ -159,47 +159,68 @@ public class FriendsList extends UserList { } } - @ObfuscatedName("fk") - @ObfuscatedSignature( - signature = "(Lbd;III)V", - garbageValue = "1475900100" - ) - @Export("performPlayerAnimation") - static void performPlayerAnimation(Player var0, int var1, int var2) { - if (var0.sequence == var1 && var1 != -1) { - int var3 = Widget.SequenceDefinition_get(var1).field3492; - if (var3 == 1) { - var0.sequenceFrame = 0; - var0.sequenceFrameCycle = 0; - var0.sequenceDelay = var2; - var0.field964 = 0; + @ObfuscatedName("c") + @Export("sleepMillis") + public static final void sleepMillis(long var0) { + if (var0 > 0L) { + if (var0 % 10L == 0L) { + long var2 = var0 - 1L; + + try { + Thread.sleep(var2); + } catch (InterruptedException var8) { + } + + try { + Thread.sleep(1L); + } catch (InterruptedException var7) { + } + } else { + try { + Thread.sleep(var0); + } catch (InterruptedException var6) { + } } - if (var3 == 2) { - var0.field964 = 0; - } - } else if (var1 == -1 || var0.sequence == -1 || Widget.SequenceDefinition_get(var1).field3508 >= Widget.SequenceDefinition_get(var0.sequence).field3508) { - var0.sequence = var1; - var0.sequenceFrame = 0; - var0.sequenceFrameCycle = 0; - var0.sequenceDelay = var2; - var0.field964 = 0; - var0.field947 = var0.pathLength; } - } - @ObfuscatedName("ht") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IIIIB)V", - garbageValue = "-11" + signature = "(Ljava/lang/CharSequence;B)Ljava/lang/String;", + garbageValue = "6" ) - static final void method5102(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.rootWidgetYs[var4] + Client.rootWidgetHeights[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { - Client.field829[var4] = true; + public static String method5163(CharSequence var0) { + int var1 = var0.length(); + StringBuilder var2 = new StringBuilder(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 = MenuAction.charToByteCp1252(var4); + var2.append('%'); + int var6 = var5 >> 4 & 15; + if (var6 >= 10) { + var2.append((char)(var6 + 55)); + } else { + var2.append((char)(var6 + 48)); + } + + var6 = var5 & 15; + if (var6 >= 10) { + var2.append((char)(var6 + 55)); + } else { + var2.append((char)(var6 + 48)); + } + } + } else { + var2.append(var4); } } + return var2.toString(); } } diff --git a/runescape-client/src/main/java/GZipDecompressor.java b/runescape-client/src/main/java/GZipDecompressor.java index 804297355e..a0d891b13b 100644 --- a/runescape-client/src/main/java/GZipDecompressor.java +++ b/runescape-client/src/main/java/GZipDecompressor.java @@ -1,19 +1,13 @@ import java.util.zip.Inflater; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lc") +@ObfuscatedName("lu") @Implements("GZipDecompressor") public class GZipDecompressor { - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -145342191 - ) - public static int field4007; - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("inflater") Inflater inflater; @@ -28,10 +22,10 @@ public class GZipDecompressor { GZipDecompressor(int var1, int var2, int var3) { } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lky;[BI)V", - garbageValue = "-1662982609" + signature = "(Lkz;[BB)V", + garbageValue = "0" ) @Export("decompress") public void decompress(Buffer var1, byte[] var2) { @@ -54,26 +48,29 @@ public class GZipDecompressor { } } - @ObfuscatedName("t") + @ObfuscatedName("fb") @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "-2077179875" + signature = "(Ljava/lang/String;ZI)V", + garbageValue = "-1847999572" ) - static void method6390(boolean var0) { - Login.Login_response1 = ""; - Login.Login_response2 = "Enter your username/email & password."; - Login.Login_response3 = ""; - Login.loginIndex = 2; - if (var0) { - Login.Login_password = ""; - } + @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 = class197.fontPlain12.lineWidth(var0, 250); + int var6 = class197.fontPlain12.lineCount(var0, 250) * 13; + Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var6 + var2, 0); + Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var6 + var2 + var2, 16777215); + class197.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); + HealthBar.method2007(var3 - var2, var4 - var2, var2 + var2 + var5, var2 + var6 + var2); + if (var1) { + DevicePcmPlayerProvider.rasterProvider.drawFull(0, 0); + } else { + WorldMapElement.method4392(var3, var4, var5, var6); + } - ItemContainer.method1120(); - 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/GameObject.java b/runescape-client/src/main/java/GameObject.java index 6090a85fe4..126d6ee26b 100644 --- a/runescape-client/src/main/java/GameObject.java +++ b/runescape-client/src/main/java/GameObject.java @@ -4,100 +4,89 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ej") +@ObfuscatedName("ef") @Implements("GameObject") public final class GameObject { - @ObfuscatedName("sg") - @ObfuscatedSignature( - signature = "Lic;" - ) - public static class237 field1921; - @ObfuscatedName("dg") - @ObfuscatedSignature( - signature = "Lid;" - ) - @Export("archive10") - static Archive archive10; - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 744501361 + intValue = -373728187 ) @Export("plane") int plane; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 2026651009 - ) - @Export("height") - int height; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -500411517 - ) - @Export("centerX") - int centerX; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -560576891 + intValue = 351218671 ) @Export("centerY") int centerY; - @ObfuscatedName("u") + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -722622461 + ) + @Export("height") + int height; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -1130119677 + ) + @Export("centerX") + int centerX; + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Len;" + signature = "Lel;" ) @Export("entity") public Entity entity; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 939156699 + intValue = -1883842779 ) @Export("orientation") int orientation; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 86850281 + intValue = -1330255505 ) @Export("startX") int startX; - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -698919929 + intValue = -941264089 ) @Export("endX") int endX; - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1676112193 + intValue = -2072718285 ) @Export("startY") int startY; - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 2114738955 + intValue = -1022796885 ) @Export("endY") int endY; - @ObfuscatedName("f") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1792624973 + intValue = -1238429947 ) - int field1916; - @ObfuscatedName("c") + int field1904; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1739525873 + intValue = 792454525 ) @Export("lastDrawn") int lastDrawn; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedGetter( - longValue = 7927595607641920085L + longValue = -8257733995685858193L ) @Export("tag") public long tag; - @ObfuscatedName("y") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 692610593 + intValue = -1096273189 ) @Export("flags") int flags; @@ -107,25 +96,99 @@ public final class GameObject { this.flags = 0; } - @ObfuscatedName("j") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZZI)V", - garbageValue = "-1828723850" + signature = "(Lhz;Lhz;S)V", + garbageValue = "390" ) - @Export("openURL") - public static void openURL(String var0, boolean var1, boolean var2) { - StudioGame.method4056(var0, var1, "openjs", var2); + @Export("NpcDefinition_setArchives") + public static void NpcDefinition_setArchives(AbstractArchive var0, AbstractArchive var1) { + NPCDefinition.NpcDefinition_archive = var0; + NPCDefinition.NpcDefinition_modelArchive = var1; } - @ObfuscatedName("k") + @ObfuscatedName("x") + public static String method3262(long var0) { + if (var0 > 0L && var0 < 6582952005840035281L) { + if (var0 % 37L == 0L) { + return null; + } else { + int var2 = 0; + + for (long var3 = var0; var3 != 0L; var3 /= 37L) { + ++var2; + } + + StringBuilder var5 = new StringBuilder(var2); + + while (var0 != 0L) { + long var6 = var0; + var0 /= 37L; + var5.append(class288.base37Table[(int)(var6 - var0 * 37L)]); + } + + return var5.reverse().toString(); + } + } else { + return null; + } + } + + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-2110373438" + signature = "(II)Lkc;", + garbageValue = "143572048" ) - @Export("ViewportMouse_unpackY") - public static int ViewportMouse_unpackY(int var0) { - long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; - int var1 = (int)(var2 >>> 7 & 127L); - return var1; + public static PrivateChatMode method3263(int var0) { + PrivateChatMode[] var1 = Frames.ChatMode_values(); + + for (int var2 = 0; var2 < var1.length; ++var2) { + PrivateChatMode var3 = var1[var2]; + if (var0 == var3.field3787) { + return var3; + } + } + + return null; + } + + @ObfuscatedName("gz") + @ObfuscatedSignature( + signature = "(Lby;ZI)V", + garbageValue = "100665877" + ) + @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.readySequence == var0.movementSequence) { + var0.isUnanimated = true; + } + + int var2 = var0.x * -78439701 >> 7; + int var3 = var0.y >> 7; + if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { + long var4 = WorldMapIcon_1.calculateTag(0, 0, 0, false, var0.index); + if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { + var0.isUnanimated = false; + var0.tileHeight = WorldMapAreaData.getTileHeight(var0.x * -78439701, var0.y, MouseRecorder.plane); + var0.playerCycle = Client.cycle; + WorldMapIcon_1.scene.addNullableObject(MouseRecorder.plane, var0.x * -78439701, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.field601, var0.field602, var0.field609, var0.field604); + } else { + if ((var0.x * -78439701 & 127) == 64 && (var0.y & 127) == 64) { + if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { + return; + } + + Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; + } + + var0.tileHeight = WorldMapAreaData.getTileHeight(var0.x * -78439701, var0.y, MouseRecorder.plane); + var0.playerCycle = Client.cycle; + WorldMapIcon_1.scene.drawEntity(MouseRecorder.plane, var0.x * -78439701, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); + } + } + } + } } diff --git a/runescape-client/src/main/java/GameShell.java b/runescape-client/src/main/java/GameShell.java index 4ffa40c5c2..357ade944b 100644 --- a/runescape-client/src/main/java/GameShell.java +++ b/runescape-client/src/main/java/GameShell.java @@ -17,8 +17,6 @@ import java.awt.event.FocusListener; import java.awt.event.WindowEvent; import java.awt.event.WindowListener; import java.awt.image.ImageObserver; -import java.io.File; -import java.io.RandomAccessFile; import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; @@ -27,183 +25,167 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bw") +@ObfuscatedName("bn") @Implements("GameShell") public abstract class GameShell extends Applet implements Runnable, FocusListener, WindowListener { - @ObfuscatedName("ra") - @ObfuscatedGetter( - intValue = 714484919 - ) - static int field446; - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lfu;" + signature = "Lfq;" ) @Export("taskHandler") protected static TaskHandler taskHandler; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lbw;" + signature = "Lbn;" ) @Export("gameShell") static GameShell gameShell; - @ObfuscatedName("i") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 2058939599 + intValue = 1940635317 ) @Export("GameShell_redundantStartThreadCount") static int GameShell_redundantStartThreadCount; - @ObfuscatedName("k") + @ObfuscatedName("l") @ObfuscatedGetter( - longValue = -5623486627210401515L + longValue = 2410955799989226407L ) @Export("stopTimeMs") static long stopTimeMs; @ObfuscatedName("u") @Export("isKilled") static boolean isKilled; - @ObfuscatedName("t") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -205705569 + intValue = -1724469587 ) - protected static int field413; - @ObfuscatedName("q") + static int field423; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1354464911 + intValue = -1078745495 ) @Export("cycleDurationMillis") static int cycleDurationMillis; - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -986211423 + intValue = -325181045 ) @Export("fiveOrOne") static int fiveOrOne; - @ObfuscatedName("f") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1118839049 + intValue = 701410381 ) @Export("fps") protected static int fps; - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Lfs;" - ) - @Export("clock") - protected static Clock clock; - @ObfuscatedName("p") - protected static long[] field423; - @ObfuscatedName("g") - protected static long[] field417; - @ObfuscatedName("ak") + @ObfuscatedName("s") + static long[] field427; + @ObfuscatedName("e") + static long[] field418; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 868948239 + intValue = -1973184751 ) - static int field436; + @Export("canvasHeight") + public static int canvasHeight; + @ObfuscatedName("ax") + @ObfuscatedGetter( + intValue = -768939705 + ) + static int field441; @ObfuscatedName("aq") @Export("volatileFocus") static volatile boolean volatileFocus; - @ObfuscatedName("al") + @ObfuscatedName("az") @ObfuscatedGetter( - longValue = -299899639913478455L + longValue = -1516080543148200363L ) @Export("garbageCollectorLastCollectionTime") static long garbageCollectorLastCollectionTime; - @ObfuscatedName("ah") + @ObfuscatedName("ai") @ObfuscatedGetter( - longValue = 3151603748493899241L + longValue = 7898189613285103621L ) @Export("garbageCollectorLastCheckTimeMs") static long garbageCollectorLastCheckTimeMs; - @ObfuscatedName("dk") - @ObfuscatedSignature( - signature = "Lid;" - ) - @Export("archive12") - static Archive archive12; - @ObfuscatedName("eg") - @ObfuscatedGetter( - intValue = -225444477 - ) - static int field425; - @ObfuscatedName("n") + @ObfuscatedName("j") @Export("hasErrored") boolean hasErrored; - @ObfuscatedName("z") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -2070164479 + intValue = -2138791277 ) @Export("contentWidth") protected int contentWidth; - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1790253551 + intValue = 1076406639 ) @Export("contentHeight") protected int contentHeight; - @ObfuscatedName("l") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1852258925 + intValue = 476057871 ) @Export("canvasX") int canvasX; - @ObfuscatedName("h") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 115241741 + intValue = 1400407449 ) @Export("canvasY") int canvasY; - @ObfuscatedName("o") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1396606465 + intValue = 1347803341 ) - int field429; - @ObfuscatedName("av") + int field435; + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 1761285899 + intValue = 1534587989 ) int field428; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 554974645 + intValue = -1315283541 ) @Export("maxCanvasWidth") int maxCanvasWidth; - @ObfuscatedName("ai") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 890524941 + intValue = -350694385 ) @Export("maxCanvasHeight") int maxCanvasHeight; - @ObfuscatedName("aj") + @ObfuscatedName("al") @Export("frame") Frame frame; - @ObfuscatedName("an") + @ObfuscatedName("as") @Export("canvas") java.awt.Canvas canvas; - @ObfuscatedName("at") - volatile boolean field435; - @ObfuscatedName("ao") + @ObfuscatedName("ad") + volatile boolean field440; + @ObfuscatedName("aj") @Export("resizeCanvasNextFrame") boolean resizeCanvasNextFrame; - @ObfuscatedName("ac") + @ObfuscatedName("ab") @Export("isCanvasInvalid") volatile boolean isCanvasInvalid; - @ObfuscatedName("ar") + @ObfuscatedName("af") @ObfuscatedGetter( - longValue = -267626387501554735L + longValue = -1097911056419616917L ) - volatile long field424; - @ObfuscatedName("ag") + volatile long field444; + @ObfuscatedName("ae") @ObfuscatedSignature( signature = "Laq;" ) @Export("mouseWheelHandler") MouseWheelHandler mouseWheelHandler; - @ObfuscatedName("aa") + @ObfuscatedName("ah") @Export("clipboard") Clipboard clipboard; - @ObfuscatedName("ap") + @ObfuscatedName("aa") @Export("eventQueue") final EventQueue eventQueue; @@ -215,9 +197,9 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene cycleDurationMillis = 20; fiveOrOne = 1; fps = 0; - field423 = new long[32]; - field417 = new long[32]; - field436 = 500; + field427 = new long[32]; + field418 = new long[32]; + field441 = 500; volatileFocus = true; garbageCollectorLastCollectionTime = -1L; garbageCollectorLastCheckTimeMs = -1L; @@ -227,10 +209,10 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.hasErrored = false; this.canvasX = 0; this.canvasY = 0; - this.field435 = true; + this.field440 = true; this.resizeCanvasNextFrame = false; this.isCanvasInvalid = false; - this.field424 = 0L; + this.field444 = 0L; EventQueue var1 = null; try { @@ -239,34 +221,35 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } this.eventQueue = var1; - ViewportMouse.method2891(new DevicePcmPlayerProvider()); + DevicePcmPlayerProvider var2 = new DevicePcmPlayerProvider(); + HealthBar.pcmPlayerProvider = var2; } - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "1609844156" + garbageValue = "952185183" ) @Export("setMaxCanvasSize") protected final void setMaxCanvasSize(int var1, int var2) { if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { - this.method880(); + this.method909(); } this.maxCanvasWidth = var1; this.maxCanvasHeight = var2; } - @ObfuscatedName("t") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(Ljava/lang/Object;I)V", - garbageValue = "1177266220" + garbageValue = "-1820035626" ) @Export("post") final void post(Object var1) { if (this.eventQueue != null) { for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { - UserList.sleepMillis(1L); + FriendsList.sleepMillis(1L); } if (var1 != null) { @@ -276,10 +259,10 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } - @ObfuscatedName("q") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(B)Lfo;", - garbageValue = "61" + signature = "(I)Lfa;", + garbageValue = "718088180" ) @Export("mouseWheel") protected MouseWheel mouseWheel() { @@ -291,88 +274,61 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene return this.mouseWheelHandler; } - @ObfuscatedName("x") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "0" + signature = "(I)V", + garbageValue = "1139058082" ) @Export("setUpClipboard") protected void setUpClipboard() { this.clipboard = this.getToolkit().getSystemClipboard(); } - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "(Ljava/lang/String;I)V", - garbageValue = "976986957" + garbageValue = "-1159772374" ) @Export("clipboardSetString") protected void clipboardSetString(String var1) { this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); } - @ObfuscatedName("f") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "406545365" + garbageValue = "-1206227036" ) @Export("setUpKeyboard") protected final void setUpKeyboard() { - if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { - KeyHandler.KeyHandler_keyCodes[186] = 57; - KeyHandler.KeyHandler_keyCodes[187] = 27; - KeyHandler.KeyHandler_keyCodes[188] = 71; - KeyHandler.KeyHandler_keyCodes[189] = 26; - KeyHandler.KeyHandler_keyCodes[190] = 72; - KeyHandler.KeyHandler_keyCodes[191] = 73; - KeyHandler.KeyHandler_keyCodes[192] = 58; - KeyHandler.KeyHandler_keyCodes[219] = 42; - KeyHandler.KeyHandler_keyCodes[220] = 74; - KeyHandler.KeyHandler_keyCodes[221] = 43; - KeyHandler.KeyHandler_keyCodes[222] = 59; - KeyHandler.KeyHandler_keyCodes[223] = 28; - } else { - KeyHandler.KeyHandler_keyCodes[44] = 71; - KeyHandler.KeyHandler_keyCodes[45] = 26; - KeyHandler.KeyHandler_keyCodes[46] = 72; - KeyHandler.KeyHandler_keyCodes[47] = 73; - KeyHandler.KeyHandler_keyCodes[59] = 57; - KeyHandler.KeyHandler_keyCodes[61] = 27; - KeyHandler.KeyHandler_keyCodes[91] = 42; - KeyHandler.KeyHandler_keyCodes[92] = 74; - KeyHandler.KeyHandler_keyCodes[93] = 43; - KeyHandler.KeyHandler_keyCodes[192] = 28; - KeyHandler.KeyHandler_keyCodes[222] = 58; - KeyHandler.KeyHandler_keyCodes[520] = 59; - } - - java.awt.Canvas var1 = this.canvas; - var1.setFocusTraversalKeysEnabled(false); - var1.addKeyListener(KeyHandler.KeyHandler_instance); - var1.addFocusListener(KeyHandler.KeyHandler_instance); + class3.method38(); + class237.method4317(this.canvas); } - @ObfuscatedName("c") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1643960217" + garbageValue = "-553241238" ) @Export("setUpMouse") protected final void setUpMouse() { - SecureRandomFuture.method2061(this.canvas); + java.awt.Canvas var1 = this.canvas; + var1.addMouseListener(MouseHandler.MouseHandler_instance); + var1.addMouseMotionListener(MouseHandler.MouseHandler_instance); + var1.addFocusListener(MouseHandler.MouseHandler_instance); } - @ObfuscatedName("r") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1946782906" + signature = "(B)V", + garbageValue = "88" ) @Export("resizeCanvas") final void resizeCanvas() { Container var1 = this.container(); if (var1 != null) { Bounds var2 = this.getFrameContentBounds(); - this.contentWidth = Math.max(var2.highX, this.field429); + this.contentWidth = Math.max(var2.highX, this.field435); this.contentHeight = Math.max(var2.highY, this.field428); if (this.contentWidth <= 0) { this.contentWidth = 1; @@ -382,43 +338,43 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.contentHeight = 1; } - KitDefinition.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); - class30.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); - this.canvasX = (this.contentWidth - KitDefinition.canvasWidth) / 2; + GraphicsDefaults.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); + canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); + this.canvasX = (this.contentWidth - GraphicsDefaults.canvasWidth) / 2; this.canvasY = 0; - this.canvas.setSize(KitDefinition.canvasWidth, class30.canvasHeight); - SpotAnimationDefinition.rasterProvider = new RasterProvider(KitDefinition.canvasWidth, class30.canvasHeight, this.canvas); + this.canvas.setSize(GraphicsDefaults.canvasWidth, canvasHeight); + DevicePcmPlayerProvider.rasterProvider = new RasterProvider(GraphicsDefaults.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, this.canvasY + var3.top); } else { this.canvas.setLocation(this.canvasX, this.canvasY); } - this.field435 = true; + this.field440 = true; this.resizeGame(); } } - @ObfuscatedName("y") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1917236425" + garbageValue = "1419567103" ) @Export("resizeGame") protected abstract void resizeGame(); - @ObfuscatedName("w") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "159297486" + signature = "(B)V", + garbageValue = "-89" ) @Export("clearBackground") void clearBackground() { int var1 = this.canvasX; int var2 = this.canvasY; - int var3 = this.contentWidth - KitDefinition.canvasWidth - var1; - int var4 = this.contentHeight - class30.canvasHeight - var2; + int var3 = this.contentWidth - GraphicsDefaults.canvasWidth - var1; + int var4 = this.contentHeight - canvasHeight - var2; if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { try { Container var5 = this.container(); @@ -453,39 +409,43 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } - @ObfuscatedName("l") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-715138989" + signature = "(B)V", + garbageValue = "-121" ) @Export("replaceCanvas") final void replaceCanvas() { - ParamDefinition.method4420(this.canvas); - class195.method3629(this.canvas); + java.awt.Canvas var1 = this.canvas; + var1.removeKeyListener(KeyHandler.KeyHandler_instance); + var1.removeFocusListener(KeyHandler.KeyHandler_instance); + KeyHandler.field366 = -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 var1 = this.canvas; - var1.setFocusTraversalKeysEnabled(false); - var1.addKeyListener(KeyHandler.KeyHandler_instance); - var1.addFocusListener(KeyHandler.KeyHandler_instance); - java.awt.Canvas var2 = this.canvas; - var2.addMouseListener(MouseHandler.MouseHandler_instance); - var2.addMouseMotionListener(MouseHandler.MouseHandler_instance); - var2.addFocusListener(MouseHandler.MouseHandler_instance); + class237.method4317(this.canvas); + java.awt.Canvas var3 = this.canvas; + var3.addMouseListener(MouseHandler.MouseHandler_instance); + var3.addMouseMotionListener(MouseHandler.MouseHandler_instance); + var3.addFocusListener(MouseHandler.MouseHandler_instance); if (this.mouseWheelHandler != null) { this.mouseWheelHandler.addTo(this.canvas); } - this.method880(); + this.method909(); } - @ObfuscatedName("h") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IIIB)V", - garbageValue = "-56" + signature = "(IIII)V", + garbageValue = "1169859735" ) @Export("startThread") protected final void startThread(int var1, int var2, int var3) { @@ -502,9 +462,9 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } gameShell = this; - KitDefinition.canvasWidth = var1; - class30.canvasHeight = var2; - class208.RunException_revision = var3; + GraphicsDefaults.canvasWidth = var1; + canvasHeight = var2; + RunException.RunException_revision = var3; RunException.RunException_applet = this; if (taskHandler == null) { taskHandler = new TaskHandler(); @@ -512,16 +472,16 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene taskHandler.newThreadTask(this, 1); } catch (Exception var5) { - class3.RunException_sendStackTrace((String)null, var5); + class188.RunException_sendStackTrace((String)null, var5); this.error("crash"); } } - @ObfuscatedName("v") + @ObfuscatedName("r") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "5178053" + garbageValue = "595873296" ) @Export("addCanvas") final synchronized void addCanvas() { @@ -531,47 +491,47 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene var1.remove(this.canvas); } - KitDefinition.canvasWidth = Math.max(var1.getWidth(), this.field429); - class30.canvasHeight = Math.max(var1.getHeight(), this.field428); + GraphicsDefaults.canvasWidth = Math.max(var1.getWidth(), this.field435); + canvasHeight = Math.max(var1.getHeight(), this.field428); Insets var2; if (this.frame != null) { var2 = this.frame.getInsets(); - KitDefinition.canvasWidth -= var2.right + var2.left; - class30.canvasHeight -= var2.bottom + var2.top; + GraphicsDefaults.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(KitDefinition.canvasWidth, class30.canvasHeight); + this.canvas.setSize(GraphicsDefaults.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(this.canvasX + var2.left, this.canvasY + var2.top); } else { this.canvas.setLocation(this.canvasX, this.canvasY); } this.canvas.addFocusListener(this); this.canvas.requestFocus(); - this.field435 = true; - if (SpotAnimationDefinition.rasterProvider != null && KitDefinition.canvasWidth == SpotAnimationDefinition.rasterProvider.width && class30.canvasHeight == SpotAnimationDefinition.rasterProvider.height) { - ((RasterProvider)SpotAnimationDefinition.rasterProvider).setComponent(this.canvas); - SpotAnimationDefinition.rasterProvider.drawFull(0, 0); + this.field440 = true; + if (DevicePcmPlayerProvider.rasterProvider != null && GraphicsDefaults.canvasWidth == DevicePcmPlayerProvider.rasterProvider.width && canvasHeight == DevicePcmPlayerProvider.rasterProvider.height) { + ((RasterProvider)DevicePcmPlayerProvider.rasterProvider).setComponent(this.canvas); + DevicePcmPlayerProvider.rasterProvider.drawFull(0, 0); } else { - SpotAnimationDefinition.rasterProvider = new RasterProvider(KitDefinition.canvasWidth, class30.canvasHeight, this.canvas); + DevicePcmPlayerProvider.rasterProvider = new RasterProvider(GraphicsDefaults.canvasWidth, canvasHeight, this.canvas); } this.isCanvasInvalid = false; - this.field424 = SequenceDefinition.method4686(); + this.field444 = SoundCache.method2480(); } - @ObfuscatedName("m") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "2140072733" + garbageValue = "-1396106184" ) @Export("checkHost") protected final boolean checkHost() { @@ -600,50 +560,50 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } - @ObfuscatedName("o") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "276918533" + garbageValue = "731379125" ) - void method877() { - long var1 = SequenceDefinition.method4686(); - long var3 = field417[class319.field3846]; - field417[class319.field3846] = var1; - class319.field3846 = class319.field3846 + 1 & 31; + void method1016() { + long var1 = SoundCache.method2480(); + long var3 = field418[Username.field3594]; + field418[Username.field3594] = var1; + Username.field3594 = Username.field3594 + 1 & 31; if (var3 != 0L && var1 > var3) { } synchronized(this) { - class3.hasFocus = volatileFocus; + PendingSpawn.hasFocus = volatileFocus; } this.doCycle(); } - @ObfuscatedName("av") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1961975804" + signature = "(B)V", + garbageValue = "39" ) - void method878() { + void method900() { Container var1 = this.container(); - long var2 = SequenceDefinition.method4686(); - long var4 = field423[class40.field330]; - field423[class40.field330] = var2; - class40.field330 = class40.field330 + 1 & 31; + long var2 = SoundCache.method2480(); + long var4 = field427[class185.field2306]; + field427[class185.field2306] = var2; + class185.field2306 = class185.field2306 + 1 & 31; if (0L != var4 && var2 > var4) { int var6 = (int)(var2 - var4); fps = ((var6 >> 1) + 32000) / var6; } - if (++field436 - 1 > 50) { - field436 -= 50; - this.field435 = true; - this.canvas.setSize(KitDefinition.canvasWidth, class30.canvasHeight); + if (++field441 - 1 > 50) { + field441 -= 50; + this.field440 = true; + this.canvas.setSize(GraphicsDefaults.canvasWidth, canvasHeight); this.canvas.setVisible(true); if (var1 == this.frame) { Insets var7 = this.frame.getInsets(); - this.canvas.setLocation(this.canvasX + var7.left, this.canvasY + var7.top); + this.canvas.setLocation(var7.left + this.canvasX, var7.top + this.canvasY); } else { this.canvas.setLocation(this.canvasX, this.canvasY); } @@ -653,21 +613,21 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.replaceCanvas(); } - this.method925(); - this.draw(this.field435); - if (this.field435) { + this.method901(); + this.draw(this.field440); + if (this.field440) { this.clearBackground(); } - this.field435 = false; + this.field440 = false; } - @ObfuscatedName("am") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "63" + garbageValue = "22" ) - final void method925() { + final void method901() { Bounds var1 = this.getFrameContentBounds(); if (this.contentWidth != var1.highX || this.contentHeight != var1.highY || this.resizeCanvasNextFrame) { this.resizeCanvas(); @@ -676,19 +636,19 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } - @ObfuscatedName("ai") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1905198552" + signature = "(B)V", + garbageValue = "30" ) - final void method880() { + final void method909() { this.resizeCanvasNextFrame = true; } - @ObfuscatedName("af") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-97" + signature = "(I)V", + garbageValue = "591639772" ) @Export("kill") final synchronized void kill() { @@ -719,91 +679,91 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } - this.vmethod1655(); + this.vmethod1248(); } } - @ObfuscatedName("az") + @ObfuscatedName("at") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1264140224" + signature = "(B)V", + garbageValue = "77" ) @Export("setUp") protected abstract void setUp(); - @ObfuscatedName("aj") + @ObfuscatedName("ao") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "712398470" + garbageValue = "-2117082118" ) @Export("doCycle") protected abstract void doCycle(); - @ObfuscatedName("an") + @ObfuscatedName("av") @ObfuscatedSignature( signature = "(ZI)V", - garbageValue = "2115085971" + garbageValue = "-2055189627" ) @Export("draw") protected abstract void draw(boolean var1); - @ObfuscatedName("at") + @ObfuscatedName("an") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1993845226" + garbageValue = "890859408" ) @Export("kill0") protected abstract void kill0(); - @ObfuscatedName("as") + @ObfuscatedName("al") @ObfuscatedSignature( - signature = "(ILjava/lang/String;ZI)V", - garbageValue = "-1643615386" + signature = "(ILjava/lang/String;ZB)V", + garbageValue = "-82" ) @Export("drawInitial") protected final void drawInitial(int var1, String var2, boolean var3) { try { Graphics var4 = this.canvas.getGraphics(); - if (WorldMapData_1.fontHelvetica13 == null) { - WorldMapData_1.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); - HealthBarUpdate.loginScreenFontMetrics = this.canvas.getFontMetrics(WorldMapData_1.fontHelvetica13); + if (class51.fontHelvetica13 == null) { + class51.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); + KeyHandler.loginScreenFontMetrics = this.canvas.getFontMetrics(class51.fontHelvetica13); } if (var3) { var4.setColor(Color.black); - var4.fillRect(0, 0, KitDefinition.canvasWidth, class30.canvasHeight); + var4.fillRect(0, 0, GraphicsDefaults.canvasWidth, canvasHeight); } Color var5 = new Color(140, 17, 17); try { - if (GrandExchangeOfferUnitPriceComparator.field74 == null) { - GrandExchangeOfferUnitPriceComparator.field74 = this.canvas.createImage(304, 34); + if (class42.field358 == null) { + class42.field358 = this.canvas.createImage(304, 34); } - Graphics var6 = GrandExchangeOfferUnitPriceComparator.field74.getGraphics(); + Graphics var6 = class42.field358.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(WorldMapData_1.fontHelvetica13); + var6.setFont(class51.fontHelvetica13); var6.setColor(Color.white); - var6.drawString(var2, (304 - HealthBarUpdate.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); - var4.drawImage(GrandExchangeOfferUnitPriceComparator.field74, KitDefinition.canvasWidth / 2 - 152, class30.canvasHeight / 2 - 18, (ImageObserver)null); + var6.drawString(var2, (304 - KeyHandler.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); + var4.drawImage(class42.field358, GraphicsDefaults.canvasWidth / 2 - 152, canvasHeight / 2 - 18, (ImageObserver)null); } catch (Exception var9) { - int var7 = KitDefinition.canvasWidth / 2 - 152; - int var8 = class30.canvasHeight / 2 - 18; + int var7 = GraphicsDefaults.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(var1 * 3 + var7 + 2, var8 + 2, 300 - var1 * 3, 30); - var4.setFont(WorldMapData_1.fontHelvetica13); + var4.fillRect(var7 + var1 * 3 + 2, var8 + 2, 300 - var1 * 3, 30); + var4.setFont(class51.fontHelvetica13); var4.setColor(Color.white); - var4.drawString(var2, var7 + (304 - HealthBarUpdate.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); + var4.drawString(var2, var7 + (304 - KeyHandler.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); } } catch (Exception var10) { this.canvas.repaint(); @@ -811,21 +771,21 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } - @ObfuscatedName("ak") + @ObfuscatedName("ax") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1281252486" + garbageValue = "-1405214029" ) - protected final void method891() { - GrandExchangeOfferUnitPriceComparator.field74 = null; - WorldMapData_1.fontHelvetica13 = null; - HealthBarUpdate.loginScreenFontMetrics = null; + protected final void method915() { + class42.field358 = null; + class51.fontHelvetica13 = null; + KeyHandler.loginScreenFontMetrics = null; } - @ObfuscatedName("ao") + @ObfuscatedName("aj") @ObfuscatedSignature( signature = "(Ljava/lang/String;I)V", - garbageValue = "-1919436562" + garbageValue = "1941506741" ) @Export("error") protected void error(String var1) { @@ -841,66 +801,58 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } - @ObfuscatedName("ac") + @ObfuscatedName("ab") @ObfuscatedSignature( signature = "(I)Ljava/awt/Container;", - garbageValue = "-133476889" + garbageValue = "1795602674" ) @Export("container") Container container() { return (Container)(this.frame != null ? this.frame : this); } - @ObfuscatedName("ar") + @ObfuscatedName("af") @ObfuscatedSignature( - signature = "(B)Llh;", - garbageValue = "0" + signature = "(I)Llr;", + garbageValue = "-894568011" ) @Export("getFrameContentBounds") Bounds getFrameContentBounds() { Container var1 = this.container(); - int var2 = Math.max(var1.getWidth(), this.field429); + int var2 = Math.max(var1.getWidth(), this.field435); int var3 = Math.max(var1.getHeight(), this.field428); 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("au") + @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-1028625375" + signature = "(S)Z", + garbageValue = "219" ) @Export("hasFrame") protected final boolean hasFrame() { return this.frame != null; } - @ObfuscatedName("ag") + @ObfuscatedName("ae") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1142845100" + garbageValue = "792262956" ) - protected abstract void vmethod1655(); - - public final void destroy() { - if (this == gameShell && !isKilled) { - stopTimeMs = SequenceDefinition.method4686(); - UserList.sleepMillis(5000L); - this.kill(); - } - } + protected abstract void vmethod1248(); public final synchronized void paint(Graphics var1) { if (this == gameShell && !isKilled) { - this.field435 = true; - if (SequenceDefinition.method4686() - this.field424 > 1000L) { + this.field440 = true; + if (SoundCache.method2480() - this.field444 > 1000L) { Rectangle var2 = var1.getClipBounds(); - if (var2 == null || var2.width >= KitDefinition.canvasWidth && var2.height >= class30.canvasHeight) { + if (var2 == null || var2.width >= GraphicsDefaults.canvasWidth && var2.height >= canvasHeight) { this.isCanvasInvalid = true; } } @@ -908,49 +860,18 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } - public final void start() { + public final void destroy() { if (this == gameShell && !isKilled) { - stopTimeMs = 0L; + stopTimeMs = SoundCache.method2480(); + FriendsList.sleepMillis(5000L); + this.kill(); } } - public final void stop() { - if (this == gameShell && !isKilled) { - stopTimeMs = SequenceDefinition.method4686() + 4000L; - } - } - - public final void focusGained(FocusEvent var1) { - volatileFocus = true; - this.field435 = true; - } - public final void focusLost(FocusEvent var1) { volatileFocus = false; } - public final void windowClosing(WindowEvent var1) { - this.destroy(); - } - - public final void windowClosed(WindowEvent var1) { - } - - public final void windowDeiconified(WindowEvent var1) { - } - - public final void update(Graphics var1) { - this.paint(var1); - } - - public final void windowOpened(WindowEvent var1) { - } - - public abstract void init(); - - public final void windowIconified(WindowEvent var1) { - } - public void run() { try { if (TaskHandler.javaVendor != null) { @@ -964,11 +885,11 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene if (var2.startsWith("1.6.0_")) { int var3; - for (var3 = 6; var3 < var2.length() && NetCache.isDigit(var2.charAt(var3)); ++var3) { + for (var3 = 6; var3 < var2.length() && Actor.isDigit(var2.charAt(var3)); ++var3) { } String var4 = var2.substring(6, var3); - if (TaskHandler.isNumber(var4) && WallDecoration.parseInt(var4) < 10) { + if (DynamicObject.isNumber(var4) && IgnoreList.parseInt(var4) < 10) { this.error("wrongjava"); return; } @@ -981,174 +902,983 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.setFocusCycleRoot(true); this.addCanvas(); this.setUp(); - clock = Bounds.newClock(); + FriendSystem.clock = UserComparator6.newClock(); - while (stopTimeMs == 0L || SequenceDefinition.method4686() < stopTimeMs) { - field413 = clock.wait(cycleDurationMillis, fiveOrOne); + while (stopTimeMs == 0L || SoundCache.method2480() < stopTimeMs) { + field423 = FriendSystem.clock.wait(cycleDurationMillis, fiveOrOne); - for (int var5 = 0; var5 < field413; ++var5) { - this.method877(); + for (int var5 = 0; var5 < field423; ++var5) { + this.method1016(); } - this.method878(); + this.method900(); this.post(this.canvas); } } catch (Exception var6) { - class3.RunException_sendStackTrace((String)null, var6); + class188.RunException_sendStackTrace((String)null, var6); this.error("crash"); } this.kill(); } + public final void start() { + if (this == gameShell && !isKilled) { + stopTimeMs = 0L; + } + } + + public final void update(Graphics var1) { + this.paint(var1); + } + + public final void focusGained(FocusEvent var1) { + volatileFocus = true; + this.field440 = true; + } + + public final void windowClosing(WindowEvent var1) { + this.destroy(); + } + + public final void windowDeiconified(WindowEvent var1) { + } + + public final void windowIconified(WindowEvent var1) { + } + + public abstract void init(); + + public final void stop() { + if (this == gameShell && !isKilled) { + stopTimeMs = SoundCache.method2480() + 4000L; + } + } + + public final void windowOpened(WindowEvent var1) { + } + + public final void windowClosed(WindowEvent var1) { + } + public final void windowActivated(WindowEvent var1) { } public final void windowDeactivated(WindowEvent var1) { } - @ObfuscatedName("s") + @ObfuscatedName("x") + public static double method1020(double var0, double var2, double var4) { + return ObjectDefinition.method4645((var0 - var2) / var4) / var4; + } + + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(II)Lif;", - garbageValue = "-2072465026" + signature = "(Lbs;II)V", + garbageValue = "116530330" ) - @Export("KitDefinition_get") - public static KitDefinition KitDefinition_get(int var0) { - KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + @Export("runScript") + static void runScript(ScriptEvent var0, int var1) { + Object[] var2 = var0.args; + Script var3; + int var17; + if (Calendar.isWorldMapEvent(var0.type)) { + class32.worldMapEvent = (WorldMapEvent)var2[0]; + WorldMapElement var4 = WorldMapSection1.WorldMapElement_get(class32.worldMapEvent.mapElement); + var3 = PlayerAppearance.getWorldMapScript(var0.type, var4.objectId, var4.category); } else { - byte[] var2 = class297.KitDefinition_archive.takeFile(3, var0); - var1 = new KitDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } + var17 = (Integer)var2[0]; + var3 = Tiles.getScript(var17); + } - KitDefinition.KitDefinition_cached.put(var1, (long)var0); - return var1; + if (var3 != null) { + class160.Interpreter_intStackSize = 0; + TextureProvider.Interpreter_stringStackSize = 0; + var17 = -1; + int[] var5 = var3.opcodes; + int[] var6 = var3.intOperands; + byte var7 = -1; + Interpreter.Interpreter_frameDepth = 0; + Interpreter.field1067 = false; + + try { + int var10; + try { + Interpreter.Interpreter_intLocals = new int[var3.localIntCount]; + int var8 = 0; + class14.Interpreter_stringLocals = new String[var3.localStringCount]; + int var9 = 0; + + int var11; + String var18; + for (var10 = 1; var10 < var2.length; ++var10) { + if (var2[var10] instanceof Integer) { + var11 = (Integer)var2[var10]; + if (var11 == -2147483647) { + var11 = var0.mouseX; + } + + if (var11 == -2147483646) { + var11 = var0.mouseY; + } + + if (var11 == -2147483645) { + var11 = var0.widget != null ? var0.widget.id : -1; + } + + if (var11 == -2147483644) { + var11 = var0.opIndex; + } + + if (var11 == -2147483643) { + var11 = var0.widget != null ? var0.widget.childIndex : -1; + } + + if (var11 == -2147483642) { + var11 = var0.dragTarget != null ? var0.dragTarget.id : -1; + } + + if (var11 == -2147483641) { + var11 = var0.dragTarget != null ? var0.dragTarget.childIndex : -1; + } + + if (var11 == -2147483640) { + var11 = var0.keyTyped; + } + + if (var11 == -2147483639) { + var11 = var0.keyPressed; + } + + Interpreter.Interpreter_intLocals[var8++] = var11; + } else if (var2[var10] instanceof String) { + var18 = (String)var2[var10]; + if (var18.equals("event_opbase")) { + var18 = var0.targetName; + } + + class14.Interpreter_stringLocals[var9++] = var18; + } + } + + var10 = 0; + Interpreter.field1066 = var0.field550; + + while (true) { + ++var10; + if (var10 > var1) { + throw new RuntimeException(); + } + + ++var17; + int var29 = var5[var17]; + int var20; + if (var29 >= 100) { + boolean var32; + if (var3.intOperands[var17] == 1) { + var32 = true; + } else { + var32 = false; + } + + var20 = WorldMapAreaData.method670(var29, var3, var32); + switch(var20) { + case 0: + return; + case 1: + default: + break; + case 2: + throw new IllegalStateException(); + } + } else if (var29 == ScriptOpcodes.ICONST) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var6[var17]; + } else if (var29 == ScriptOpcodes.GET_VARP) { + var11 = var6[var17]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Varps.Varps_main[var11]; + } else if (var29 == ScriptOpcodes.SET_VARP) { + var11 = var6[var17]; + Varps.Varps_main[var11] = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Players.method2123(var11); + } else if (var29 == ScriptOpcodes.SCONST) { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3.stringOperands[var17]; + } else if (var29 == ScriptOpcodes.JUMP) { + var17 += var6[var17]; + } else if (var29 == ScriptOpcodes.IF_ICMPNE) { + class160.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]) { + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.IF_ICMPEQ) { + class160.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]) { + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.IF_ICMPLT) { + class160.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]) { + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.IF_ICMPGT) { + class160.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]) { + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.RETURN) { + if (Interpreter.Interpreter_frameDepth == 0) { + return; + } + + ScriptFrame var34 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; + var3 = var34.script; + var5 = var3.opcodes; + var6 = var3.intOperands; + var17 = var34.pc; + Interpreter.Interpreter_intLocals = var34.intLocals; + class14.Interpreter_stringLocals = var34.stringLocals; + } else if (var29 == ScriptOpcodes.GET_VARBIT) { + var11 = var6[var17]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = WorldMapCacheName.getVarbit(var11); + } else if (var29 == ScriptOpcodes.SET_VARBIT) { + var11 = var6[var17]; + WorldMapData_1.method703(var11, Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]); + } else if (var29 == ScriptOpcodes.IF_ICMPLE) { + class160.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]) { + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.IF_ICMPGE) { + class160.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]) { + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.ILOAD) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Interpreter.Interpreter_intLocals[var6[var17]]; + } else if (var29 == ScriptOpcodes.ISTORE) { + Interpreter.Interpreter_intLocals[var6[var17]] = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + } else if (var29 == ScriptOpcodes.SLOAD) { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = class14.Interpreter_stringLocals[var6[var17]]; + } else if (var29 == ScriptOpcodes.SSTORE) { + class14.Interpreter_stringLocals[var6[var17]] = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + } else if (var29 == ScriptOpcodes.JOIN_STRING) { + var11 = var6[var17]; + TextureProvider.Interpreter_stringStackSize -= var11; + String var31 = WorldMapRegion.method515(Interpreter.Interpreter_stringStack, TextureProvider.Interpreter_stringStackSize, var11); + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var31; + } else if (var29 == ScriptOpcodes.POP_INT) { + --class160.Interpreter_intStackSize; + } else if (var29 == ScriptOpcodes.POP_STRING) { + --TextureProvider.Interpreter_stringStackSize; + } else { + int var15; + if (var29 != ScriptOpcodes.INVOKE) { + if (var29 == ScriptOpcodes.GET_VARC_INT) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = BoundaryObject.varcs.getInt(var6[var17]); + } else if (var29 == ScriptOpcodes.SET_VARC_INT) { + BoundaryObject.varcs.setInt(var6[var17], Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]); + } else if (var29 == ScriptOpcodes.DEFINE_ARRAY) { + var11 = var6[var17] >> 16; + var20 = var6[var17] & 65535; + int var21 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + if (var21 < 0 || var21 > 5000) { + throw new RuntimeException(); + } + + Interpreter.Interpreter_arrayLengths[var11] = var21; + byte var22 = -1; + if (var20 == 105) { + var22 = 0; + } + + for (var15 = 0; var15 < var21; ++var15) { + Interpreter.Interpreter_arrays[var11][var15] = var22; + } + } else if (var29 == ScriptOpcodes.GET_ARRAY_INT) { + var11 = var6[var17]; + var20 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { + throw new RuntimeException(); + } + + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var11][var20]; + } else if (var29 == ScriptOpcodes.SET_ARRAY_INT) { + var11 = var6[var17]; + class160.Interpreter_intStackSize -= 2; + var20 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { + throw new RuntimeException(); + } + + Interpreter.Interpreter_arrays[var11][var20] = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + } else if (var29 == ScriptOpcodes.GET_VARC_STRING_OLD) { + var18 = BoundaryObject.varcs.getStringOld(var6[var17]); + if (var18 == null) { + var18 = "null"; + } + + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var18; + } else if (var29 == ScriptOpcodes.SET_VARC_STRING_OLD) { + BoundaryObject.varcs.setStringOld(var6[var17], Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]); + } else if (var29 == ScriptOpcodes.GET_VARC_STRING) { + var18 = BoundaryObject.varcs.getString(var6[var17]); + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var18; + } else if (var29 == ScriptOpcodes.SET_VARC_STRING) { + BoundaryObject.varcs.setString(var6[var17], Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]); + } else { + if (var29 != ScriptOpcodes.SWITCH) { + throw new IllegalStateException(); + } + + IterableNodeHashTable var33 = var3.switches[var6[var17]]; + IntegerNode var30 = (IntegerNode)var33.get((long)Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]); + if (var30 != null) { + var17 += var30.integer; + } + } + } else { + var11 = var6[var17]; + Script var12 = Tiles.getScript(var11); + int[] var13 = new int[var12.localIntCount]; + String[] var14 = new String[var12.localStringCount]; + + for (var15 = 0; var15 < var12.intArgumentCount; ++var15) { + var13[var15] = Interpreter.Interpreter_intStack[var15 + (class160.Interpreter_intStackSize - var12.intArgumentCount)]; + } + + for (var15 = 0; var15 < var12.stringArgumentCount; ++var15) { + var14[var15] = Interpreter.Interpreter_stringStack[var15 + (TextureProvider.Interpreter_stringStackSize - var12.stringArgumentCount)]; + } + + class160.Interpreter_intStackSize -= var12.intArgumentCount; + TextureProvider.Interpreter_stringStackSize -= var12.stringArgumentCount; + ScriptFrame var19 = new ScriptFrame(); + var19.script = var3; + var19.pc = var17; + var19.intLocals = Interpreter.Interpreter_intLocals; + var19.stringLocals = class14.Interpreter_stringLocals; + Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var19; + var3 = var12; + var5 = var12.opcodes; + var6 = var12.intOperands; + var17 = -1; + Interpreter.Interpreter_intLocals = var13; + class14.Interpreter_stringLocals = var14; + } + } + } + } catch (Exception var27) { + StringBuilder var24 = new StringBuilder(30); + var24.append("").append(var3.key).append(" "); + + for (var10 = Interpreter.Interpreter_frameDepth - 1; var10 >= 0; --var10) { + var24.append("").append(Interpreter.Interpreter_frames[var10].script.key).append(" "); + } + + var24.append("").append(var7); + class188.RunException_sendStackTrace(var24.toString(), var27); + } + } finally { + if (Interpreter.field1067) { + Interpreter.field1068 = true; + GrandExchangeEvent.method73(); + Interpreter.field1068 = false; + Interpreter.field1067 = false; + } + + } } } - @ObfuscatedName("s") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I[BLkv;I)V", - garbageValue = "-651832532" + signature = "(Lkf;Lkf;Lkf;I)V", + garbageValue = "2116870106" ) - static void method1005(int var0, byte[] var1, ArchiveDisk var2) { - ArchiveDiskAction var3 = new ArchiveDiskAction(); - var3.type = 0; - var3.key = (long)var0; - var3.data = var1; - var3.archiveDisk = var2; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); - } - - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { - if (ArchiveDiskActionHandler.field3124 == 0) { - class13.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); - class13.ArchiveDiskActionHandler_thread.setDaemon(true); - class13.ArchiveDiskActionHandler_thread.start(); - class13.ArchiveDiskActionHandler_thread.setPriority(5); + @Export("drawTitle") + static void drawTitle(Font var0, Font var1, Font var2) { + Login.xPadding = (GraphicsDefaults.canvasWidth - 765) / 2; + Login.loginBoxX = Login.xPadding + 202; + VarcInt.loginBoxCenter = Login.loginBoxX + 180; + int var6; + int var7; + int var10; + int var18; + byte var23; + int var24; + int var36; + int var48; + if (Login.worldSelectOpen) { + if (class162.worldSelectBackSprites == null) { + Archive var35 = WorldMapDecoration.archive8; + var36 = var35.getGroupId("sl_back"); + var6 = var35.getFileId(var36, ""); + Sprite[] var34 = PendingSpawn.SpriteBuffer_getSpriteArray(var35, var36, var6); + class162.worldSelectBackSprites = var34; + } + + if (PlayerType.worldSelectFlagSprites == null) { + PlayerType.worldSelectFlagSprites = GrandExchangeOfferNameComparator.method122(WorldMapDecoration.archive8, "sl_flags", ""); + } + + if (FileSystem.worldSelectArrows == null) { + FileSystem.worldSelectArrows = GrandExchangeOfferNameComparator.method122(WorldMapDecoration.archive8, "sl_arrows", ""); + } + + if (class226.worldSelectStars == null) { + class226.worldSelectStars = GrandExchangeOfferNameComparator.method122(WorldMapDecoration.archive8, "sl_stars", ""); + } + + if (class2.worldSelectLeftSprite == null) { + class2.worldSelectLeftSprite = Interpreter.SpriteBuffer_getIndexedSpriteByName(WorldMapDecoration.archive8, "leftarrow", ""); + } + + if (WorldMapRectangle.worldSelectRightSprite == null) { + WorldMapRectangle.worldSelectRightSprite = Interpreter.SpriteBuffer_getIndexedSpriteByName(WorldMapDecoration.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 (class226.worldSelectStars != null) { + class226.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); + var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); + class226.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); + var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); + } + + if (FileSystem.worldSelectArrows != null) { + var48 = Login.xPadding + 280; + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { + FileSystem.worldSelectArrows[2].drawAt(var48, 4); + } else { + FileSystem.worldSelectArrows[0].drawAt(var48, 4); + } + + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { + FileSystem.worldSelectArrows[3].drawAt(var48 + 15, 4); + } else { + FileSystem.worldSelectArrows[1].drawAt(var48 + 15, 4); + } + + var0.draw("World", var48 + 32, 17, 16777215, -1); + var24 = Login.xPadding + 390; + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { + FileSystem.worldSelectArrows[2].drawAt(var24, 4); + } else { + FileSystem.worldSelectArrows[0].drawAt(var24, 4); + } + + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { + FileSystem.worldSelectArrows[3].drawAt(var24 + 15, 4); + } else { + FileSystem.worldSelectArrows[1].drawAt(var24 + 15, 4); + } + + var0.draw("Players", var24 + 32, 17, 16777215, -1); + var36 = Login.xPadding + 500; + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { + FileSystem.worldSelectArrows[2].drawAt(var36, 4); + } else { + FileSystem.worldSelectArrows[0].drawAt(var36, 4); + } + + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { + FileSystem.worldSelectArrows[3].drawAt(var36 + 15, 4); + } else { + FileSystem.worldSelectArrows[1].drawAt(var36 + 15, 4); + } + + var0.draw("Location", var36 + 32, 17, 16777215, -1); + var6 = Login.xPadding + 610; + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { + FileSystem.worldSelectArrows[2].drawAt(var6, 4); + } else { + FileSystem.worldSelectArrows[0].drawAt(var6, 4); + } + + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { + FileSystem.worldSelectArrows[3].drawAt(var6 + 15, 4); + } else { + FileSystem.worldSelectArrows[1].drawAt(var6 + 15, 4); + } + + var0.draw("Type", var6 + 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 (class162.worldSelectBackSprites != null) { + var23 = 88; + byte var51 = 19; + var36 = 765 / (var23 + 1) - 1; + var6 = 480 / (var51 + 1); + + int var40; + do { + var7 = var6; + var40 = var36; + if (var6 * (var36 - 1) >= World.World_count) { + --var36; + } + + if (var36 * (var6 - 1) >= World.World_count) { + --var6; + } + + if (var36 * (var6 - 1) >= World.World_count) { + --var6; + } + } while(var7 != var6 || var36 != var40); + + var7 = (765 - var23 * var36) / (var36 + 1); + if (var7 > 5) { + var7 = 5; + } + + var40 = (480 - var51 * var6) / (var6 + 1); + if (var40 > 5) { + var40 = 5; + } + + int var9 = (765 - var23 * var36 - var7 * (var36 - 1)) / 2; + var10 = (480 - var51 * var6 - var40 * (var6 - 1)) / 2; + int var11 = (var6 + World.World_count - 1) / var6; + Login.worldSelectPagesCount = var11 - var36; + if (class2.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { + class2.worldSelectLeftSprite.drawAt(8, canvasHeight / 2 - class2.worldSelectLeftSprite.subHeight / 2); + } + + if (WorldMapRectangle.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { + WorldMapRectangle.worldSelectRightSprite.drawAt(GraphicsDefaults.canvasWidth - WorldMapRectangle.worldSelectRightSprite.subWidth - 8, canvasHeight / 2 - WorldMapRectangle.worldSelectRightSprite.subHeight / 2); + } + + int var41 = var10 + 23; + int var42 = var9 + Login.xPadding; + int var31 = 0; + boolean var32 = false; + int var43 = Login.worldSelectPage; + + int var44; + for (var44 = var6 * var43; var44 < World.World_count && var43 - Login.worldSelectPage < var36; ++var44) { + World var33 = World.World_worlds[var44]; + boolean var45 = true; + String var20 = Integer.toString(var33.population); + if (var33.population == -1) { + var20 = "OFF"; + var45 = false; + } else if (var33.population > 1980) { + var20 = "FULL"; + var45 = false; + } + + int var22 = 0; + byte var21; + if (var33.isBeta()) { + if (var33.isMembersOnly()) { + var21 = 7; + } else { + var21 = 6; + } + } else if (var33.isDeadman()) { + var22 = 16711680; + if (var33.isMembersOnly()) { + var21 = 5; + } else { + var21 = 4; + } + } else if (var33.isPvp()) { + if (var33.isMembersOnly()) { + var21 = 3; + } else { + var21 = 2; + } + } else if (var33.isMembersOnly()) { + var21 = 1; + } else { + var21 = 0; + } + + if (MouseHandler.MouseHandler_x >= var42 && MouseHandler.MouseHandler_y >= var41 && MouseHandler.MouseHandler_x < var23 + var42 && MouseHandler.MouseHandler_y < var41 + var51 && var45) { + Login.hoveredWorldIndex = var44; + class162.worldSelectBackSprites[var21].drawTransOverlayAt(var42, var41, 128, 16777215); + var32 = true; + } else { + class162.worldSelectBackSprites[var21].drawAt(var42, var41); + } + + if (PlayerType.worldSelectFlagSprites != null) { + PlayerType.worldSelectFlagSprites[(var33.isMembersOnly() ? 8 : 0) + var33.location].drawAt(var42 + 29, var41); + } + + var0.drawCentered(Integer.toString(var33.id), var42 + 15, var51 / 2 + var41 + 5, var22, -1); + var1.drawCentered(var20, var42 + 60, var51 / 2 + var41 + 5, 268435455, -1); + var41 = var41 + var40 + var51; + ++var31; + if (var31 >= var6) { + var41 = var10 + 23; + var42 = var42 + var7 + var23; + var31 = 0; + ++var43; + } + } + + if (var32) { + var44 = var1.stringWidth(World.World_worlds[Login.hoveredWorldIndex].activity) + 6; + var18 = var1.ascent + 8; + int var46 = MouseHandler.MouseHandler_y + 25; + if (var46 + var18 > 480) { + var46 = MouseHandler.MouseHandler_y - 25 - var18; + } + + Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var44 / 2, var46, var44, var18, 16777120); + Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var44 / 2, var46, var44, var18, 0); + var1.drawCentered(World.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var46 + var1.ascent + 4, 0, -1); + } + } + + DevicePcmPlayerProvider.rasterProvider.drawFull(0, 0); + } else { + Login.leftTitleSprite.drawAt(Login.xPadding, 0); + class191.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + HealthBar.logoSprite.drawAt(Login.xPadding + 382 - HealthBar.logoSprite.subWidth / 2, 18); + if (Client.gameState == 0 || Client.gameState == 5) { + var23 = 20; + var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var23, 16777215, -1); + var24 = 253 - var23; + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var24, 304, 34, 9179409); + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var24 + 1, 302, 32, 0); + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var24 + 2, Login.Login_loadingPercent * 3, 30, 9179409); + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var24 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); + var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var23, 16777215, -1); + } + + String var25; + short var47; + short var49; + if (Client.gameState == 20) { + Login.titleboxSprite.drawAt(Login.loginBoxX + 180 - Login.titleboxSprite.subWidth / 2, 271 - Login.titleboxSprite.subHeight / 2); + var47 = 201; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var47, 16776960, 0); + var48 = var47 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var48, 16776960, 0); + var48 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var48, 16776960, 0); + var48 += 15; + var48 += 7; + if (Login.loginIndex != 4) { + var0.draw("Login: ", Login.loginBoxX + 180 - 110, var48, 16777215, 0); + var49 = 200; + + for (var25 = VerticalAlignment.method4328(); var0.stringWidth(var25) > var49; var25 = var25.substring(0, var25.length() - 1)) { + } + + var0.draw(AbstractFont.escapeBrackets(var25), Login.loginBoxX + 180 - 70, var48, 16777215, 0); + var48 += 15; + var0.draw("Password: " + TextureProvider.method2727(Login.Login_password), Login.loginBoxX + 180 - 108, var48, 16777215, 0); + var48 += 15; + } + } + + if (Client.gameState == 10 || Client.gameState == 11) { + Login.titleboxSprite.drawAt(Login.loginBoxX, 171); + short var5; + if (Login.loginIndex == 0) { + var47 = 251; + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var47, 16776960, 0); + var48 = var47 + 30; + var24 = Login.loginBoxX + 180 - 80; + var5 = 291; + class191.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); + var0.drawLines("New User", var24 - 73, var5 - 20, 144, 40, 16777215, 0, 1, 1, 0); + var24 = Login.loginBoxX + 180 + 80; + class191.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); + var0.drawLines("Existing User", var24 - 73, var5 - 20, 144, 40, 16777215, 0, 1, 1, 0); + } else if (Login.loginIndex == 1) { + var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); + var47 = 236; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var47, 16777215, 0); + var48 = var47 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var48, 16777215, 0); + var48 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var48, 16777215, 0); + var48 += 15; + var24 = Login.loginBoxX + 180 - 80; + var5 = 321; + class191.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); + var0.drawCentered("Continue", var24, var5 + 5, 16777215, 0); + var24 = Login.loginBoxX + 180 + 80; + class191.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); + var0.drawCentered("Cancel", var24, var5 + 5, 16777215, 0); + } else if (Login.loginIndex == 2) { + var47 = 201; + var0.drawCentered(Login.Login_response1, VarcInt.loginBoxCenter, var47, 16776960, 0); + var48 = var47 + 15; + var0.drawCentered(Login.Login_response2, VarcInt.loginBoxCenter, var48, 16776960, 0); + var48 += 15; + var0.drawCentered(Login.Login_response3, VarcInt.loginBoxCenter, var48, 16776960, 0); + var48 += 15; + var48 += 7; + var0.draw("Login: ", VarcInt.loginBoxCenter - 110, var48, 16777215, 0); + var49 = 200; + + for (var25 = VerticalAlignment.method4328(); var0.stringWidth(var25) > var49; var25 = var25.substring(1)) { + } + + var0.draw(AbstractFont.escapeBrackets(var25) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? UserComparator7.colorStartTag(16776960) + "|" : ""), VarcInt.loginBoxCenter - 70, var48, 16777215, 0); + var48 += 15; + String var27 = "Password: "; + String var28 = Login.Login_password; + String var29 = HealthBarDefinition.method4481('*', var28.length()); + var0.draw(var27 + var29 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? UserComparator7.colorStartTag(16776960) + "|" : ""), VarcInt.loginBoxCenter - 108, var48, 16777215, 0); + var48 += 15; + var47 = 277; + var10 = VarcInt.loginBoxCenter + -117; + boolean var12 = Client.Login_isUsernameRemembered; + boolean var13 = Login.field1169; + IndexedSprite var30 = var12 ? (var13 ? WorldMapDecoration.field202 : Login.options_buttons_2Sprite) : (var13 ? Login.field1153 : GrandExchangeOfferWorldComparator.options_buttons_0Sprite); + var30.drawAt(var10, var47); + var10 = var10 + var30.subWidth + 5; + var1.draw("Remember username", var10, var47 + 13, 16776960, 0); + var10 = VarcInt.loginBoxCenter + 24; + boolean var16 = Actor.clientPreferences.hideUsername; + boolean var17 = Login.field1170; + IndexedSprite var15 = var16 ? (var17 ? WorldMapDecoration.field202 : Login.options_buttons_2Sprite) : (var17 ? Login.field1153 : GrandExchangeOfferWorldComparator.options_buttons_0Sprite); + var15.drawAt(var10, var47); + var10 = var10 + var15.subWidth + 5; + var1.draw("Hide username", var10, var47 + 13, 16776960, 0); + var48 = var47 + 15; + var18 = VarcInt.loginBoxCenter - 80; + short var19 = 321; + class191.titlebuttonSprite.drawAt(var18 - 73, var19 - 20); + var0.drawCentered("Login", var18, var19 + 5, 16777215, 0); + var18 = VarcInt.loginBoxCenter + 80; + class191.titlebuttonSprite.drawAt(var18 - 73, var19 - 20); + var0.drawCentered("Cancel", var18, var19 + 5, 16777215, 0); + var47 = 357; + switch(Login.field1161) { + case 2: + class51.field405 = "Having trouble logging in?"; + break; + default: + class51.field405 = "Can't login? Click here."; + } + + MusicPatchNode2.field2369 = new Bounds(VarcInt.loginBoxCenter, var47, var1.stringWidth(class51.field405), 11); + class51.field411 = new Bounds(VarcInt.loginBoxCenter, var47, var1.stringWidth("Still having trouble logging in?"), 11); + var1.drawCentered(class51.field405, VarcInt.loginBoxCenter, var47, 16777215, 0); + } else if (Login.loginIndex == 3) { + var47 = 201; + var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var47, 16776960, 0); + var48 = var47 + 20; + var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var48, 16776960, 0); + var48 += 15; + var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var48, 16776960, 0); + var48 += 15; + var24 = Login.loginBoxX + 180; + var5 = 276; + class191.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); + var2.drawCentered("Try again", var24, var5 + 5, 16777215, 0); + var24 = Login.loginBoxX + 180; + var5 = 326; + class191.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); + var2.drawCentered("Forgotten password?", var24, var5 + 5, 16777215, 0); + } else { + short var8; + if (Login.loginIndex == 4) { + var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); + var47 = 236; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var47, 16777215, 0); + var48 = var47 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var48, 16777215, 0); + var48 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var48, 16777215, 0); + var48 += 15; + var0.draw("PIN: " + TextureProvider.method2727(class81.otp) + (Client.cycle % 40 < 20 ? UserComparator7.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var48, 16777215, 0); + var48 -= 8; + var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var48, 16776960, 0); + var48 += 15; + var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var48, 16776960, 0); + var24 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; + var36 = var48 - var0.ascent; + IndexedSprite var26; + if (Login.field1183) { + var26 = Login.options_buttons_2Sprite; + } else { + var26 = GrandExchangeOfferWorldComparator.options_buttons_0Sprite; + } + + var26.drawAt(var24, var36); + var48 += 15; + var7 = Login.loginBoxX + 180 - 80; + var8 = 321; + class191.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); + var0.drawCentered("Continue", var7, var8 + 5, 16777215, 0); + var7 = Login.loginBoxX + 180 + 80; + class191.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); + var47 = 221; + var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var47, 16776960, 0); + var48 = var47 + 15; + var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var48, 16776960, 0); + var48 += 15; + var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var48, 16776960, 0); + var48 += 15; + var48 += 14; + var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var48, 16777215, 0); + var49 = 174; + + for (var25 = VerticalAlignment.method4328(); var0.stringWidth(var25) > var49; var25 = var25.substring(1)) { + } + + var0.draw(AbstractFont.escapeBrackets(var25) + (Client.cycle % 40 < 20 ? UserComparator7.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var48, 16777215, 0); + var48 += 15; + var6 = Login.loginBoxX + 180 - 80; + short var38 = 321; + class191.titlebuttonSprite.drawAt(var6 - 73, var38 - 20); + var0.drawCentered("Recover", var6, var38 + 5, 16777215, 0); + var6 = Login.loginBoxX + 180 + 80; + class191.titlebuttonSprite.drawAt(var6 - 73, var38 - 20); + var0.drawCentered("Back", var6, var38 + 5, 16777215, 0); + var38 = 356; + var1.drawCentered("Still having trouble logging in?", VarcInt.loginBoxCenter, var38, 268435455, 0); + } else if (Login.loginIndex == 6) { + var47 = 201; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var47, 16776960, 0); + var48 = var47 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var48, 16776960, 0); + var48 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var48, 16776960, 0); + var48 += 15; + var24 = Login.loginBoxX + 180; + var5 = 321; + class191.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); + var0.drawCentered("Back", var24, var5 + 5, 16777215, 0); + } else if (Login.loginIndex == 7) { + var47 = 216; + var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var47, 16776960, 0); + var48 = var47 + 15; + var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var48, 16776960, 0); + var48 += 15; + var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var48, 16776960, 0); + var48 += 15; + var24 = Login.loginBoxX + 180 - 80; + var5 = 321; + class191.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); + var0.drawCentered("Set Date of Birth", var24, var5 + 5, 16777215, 0); + var24 = Login.loginBoxX + 180 + 80; + class191.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); + var0.drawCentered("Back", var24, var5 + 5, 16777215, 0); + } else if (Login.loginIndex == 8) { + var47 = 216; + var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var47, 16776960, 0); + var48 = var47 + 15; + var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var48, 16776960, 0); + var48 += 15; + var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var48, 16776960, 0); + var48 += 15; + var24 = Login.loginBoxX + 180 - 80; + var5 = 321; + class191.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); + var0.drawCentered("Privacy Policy", var24, var5 + 5, 16777215, 0); + var24 = Login.loginBoxX + 180 + 80; + class191.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); + var0.drawCentered("Back", var24, var5 + 5, 16777215, 0); + } else if (Login.loginIndex == 12) { + var47 = 201; + String var4 = ""; + var25 = ""; + String var50 = ""; + switch(Login.field1156) { + case 0: + var4 = "Your account has been disabled."; + var25 = Strings.field2863; + var50 = ""; + break; + case 1: + var4 = "Account locked as we suspect it has been stolen."; + var25 = Strings.field3016; + var50 = ""; + break; + default: + WorldMapID.method520(false); + } + + var0.drawCentered(var4, Login.loginBoxX + 180, var47, 16776960, 0); + var48 = var47 + 15; + var2.drawCentered(var25, Login.loginBoxX + 180, var48, 16776960, 0); + var48 += 15; + var2.drawCentered(var50, Login.loginBoxX + 180, var48, 16776960, 0); + var48 += 15; + var7 = Login.loginBoxX + 180; + var8 = 276; + class191.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); + var0.drawCentered("Support Page", var7, var8 + 5, 16777215, 0); + var7 = Login.loginBoxX + 180; + var8 = 326; + class191.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); + var0.drawCentered("Back", var7, var8 + 5, 16777215, 0); + } else if (Login.loginIndex == 24) { + var47 = 221; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var47, 16777215, 0); + var48 = var47 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var48, 16777215, 0); + var48 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var48, 16777215, 0); + var48 += 15; + var24 = Login.loginBoxX + 180; + var5 = 301; + class191.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); + var0.drawCentered("Ok", var24, var5 + 5, 16777215, 0); + } + } + } + + if (Client.gameState >= 10) { + int[] var3 = new int[4]; + Rasterizer2D.Rasterizer2D_getClipArray(var3); + Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, canvasHeight); + UserComparator5.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); + UserComparator5.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); + Rasterizer2D.Rasterizer2D_setClipArray(var3); + } + + FileSystem.title_muteSprite[Actor.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); + if (Client.gameState > 5 && Language.Language_EN == class43.clientLanguage) { + if (GrandExchangeOfferWorldComparator.field32 != null) { + var48 = Login.xPadding + 5; + var49 = 463; + byte var39 = 100; + byte var37 = 35; + GrandExchangeOfferWorldComparator.field32.drawAt(var48, var49); + var0.drawCentered("World" + " " + Client.worldId, var39 / 2 + var48, var37 / 2 + var49 - 2, 16777215, 0); + if (RouteStrategy.World_request != null) { + var1.drawCentered("Loading...", var39 / 2 + var48, var37 / 2 + var49 + 12, 16777215, 0); + } else { + var1.drawCentered("Click to switch", var39 / 2 + var48, var37 / 2 + var49 + 12, 16777215, 0); + } + } else { + GrandExchangeOfferWorldComparator.field32 = Interpreter.SpriteBuffer_getIndexedSpriteByName(WorldMapDecoration.archive8, "sl_button", ""); + } } - ArchiveDiskActionHandler.field3124 = 600; } } - @ObfuscatedName("i") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(Ljava/io/File;ZB)Z", - garbageValue = "1" + signature = "(II)I", + garbageValue = "-1651164441" ) - @Export("testReadWritePermissions") - public static boolean testReadWritePermissions(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(); - if (var1) { - var0.delete(); - } - - return true; - } catch (Exception var4) { - return false; - } - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(I)[Lls;", - garbageValue = "-575278819" - ) - static Sprite[] method897() { - Sprite[] var0 = new Sprite[class325.SpriteBuffer_spriteCount]; - - for (int var1 = 0; var1 < class325.SpriteBuffer_spriteCount; ++var1) { - Sprite var2 = var0[var1] = new Sprite(); - var2.width = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth; - var2.height = class325.SpriteBuffer_spriteHeight; - var2.xOffset = class325.SpriteBuffer_xOffsets[var1]; - var2.yOffset = class325.SpriteBuffer_yOffsets[var1]; - var2.subWidth = class325.SpriteBuffer_spriteWidths[var1]; - var2.subHeight = class225.SpriteBuffer_spriteHeights[var1]; - int var3 = var2.subHeight * var2.subWidth; - byte[] var4 = WorldMapSection1.SpriteBuffer_pixels[var1]; - var2.pixels = new int[var3]; - - for (int var5 = 0; var5 < var3; ++var5) { - var2.pixels[var5] = class325.SpriteBuffer_spritePalette[var4[var5] & 255]; - } - } - - UserComparator7.SpriteBuffer_clear(); - return var0; - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "(ILcr;ZI)I", - garbageValue = "853473447" - ) - static int method1003(int var0, Script var1, boolean var2) { - Widget var3 = WorldMapElement.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; + public static int method951(int var0) { + if (var0 > 0) { return 1; } else { - return 2; + return var0 < 0 ? -1 : 0; } } - - @ObfuscatedName("id") - @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "153547504" - ) - @Export("resumePauseWidget") - static void resumePauseWidget(int var0, int var1) { - PacketBufferNode var2 = MenuAction.getPacketBufferNode(ClientPacket.field2192, Client.packetWriter.isaacCipher); - var2.packetBuffer.writeIntLE16(var0); - var2.packetBuffer.method5443(var1); - Client.packetWriter.addNode(var2); - } } diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index cf3403e5a9..87ee38c07d 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -1,56 +1,45 @@ -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("q") +@ObfuscatedName("v") @Implements("GrandExchangeEvent") public class GrandExchangeEvent { - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 1320136717 - ) - static int field50; - @ObfuscatedName("g") - public static String[] field47; - @ObfuscatedName("ad") - @Export("garbageCollector") - static GarbageCollectorMXBean garbageCollector; - @ObfuscatedName("ds") + @ObfuscatedName("fi") @ObfuscatedSignature( - signature = "Lid;" + signature = "Lkf;" ) - @Export("archive6") - static Archive archive6; - @ObfuscatedName("s") + @Export("fontPlain11") + static Font fontPlain11; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -997401899 + intValue = -158786095 ) @Export("world") public final int world; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - longValue = 3311995201519859273L + longValue = 3834067055658986045L ) @Export("age") public final long age; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Ld;" + signature = "Lz;" ) @Export("grandExchangeOffer") public final GrandExchangeOffer grandExchangeOffer; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("offerName") String offerName; - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("previousOfferName") String previousOfferName; @ObfuscatedSignature( - signature = "(Lky;BI)V" + signature = "(Lkz;BI)V" ) GrandExchangeEvent(Buffer var1, byte var2, int var3) { this.offerName = var1.readStringCp1252NullTerminated(); @@ -60,8 +49,8 @@ public class GrandExchangeEvent { int var4 = var1.readInt(); int var5 = var1.readInt(); this.grandExchangeOffer = new GrandExchangeOffer(); - this.grandExchangeOffer.method108(2); - this.grandExchangeOffer.method124(var2); + this.grandExchangeOffer.method98(2); + this.grandExchangeOffer.method92(var2); this.grandExchangeOffer.unitPrice = var4; this.grandExchangeOffer.totalQuantity = var5; this.grandExchangeOffer.currentQuantity = 0; @@ -69,675 +58,54 @@ public class GrandExchangeEvent { this.grandExchangeOffer.id = var3; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)Ljava/lang/String;", - garbageValue = "-894568552" + signature = "(B)Ljava/lang/String;", + garbageValue = "1" ) @Export("getOfferName") public String getOfferName() { return this.offerName; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)Ljava/lang/String;", - garbageValue = "1580771980" + signature = "(B)Ljava/lang/String;", + garbageValue = "3" ) @Export("getPreviousOfferName") public String getPreviousOfferName() { return this.previousOfferName; } - @ObfuscatedName("x") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lkb;Lkb;Lkb;B)V", - garbageValue = "-43" + signature = "(Ljava/lang/CharSequence;II)I", + garbageValue = "1731864296" ) - @Export("drawTitle") - static void drawTitle(Font var0, Font var1, Font var2) { - Login.xPadding = (KitDefinition.canvasWidth - 765) / 2; - Login.loginBoxX = Login.xPadding + 202; - Login.loginBoxCenter = Login.loginBoxX + 180; - byte var23; - int var24; - int var27; - int var35; - int var46; - if (Login.worldSelectOpen) { - if (SoundCache.worldSelectBackSprites == null) { - SoundCache.worldSelectBackSprites = class30.method535(class2.archive8, "sl_back", ""); + public static int method74(CharSequence var0, int var1) { + return class51.parseIntCustomRadix(var0, var1, true); + } + + @ObfuscatedName("jq") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "-57" + ) + static final void method73() { + PacketBufferNode var0 = MenuAction.getPacketBufferNode(ClientPacket.field2262, 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) { + StructDefinition.closeInterface(var1, true); } - - IndexedSprite[] var7; - IndexedSprite[] var29; - IndexedSprite var30; - Archive var33; - int var34; - int var39; - if (class1.worldSelectFlagSprites == null) { - var33 = class2.archive8; - var35 = var33.getGroupId("sl_flags"); - var34 = var33.getFileId(var35, ""); - if (!World.SpriteBuffer_bufferFile(var33, var35, var34)) { - var7 = null; - } else { - var29 = new IndexedSprite[class325.SpriteBuffer_spriteCount]; - - for (var39 = 0; var39 < class325.SpriteBuffer_spriteCount; ++var39) { - var30 = var29[var39] = new IndexedSprite(); - var30.width = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth; - var30.height = class325.SpriteBuffer_spriteHeight; - var30.xOffset = class325.SpriteBuffer_xOffsets[var39]; - var30.yOffset = class325.SpriteBuffer_yOffsets[var39]; - var30.subWidth = class325.SpriteBuffer_spriteWidths[var39]; - var30.subHeight = class225.SpriteBuffer_spriteHeights[var39]; - var30.palette = class325.SpriteBuffer_spritePalette; - var30.pixels = WorldMapSection1.SpriteBuffer_pixels[var39]; - } - - UserComparator7.SpriteBuffer_clear(); - var7 = var29; - } - - class1.worldSelectFlagSprites = var7; - } - - if (Decimator.worldSelectArrows == null) { - var33 = class2.archive8; - var35 = var33.getGroupId("sl_arrows"); - var34 = var33.getFileId(var35, ""); - if (!World.SpriteBuffer_bufferFile(var33, var35, var34)) { - var7 = null; - } else { - var29 = new IndexedSprite[class325.SpriteBuffer_spriteCount]; - - for (var39 = 0; var39 < class325.SpriteBuffer_spriteCount; ++var39) { - var30 = var29[var39] = new IndexedSprite(); - var30.width = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth; - var30.height = class325.SpriteBuffer_spriteHeight; - var30.xOffset = class325.SpriteBuffer_xOffsets[var39]; - var30.yOffset = class325.SpriteBuffer_yOffsets[var39]; - var30.subWidth = class325.SpriteBuffer_spriteWidths[var39]; - var30.subHeight = class225.SpriteBuffer_spriteHeights[var39]; - var30.palette = class325.SpriteBuffer_spritePalette; - var30.pixels = WorldMapSection1.SpriteBuffer_pixels[var39]; - } - - UserComparator7.SpriteBuffer_clear(); - var7 = var29; - } - - Decimator.worldSelectArrows = var7; - } - - if (NetFileRequest.worldSelectStars == null) { - var33 = class2.archive8; - var35 = var33.getGroupId("sl_stars"); - var34 = var33.getFileId(var35, ""); - if (!World.SpriteBuffer_bufferFile(var33, var35, var34)) { - var7 = null; - } else { - var29 = new IndexedSprite[class325.SpriteBuffer_spriteCount]; - - for (var39 = 0; var39 < class325.SpriteBuffer_spriteCount; ++var39) { - var30 = var29[var39] = new IndexedSprite(); - var30.width = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth; - var30.height = class325.SpriteBuffer_spriteHeight; - var30.xOffset = class325.SpriteBuffer_xOffsets[var39]; - var30.yOffset = class325.SpriteBuffer_yOffsets[var39]; - var30.subWidth = class325.SpriteBuffer_spriteWidths[var39]; - var30.subHeight = class225.SpriteBuffer_spriteHeights[var39]; - var30.palette = class325.SpriteBuffer_spritePalette; - var30.pixels = WorldMapSection1.SpriteBuffer_pixels[var39]; - } - - UserComparator7.SpriteBuffer_clear(); - var7 = var29; - } - - NetFileRequest.worldSelectStars = var7; - } - - if (AbstractWorldMapIcon.worldSelectLeftSprite == null) { - AbstractWorldMapIcon.worldSelectLeftSprite = VertexNormal.SpriteBuffer_getIndexedSpriteByName(class2.archive8, "leftarrow", ""); - } - - if (ClanChat.worldSelectRightSprite == null) { - ClanChat.worldSelectRightSprite = VertexNormal.SpriteBuffer_getIndexedSpriteByName(class2.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 (NetFileRequest.worldSelectStars != null) { - NetFileRequest.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); - var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); - NetFileRequest.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); - var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); - } - - if (Decimator.worldSelectArrows != null) { - var46 = Login.xPadding + 280; - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { - Decimator.worldSelectArrows[2].drawAt(var46, 4); - } else { - Decimator.worldSelectArrows[0].drawAt(var46, 4); - } - - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { - Decimator.worldSelectArrows[3].drawAt(var46 + 15, 4); - } else { - Decimator.worldSelectArrows[1].drawAt(var46 + 15, 4); - } - - var0.draw("World", var46 + 32, 17, 16777215, -1); - var24 = Login.xPadding + 390; - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { - Decimator.worldSelectArrows[2].drawAt(var24, 4); - } else { - Decimator.worldSelectArrows[0].drawAt(var24, 4); - } - - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { - Decimator.worldSelectArrows[3].drawAt(var24 + 15, 4); - } else { - Decimator.worldSelectArrows[1].drawAt(var24 + 15, 4); - } - - var0.draw("Players", var24 + 32, 17, 16777215, -1); - var35 = Login.xPadding + 500; - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { - Decimator.worldSelectArrows[2].drawAt(var35, 4); - } else { - Decimator.worldSelectArrows[0].drawAt(var35, 4); - } - - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { - Decimator.worldSelectArrows[3].drawAt(var35 + 15, 4); - } else { - Decimator.worldSelectArrows[1].drawAt(var35 + 15, 4); - } - - var0.draw("Location", var35 + 32, 17, 16777215, -1); - var34 = Login.xPadding + 610; - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { - Decimator.worldSelectArrows[2].drawAt(var34, 4); - } else { - Decimator.worldSelectArrows[0].drawAt(var34, 4); - } - - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { - Decimator.worldSelectArrows[3].drawAt(var34 + 15, 4); - } else { - Decimator.worldSelectArrows[1].drawAt(var34 + 15, 4); - } - - var0.draw("Type", var34 + 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 (SoundCache.worldSelectBackSprites != null) { - var23 = 88; - byte var49 = 19; - var35 = 765 / (var23 + 1) - 1; - var34 = 480 / (var49 + 1); - - int var38; - do { - var27 = var34; - var38 = var35; - if (var34 * (var35 - 1) >= World.World_count) { - --var35; - } - - if (var35 * (var34 - 1) >= World.World_count) { - --var34; - } - - if (var35 * (var34 - 1) >= World.World_count) { - --var34; - } - } while(var27 != var34 || var35 != var38); - - var27 = (765 - var23 * var35) / (var35 + 1); - if (var27 > 5) { - var27 = 5; - } - - var38 = (480 - var34 * var49) / (var34 + 1); - if (var38 > 5) { - var38 = 5; - } - - int var37 = (765 - var35 * var23 - var27 * (var35 - 1)) / 2; - var39 = (480 - var49 * var34 - var38 * (var34 - 1)) / 2; - int var11 = (var34 + World.World_count - 1) / var34; - Login.worldSelectPagesCount = var11 - var35; - if (AbstractWorldMapIcon.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { - AbstractWorldMapIcon.worldSelectLeftSprite.drawAt(8, class30.canvasHeight / 2 - AbstractWorldMapIcon.worldSelectLeftSprite.subHeight / 2); - } - - if (ClanChat.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { - ClanChat.worldSelectRightSprite.drawAt(KitDefinition.canvasWidth - ClanChat.worldSelectRightSprite.subWidth - 8, class30.canvasHeight / 2 - ClanChat.worldSelectRightSprite.subHeight / 2); - } - - int var12 = var39 + 23; - int var40 = var37 + Login.xPadding; - int var41 = 0; - boolean var42 = false; - int var43 = Login.worldSelectPage; - - int var17; - for (var17 = var34 * var43; var17 < World.World_count && var43 - Login.worldSelectPage < var35; ++var17) { - World var28 = ChatChannel.World_worlds[var17]; - boolean var19 = true; - String var20 = Integer.toString(var28.population); - if (var28.population == -1) { - var20 = "OFF"; - var19 = false; - } else if (var28.population > 1980) { - var20 = "FULL"; - var19 = false; - } - - int var22 = 0; - byte var21; - if (var28.isBeta()) { - if (var28.isMembersOnly()) { - var21 = 7; - } else { - var21 = 6; - } - } else if (var28.isDeadman()) { - var22 = 16711680; - if (var28.isMembersOnly()) { - var21 = 5; - } else { - var21 = 4; - } - } else if (var28.isPvp()) { - if (var28.isMembersOnly()) { - var21 = 3; - } else { - var21 = 2; - } - } else if (var28.isMembersOnly()) { - var21 = 1; - } else { - var21 = 0; - } - - if (MouseHandler.MouseHandler_x >= var40 && MouseHandler.MouseHandler_y >= var12 && MouseHandler.MouseHandler_x < var40 + var23 && MouseHandler.MouseHandler_y < var12 + var49 && var19) { - Login.hoveredWorldIndex = var17; - SoundCache.worldSelectBackSprites[var21].drawTransOverlayAt(var40, var12, 128, 16777215); - var42 = true; - } else { - SoundCache.worldSelectBackSprites[var21].drawAt(var40, var12); - } - - if (class1.worldSelectFlagSprites != null) { - class1.worldSelectFlagSprites[(var28.isMembersOnly() ? 8 : 0) + var28.location].drawAt(var40 + 29, var12); - } - - var0.drawCentered(Integer.toString(var28.id), var40 + 15, var49 / 2 + var12 + 5, var22, -1); - var1.drawCentered(var20, var40 + 60, var49 / 2 + var12 + 5, 268435455, -1); - var12 = var12 + var38 + var49; - ++var41; - if (var41 >= var34) { - var12 = var39 + 23; - var40 = var40 + var23 + var27; - var41 = 0; - ++var43; - } - } - - if (var42) { - var17 = var1.stringWidth(ChatChannel.World_worlds[Login.hoveredWorldIndex].activity) + 6; - int var18 = var1.ascent + 8; - int var44 = MouseHandler.MouseHandler_y + 25; - if (var18 + var44 > 480) { - var44 = MouseHandler.MouseHandler_y - 25 - var18; - } - - Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var17 / 2, var44, var17, var18, 16777120); - Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var17 / 2, var44, var17, var18, 0); - var1.drawCentered(ChatChannel.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var44 + var1.ascent + 4, 0, -1); - } - } - - SpotAnimationDefinition.rasterProvider.drawFull(0, 0); - } else { - Login.leftTitleSprite.drawAt(Login.xPadding, 0); - Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - class51.logoSprite.drawAt(Login.xPadding + 382 - class51.logoSprite.subWidth / 2, 18); - if (Client.gameState == 0 || Client.gameState == 5) { - var23 = 20; - var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var23, 16777215, -1); - var24 = 253 - var23; - Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var24, 304, 34, 9179409); - Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var24 + 1, 302, 32, 0); - Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var24 + 2, Login.Login_loadingPercent * 3, 30, 9179409); - Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var24 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); - var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var23, 16777215, -1); - } - - String var25; - String var26; - short var45; - short var47; - if (Client.gameState == 20) { - Login.titleboxSprite.drawAt(Login.loginBoxX + 180 - Login.titleboxSprite.subWidth / 2, 271 - Login.titleboxSprite.subHeight / 2); - var45 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var45, 16776960, 0); - var46 = var45 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var46, 16776960, 0); - var46 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var46, 16776960, 0); - var46 += 15; - var46 += 7; - if (Login.loginIndex != 4) { - var0.draw("Login: ", Login.loginBoxX + 180 - 110, var46, 16777215, 0); - var47 = 200; - var25 = GrandExchangeOffer.clientPreferences.hideUsername ? Huffman.method3903(Login.Login_username) : Login.Login_username; - - for (var26 = var25; var0.stringWidth(var26) > var47; var26 = var26.substring(0, var26.length() - 1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var26), Login.loginBoxX + 180 - 70, var46, 16777215, 0); - var46 += 15; - var0.draw("Password: " + Huffman.method3903(Login.Login_password), Login.loginBoxX + 180 - 108, var46, 16777215, 0); - var46 += 15; - } - } - - if (Client.gameState == 10 || Client.gameState == 11) { - Login.titleboxSprite.drawAt(Login.loginBoxX, 171); - short var5; - if (Login.loginIndex == 0) { - var45 = 251; - var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var45, 16776960, 0); - var46 = var45 + 30; - var24 = Login.loginBoxX + 180 - 80; - var5 = 291; - Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var0.drawLines("New User", var24 - 73, var5 - 20, 144, 40, 16777215, 0, 1, 1, 0); - var24 = Login.loginBoxX + 180 + 80; - Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var0.drawLines("Existing User", var24 - 73, var5 - 20, 144, 40, 16777215, 0, 1, 1, 0); - } else if (Login.loginIndex == 1) { - var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); - var45 = 236; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var45, 16777215, 0); - var46 = var45 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var46, 16777215, 0); - var46 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var46, 16777215, 0); - var46 += 15; - var24 = Login.loginBoxX + 180 - 80; - var5 = 321; - Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var0.drawCentered("Continue", var24, var5 + 5, 16777215, 0); - var24 = Login.loginBoxX + 180 + 80; - Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var0.drawCentered("Cancel", var24, var5 + 5, 16777215, 0); - } else if (Login.loginIndex == 2) { - var45 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxCenter, var45, 16776960, 0); - var46 = var45 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxCenter, var46, 16776960, 0); - var46 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxCenter, var46, 16776960, 0); - var46 += 15; - var46 += 7; - var0.draw("Login: ", Login.loginBoxCenter - 110, var46, 16777215, 0); - var47 = 200; - var25 = GrandExchangeOffer.clientPreferences.hideUsername ? Huffman.method3903(Login.Login_username) : Login.Login_username; - - for (var26 = var25; var0.stringWidth(var26) > var47; var26 = var26.substring(1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var26) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? class16.colorStartTag(16776960) + "|" : ""), Login.loginBoxCenter - 70, var46, 16777215, 0); - var46 += 15; - var0.draw("Password: " + Huffman.method3903(Login.Login_password) + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? class16.colorStartTag(16776960) + "|" : ""), Login.loginBoxCenter - 108, var46, 16777215, 0); - var46 += 15; - var45 = 277; - var27 = Login.loginBoxCenter + -117; - boolean var9 = Client.Login_isUsernameRemembered; - boolean var10 = Login.field1169; - IndexedSprite var31 = var9 ? (var10 ? class96.field1303 : Login.options_buttons_2Sprite) : (var10 ? class83.field1136 : Login.options_buttons_0Sprite); - var31.drawAt(var27, var45); - var27 = var27 + var31.subWidth + 5; - var1.draw("Remember username", var27, var45 + 13, 16776960, 0); - var27 = Login.loginBoxCenter + 24; - boolean var13 = GrandExchangeOffer.clientPreferences.hideUsername; - boolean var14 = Login.field1170; - IndexedSprite var32 = var13 ? (var14 ? class96.field1303 : Login.options_buttons_2Sprite) : (var14 ? class83.field1136 : Login.options_buttons_0Sprite); - var32.drawAt(var27, var45); - var27 = var27 + var32.subWidth + 5; - var1.draw("Hide username", var27, var45 + 13, 16776960, 0); - var46 = var45 + 15; - int var15 = Login.loginBoxCenter - 80; - short var16 = 321; - Login.titlebuttonSprite.drawAt(var15 - 73, var16 - 20); - var0.drawCentered("Login", var15, var16 + 5, 16777215, 0); - var15 = Login.loginBoxCenter + 80; - Login.titlebuttonSprite.drawAt(var15 - 73, var16 - 20); - var0.drawCentered("Cancel", var15, var16 + 5, 16777215, 0); - var45 = 357; - switch(Login.field1161) { - case 2: - DynamicObject.field1268 = "Having trouble logging in?"; - break; - default: - DynamicObject.field1268 = "Can't login? Click here."; - } - - Decimator.field1443 = new Bounds(Login.loginBoxCenter, var45, var1.stringWidth(DynamicObject.field1268), 11); - MusicPatchPcmStream.field2466 = new Bounds(Login.loginBoxCenter, var45, var1.stringWidth("Still having trouble logging in?"), 11); - var1.drawCentered(DynamicObject.field1268, Login.loginBoxCenter, var45, 16777215, 0); - } else if (Login.loginIndex == 3) { - var45 = 201; - var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var45, 16776960, 0); - var46 = var45 + 20; - var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var46, 16776960, 0); - var46 += 15; - var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var46, 16776960, 0); - var46 += 15; - var24 = Login.loginBoxX + 180; - var5 = 276; - Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var2.drawCentered("Try again", var24, var5 + 5, 16777215, 0); - var24 = Login.loginBoxX + 180; - var5 = 326; - Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var2.drawCentered("Forgotten password?", var24, var5 + 5, 16777215, 0); - } else { - short var8; - if (Login.loginIndex == 4) { - var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); - var45 = 236; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var45, 16777215, 0); - var46 = var45 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var46, 16777215, 0); - var46 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var46, 16777215, 0); - var46 += 15; - var0.draw("PIN: " + Huffman.method3903(WorldMapSection1.otp) + (Client.cycle % 40 < 20 ? class16.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var46, 16777215, 0); - var46 -= 8; - var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var46, 16776960, 0); - var46 += 15; - var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var46, 16776960, 0); - var24 = 180 + Login.loginBoxX - 9 + var0.stringWidth("for 30 days: ") + 15; - var35 = var46 - var0.ascent; - IndexedSprite var48; - if (Login.field1171) { - var48 = Login.options_buttons_2Sprite; - } else { - var48 = Login.options_buttons_0Sprite; - } - - var48.drawAt(var24, var35); - var46 += 15; - var27 = Login.loginBoxX + 180 - 80; - var8 = 321; - Login.titlebuttonSprite.drawAt(var27 - 73, var8 - 20); - var0.drawCentered("Continue", var27, var8 + 5, 16777215, 0); - var27 = Login.loginBoxX + 180 + 80; - Login.titlebuttonSprite.drawAt(var27 - 73, var8 - 20); - var0.drawCentered("Cancel", var27, 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); - var45 = 221; - var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var45, 16776960, 0); - var46 = var45 + 15; - var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var46, 16776960, 0); - var46 += 15; - var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var46, 16776960, 0); - var46 += 15; - var46 += 14; - var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var46, 16777215, 0); - var47 = 174; - var25 = GrandExchangeOffer.clientPreferences.hideUsername ? Huffman.method3903(Login.Login_username) : Login.Login_username; - - for (var26 = var25; var0.stringWidth(var26) > var47; var26 = var26.substring(1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var26) + (Client.cycle % 40 < 20 ? class16.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var46, 16777215, 0); - var46 += 15; - var27 = Login.loginBoxX + 180 - 80; - var8 = 321; - Login.titlebuttonSprite.drawAt(var27 - 73, var8 - 20); - var0.drawCentered("Recover", var27, var8 + 5, 16777215, 0); - var27 = Login.loginBoxX + 180 + 80; - Login.titlebuttonSprite.drawAt(var27 - 73, var8 - 20); - var0.drawCentered("Back", var27, var8 + 5, 16777215, 0); - var8 = 356; - var1.drawCentered("Still having trouble logging in?", Login.loginBoxCenter, var8, 268435455, 0); - } else if (Login.loginIndex == 6) { - var45 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var45, 16776960, 0); - var46 = var45 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var46, 16776960, 0); - var46 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var46, 16776960, 0); - var46 += 15; - var24 = Login.loginBoxX + 180; - var5 = 321; - Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var0.drawCentered("Back", var24, var5 + 5, 16777215, 0); - } else if (Login.loginIndex == 7) { - var45 = 216; - var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var45, 16776960, 0); - var46 = var45 + 15; - var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var46, 16776960, 0); - var46 += 15; - var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var46, 16776960, 0); - var46 += 15; - var24 = Login.loginBoxX + 180 - 80; - var5 = 321; - Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var0.drawCentered("Set Date of Birth", var24, var5 + 5, 16777215, 0); - var24 = Login.loginBoxX + 180 + 80; - Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var0.drawCentered("Back", var24, var5 + 5, 16777215, 0); - } else if (Login.loginIndex == 8) { - var45 = 216; - var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var45, 16776960, 0); - var46 = var45 + 15; - var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var46, 16776960, 0); - var46 += 15; - var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var46, 16776960, 0); - var46 += 15; - var24 = Login.loginBoxX + 180 - 80; - var5 = 321; - Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var0.drawCentered("Privacy Policy", var24, var5 + 5, 16777215, 0); - var24 = Login.loginBoxX + 180 + 80; - Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var0.drawCentered("Back", var24, var5 + 5, 16777215, 0); - } else if (Login.loginIndex == 12) { - var45 = 201; - String var4 = ""; - var25 = ""; - var26 = ""; - switch(Login.field1160) { - case 0: - var4 = "Your account has been disabled."; - var25 = Strings.field2992; - var26 = ""; - break; - case 1: - var4 = "Account locked as we suspect it has been stolen."; - var25 = Strings.field2831; - var26 = ""; - break; - default: - GZipDecompressor.method6390(false); - } - - var0.drawCentered(var4, Login.loginBoxX + 180, var45, 16776960, 0); - var46 = var45 + 15; - var2.drawCentered(var25, Login.loginBoxX + 180, var46, 16776960, 0); - var46 += 15; - var2.drawCentered(var26, Login.loginBoxX + 180, var46, 16776960, 0); - var46 += 15; - var27 = Login.loginBoxX + 180; - var8 = 276; - Login.titlebuttonSprite.drawAt(var27 - 73, var8 - 20); - var0.drawCentered("Support Page", var27, var8 + 5, 16777215, 0); - var27 = Login.loginBoxX + 180; - var8 = 326; - Login.titlebuttonSprite.drawAt(var27 - 73, var8 - 20); - var0.drawCentered("Back", var27, var8 + 5, 16777215, 0); - } else if (Login.loginIndex == 24) { - var45 = 221; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var45, 16777215, 0); - var46 = var45 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var46, 16777215, 0); - var46 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var46, 16777215, 0); - var46 += 15; - var24 = Login.loginBoxX + 180; - var5 = 301; - Login.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var0.drawCentered("Ok", var24, var5 + 5, 16777215, 0); - } - } - } - - if (Client.gameState >= 10) { - int[] var3 = new int[4]; - Rasterizer2D.Rasterizer2D_getClipArray(var3); - Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, class30.canvasHeight); - Bounds.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); - Bounds.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); - Rasterizer2D.Rasterizer2D_setClipArray(var3); - } - - BoundaryObject.title_muteSprite[GrandExchangeOffer.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); - if (Client.gameState > 5 && Language.Language_EN == class60.clientLanguage) { - if (class195.field2368 != null) { - var46 = Login.xPadding + 5; - var47 = 463; - byte var36 = 100; - byte var6 = 35; - class195.field2368.drawAt(var46, var47); - var0.drawCentered("World" + " " + Client.worldId, var36 / 2 + var46, var6 / 2 + var47 - 2, 16777215, 0); - if (IgnoreList.World_request != null) { - var1.drawCentered("Loading...", var36 / 2 + var46, var6 / 2 + var47 + 12, 16777215, 0); - } else { - var1.drawCentered("Click to switch", var36 / 2 + var46, var6 / 2 + var47 + 12, 16777215, 0); - } - } else { - class195.field2368 = VertexNormal.SpriteBuffer_getIndexedSpriteByName(class2.archive8, "sl_button", ""); - } - } - } + + if (Client.meslayerContinueWidget != null) { + WorldMapID.invalidateWidget(Client.meslayerContinueWidget); + Client.meslayerContinueWidget = null; + } + } } diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java index fc14e3dfd1..50441e1201 100644 --- a/runescape-client/src/main/java/GrandExchangeEvents.java +++ b/runescape-client/src/main/java/GrandExchangeEvents.java @@ -4,26 +4,38 @@ import java.util.Comparator; import java.util.List; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("t") +@ObfuscatedName("j") @Implements("GrandExchangeEvents") public class GrandExchangeEvents { - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("GrandExchangeEvents_ageComparator") public static Comparator GrandExchangeEvents_ageComparator; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("GrandExchangeEvents_priceComparator") public static Comparator GrandExchangeEvents_priceComparator; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("GrandExchangeEvents_nameComparator") public static Comparator GrandExchangeEvents_nameComparator; - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("GrandExchangeEvents_quantityComparator") public static Comparator GrandExchangeEvents_quantityComparator; - @ObfuscatedName("s") + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 1066542769 + ) + @Export("PcmPlayer_count") + static int PcmPlayer_count; + @ObfuscatedName("gd") + @ObfuscatedSignature( + signature = "[Lli;" + ) + @Export("headIconHintSprites") + static Sprite[] headIconHintSprites; + @ObfuscatedName("c") @Export("events") public final List events; @@ -36,7 +48,7 @@ public class GrandExchangeEvents { } @ObfuscatedSignature( - signature = "(Lky;Z)V", + signature = "(Lkz;Z)V", garbageValue = "1" ) public GrandExchangeEvents(Buffer var1, boolean var2) { @@ -58,10 +70,10 @@ public class GrandExchangeEvents { } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(Ljava/util/Comparator;ZB)V", - garbageValue = "64" + garbageValue = "0" ) @Export("sort") public void sort(Comparator var1, boolean var2) { @@ -73,50 +85,72 @@ public class GrandExchangeEvents { } - @ObfuscatedName("l") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(ILcr;ZS)I", - garbageValue = "-10184" + signature = "(Lhz;Lhz;ZLkf;B)V", + garbageValue = "118" ) - static int method84(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { - var3 = WorldMapElement.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemId; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { - var3 = WorldMapElement.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - 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.IF_HASSUB) { - int var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var5); - 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; - } + public static void method69(AbstractArchive var0, AbstractArchive var1, boolean var2, Font var3) { + class65.ItemDefinition_archive = var0; + ItemDefinition.ItemDefinition_modelArchive = var1; + ItemDefinition.ItemDefinition_inMembersWorld = var2; + ItemDefinition.ItemDefinition_fileCount = class65.ItemDefinition_archive.getGroupFileCount(10); + class215.ItemDefinition_fontPlain11 = var3; } - @ObfuscatedName("gc") + @ObfuscatedName("jp") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "0" + signature = "(I)V", + garbageValue = "2004785230" ) - static boolean method81() { - return (Client.drawPlayerNames & 1) != 0; + static final void method66() { + Client.field815 = Client.cycleCntr; + } + + @ObfuscatedName("ko") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;ZB)Ljava/lang/String;", + garbageValue = "59" + ) + static String method67(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 (WorldMapArea.field217 != null) { + var3 = "/p=" + WorldMapArea.field217; + } + + String var4 = "runescape.com"; + return var2 + var0 + "." + var4 + "/l=" + class43.clientLanguage + "/a=" + MouseRecorder.field565 + var3 + "/"; + } + + @ObfuscatedName("kq") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "-1862958560" + ) + static String method68(String var0) { + PlayerType[] var1 = PlayerAppearance.PlayerType_values(); + + for (int var2 = 0; var2 < var1.length; ++var2) { + PlayerType var3 = var1[var2]; + if (var3.modIcon != -1 && var0.startsWith(ArchiveDiskAction.method4133(var3.modIcon))) { + var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); + break; + } + } + + return var0; } } diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java index 3032005634..ccbfdca142 100644 --- a/runescape-client/src/main/java/GrandExchangeOffer.java +++ b/runescape-client/src/main/java/GrandExchangeOffer.java @@ -5,51 +5,47 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("d") +@ObfuscatedName("z") @Implements("GrandExchangeOffer") public class GrandExchangeOffer { - @ObfuscatedName("st") - @ObfuscatedGetter( - intValue = 549974423 - ) - @Export("foundItemIndex") - static int foundItemIndex; - @ObfuscatedName("se") + @ObfuscatedName("d") + static int[] field67; + @ObfuscatedName("da") @ObfuscatedSignature( - signature = "Lbx;" + signature = "Lio;" ) - @Export("clientPreferences") - static ClientPreferences clientPreferences; - @ObfuscatedName("s") + @Export("archive1") + static Archive archive1; + @ObfuscatedName("c") @Export("state") byte state; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 416922963 + intValue = 742288721 ) @Export("id") public int id; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1858157699 + intValue = -900885629 ) @Export("unitPrice") public int unitPrice; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -214524093 + intValue = 915947343 ) @Export("totalQuantity") public int totalQuantity; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 280180281 + intValue = -1696571551 ) @Export("currentQuantity") public int currentQuantity; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 24514895 + intValue = 737013101 ) @Export("currentPrice") public int currentPrice; @@ -58,7 +54,7 @@ public class GrandExchangeOffer { } @ObfuscatedSignature( - signature = "(Lky;Z)V", + signature = "(Lkz;Z)V", garbageValue = "0" ) public GrandExchangeOffer(Buffer var1, boolean var2) { @@ -70,42 +66,42 @@ public class GrandExchangeOffer { this.currentPrice = var1.readInt(); } - @ObfuscatedName("i") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-1032509365" + signature = "(B)I", + garbageValue = "1" ) @Export("status") public int status() { return this.state & 7; } - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-636010194" + garbageValue = "639881605" ) @Export("type") public int type() { return (this.state & 8) == 8 ? 1 : 0; } - @ObfuscatedName("u") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1701823469" + garbageValue = "1620696399" ) - void method108(int var1) { + void method98(int var1) { this.state &= -8; this.state = (byte)(this.state | var1 & 7); } - @ObfuscatedName("n") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-184114003" + garbageValue = "-417146285" ) - void method124(int var1) { + void method92(int var1) { this.state &= -9; if (var1 == 1) { this.state = (byte)(this.state | 8); @@ -113,270 +109,203 @@ public class GrandExchangeOffer { } - @ObfuscatedName("k") + @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "(Ljava/lang/String;II)Z", - garbageValue = "-1475643333" + signature = "(ILcu;ZI)I", + garbageValue = "1743615056" ) - static boolean method109(String var0, int var1) { - return WorldMapSection0.method232(var0, var1, "openjs"); - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(ILcr;ZB)I", - garbageValue = "5" - ) - static int method123(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var3 = WorldMapElement.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - } else { - var3 = var2 ? class286.field3623 : class297.field3693; - } - - FriendSystem.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 = WorldMapIcon_1.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; - ItemDefinition var6 = WorldMapData_0.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.field2638 > 0) { - var3.modelZoom = var3.modelZoom * 32 / var3.field2638; - } else if (var3.rawWidth > 0) { - var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; - } - + static int method103(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = ClientPacket.loadWorlds() ? 1 : 0; return 1; - } - } - - @ObfuscatedName("hs") - @ObfuscatedSignature( - signature = "(ZLkx;B)V", - garbageValue = "104" - ) - @Export("updateNpcs") - static final void updateNpcs(boolean var0, PacketBuffer var1) { - Client.field899 = 0; - Client.field861 = 0; - GrandExchangeOfferUnitPriceComparator.readNpcUpdates(); - BoundaryObject.method3216(var0, var1); - method112(var1); - - int var2; - for (var2 = 0; var2 < Client.field899; ++var2) { - int var3 = Client.field655[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); - } - } - - } - } - - @ObfuscatedName("hj") - @ObfuscatedSignature( - signature = "(Lkx;I)V", - garbageValue = "494584381" - ) - static final void method112(PacketBuffer var0) { - for (int var1 = 0; var1 < Client.field861; ++var1) { - int var2 = Client.field669[var1]; - NPC var3 = Client.npcs[var2]; - int var4 = var0.readUnsignedByte(); - if ((var4 & 1) != 0) { - var3.targetIndex = var0.method5445(); - if (var3.targetIndex == 65535) { - var3.targetIndex = -1; - } - } - - int var5; - int var6; - int var7; - int var8; - if ((var4 & 64) != 0) { - var5 = var0.method5447(); - var6 = var0.method5447(); - var7 = var3.x - (var5 - PacketWriter.baseX * 64 - PacketWriter.baseX * 64) * 64; - var8 = var3.y - (var6 - RouteStrategy.baseY * 64 - RouteStrategy.baseY * 64) * 64; - if (var7 != 0 || var8 != 0) { - var3.field946 = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047; - } - } - - if ((var4 & 32) != 0) { - var5 = var0.readUnsignedShort(); - if (var5 == 65535) { - var5 = -1; + World var3; + if (var0 == ScriptOpcodes.WORLDLIST_START) { + var3 = class185.worldListStart(); + if (var3 != null) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.id; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.properties; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3.activity; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.location; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.population; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3.host; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; } - var6 = var0.method5438(); - if (var5 == var3.sequence && var5 != -1) { - var7 = Widget.SequenceDefinition_get(var5).field3492; - if (var7 == 1) { - var3.sequenceFrame = 0; - var3.sequenceFrameCycle = 0; - var3.sequenceDelay = var6; - var3.field964 = 0; - } - - if (var7 == 2) { - var3.field964 = 0; - } - } else if (var5 == -1 || var3.sequence == -1 || Widget.SequenceDefinition_get(var5).field3508 >= Widget.SequenceDefinition_get(var3.sequence).field3508) { - var3.sequence = var5; - var3.sequenceFrame = 0; - var3.sequenceFrameCycle = 0; - var3.sequenceDelay = var6; - var3.field964 = 0; - var3.field947 = var3.pathLength; - } - } - - if ((var4 & 4) != 0) { - var3.definition = ViewportMouse.getNpcDefinition(var0.readUnsignedShort()); - var3.size = var3.definition.size * 64; - var3.field971 = var3.definition.rotation; - var3.walkSequence = var3.definition.walkSequence; - var3.walkBackSequence = var3.definition.walkBackSequence; - var3.walkLeftSequence = var3.definition.walkLeftSequence; - var3.walkRightSequence = var3.definition.walkRightSequence; - var3.readySequence = var3.definition.readySequence; - var3.turnLeftSequence = var3.definition.turnLeftSequence; - var3.turnRightSequence = var3.definition.turnRightSequence; - } - - if ((var4 & 16) != 0) { - var5 = var0.readUnsignedByteNegate(); - 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); - } + return 1; + } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { + var3 = Frames.getNextWorldListWorld(); + if (var3 != null) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.id; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.properties; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3.activity; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.location; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.population; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3.host; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; } - var6 = var0.method5436(); - if (var6 > 0) { - for (var7 = 0; var7 < var6; ++var7) { - var8 = var0.readUShortSmart(); - var9 = var0.readUShortSmart(); - if (var9 != 32767) { - var10 = var0.readUShortSmart(); - var11 = var0.readUnsignedByte(); - int var12 = var9 > 0 ? var0.method5438() : var11; - var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12); - } else { - var3.removeHealthBar(var8); + return 1; + } else { + World var4; + int var5; + int var7; + if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { + var7 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + var4 = null; + + for (var5 = 0; var5 < World.World_count; ++var5) { + if (var7 == World.World_worlds[var5].id) { + var4 = World.World_worlds[var5]; + break; } } - } - } - if ((var4 & 8) != 0) { - var3.spotAnimation = var0.method5445(); - var5 = var0.method5455(); - var3.heightOffset = var5 >> 16; - var3.field958 = (var5 & 65535) + Client.cycle; - var3.spotAnimationFrame = 0; - var3.spotAnimationFrameCycle = 0; - if (var3.field958 > Client.cycle) { - var3.spotAnimationFrame = -1; - } + if (var4 != null) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var4.id; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var4.properties; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var4.activity; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var4.location; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var4.population; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var4.host; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + } - if (var3.spotAnimation == 65535) { - var3.spotAnimation = -1; - } - } + return 1; + } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { + class160.Interpreter_intStackSize -= 4; + var7 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + boolean var10 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1] == 1; + var5 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 2]; + boolean var6 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 3] == 1; + WorldMapID.sortWorldList(var7, var10, var5, var6); + return 1; + } else if (var0 != ScriptOpcodes.GETWORLDINFO) { + if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { + Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + return 1; + } else { + int var8; + ParamDefinition var9; + if (var0 == ScriptOpcodes.NC_PARAM) { + class160.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + var9 = GrandExchangeOfferTotalQuantityComparator.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = FontName.getNpcDefinition(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = FontName.getNpcDefinition(var7).getIntParam(var8, var9.defaultInt); + } - if ((var4 & 2) != 0) { - var3.overheadText = var0.readStringCp1252NullTerminated(); - var3.overheadTextCyclesRemaining = 100; + return 1; + } else if (var0 == ScriptOpcodes.LC_PARAM) { + class160.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + var9 = GrandExchangeOfferTotalQuantityComparator.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = WallDecoration.getObjectDefinition(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = WallDecoration.getObjectDefinition(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_PARAM) { + class160.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + var9 = GrandExchangeOfferTotalQuantityComparator.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = Player.ItemDefinition_get(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Player.ItemDefinition_get(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { + class160.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + var9 = GrandExchangeOfferTotalQuantityComparator.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = class225.StructDefinition_getStructDefinition(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = class225.StructDefinition_getStructDefinition(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } else if (var0 == ScriptOpcodes.ON_MOBILE) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLIENTTYPE) { + Interpreter.Interpreter_intStack[++class160.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) { + --TextureProvider.Interpreter_stringStackSize; + --class160.Interpreter_intStackSize; + return 1; + } else if (var0 == 6523) { + --TextureProvider.Interpreter_stringStackSize; + --class160.Interpreter_intStackSize; + return 1; + } else if (var0 == ScriptOpcodes.BATTERYLEVEL) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1; + return 1; + } else if (var0 == ScriptOpcodes.BATTERYCHARGING) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 1; + return 1; + } else if (var0 == ScriptOpcodes.WIFIAVAILABLE) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 1; + return 1; + } else { + return 2; + } + } + } else { + var7 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + if (var7 >= 0 && var7 < World.World_count) { + var4 = World.World_worlds[var7]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var4.id; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var4.properties; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var4.activity; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var4.location; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var4.population; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var4.host; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } } } - - } - - @ObfuscatedName("li") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "869899201" - ) - static void method122() { - if (Client.field706 && WorldMapIcon_1.localPlayer != null) { - int var0 = WorldMapIcon_1.localPlayer.pathX[0]; - int var1 = WorldMapIcon_1.localPlayer.pathY[0]; - if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) { - return; - } - - DynamicObject.oculusOrbFocalPointX = WorldMapIcon_1.localPlayer.x; - int var2 = GrandExchangeOfferTotalQuantityComparator.getTileHeight(WorldMapIcon_1.localPlayer.x, WorldMapIcon_1.localPlayer.y, ItemContainer.plane) - Client.camFollowHeight; - if (var2 < ScriptEvent.field559) { - ScriptEvent.field559 = var2; - } - - FriendSystem.oculusOrbFocalPointY = WorldMapIcon_1.localPlayer.y; - Client.field706 = false; - } - } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java index f7bc568d98..0429d98d68 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java @@ -4,150 +4,43 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("r") +@ObfuscatedName("f") @Implements("GrandExchangeOfferAgeComparator") final class GrandExchangeOfferAgeComparator implements Comparator { - @ObfuscatedName("s") + @ObfuscatedName("gj") + @Export("xteaKeys") + static int[][] xteaKeys; + + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lq;Lq;B)I", - garbageValue = "-1" + signature = "(Lv;Lv;I)I", + garbageValue = "-231146255" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.age < var2.age ? -1 : (var1.age == var2.age ? 0 : 1); } - public boolean equals(Object var1) { - return super.equals(var1); - } - public int compare(Object var1, Object var2) { return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(IIIIB)V", - garbageValue = "125" - ) - static void method156(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.field1052 * 16384) { - var5 += var1 - var4.field1052 * 16384; - } else if (var1 < var4.x * 16384) { - var5 += var4.x * 16384 - var1; - } - - if (var2 > var4.field1053 * 16384) { - var5 += var2 - var4.field1053 * 16384; - } else if (var2 < var4.y * 16384) { - var5 += var4.y * 16384 - var2; - } - - if (var5 - 64 <= var4.field1054 && Client.field860 != 0 && var0 == var4.plane) { - var5 -= 64; - if (var5 < 0) { - var5 = 0; - } - - int var6 = (var4.field1054 - var5) * Client.field860 / var4.field1054; - if (var4.stream1 == null) { - if (var4.soundEffectId >= 0) { - SoundEffect var7 = SoundEffect.readSoundEffect(WorldMapSprite.archive4, var4.soundEffectId, 0); - if (var7 != null) { - RawSound var8 = var7.toRawSound().resample(class247.decimator); - RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6); - var9.setNumLoops(-1); - IgnoreList.pcmStreamMixer.addSubStream(var9); - var4.stream1 = var9; - } - } - } else { - var4.stream1.method2599(var6); - } - - if (var4.stream2 == null) { - if (var4.soundEffectIds != null && (var4.field1056 -= var3) <= 0) { - int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length); - SoundEffect var12 = SoundEffect.readSoundEffect(WorldMapSprite.archive4, var4.soundEffectIds[var11], 0); - if (var12 != null) { - RawSound var13 = var12.toRawSound().resample(class247.decimator); - RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6); - var10.setNumLoops(0); - IgnoreList.pcmStreamMixer.addSubStream(var10); - var4.stream2 = var10; - var4.field1056 = var4.field1057 + (int)(Math.random() * (double)(var4.field1058 - var4.field1057)); - } - } - } else { - var4.stream2.method2599(var6); - if (!var4.stream2.hasNext()) { - var4.stream2 = null; - } - } - } else { - if (var4.stream1 != null) { - IgnoreList.pcmStreamMixer.removeSubStream(var4.stream1); - var4.stream1 = null; - } - - if (var4.stream2 != null) { - IgnoreList.pcmStreamMixer.removeSubStream(var4.stream2); - var4.stream2 = null; - } - } - } - } - + public boolean equals(Object var1) { + return super.equals(var1); } - @ObfuscatedName("i") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1443594244" + signature = "(Lhy;IIII)V", + garbageValue = "-1708148250" ) - @Export("savePreferences") - static void savePreferences() { - AccessFile var0 = null; - - try { - var0 = TaskHandler.getPreferencesFile("", WorldMapRectangle.field166.name, true); - Buffer var1 = GrandExchangeOffer.clientPreferences.toBuffer(); - var0.write(var1.array, 0, var1.offset); - } catch (Exception var3) { + @Export("Widget_setKeyRate") + static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { + if (var0.field2615 == null) { + throw new RuntimeException(); + } else { + var0.field2615[var1] = var2; + var0.field2616[var1] = var3; } - - try { - if (var0 != null) { - var0.closeSync(true); - } - } catch (Exception var2) { - } - - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(I)Lbl;", - garbageValue = "-1436154979" - ) - @Export("getNextWorldListWorld") - static World getNextWorldListWorld() { - return World.World_listCount < World.World_count ? ChatChannel.World_worlds[++World.World_listCount - 1] : null; - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "4" - ) - @Export("Widget_clearCached") - public static void Widget_clearCached() { - Widget.Widget_cachedSprites.clear(); - Widget.Widget_cachedModels.clear(); - Widget.Widget_cachedFonts.clear(); - Widget.Widget_cachedSpriteMasks.clear(); } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java index 4f43b80115..4faf9775c9 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java @@ -1,450 +1,73 @@ import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("c") +@ObfuscatedName("h") @Implements("GrandExchangeOfferNameComparator") final class GrandExchangeOfferNameComparator implements Comparator { - @ObfuscatedName("s") + @ObfuscatedName("ne") + @ObfuscatedGetter( + intValue = 1296404691 + ) + static int field79; + @ObfuscatedName("sp") + @ObfuscatedGetter( + intValue = -1426574287 + ) + @Export("foundItemIdCount") + static int foundItemIdCount; + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lq;Lq;B)I", - garbageValue = "68" + signature = "Lhz;" + ) + @Export("ObjectDefinition_archive") + public static AbstractArchive ObjectDefinition_archive; + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(Lv;Lv;I)I", + garbageValue = "576633421" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.getOfferName().compareTo(var2.getOfferName()); } - 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("an") - @ObfuscatedSignature( - signature = "(ILcr;ZB)I", - garbageValue = "68" - ) - static int method150(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]; - WorldMapIcon_0.privateChatMode = class270.method4895(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - if (WorldMapIcon_0.privateChatMode == null) { - WorldMapIcon_0.privateChatMode = PrivateChatMode.field3788; - } + public int compare(Object var1, Object var2) { + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + } - Client.tradeChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - PacketBufferNode var18 = MenuAction.getPacketBufferNode(ClientPacket.field2200, Client.packetWriter.isaacCipher); - var18.packetBuffer.writeByte(Client.publicChatMode); - var18.packetBuffer.writeByte(WorldMapIcon_0.privateChatMode.field3791); - var18.packetBuffer.writeByte(Client.tradeChatMode); - Client.packetWriter.addNode(var18); - return 1; + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(Lhz;Ljava/lang/String;Ljava/lang/String;I)[Llt;", + garbageValue = "-527219234" + ) + public static IndexedSprite[] method122(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); + int var4 = var0.getFileId(var3, var2); + byte[] var7 = var0.takeFile(var3, var4); + boolean var6; + if (var7 == null) { + var6 = false; } else { - String var3; - int var4; - if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - Interpreter.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - PacketBufferNode var6 = MenuAction.getPacketBufferNode(ClientPacket.field2223, Client.packetWriter.isaacCipher); - var6.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var3) + 2); - var6.packetBuffer.writeStringCp1252NullTerminated(var3); - var6.packetBuffer.writeByte(var4 - 1); - var6.packetBuffer.writeByte(var5); - Client.packetWriter.addNode(var6); - return 1; - } else { - int var10; - if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { - Interpreter.Interpreter_intStackSize -= 2; - var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Message var15 = FileSystem.Messages_getByChannelAndID(var10, var4); - if (var15 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var15.count; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var15.cycle; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.sender != null ? var15.sender : ""; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.prefix != null ? var15.prefix : ""; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.text != null ? var15.text : ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var15.isFromFriend() ? 1 : (var15.isFromIgnored() ? 2 : 0); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.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[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Message var16 = class227.Messages_getMessage(var10); - if (var16 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var16.type; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var16.cycle; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.sender != null ? var16.sender : ""; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.prefix != null ? var16.prefix : ""; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.text != null ? var16.text : ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var16.isFromFriend() ? 1 : (var16.isFromIgnored() ? 2 : 0); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.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[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { - if (WorldMapIcon_0.privateChatMode == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapIcon_0.privateChatMode.field3791; - } - - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - String var14 = var3.toLowerCase(); - byte var17 = 0; - if (var14.startsWith("yellow:")) { - var17 = 0; - var3 = var3.substring("yellow:".length()); - } else if (var14.startsWith("red:")) { - var17 = 1; - var3 = var3.substring("red:".length()); - } else if (var14.startsWith("green:")) { - var17 = 2; - var3 = var3.substring("green:".length()); - } else if (var14.startsWith("cyan:")) { - var17 = 3; - var3 = var3.substring("cyan:".length()); - } else if (var14.startsWith("purple:")) { - var17 = 4; - var3 = var3.substring("purple:".length()); - } else if (var14.startsWith("white:")) { - var17 = 5; - var3 = var3.substring("white:".length()); - } else if (var14.startsWith("flash1:")) { - var17 = 6; - var3 = var3.substring("flash1:".length()); - } else if (var14.startsWith("flash2:")) { - var17 = 7; - var3 = var3.substring("flash2:".length()); - } else if (var14.startsWith("flash3:")) { - var17 = 8; - var3 = var3.substring("flash3:".length()); - } else if (var14.startsWith("glow1:")) { - var17 = 9; - var3 = var3.substring("glow1:".length()); - } else if (var14.startsWith("glow2:")) { - var17 = 10; - var3 = var3.substring("glow2:".length()); - } else if (var14.startsWith("glow3:")) { - var17 = 11; - var3 = var3.substring("glow3:".length()); - } else if (class60.clientLanguage != Language.Language_EN) { - if (var14.startsWith("yellow:")) { - var17 = 0; - var3 = var3.substring("yellow:".length()); - } else if (var14.startsWith("red:")) { - var17 = 1; - var3 = var3.substring("red:".length()); - } else if (var14.startsWith("green:")) { - var17 = 2; - var3 = var3.substring("green:".length()); - } else if (var14.startsWith("cyan:")) { - var17 = 3; - var3 = var3.substring("cyan:".length()); - } else if (var14.startsWith("purple:")) { - var17 = 4; - var3 = var3.substring("purple:".length()); - } else if (var14.startsWith("white:")) { - var17 = 5; - var3 = var3.substring("white:".length()); - } else if (var14.startsWith("flash1:")) { - var17 = 6; - var3 = var3.substring("flash1:".length()); - } else if (var14.startsWith("flash2:")) { - var17 = 7; - var3 = var3.substring("flash2:".length()); - } else if (var14.startsWith("flash3:")) { - var17 = 8; - var3 = var3.substring("flash3:".length()); - } else if (var14.startsWith("glow1:")) { - var17 = 9; - var3 = var3.substring("glow1:".length()); - } else if (var14.startsWith("glow2:")) { - var17 = 10; - var3 = var3.substring("glow2:".length()); - } else if (var14.startsWith("glow3:")) { - var17 = 11; - var3 = var3.substring("glow3:".length()); - } - } - - var14 = var3.toLowerCase(); - byte var7 = 0; - if (var14.startsWith("wave:")) { - var7 = 1; - var3 = var3.substring("wave:".length()); - } else if (var14.startsWith("wave2:")) { - var7 = 2; - var3 = var3.substring("wave2:".length()); - } else if (var14.startsWith("shake:")) { - var7 = 3; - var3 = var3.substring("shake:".length()); - } else if (var14.startsWith("scroll:")) { - var7 = 4; - var3 = var3.substring("scroll:".length()); - } else if (var14.startsWith("slide:")) { - var7 = 5; - var3 = var3.substring("slide:".length()); - } else if (Language.Language_EN != class60.clientLanguage) { - if (var14.startsWith("wave:")) { - var7 = 1; - var3 = var3.substring("wave:".length()); - } else if (var14.startsWith("wave2:")) { - var7 = 2; - var3 = var3.substring("wave2:".length()); - } else if (var14.startsWith("shake:")) { - var7 = 3; - var3 = var3.substring("shake:".length()); - } else if (var14.startsWith("scroll:")) { - var7 = 4; - var3 = var3.substring("scroll:".length()); - } else if (var14.startsWith("slide:")) { - var7 = 5; - var3 = var3.substring("slide:".length()); - } - } - - PacketBufferNode var8 = MenuAction.getPacketBufferNode(ClientPacket.field2282, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeByte(0); - int var9 = var8.packetBuffer.offset; - var8.packetBuffer.writeByte(var4); - var8.packetBuffer.writeByte(var17); - var8.packetBuffer.writeByte(var7); - SpotAnimationDefinition.method4334(var8.packetBuffer, var3); - var8.packetBuffer.writeLengthByte(var8.packetBuffer.offset - var9); - Client.packetWriter.addNode(var8); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { - Interpreter.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; - String var12 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; - PacketBufferNode var11 = MenuAction.getPacketBufferNode(ClientPacket.field2210, Client.packetWriter.isaacCipher); - var11.packetBuffer.writeShort(0); - int var13 = var11.packetBuffer.offset; - var11.packetBuffer.writeStringCp1252NullTerminated(var3); - SpotAnimationDefinition.method4334(var11.packetBuffer, var12); - var11.packetBuffer.writeLengthShort(var11.packetBuffer.offset - var13); - Client.packetWriter.addNode(var11); - 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) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = BoundaryObject.Messages_getHistorySize(var10); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = FaceNormal.Messages_getNextChatID(var10); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Language.Messages_getLastChatID(var10); - return 1; - } else if (var0 == ScriptOpcodes.DOCHEAT) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - BuddyRankComparator.doCheat(var3); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { - Client.field668 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize].toLowerCase().trim(); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Client.field668; - return 1; - } else if (var0 == 5023) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - System.out.println(var3); - return 1; - } else { - return 2; - } - } else { - if (WorldMapIcon_1.localPlayer != null && WorldMapIcon_1.localPlayer.username != null) { - var3 = WorldMapIcon_1.localPlayer.username.getName(); - } else { - var3 = ""; - } - - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3; - return 1; - } - } - } - } - - @ObfuscatedName("fl") - @ObfuscatedSignature( - signature = "(Lbu;S)V", - garbageValue = "134" - ) - static final void method149(Actor var0) { - var0.isWalking = false; - SequenceDefinition var1; - if (var0.movementSequence != -1) { - var1 = Widget.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; - class325.addSequenceSoundEffect(var1, var0.movementFrame, var0.x, var0.y); - } - - if (var0.movementFrame >= var1.frameIds.length) { - var0.movementFrameCycle = 0; - var0.movementFrame = 0; - class325.addSequenceSoundEffect(var1, var0.movementFrame, var0.x, var0.y); - } - } else { - var0.movementSequence = -1; - } + GrandExchangeOfferWorldComparator.SpriteBuffer_decode(var7); + var6 = true; } - if (var0.spotAnimation != -1 && Client.cycle >= var0.field958) { - if (var0.spotAnimationFrame < 0) { - var0.spotAnimationFrame = 0; - } - - int var3 = HealthBarUpdate.SpotAnimationDefinition_get(var0.spotAnimation).sequence; - if (var3 != -1) { - SequenceDefinition var2 = Widget.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; - class325.addSequenceSoundEffect(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 = Widget.SequenceDefinition_get(var0.sequence); - if (var1.field3506 == 1 && var0.field947 > 0 && var0.field941 <= Client.cycle && var0.field965 < Client.cycle) { - var0.sequenceDelay = 1; - return; - } - } - - if (var0.sequence != -1 && var0.sequenceDelay == 0) { - var1 = Widget.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; - class325.addSequenceSoundEffect(var1, var0.sequenceFrame, var0.x, var0.y); - } - - if (var0.sequenceFrame >= var1.frameIds.length) { - var0.sequenceFrame -= var1.frameCount; - ++var0.field964; - if (var0.field964 >= var1.field3502) { - var0.sequence = -1; - } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) { - class325.addSequenceSoundEffect(var1, var0.sequenceFrame, var0.x, var0.y); - } else { - var0.sequence = -1; - } - } - - var0.isWalking = var1.field3501; - } else { - var0.sequence = -1; - } - } - - if (var0.sequenceDelay > 0) { - --var0.sequenceDelay; - } - - } - - @ObfuscatedName("hh") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1895114197" - ) - @Export("calculateMenuBounds") - static void calculateMenuBounds() { - WorldMapData_1.calculateMenuBounds(World.menuWidth / 2 + MilliClock.menuX, class96.menuY); - } - - @ObfuscatedName("iu") - @ObfuscatedSignature( - signature = "(IIIZI)V", - garbageValue = "1199898430" - ) - @Export("resizeComponents") - static final void resizeComponents(int var0, int var1, int var2, boolean var3) { - if (Projectile.loadInterface(var0)) { - ItemContainer.resizeInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3); - } - } - - @ObfuscatedName("kc") - @ObfuscatedSignature( - signature = "(IIIILls;Lhg;I)V", - garbageValue = "1652604393" - ) - @Export("worldToMinimap") - static final void worldToMinimap(int var0, int var1, int var2, int var3, Sprite 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; - UserComparator3.redHintArrowSprite.method6022(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); + IndexedSprite[] var5; + if (!var6) { + var5 = null; } else { - class191.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); + var5 = FileSystem.method3489(); } + return var5; } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java index b8132203d3..1a15d3f78e 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java @@ -4,26 +4,26 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("br") +@ObfuscatedName("bh") @Implements("GrandExchangeOfferOwnWorldComparator") public class GrandExchangeOfferOwnWorldComparator implements Comparator { - @ObfuscatedName("gd") + @ObfuscatedName("dm") @ObfuscatedSignature( - signature = "[Llq;" + signature = "Lfc;" ) - @Export("mapSceneSprites") - static IndexedSprite[] mapSceneSprites; - @ObfuscatedName("s") + @Export("js5SocketTask") + static Task js5SocketTask; + @ObfuscatedName("c") @Export("filterWorlds") boolean filterWorlds; GrandExchangeOfferOwnWorldComparator() { } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lq;Lq;I)I", - garbageValue = "-1137362043" + signature = "(Lv;Lv;S)I", + garbageValue = "27782" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -44,119 +44,78 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { } } - 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("d") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "1333427398" - ) - @Export("setLoginResponseString") - static void setLoginResponseString(String var0, String var1, String var2) { - Login.Login_response1 = var0; - Login.Login_response2 = var1; - Login.Login_response3 = var2; + public int compare(Object var1, Object var2) { + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } - @ObfuscatedName("ev") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "-84" + signature = "([BIIII[Lfj;I)V", + garbageValue = "-1084526407" ) - @Export("getLoginError") - static void getLoginError(int var0) { - if (var0 == -3) { - setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); - } else if (var0 == -2) { - setLoginResponseString("", "Error connecting to server.", ""); - } else if (var0 == -1) { - setLoginResponseString("No response from server.", "Please try using a different world.", ""); - } else if (var0 == 3) { - Login.loginIndex = 3; - Login.field1161 = 1; - } else if (var0 == 4) { - Login.loginIndex = 12; - Login.field1160 = 0; - } else if (var0 == 5) { - Login.field1161 = 2; - 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) { - setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); - } else if (var0 == 7) { - setLoginResponseString("This world is full.", "Please use a different world.", ""); - } else if (var0 == 8) { - setLoginResponseString("Unable to connect.", "Login server offline.", ""); - } else if (var0 == 9) { - setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); - } else if (var0 == 10) { - setLoginResponseString("Unable to connect.", "Bad session id.", ""); - } else if (var0 == 11) { - setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); - } else if (var0 == 12) { - setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); - } else if (var0 == 13) { - setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); - } else if (var0 == 14) { - setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 16) { - setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); - } else if (var0 == 17) { - 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.field1160 = 1; - } else if (var0 == 19) { - setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); - } else if (var0 == 20) { - setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); - } else if (var0 == 22) { - setLoginResponseString("Malformed login packet.", "Please try again.", ""); - } else if (var0 == 23) { - setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 24) { - setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); - } else if (var0 == 25) { - setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); - } else if (var0 == 26) { - setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); - } else if (var0 == 27) { - setLoginResponseString("", "Service unavailable.", ""); - } else if (var0 == 31) { - 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) { - 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) { - setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); - } else if (var0 == 38) { - 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) { - setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); - FloorDecoration.updateGameState(11); - return; - } - - if (var0 == 57) { - setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); - FloorDecoration.updateGameState(11); - return; - } - - if (var0 == 61) { - Login.loginIndex = 7; - } else { - setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); + static final void method1244(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; + } + } } } - FloorDecoration.updateGameState(10); + Buffer var10 = new Buffer(var0); + + for (var7 = 0; var7 < 4; ++var7) { + for (var8 = 0; var8 < 64; ++var8) { + for (int var9 = 0; var9 < 64; ++var9) { + class32.loadTerrain(var10, var7, var8 + var1, var9 + var2, var3, var4, 0); + } + } + } + + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "(II)I", + garbageValue = "1688016819" + ) + @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.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; + } + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-325368382" + ) + static void method1232() { + Login.worldSelectOpen = false; + Login.leftTitleSprite.drawAt(Login.xPadding, 0); + class191.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + HealthBar.logoSprite.drawAt(Login.xPadding + 382 - HealthBar.logoSprite.subWidth / 2, 18); + } + + @ObfuscatedName("aw") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)I", + garbageValue = "1088235300" + ) + public static int method1245(String var0) { + return var0.length() + 2; } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java index 07a42e8099..2390b454f0 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java @@ -1,3 +1,4 @@ +import java.lang.management.GarbageCollectorMXBean; import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; @@ -5,568 +6,57 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("x") +@ObfuscatedName("d") @Implements("GrandExchangeOfferTotalQuantityComparator") final class GrandExchangeOfferTotalQuantityComparator implements Comparator { - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "Lhz;" - ) - @Export("HitSplatDefinition_spritesArchive") - public static AbstractArchive HitSplatDefinition_spritesArchive; - @ObfuscatedName("ep") + @ObfuscatedName("ac") + @Export("garbageCollector") + static GarbageCollectorMXBean garbageCollector; + @ObfuscatedName("hy") @ObfuscatedGetter( - intValue = 349503159 + intValue = -1848118147 ) - static int field59; + @Export("cameraY") + static int cameraY; - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lq;Lq;I)I", - garbageValue = "-1907717670" + signature = "(Lv;Lv;I)I", + garbageValue = "1419484112" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.grandExchangeOffer.totalQuantity < var2.grandExchangeOffer.totalQuantity ? -1 : (var2.grandExchangeOffer.totalQuantity == var1.grandExchangeOffer.totalQuantity ? 0 : 1); } - public boolean equals(Object var1) { - return super.equals(var1); - } - public int compare(Object var1, Object var2) { return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(Lea;[Lfm;I)V", - garbageValue = "-207613599" - ) - static final void method98(Scene var0, CollisionMap[] var1) { - int var2; - int var3; - int var4; - int var5; - for (var2 = 0; var2 < 4; ++var2) { - for (var3 = 0; var3 < 104; ++var3) { - for (var4 = 0; var4 < 104; ++var4) { - if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) == 1) { - var5 = var2; - if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { - var5 = var2 - 1; - } - - if (var5 >= 0) { - var1[var5].setBlockedByFloor(var3, var4); - } - } - } - } - } - - Tiles.field477 += (int)(Math.random() * 5.0D) - 2; - if (Tiles.field477 < -8) { - Tiles.field477 = -8; - } - - if (Tiles.field477 > 8) { - Tiles.field477 = 8; - } - - Tiles.field486 += (int)(Math.random() * 5.0D) - 2; - if (Tiles.field486 < -16) { - Tiles.field486 = -16; - } - - if (Tiles.field486 > 16) { - Tiles.field486 = 16; - } - - int var9; - int var10; - int var11; - int var12; - int var13; - int var14; - int var15; - int var16; - int[] var10000; - int var17; - int var18; - for (var2 = 0; var2 < 4; ++var2) { - byte[][] var44 = class188.field2321[var2]; - var9 = (int)Math.sqrt(5100.0D); - var10 = var9 * 768 >> 8; - - int var19; - int var20; - for (var11 = 1; var11 < 103; ++var11) { - for (var12 = 1; var12 < 103; ++var12) { - var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11]; - var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1]; - var15 = (int)Math.sqrt((double)(var13 * var13 + var14 * var14 + 65536)); - var16 = (var13 << 8) / var15; - var17 = 65536 / var15; - var18 = (var14 << 8) / var15; - var19 = (var16 * -50 + var18 * -50 + var17 * -10) / var10 + 96; - var20 = (var44[var12][var11 + 1] >> 3) + (var44[var12 - 1][var11] >> 2) + (var44[var12][var11 - 1] >> 2) + (var44[var12 + 1][var11] >> 3) + (var44[var12][var11] >> 1); - class4.field31[var12][var11] = var19 - var20; - } - } - - for (var11 = 0; var11 < 104; ++var11) { - Tiles.Tiles_hue[var11] = 0; - class3.Tiles_saturation[var11] = 0; - Buddy.Tiles_lightness[var11] = 0; - class49.Tiles_hueMultiplier[var11] = 0; - MenuAction.field1129[var11] = 0; - } - - for (var11 = -5; var11 < 109; ++var11) { - for (var12 = 0; var12 < 104; ++var12) { - var13 = var11 + 5; - int var10002; - if (var13 >= 0 && var13 < 104) { - var14 = Tiles.field485[var2][var13][var12] & 255; - if (var14 > 0) { - FloorUnderlayDefinition var45 = StudioGame.FloorUnderlayDefinition_get(var14 - 1); - var10000 = Tiles.Tiles_hue; - var10000[var12] += var45.hue; - var10000 = class3.Tiles_saturation; - var10000[var12] += var45.saturation; - var10000 = Buddy.Tiles_lightness; - var10000[var12] += var45.lightness; - var10000 = class49.Tiles_hueMultiplier; - var10000[var12] += var45.hueMultiplier; - var10002 = MenuAction.field1129[var12]++; - } - } - - var14 = var11 - 5; - if (var14 >= 0 && var14 < 104) { - var15 = Tiles.field485[var2][var14][var12] & 255; - if (var15 > 0) { - FloorUnderlayDefinition var46 = StudioGame.FloorUnderlayDefinition_get(var15 - 1); - var10000 = Tiles.Tiles_hue; - var10000[var12] -= var46.hue; - var10000 = class3.Tiles_saturation; - var10000[var12] -= var46.saturation; - var10000 = Buddy.Tiles_lightness; - var10000[var12] -= var46.lightness; - var10000 = class49.Tiles_hueMultiplier; - var10000[var12] -= var46.hueMultiplier; - var10002 = MenuAction.field1129[var12]--; - } - } - } - - if (var11 >= 1 && var11 < 103) { - var12 = 0; - var13 = 0; - var14 = 0; - var15 = 0; - var16 = 0; - - for (var17 = -5; var17 < 109; ++var17) { - var18 = var17 + 5; - if (var18 >= 0 && var18 < 104) { - var12 += Tiles.Tiles_hue[var18]; - var13 += class3.Tiles_saturation[var18]; - var14 += Buddy.Tiles_lightness[var18]; - var15 += class49.Tiles_hueMultiplier[var18]; - var16 += MenuAction.field1129[var18]; - } - - var19 = var17 - 5; - if (var19 >= 0 && var19 < 104) { - var12 -= Tiles.Tiles_hue[var19]; - var13 -= class3.Tiles_saturation[var19]; - var14 -= Buddy.Tiles_lightness[var19]; - var15 -= class49.Tiles_hueMultiplier[var19]; - var16 -= MenuAction.field1129[var19]; - } - - if (var17 >= 1 && var17 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var11][var17] & 2) != 0 || (Tiles.Tiles_renderFlags[var2][var11][var17] & 16) == 0)) { - if (var2 < Tiles.Tiles_minPlane) { - Tiles.Tiles_minPlane = var2; - } - - var20 = Tiles.field485[var2][var11][var17] & 255; - int var21 = AccessFile.field4061[var2][var11][var17] & 255; - if (var20 > 0 || var21 > 0) { - int var22 = Tiles.Tiles_heights[var2][var11][var17]; - int var23 = Tiles.Tiles_heights[var2][var11 + 1][var17]; - int var24 = Tiles.Tiles_heights[var2][var11 + 1][var17 + 1]; - int var25 = Tiles.Tiles_heights[var2][var11][var17 + 1]; - int var26 = class4.field31[var11][var17]; - int var27 = class4.field31[var11 + 1][var17]; - int var28 = class4.field31[var11 + 1][var17 + 1]; - int var29 = class4.field31[var11][var17 + 1]; - int var30 = -1; - int var31 = -1; - int var32; - int var33; - int var34; - if (var20 > 0) { - var32 = var12 * 256 / var15; - var33 = var13 / var16; - var34 = var14 / var16; - var30 = BoundaryObject.hslToRgb(var32, var33, var34); - var32 = var32 + Tiles.field477 & 255; - var34 += Tiles.field486; - if (var34 < 0) { - var34 = 0; - } else if (var34 > 255) { - var34 = 255; - } - - var31 = BoundaryObject.hslToRgb(var32, var33, var34); - } - - FloorOverlayDefinition var35; - if (var2 > 0) { - boolean var51 = true; - if (var20 == 0 && class210.field2492[var2][var11][var17] != 0) { - var51 = false; - } - - if (var21 > 0) { - var34 = var21 - 1; - var35 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var34); - FloorOverlayDefinition var47; - if (var35 != null) { - var47 = var35; - } else { - byte[] var49 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var34); - var35 = new FloorOverlayDefinition(); - if (var49 != null) { - var35.decode(new Buffer(var49), var34); - } - - var35.postDecode(); - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var35, (long)var34); - var47 = var35; - } - - if (!var47.hideUnderlay) { - var51 = false; - } - } - - if (var51 && var23 == var22 && var24 == var22 && var22 == var25) { - var10000 = Tiles.field483[var2][var11]; - var10000[var17] |= 2340; - } - } - - var32 = 0; - if (var31 != -1) { - var32 = Rasterizer3D.Rasterizer3D_colorPalette[class197.method3645(var31, 96)]; - } - - if (var21 == 0) { - var0.addTile(var2, var11, var17, 0, 0, -1, var22, var23, var24, var25, class197.method3645(var30, var26), class197.method3645(var30, var27), class197.method3645(var30, var28), class197.method3645(var30, var29), 0, 0, 0, 0, var32, 0); - } else { - var33 = class210.field2492[var2][var11][var17] + 1; - byte var52 = Tiles.field475[var2][var11][var17]; - int var36 = var21 - 1; - FloorOverlayDefinition var37 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var36); - if (var37 != null) { - var35 = var37; - } else { - byte[] var48 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var36); - var37 = new FloorOverlayDefinition(); - if (var48 != null) { - var37.decode(new Buffer(var48), var36); - } - - var37.postDecode(); - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var37, (long)var36); - var35 = var37; - } - - int var38 = var35.texture; - int var39; - int var40; - int var41; - int var42; - if (var38 >= 0) { - var40 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var38); - var39 = -1; - } else if (var35.primaryRgb == 16711935) { - var39 = -2; - var38 = -1; - var40 = -2; - } else { - var39 = BoundaryObject.hslToRgb(var35.hue, var35.saturation, var35.lightness); - var41 = var35.hue + Tiles.field477 & 255; - var42 = var35.lightness + Tiles.field486; - if (var42 < 0) { - var42 = 0; - } else if (var42 > 255) { - var42 = 255; - } - - var40 = BoundaryObject.hslToRgb(var41, var35.saturation, var42); - } - - var41 = 0; - if (var40 != -2) { - var41 = Rasterizer3D.Rasterizer3D_colorPalette[RouteStrategy.method3533(var40, 96)]; - } - - if (var35.secondaryRgb != -1) { - var42 = var35.secondaryHue + Tiles.field477 & 255; - int var43 = var35.secondaryLightness + Tiles.field486; - if (var43 < 0) { - var43 = 0; - } else if (var43 > 255) { - var43 = 255; - } - - var40 = BoundaryObject.hslToRgb(var42, var35.secondarySaturation, var43); - var41 = Rasterizer3D.Rasterizer3D_colorPalette[RouteStrategy.method3533(var40, 96)]; - } - - var0.addTile(var2, var11, var17, var33, var52, var38, var22, var23, var24, var25, class197.method3645(var30, var26), class197.method3645(var30, var27), class197.method3645(var30, var28), class197.method3645(var30, var29), RouteStrategy.method3533(var39, var26), RouteStrategy.method3533(var39, var27), RouteStrategy.method3533(var39, var28), RouteStrategy.method3533(var39, var29), var32, var41); - } - } - } - } - } - } - - for (var11 = 1; var11 < 103; ++var11) { - for (var12 = 1; var12 < 103; ++var12) { - var0.setTileMinPlane(var2, var12, var11, ObjectDefinition.method4545(var2, var12, var11)); - } - } - - Tiles.field485[var2] = null; - AccessFile.field4061[var2] = null; - class210.field2492[var2] = null; - Tiles.field475[var2] = null; - class188.field2321[var2] = null; - } - - var0.method3100(-50, -10, -50); - - for (var2 = 0; var2 < 104; ++var2) { - for (var3 = 0; var3 < 104; ++var3) { - if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { - var0.setLinkBelow(var2, var3); - } - } - } - - var2 = 1; - var3 = 2; - var4 = 4; - - for (var5 = 0; var5 < 4; ++var5) { - if (var5 > 0) { - var2 <<= 3; - var3 <<= 3; - var4 <<= 3; - } - - for (int var6 = 0; var6 <= var5; ++var6) { - for (int var7 = 0; var7 <= 104; ++var7) { - for (int var8 = 0; var8 <= 104; ++var8) { - short var50; - if ((Tiles.field483[var6][var8][var7] & var2) != 0) { - var9 = var7; - var10 = var7; - var11 = var6; - - for (var12 = var6; var9 > 0 && (Tiles.field483[var6][var8][var9 - 1] & var2) != 0; --var9) { - } - - while (var10 < 104 && (Tiles.field483[var6][var8][var10 + 1] & var2) != 0) { - ++var10; - } - - label483: - while (var11 > 0) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((Tiles.field483[var11 - 1][var8][var13] & var2) == 0) { - break label483; - } - } - - --var11; - } - - label472: - while (var12 < var5) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((Tiles.field483[var12 + 1][var8][var13] & var2) == 0) { - break label472; - } - } - - ++var12; - } - - var13 = (var10 - var9 + 1) * (var12 + 1 - var11); - if (var13 >= 8) { - var50 = 240; - var15 = Tiles.Tiles_heights[var12][var8][var9] - var50; - var16 = Tiles.Tiles_heights[var11][var8][var9]; - Scene.Scene_addOccluder(var5, 1, var8 * 128, var8 * 128, var9 * 128, var10 * 128 + 128, var15, var16); - - for (var17 = var11; var17 <= var12; ++var17) { - for (var18 = var9; var18 <= var10; ++var18) { - var10000 = Tiles.field483[var17][var8]; - var10000[var18] &= ~var2; - } - } - } - } - - if ((Tiles.field483[var6][var8][var7] & var3) != 0) { - var9 = var8; - var10 = var8; - var11 = var6; - - for (var12 = var6; var9 > 0 && (Tiles.field483[var6][var9 - 1][var7] & var3) != 0; --var9) { - } - - while (var10 < 104 && (Tiles.field483[var6][var10 + 1][var7] & var3) != 0) { - ++var10; - } - - label536: - while (var11 > 0) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((Tiles.field483[var11 - 1][var13][var7] & var3) == 0) { - break label536; - } - } - - --var11; - } - - label525: - while (var12 < var5) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((Tiles.field483[var12 + 1][var13][var7] & var3) == 0) { - break label525; - } - } - - ++var12; - } - - var13 = (var12 + 1 - var11) * (var10 - var9 + 1); - if (var13 >= 8) { - var50 = 240; - var15 = Tiles.Tiles_heights[var12][var9][var7] - var50; - var16 = Tiles.Tiles_heights[var11][var9][var7]; - Scene.Scene_addOccluder(var5, 2, var9 * 128, var10 * 128 + 128, var7 * 128, var7 * 128, var15, var16); - - for (var17 = var11; var17 <= var12; ++var17) { - for (var18 = var9; var18 <= var10; ++var18) { - var10000 = Tiles.field483[var17][var18]; - var10000[var7] &= ~var3; - } - } - } - } - - if ((Tiles.field483[var6][var8][var7] & var4) != 0) { - var9 = var8; - var10 = var8; - var11 = var7; - - for (var12 = var7; var11 > 0 && (Tiles.field483[var6][var8][var11 - 1] & var4) != 0; --var11) { - } - - while (var12 < 104 && (Tiles.field483[var6][var8][var12 + 1] & var4) != 0) { - ++var12; - } - - label589: - while (var9 > 0) { - for (var13 = var11; var13 <= var12; ++var13) { - if ((Tiles.field483[var6][var9 - 1][var13] & var4) == 0) { - break label589; - } - } - - --var9; - } - - label578: - while (var10 < 104) { - for (var13 = var11; var13 <= var12; ++var13) { - if ((Tiles.field483[var6][var10 + 1][var13] & var4) == 0) { - break label578; - } - } - - ++var10; - } - - if ((var12 - var11 + 1) * (var10 - var9 + 1) >= 4) { - var13 = Tiles.Tiles_heights[var6][var9][var11]; - Scene.Scene_addOccluder(var5, 4, var9 * 128, var10 * 128 + 128, var11 * 128, var12 * 128 + 128, var13, var13); - - for (var14 = var9; var14 <= var10; ++var14) { - for (var15 = var11; var15 <= var12; ++var15) { - var10000 = Tiles.field483[var6][var14]; - var10000[var15] &= ~var4; - } - } - } - } - } - } - } - } - + public boolean equals(Object var1) { + return super.equals(var1); } - @ObfuscatedName("d") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "510477713" + signature = "(II)Lij;", + garbageValue = "957184783" ) - static final int method101(int var0, int var1) { - int var2 = User.method4969(var0 + 45365, var1 + 91923, 4) - 128 + (User.method4969(var0 + 10294, 37821 + var1, 2) - 128 >> 1) + (User.method4969(var0, var1, 1) - 128 >> 2); - var2 = (int)(0.3D * (double)var2) + 35; - if (var2 < 10) { - var2 = 10; - } else if (var2 > 60) { - var2 = 60; - } - - return var2; - } - - @ObfuscatedName("gg") - @ObfuscatedSignature( - signature = "(IIIB)I", - garbageValue = "-30" - ) - @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 = Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) + Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] * var6 >> 7; - return var8 * (128 - var7) + var9 * var7 >> 7; + @Export("getParamDefinition") + public static ParamDefinition getParamDefinition(int var0) { + ParamDefinition var1 = (ParamDefinition)ParamDefinition.ParamDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; } else { - return 0; + byte[] var2 = ParamDefinition.ParamDefinition_archive.takeFile(11, var0); + var1 = new ParamDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); + ParamDefinition.ParamDefinition_cached.put(var1, (long)var0); + return var1; } } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java index 7f3bfd3f1c..9b06abccbf 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java @@ -1,28 +1,37 @@ -import java.awt.Image; +import java.io.File; +import java.io.IOException; import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("f") +@ObfuscatedName("n") @Implements("GrandExchangeOfferUnitPriceComparator") final class GrandExchangeOfferUnitPriceComparator implements Comparator { - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -1744737453 - ) - @Export("SpriteBuffer_spriteWidth") - public static int SpriteBuffer_spriteWidth; - @ObfuscatedName("as") - static Image field74; - - @ObfuscatedName("s") + @ObfuscatedName("pa") @ObfuscatedSignature( - signature = "(Lq;Lq;I)I", - garbageValue = "1336373316" + signature = "Ljz;" + ) + @Export("clanChat") + static ClanChat clanChat; + @ObfuscatedName("sb") + @ObfuscatedSignature( + signature = "Lln;" + ) + @Export("worldMap") + static WorldMap worldMap; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -135135315 + ) + static int field75; + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(Lv;Lv;I)I", + garbageValue = "-1189972175" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -37,302 +46,53 @@ final class GrandExchangeOfferUnitPriceComparator implements Comparator { return super.equals(var1); } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(II)Lig;", - garbageValue = "-2004472785" + signature = "(B)[Lgn;", + garbageValue = "-20" ) - @Export("HealthBarDefinition_get") - public static HealthBarDefinition HealthBarDefinition_get(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; - } + public static class185[] method116() { + return new class185[]{class185.field2298, class185.field2300, class185.field2297, class185.field2299, class185.field2304, class185.field2296, class185.field2302, class185.field2301, class185.field2303, class185.field2305}; } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "75" + signature = "(Ljava/lang/String;Ljava/lang/String;ZB)Lmr;", + garbageValue = "48" ) - @Export("VarbitDefinition_clearCached") - public static void VarbitDefinition_clearCached() { - VarbitDefinition.VarbitDefinition_cached.clear(); - } - - @ObfuscatedName("af") - @ObfuscatedSignature( - signature = "(ILcr;ZI)I", - garbageValue = "1195585580" - ) - static int method136(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] = var3 + var4; - 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] = var3 * var4; - 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 if (var0 == ScriptOpcodes.INTERPOLATE) { - Interpreter.Interpreter_intStackSize -= 5; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - int var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - int var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 + (var4 - var3) * (var7 - var5) / (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 + var4 * var3 / 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 { - return 2; - } - } - - @ObfuscatedName("fg") - @ObfuscatedSignature( - signature = "(IIII)V", - garbageValue = "773083265" - ) - @Export("queueSoundEffect") - static void queueSoundEffect(int var0, int var1, int var2) { - if (Client.soundEffectVolume != 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("fh") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-38" - ) - static final void method133() { - if (Client.field651 != ItemContainer.plane) { - Client.field651 = ItemContainer.plane; - AbstractWorldMapData.method264(ItemContainer.plane); - } - - } - - @ObfuscatedName("hp") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "78" - ) - @Export("readNpcUpdates") - static final void readNpcUpdates() { - 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.field655[++Client.field899 - 1] = Client.npcIndices[var2]; + @Export("getPreferencesFile") + public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { + File var3 = new File(InvDefinition.cacheDir, "preferences" + var0 + ".dat"); + if (var3.exists()) { + try { + AccessFile var10 = new AccessFile(var3, "rw", 10000L); + return var10; + } catch (IOException var9) { } } - if (var1 > Client.npcCount) { - throw new RuntimeException(""); - } else { - 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.field669[++Client.field861 - 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.method1961(var7, (byte)1); - var8 = var0.readBits(1); - if (var8 == 1) { - Client.field669[++Client.field861 - 1] = var3; - } - } else if (var6 == 2) { - Client.npcIndices[++Client.npcCount - 1] = var3; - var4.npcCycle = Client.cycle; - var7 = var0.readBits(3); - var4.method1961(var7, (byte)2); - var8 = var0.readBits(3); - var4.method1961(var8, (byte)2); - int var9 = var0.readBits(1); - if (var9 == 1) { - Client.field669[++Client.field861 - 1] = var3; - } - } else if (var6 == 3) { - Client.field655[++Client.field899 - 1] = var3; - } - } - } - } - + String var4 = ""; + if (ViewportMouse.cacheGamebuild == 33) { + var4 = "_rc"; + } else if (ViewportMouse.cacheGamebuild == 34) { + var4 = "_wip"; } - } - @ObfuscatedName("jp") - @ObfuscatedSignature( - signature = "(II)Ljava/lang/String;", - garbageValue = "-59560739" - ) - static final String method127(int var0) { - return var0 < 999999999 ? Integer.toString(var0) : "*"; - } + File var5 = new File(Message.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) { + } + } - @ObfuscatedName("km") - @ObfuscatedSignature( - signature = "(Lhp;IB)Ljava/lang/String;", - garbageValue = "0" - ) - static String method125(Widget var0, int var1) { - int var3 = ParamDefinition.getWidgetClickMask(var0); - boolean var2 = (var3 >> var1 + 1 & 1) != 0; - if (!var2 && 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; + try { + var6 = new AccessFile(var3, "rw", 10000L); + return var6; + } catch (IOException var7) { + throw new RuntimeException(); } } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java index f131a2fe63..e9faa67a09 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java @@ -1,125 +1,158 @@ import java.util.Comparator; -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; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("n") +@ObfuscatedName("u") @Implements("GrandExchangeOfferWorldComparator") final class GrandExchangeOfferWorldComparator implements Comparator { - @ObfuscatedName("rr") + @ObfuscatedName("sl") @ObfuscatedGetter( - intValue = 133251749 + longValue = 7996115852397139965L ) - static int field34; - @ObfuscatedName("q") - @Export("soundSystemExecutor") - static ScheduledExecutorService soundSystemExecutor; - @ObfuscatedName("do") + static long field25; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 850096723 + ) + @Export("PcmPlayer_sampleRate") + public static int PcmPlayer_sampleRate; + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lid;" + signature = "Llt;" ) - @Export("archive15") - static Archive archive15; + @Export("options_buttons_0Sprite") + static IndexedSprite options_buttons_0Sprite; + @ObfuscatedName("i") + static String[] field30; + @ObfuscatedName("bt") + @ObfuscatedSignature( + signature = "Llt;" + ) + static IndexedSprite field32; - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lq;Lq;I)I", - garbageValue = "1902979302" + signature = "(Lv;Lv;I)I", + garbageValue = "2009087817" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.world < var2.world ? -1 : (var2.world == var1.world ? 0 : 1); } - public boolean equals(Object var1) { - return super.equals(var1); - } - public int compare(Object var1, Object var2) { return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); } - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", - garbageValue = "1594628992" - ) - public static String method74(CharSequence[] var0, int var1, int var2) { - if (var2 == 0) { - return ""; - } else if (var2 == 1) { - CharSequence var3 = var0[var1]; - return var3 == null ? "null" : var3.toString(); - } else { - int var8 = var2 + var1; - int var4 = 0; - - for (int var5 = var1; var5 < var8; ++var5) { - CharSequence var6 = var0[var5]; - if (var6 == null) { - var4 += 4; - } else { - var4 += var6.length(); - } - } - - StringBuilder var9 = new StringBuilder(var4); - - for (int var10 = var1; var10 < var8; ++var10) { - CharSequence var7 = var0[var10]; - if (var7 == null) { - var9.append("null"); - } else { - var9.append(var7); - } - } - - return var9.toString(); - } + public boolean equals(Object var1) { + return super.equals(var1); } - @ObfuscatedName("e") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(ILcr;ZI)I", - garbageValue = "-1665010136" + signature = "(Lkz;I)Ljava/lang/String;", + garbageValue = "-1287260544" ) - static int method79(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var3 = WorldMapElement.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - } else { - var3 = var2 ? class286.field3623 : class297.field3693; + public static String method60(Buffer var0) { + String var1; + try { + int var2 = var0.readUShortSmart(); + if (var2 > 32767) { + var2 = 32767; + } + + byte[] var3 = new byte[var2]; + var0.offset += class210.huffman.decompress(var0.array, var0.offset, var3, 0, var2); + String var4 = class51.decodeStringCp1252(var3, 0, var2); + var1 = var4; + } catch (Exception var6) { + var1 = "Cabbage"; } - if (var0 == ScriptOpcodes.CC_CALLONRESIZE) { - if (Interpreter.field1064 >= 10) { - throw new RuntimeException(); - } else if (var3.onResize == null) { - return 0; - } else { - ScriptEvent var4 = new ScriptEvent(); - var4.widget = var3; - var4.args = var3.onResize; - var4.field555 = Interpreter.field1064 + 1; - Client.scriptEvents.addFirst(var4); - return 1; - } - } else { - return 2; - } + return var1; } - @ObfuscatedName("bo") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)I", - garbageValue = "516723982" + signature = "(I)V", + garbageValue = "236963295" ) - public static int method80(String var0) { - return var0.length() + 2; + public static void method62() { + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "([BI)V", + garbageValue = "1642239877" + ) + @Export("SpriteBuffer_decode") + public static void SpriteBuffer_decode(byte[] var0) { + Buffer var1 = new Buffer(var0); + var1.offset = var0.length - 2; + class325.SpriteBuffer_spriteCount = var1.readUnsignedShort(); + class325.SpriteBuffer_xOffsets = new int[class325.SpriteBuffer_spriteCount]; + SecureRandomCallable.SpriteBuffer_yOffsets = new int[class325.SpriteBuffer_spriteCount]; + class325.SpriteBuffer_spriteWidths = new int[class325.SpriteBuffer_spriteCount]; + SoundSystem.SpriteBuffer_spriteHeights = new int[class325.SpriteBuffer_spriteCount]; + InvDefinition.SpriteBuffer_pixels = new byte[class325.SpriteBuffer_spriteCount][]; + var1.offset = var0.length - 7 - class325.SpriteBuffer_spriteCount * 8; + class325.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); + class325.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); + int var2 = (var1.readUnsignedByte() & 255) + 1; + + int var3; + for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) { + class325.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) { + SecureRandomCallable.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) { + class325.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) { + SoundSystem.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); + } + + var1.offset = var0.length - 7 - class325.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; + class325.SpriteBuffer_spritePalette = new int[var2]; + + for (var3 = 1; var3 < var2; ++var3) { + class325.SpriteBuffer_spritePalette[var3] = var1.readMedium(); + if (class325.SpriteBuffer_spritePalette[var3] == 0) { + class325.SpriteBuffer_spritePalette[var3] = 1; + } + } + + var1.offset = 0; + + for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) { + int var4 = class325.SpriteBuffer_spriteWidths[var3]; + int var5 = SoundSystem.SpriteBuffer_spriteHeights[var3]; + int var6 = var5 * var4; + byte[] var7 = new byte[var6]; + InvDefinition.SpriteBuffer_pixels[var3] = var7; + int var8 = var1.readUnsignedByte(); + int var9; + if (var8 == 0) { + for (var9 = 0; var9 < var6; ++var9) { + var7[var9] = var1.readByte(); + } + } else if (var8 == 1) { + for (var9 = 0; var9 < var4; ++var9) { + for (int var10 = 0; var10 < var5; ++var10) { + var7[var9 + var4 * var10] = var1.readByte(); + } + } + } + } + } } diff --git a/runescape-client/src/main/java/GraphicsDefaults.java b/runescape-client/src/main/java/GraphicsDefaults.java index 0cfc3d0b74..36d7e09324 100644 --- a/runescape-client/src/main/java/GraphicsDefaults.java +++ b/runescape-client/src/main/java/GraphicsDefaults.java @@ -4,90 +4,96 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kp") +@ObfuscatedName("kk") @Implements("GraphicsDefaults") public class GraphicsDefaults { - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -2112004677 + intValue = -1326295971 + ) + @Export("canvasWidth") + public static int canvasWidth; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 743645305 ) @Export("compass") public int compass; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -258294563 + intValue = -1263393423 ) - public int field3806; - @ObfuscatedName("i") + public int field3794; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 701602469 + intValue = -222158885 ) @Export("mapScenes") public int mapScenes; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -2141260483 + intValue = 293018585 ) @Export("headIconsPk") public int headIconsPk; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -479103763 - ) - public int field3805; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -556598901 - ) - public int field3802; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 885733673 - ) - public int field3798; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 1784857591 - ) - public int field3804; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 2055927251 + intValue = 59968597 ) public int field3797; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 407705871 + ) + public int field3798; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 24582741 + ) + public int field3800; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -1990585073 + ) + public int field3804; @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1869072211 + intValue = 309369313 ) public int field3801; - @ObfuscatedName("f") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1312425167 + intValue = -328738669 ) - public int field3807; + public int field3802; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -1048737749 + ) + public int field3799; public GraphicsDefaults() { this.compass = -1; - this.field3806 = -1; + this.field3794 = -1; this.mapScenes = -1; this.headIconsPk = -1; - this.field3805 = -1; - this.field3802 = -1; - this.field3798 = -1; - this.field3804 = -1; this.field3797 = -1; + this.field3798 = -1; + this.field3800 = -1; + this.field3804 = -1; this.field3801 = -1; - this.field3807 = -1; + this.field3802 = -1; + this.field3799 = -1; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(Lhz;I)V", - garbageValue = "-2074842335" + garbageValue = "361058639" ) @Export("decode") public void decode(AbstractArchive var1) { - byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3794.group); + byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3792.group); Buffer var3 = new Buffer(var2); while (true) { @@ -101,18 +107,67 @@ public class GraphicsDefaults { var3.readMedium(); break; case 2: - this.compass = var3.method5602(); - this.field3806 = var3.method5602(); - this.mapScenes = var3.method5602(); - this.headIconsPk = var3.method5602(); - this.field3805 = var3.method5602(); - this.field3802 = var3.method5602(); - this.field3798 = var3.method5602(); - this.field3804 = var3.method5602(); - this.field3797 = var3.method5602(); - this.field3801 = var3.method5602(); - this.field3807 = var3.method5602(); + this.compass = var3.method5623(); + this.field3794 = var3.method5623(); + this.mapScenes = var3.method5623(); + this.headIconsPk = var3.method5623(); + this.field3797 = var3.method5623(); + this.field3798 = var3.method5623(); + this.field3800 = var3.method5623(); + this.field3804 = var3.method5623(); + this.field3801 = var3.method5623(); + this.field3802 = var3.method5623(); + this.field3799 = var3.method5623(); } } } + + @ObfuscatedName("ji") + @ObfuscatedSignature( + signature = "(IIII)Lbw;", + garbageValue = "-1376012645" + ) + static final InterfaceParent method5875(int var0, int var1, int var2) { + InterfaceParent var3 = new InterfaceParent(); + var3.group = var1; + var3.type = var2; + Client.interfaceParents.put(var3, (long)var0); + DevicePcmPlayerProvider.Widget_resetModelFrames(var1); + Widget var4 = Player.getWidget(var0); + WorldMapID.invalidateWidget(var4); + if (Client.meslayerContinueWidget != null) { + WorldMapID.invalidateWidget(Client.meslayerContinueWidget); + Client.meslayerContinueWidget = null; + } + + for (int var5 = 0; var5 < Client.menuOptionsCount; ++var5) { + int var7 = Client.menuOpcodes[var5]; + boolean var6 = var7 == 57 || var7 == 58 || var7 == 1007 || var7 == 25 || var7 == 30; + if (var6) { + if (var5 < Client.menuOptionsCount - 1) { + for (int var8 = var5; var8 < Client.menuOptionsCount - 1; ++var8) { + Client.menuActions[var8] = Client.menuActions[var8 + 1]; + Client.menuTargets[var8] = Client.menuTargets[var8 + 1]; + Client.menuOpcodes[var8] = Client.menuOpcodes[var8 + 1]; + Client.menuIdentifiers[var8] = Client.menuIdentifiers[var8 + 1]; + Client.menuArguments1[var8] = Client.menuArguments1[var8 + 1]; + Client.menuArguments2[var8] = Client.menuArguments2[var8 + 1]; + Client.menuShiftClick[var8] = Client.menuShiftClick[var8 + 1]; + } + } + + --var5; + --Client.menuOptionsCount; + } + } + + WorldMapRegion.calculateMenuBounds(); + class197.revalidateWidgetScroll(class289.Widget_interfaceComponents[var0 >> 16], var4, false); + Tile.runWidgetOnLoadListener(var1); + if (Client.rootInterface != -1) { + WorldMapRectangle.runIntfCloseListeners(Client.rootInterface, 1); + } + + return var3; + } } diff --git a/runescape-client/src/main/java/GraphicsObject.java b/runescape-client/src/main/java/GraphicsObject.java index da71d1074c..15929b5cc8 100644 --- a/runescape-client/src/main/java/GraphicsObject.java +++ b/runescape-client/src/main/java/GraphicsObject.java @@ -3,74 +3,71 @@ 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("bc") +@ObfuscatedName("bq") @Implements("GraphicsObject") public final class GraphicsObject extends Entity { - @ObfuscatedName("qe") - @ObfuscatedGetter( - intValue = -487309312 + @ObfuscatedName("fa") + @ObfuscatedSignature( + signature = "Lku;" ) - static int field1079; - @ObfuscatedName("gx") - @Export("regionLandArchives") - static byte[][] regionLandArchives; - @ObfuscatedName("s") + @Export("WorldMapElement_fonts") + static Fonts WorldMapElement_fonts; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -609520515 + intValue = -46719175 ) @Export("id") int id; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 528073861 + intValue = 824152429 + ) + @Export("y") + int y; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -652492191 ) @Export("cycleStart") int cycleStart; - @ObfuscatedName("i") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1305204903 + intValue = -1299632507 ) @Export("plane") int plane; - @ObfuscatedName("k") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1986692437 + intValue = -1087465937 ) @Export("x") int x; @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 575337647 - ) - @Export("y") - int y; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -893117639 + intValue = 12234547 ) @Export("height") int height; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lij;" + signature = "Liw;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1568571077 + intValue = 353830109 ) @Export("frame") int frame; - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1439045539 + intValue = 1621269353 ) @Export("frameCycle") int frameCycle; - @ObfuscatedName("d") + @ObfuscatedName("z") @Export("isFinished") boolean isFinished; @@ -84,20 +81,20 @@ public final class GraphicsObject extends Entity { this.y = var4; this.height = var5; this.cycleStart = var7 + var6; - int var8 = HealthBarUpdate.SpotAnimationDefinition_get(this.id).sequence; + int var8 = NetCache.SpotAnimationDefinition_get(this.id).sequence; if (var8 != -1) { this.isFinished = false; - this.sequenceDefinition = Widget.SequenceDefinition_get(var8); + this.sequenceDefinition = class83.SequenceDefinition_get(var8); } else { this.isFinished = true; } } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IS)V", - garbageValue = "-9690" + signature = "(II)V", + garbageValue = "477710925" ) @Export("advance") final void advance(int var1) { @@ -116,14 +113,14 @@ public final class GraphicsObject extends Entity { } } - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)Ldo;", - garbageValue = "-419920513" + signature = "(B)Ldr;", + garbageValue = "-35" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = HealthBarUpdate.SpotAnimationDefinition_get(this.id); + SpotAnimationDefinition var1 = NetCache.SpotAnimationDefinition_get(this.id); Model var2; if (!this.isFinished) { var2 = var1.getModel(this.frame); @@ -134,49 +131,65 @@ public final class GraphicsObject extends Entity { return var2 == null ? null : var2; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "971415890" + signature = "(Lkt;B)V", + garbageValue = "-5" ) - public static boolean method1946(int var0) { - return var0 == WorldMapDecorationType.field2722.id; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "85520367" - ) - @Export("hasReflectionCheck") - public static boolean hasReflectionCheck() { - ReflectionCheck var0 = (ReflectionCheck)class96.reflectionChecks.last(); - return var0 != null; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(ILcr;ZI)I", - garbageValue = "886521701" - ) - static int method1939(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? class286.field3623 : class297.field3693; - 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; + @Export("updatePlayer") + static final void updatePlayer(PacketBuffer var0) { + var0.importIndex(); + int var1 = Client.localPlayerIndex; + Player var2 = Varps.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 - class4.baseX * 64; + var2.x = ((var2.pathX[0] << 7) + (var2.transformedSize() << 6)) * 62504387; + var2.pathY[0] = var6 - ScriptEvent.baseY; + var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); + MouseRecorder.plane = var2.plane = var4; + if (Players.field1221[var1] != null) { + var2.read(Players.field1221[var1]); } + + Players.Players_count = 0; + Players.Players_indices[++Players.Players_count - 1] = var1; + Players.field1217[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.field1217[var7] = 0; + } + } + + var0.exportIndex(); + } + + @ObfuscatedName("hl") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "4" + ) + @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; } } diff --git a/runescape-client/src/main/java/HealthBar.java b/runescape-client/src/main/java/HealthBar.java index 863efac97b..e2aa3a3d6e 100644 --- a/runescape-client/src/main/java/HealthBar.java +++ b/runescape-client/src/main/java/HealthBar.java @@ -2,35 +2,62 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ce") +@ObfuscatedName("cb") @Implements("HealthBar") public class HealthBar extends Node { - @ObfuscatedName("i") + @ObfuscatedName("j") + static byte[][][] field1089; + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lig;" + signature = "Llt;" + ) + @Export("logoSprite") + static IndexedSprite logoSprite; + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "Lhz;" + ) + @Export("Widget_spritesArchive") + static AbstractArchive Widget_spritesArchive; + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "Lco;" + ) + @Export("pcmPlayerProvider") + public static PcmPlayerProvider pcmPlayerProvider; + @ObfuscatedName("fp") + @ObfuscatedSignature( + signature = "Lkf;" + ) + @Export("fontBold12") + static Font fontBold12; + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "Lix;" ) @Export("definition") HealthBarDefinition definition; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Ljp;" + signature = "Ljd;" ) @Export("updates") IterableNodeDeque updates; @ObfuscatedSignature( - signature = "(Lig;)V" + signature = "(Lix;)V" ) HealthBar(HealthBarDefinition var1) { this.updates = new IterableNodeDeque(); this.definition = var1; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(IIIII)V", - garbageValue = "1581438808" + garbageValue = "-1491232381" ) @Export("put") void put(int var1, int var2, int var3, int var4) { @@ -63,10 +90,10 @@ public class HealthBar extends Node { } } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IB)Lbb;", - garbageValue = "-77" + signature = "(IB)Lbl;", + garbageValue = "1" ) @Export("get") HealthBarUpdate get(int var1) { @@ -77,7 +104,7 @@ public class HealthBar extends Node { var2 = var3; } - if (this.definition.int5 + var2.cycleOffset + var2.cycle > var1) { + if (this.definition.int5 + var2.cycle + var2.cycleOffset > var1) { return var2; } else { var2.remove(); @@ -88,13 +115,195 @@ public class HealthBar extends Node { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "88" + signature = "(I)Z", + garbageValue = "-796562710" ) @Export("isEmpty") boolean isEmpty() { - return this.updates.method4729(); + return this.updates.method4874(); + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "(CI)Z", + garbageValue = "-60300776" + ) + @Export("isAlphaNumeric") + public static boolean isAlphaNumeric(char var0) { + return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + signature = "(ILcu;ZI)I", + garbageValue = "-1113312719" + ) + static int method2006(int var0, Script var1, boolean var2) { + int var3; + int var4; + if (var0 == ScriptOpcodes.ADD) { + class160.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 + var4; + return 1; + } else if (var0 == ScriptOpcodes.SUB) { + class160.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 - var4; + return 1; + } else if (var0 == ScriptOpcodes.MULTIPLY) { + class160.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 * var4; + return 1; + } else if (var0 == ScriptOpcodes.DIV) { + class160.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 / var4; + return 1; + } else if (var0 == ScriptOpcodes.RANDOM) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); + return 1; + } else if (var0 == ScriptOpcodes.RANDOMINC) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); + return 1; + } else if (var0 == ScriptOpcodes.INTERPOLATE) { + class160.Interpreter_intStackSize -= 5; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + int var5 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 2]; + int var6 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 3]; + int var7 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 4]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 + (var7 - var5) * (var4 - var3) / (var6 - var5); + return 1; + } else if (var0 == ScriptOpcodes.ADDPERCENT) { + class160.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 + var3 * var4 / 100; + return 1; + } else if (var0 == ScriptOpcodes.SETBIT) { + class160.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 | 1 << var4; + return 1; + } else if (var0 == ScriptOpcodes.CLEARBIT) { + class160.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); + return 1; + } else if (var0 == ScriptOpcodes.TESTBIT) { + class160.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.MOD) { + class160.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 % var4; + return 1; + } else if (var0 == ScriptOpcodes.POW) { + class160.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + if (var3 == 0) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); + } + + return 1; + } else if (var0 == ScriptOpcodes.INVPOW) { + class160.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + if (var3 == 0) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + return 1; + } else { + switch(var4) { + case 0: + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; + break; + case 1: + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3; + break; + case 2: + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); + break; + case 3: + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); + break; + case 4: + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); + break; + default: + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); + } + + return 1; + } + } else if (var0 == ScriptOpcodes.AND) { + class160.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 & var4; + return 1; + } else if (var0 == ScriptOpcodes.OR) { + class160.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 | var4; + return 1; + } else if (var0 == ScriptOpcodes.SCALE) { + class160.Interpreter_intStackSize -= 3; + long var9 = (long)Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + long var11 = (long)Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + long var13 = (long)Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 2]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = (int)(var9 * var13 / var11); + return 1; + } else { + return 2; + } + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + signature = "(ILcu;ZB)I", + garbageValue = "-65" + ) + static int method1999(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.LOGOUT) { + Client.logoutTimer = 250; + return 1; + } else { + return 2; + } + } + + @ObfuscatedName("hy") + @ObfuscatedSignature( + signature = "(IIIII)V", + garbageValue = "-1895452388" + ) + static final void method2007(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.rootWidgetYs[var4] + Client.rootWidgetHeights[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { + Client.field827[var4] = true; + } + } + } } diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java index e98482ddd3..72060d1058 100644 --- a/runescape-client/src/main/java/HealthBarDefinition.java +++ b/runescape-client/src/main/java/HealthBarDefinition.java @@ -4,89 +4,89 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ig") +@ObfuscatedName("ix") @Implements("HealthBarDefinition") public class HealthBarDefinition extends DualNode { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "Lhz;" ) @Export("HealthBarDefinition_archive") public static AbstractArchive HealthBarDefinition_archive; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "Lhz;" ) - @Export("HealthBarDefinition_spritesArchive") - public static AbstractArchive HealthBarDefinition_spritesArchive; - @ObfuscatedName("i") + @Export("HitSplatDefinition_spritesArchive") + static AbstractArchive HitSplatDefinition_spritesArchive; + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("HealthBarDefinition_cached") - static EvictingDualNodeHashTable HealthBarDefinition_cached; - @ObfuscatedName("k") + public static EvictingDualNodeHashTable HealthBarDefinition_cached; + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("HealthBarDefinition_cachedSprites") static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1504637567 + intValue = -1806671907 ) - public int field3264; - @ObfuscatedName("q") + public int field3253; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1807788243 + intValue = 379529355 ) @Export("int1") public int int1; - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1909708279 + intValue = -1016386229 ) @Export("int2") public int int2; - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1885853349 + intValue = -565788357 ) @Export("int3") public int int3; - @ObfuscatedName("f") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -563818397 + intValue = -1008936631 ) @Export("int4") public int int4; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -74768593 + intValue = -1386850377 ) @Export("int5") public int int5; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1506111747 + intValue = 1663965695 ) @Export("frontSpriteID") int frontSpriteID; - @ObfuscatedName("y") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1208608669 + intValue = 1998724721 ) @Export("backSpriteID") int backSpriteID; @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -567354113 + intValue = -1503683449 ) @Export("width") public int width; - @ObfuscatedName("b") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1929001923 + intValue = 571878805 ) @Export("widthPadding") public int widthPadding; @@ -96,7 +96,7 @@ public class HealthBarDefinition extends DualNode { HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64); } - HealthBarDefinition() { + public HealthBarDefinition() { this.int1 = 255; this.int2 = 255; this.int3 = -1; @@ -108,13 +108,13 @@ public class HealthBarDefinition extends DualNode { this.widthPadding = 0; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lky;I)V", - garbageValue = "-2108312426" + signature = "(Lkz;B)V", + garbageValue = "0" ) @Export("decode") - void decode(Buffer var1) { + public void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { @@ -125,10 +125,10 @@ public class HealthBarDefinition extends DualNode { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lky;II)V", - garbageValue = "1232956083" + signature = "(Lkz;II)V", + garbageValue = "1787792869" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -145,9 +145,9 @@ public class HealthBarDefinition extends DualNode { } else if (var2 == 6) { var1.readUnsignedByte(); } else if (var2 == 7) { - this.frontSpriteID = var1.method5602(); + this.frontSpriteID = var1.method5623(); } else if (var2 == 8) { - this.backSpriteID = var1.method5602(); + this.backSpriteID = var1.method5623(); } else if (var2 == 11) { this.int3 = var1.readUnsignedShort(); } else if (var2 == 14) { @@ -158,10 +158,10 @@ public class HealthBarDefinition extends DualNode { } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)Lls;", - garbageValue = "32246110" + signature = "(B)Lli;", + garbageValue = "-8" ) @Export("getFrontSprite") public Sprite getFrontSprite() { @@ -172,7 +172,7 @@ public class HealthBarDefinition extends DualNode { if (var1 != null) { return var1; } else { - var1 = TilePaint.SpriteBuffer_getSprite(HealthBarDefinition_spritesArchive, this.frontSpriteID, 0); + var1 = FillMode.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.frontSpriteID, 0); if (var1 != null) { HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID); } @@ -182,10 +182,10 @@ public class HealthBarDefinition extends DualNode { } } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(I)Lls;", - garbageValue = "2113280722" + signature = "(I)Lli;", + garbageValue = "1663906218" ) @Export("getBackSprite") public Sprite getBackSprite() { @@ -196,7 +196,7 @@ public class HealthBarDefinition extends DualNode { if (var1 != null) { return var1; } else { - var1 = TilePaint.SpriteBuffer_getSprite(HealthBarDefinition_spritesArchive, this.backSpriteID, 0); + var1 = FillMode.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0); if (var1 != null) { HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); } @@ -205,4 +205,19 @@ public class HealthBarDefinition extends DualNode { } } } + + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "(CII)Ljava/lang/String;", + garbageValue = "-1190988008" + ) + public static String method4481(char var0, int var1) { + char[] var2 = new char[var1]; + + for (int var3 = 0; var3 < var1; ++var3) { + var2[var3] = var0; + } + + return new String(var2); + } } diff --git a/runescape-client/src/main/java/HealthBarUpdate.java b/runescape-client/src/main/java/HealthBarUpdate.java index 7bb30b212b..64b7b1b832 100644 --- a/runescape-client/src/main/java/HealthBarUpdate.java +++ b/runescape-client/src/main/java/HealthBarUpdate.java @@ -1,48 +1,34 @@ -import java.awt.FontMetrics; +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("bb") +@ObfuscatedName("bl") @Implements("HealthBarUpdate") public class HealthBarUpdate extends Node { - @ObfuscatedName("nk") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1632744841 - ) - static int field986; - @ObfuscatedName("az") - @Export("loginScreenFontMetrics") - static FontMetrics loginScreenFontMetrics; - @ObfuscatedName("dp") - @ObfuscatedSignature( - signature = "Lid;" - ) - @Export("archive2") - static Archive archive2; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 1232956083 + intValue = 563892135 ) @Export("cycle") int cycle; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -840023753 + intValue = 1489030815 ) @Export("health") int health; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -207161283 + intValue = -1355122563 ) @Export("health2") int health2; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 309403729 + intValue = -716904445 ) @Export("cycleOffset") int cycleOffset; @@ -54,10 +40,10 @@ public class HealthBarUpdate extends Node { this.cycleOffset = var4; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(IIIII)V", - garbageValue = "-782735751" + garbageValue = "-1563848755" ) @Export("set") void set(int var1, int var2, int var3, int var4) { @@ -67,35 +53,35 @@ public class HealthBarUpdate extends Node { this.cycleOffset = var4; } - @ObfuscatedName("s") + @ObfuscatedName("ga") @ObfuscatedSignature( - signature = "(II)Lil;", - garbageValue = "-790003135" + signature = "(I)V", + garbageValue = "-330956579" ) - @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; + static void method1708() { + if (Client.renderSelf) { + GameObject.addPlayerToScene(Varps.localPlayer, false); } + } - @ObfuscatedName("j") + @ObfuscatedName("jy") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "0" + signature = "(B)V", + garbageValue = "-86" ) - static int method1683() { - return 11; + @Export("FriendSystem_invalidateIgnoreds") + static final void FriendSystem_invalidateIgnoreds() { + Iterator var0 = Messages.Messages_hashTable.iterator(); + + while (var0.hasNext()) { + Message var1 = (Message)var0.next(); + var1.clearIsFromIgnored(); + } + + if (GrandExchangeOfferUnitPriceComparator.clanChat != null) { + GrandExchangeOfferUnitPriceComparator.clanChat.invalidateIgnoreds(); + } + } } diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index 90ed8435ae..16df2c1f6b 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -4,109 +4,114 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("io") +@ObfuscatedName("ic") @Implements("HitSplatDefinition") public class HitSplatDefinition extends DualNode { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "Lhz;" ) @Export("HitSplatDefinition_archive") - public static AbstractArchive HitSplatDefinition_archive; - @ObfuscatedName("k") + static AbstractArchive HitSplatDefinition_archive; + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lep;" + signature = "Lhz;" + ) + static AbstractArchive field3300; + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "Let;" ) @Export("HitSplatDefinition_cached") static EvictingDualNodeHashTable HitSplatDefinition_cached; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("HitSplatDefinition_cachedSprites") static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("HitSplatDefinition_cachedFonts") static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1215732899 + intValue = -357420585 ) @Export("fontId") int fontId; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1479775449 + intValue = 327492087 ) @Export("textColor") public int textColor; - @ObfuscatedName("y") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -999843627 + intValue = -687651927 ) - public int field3314; + public int field3306; @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -478859311 + intValue = 1048362973 ) - int field3315; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 1276859251 - ) - int field3316; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -348958833 - ) - int field3311; + int field3314; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 740187387 + intValue = -224285899 + ) + int field3308; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 163479341 ) int field3312; - @ObfuscatedName("z") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 417347841 + intValue = 295694895 ) - public int field3319; - @ObfuscatedName("a") + int field3313; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1914679 + intValue = -1371594611 + ) + public int field3311; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -1444212513 + ) + public int field3310; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -1563267253 ) public int field3307; @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 348395975 - ) - public int field3318; - @ObfuscatedName("l") - String field3322; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -172728541 - ) - public int field3323; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 1823926687 - ) - public int field3324; + String field3309; @ObfuscatedName("m") - @Export("transforms") - public int[] transforms; + @ObfuscatedGetter( + intValue = 1065378437 + ) + public int field3315; @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1435373639 + intValue = -267578869 + ) + public int field3316; + @ObfuscatedName("a") + @Export("transforms") + public int[] transforms; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -222601541 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("av") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -1817930543 + intValue = 158583145 ) @Export("transformVarp") int transformVarp; @@ -120,25 +125,25 @@ public class HitSplatDefinition extends DualNode { HitSplatDefinition() { this.fontId = -1; this.textColor = 16777215; - this.field3314 = 70; - this.field3315 = -1; - this.field3316 = -1; - this.field3311 = -1; + this.field3306 = 70; + this.field3314 = -1; + this.field3308 = -1; this.field3312 = -1; - this.field3319 = 0; - this.field3307 = 0; - this.field3318 = -1; - this.field3322 = ""; - this.field3323 = -1; - this.field3324 = 0; + this.field3313 = -1; + this.field3311 = 0; + this.field3310 = 0; + this.field3307 = -1; + this.field3309 = ""; + this.field3315 = -1; + this.field3316 = 0; this.transformVarbit = -1; this.transformVarp = -1; } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lky;I)V", - garbageValue = "513120287" + signature = "(Lkz;I)V", + garbageValue = "1961600783" ) @Export("decode") void decode(Buffer var1) { @@ -152,41 +157,41 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("i") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lky;II)V", - garbageValue = "198357624" + signature = "(Lkz;II)V", + garbageValue = "138973037" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { - this.fontId = var1.method5602(); + this.fontId = var1.method5623(); } else if (var2 == 2) { this.textColor = var1.readMedium(); } else if (var2 == 3) { - this.field3315 = var1.method5602(); + this.field3314 = var1.method5623(); } else if (var2 == 4) { - this.field3311 = var1.method5602(); + this.field3312 = var1.method5623(); } else if (var2 == 5) { - this.field3316 = var1.method5602(); + this.field3308 = var1.method5623(); } else if (var2 == 6) { - this.field3312 = var1.method5602(); + this.field3313 = var1.method5623(); } else if (var2 == 7) { - this.field3319 = var1.readShort(); + this.field3311 = var1.readShort(); } else if (var2 == 8) { - this.field3322 = var1.readStringCp1252NullCircumfixed(); + this.field3309 = var1.readStringCp1252NullCircumfixed(); } else if (var2 == 9) { - this.field3314 = var1.readUnsignedShort(); + this.field3306 = var1.readUnsignedShort(); } else if (var2 == 10) { - this.field3307 = var1.readShort(); + this.field3310 = var1.readShort(); } else if (var2 == 11) { - this.field3318 = 0; + this.field3307 = 0; } else if (var2 == 12) { - this.field3323 = var1.readUnsignedByte(); + this.field3315 = var1.readUnsignedByte(); } else if (var2 == 13) { - this.field3324 = var1.readShort(); + this.field3316 = var1.readShort(); } else if (var2 == 14) { - this.field3318 = var1.readUnsignedShort(); + this.field3307 = var1.readUnsignedShort(); } else if (var2 == 17 || var2 == 18) { this.transformVarbit = var1.readUnsignedShort(); if (this.transformVarbit == 65535) { @@ -221,16 +226,16 @@ public class HitSplatDefinition extends DualNode { } - @ObfuscatedName("k") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(I)Lio;", - garbageValue = "-1634643296" + signature = "(I)Lic;", + garbageValue = "-2043410275" ) @Export("transform") public final HitSplatDefinition transform() { int var1 = -1; if (this.transformVarbit != -1) { - var1 = class208.getVarbit(this.transformVarbit); + var1 = WorldMapCacheName.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -242,17 +247,17 @@ public class HitSplatDefinition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? StructDefinition.HitSplatDefinition_get(var2) : null; + return var2 != -1 ? Interpreter.HitSplatDefinition_get(var2) : null; } @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(II)Ljava/lang/String;", - garbageValue = "188489511" + signature = "(IB)Ljava/lang/String;", + garbageValue = "-7" ) @Export("getString") public String getString(int var1) { - String var2 = this.field3322; + String var2 = this.field3309; while (true) { int var3 = var2.indexOf("%1"); @@ -260,26 +265,26 @@ public class HitSplatDefinition extends DualNode { return var2; } - var2 = var2.substring(0, var3) + Friend.intToString(var1, false) + var2.substring(var3 + 2); + var2 = var2.substring(0, var3) + Skeleton.intToString(var1, false) + var2.substring(var3 + 2); } } - @ObfuscatedName("n") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(B)Lls;", - garbageValue = "108" + signature = "(I)Lli;", + garbageValue = "-1669943283" ) - public Sprite method4494() { - if (this.field3315 < 0) { + public Sprite method4568() { + if (this.field3314 < 0) { return null; } else { - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3315); + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3314); if (var1 != null) { return var1; } else { - var1 = TilePaint.SpriteBuffer_getSprite(GrandExchangeOfferTotalQuantityComparator.HitSplatDefinition_spritesArchive, this.field3315, 0); + var1 = FillMode.SpriteBuffer_getSprite(field3300, this.field3314, 0); if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3315); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3314); } return var1; @@ -287,68 +292,22 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("t") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(I)Lls;", - garbageValue = "1004292382" + signature = "(I)Lli;", + garbageValue = "-675719915" ) - public Sprite method4468() { - if (this.field3316 < 0) { + public Sprite method4581() { + if (this.field3308 < 0) { return null; } else { - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3316); + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3308); if (var1 != null) { return var1; } else { - var1 = TilePaint.SpriteBuffer_getSprite(GrandExchangeOfferTotalQuantityComparator.HitSplatDefinition_spritesArchive, this.field3316, 0); + var1 = FillMode.SpriteBuffer_getSprite(field3300, this.field3308, 0); if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3316); - } - - return var1; - } - } - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(B)Lls;", - garbageValue = "101" - ) - public Sprite method4472() { - if (this.field3311 < 0) { - return null; - } else { - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3311); - if (var1 != null) { - return var1; - } else { - var1 = TilePaint.SpriteBuffer_getSprite(GrandExchangeOfferTotalQuantityComparator.HitSplatDefinition_spritesArchive, this.field3311, 0); - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3311); - } - - return var1; - } - } - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(B)Lls;", - garbageValue = "-74" - ) - public Sprite method4470() { - if (this.field3312 < 0) { - return null; - } else { - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3312); - if (var1 != null) { - return var1; - } else { - var1 = TilePaint.SpriteBuffer_getSprite(GrandExchangeOfferTotalQuantityComparator.HitSplatDefinition_spritesArchive, this.field3312, 0); - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3312); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3308); } return var1; @@ -358,8 +317,54 @@ public class HitSplatDefinition extends DualNode { @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)Lkb;", - garbageValue = "489170470" + signature = "(I)Lli;", + garbageValue = "-1399773302" + ) + public Sprite method4570() { + if (this.field3312 < 0) { + return null; + } else { + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3312); + if (var1 != null) { + return var1; + } else { + var1 = FillMode.SpriteBuffer_getSprite(field3300, this.field3312, 0); + if (var1 != null) { + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3312); + } + + return var1; + } + } + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "(S)Lli;", + garbageValue = "-24882" + ) + public Sprite method4561() { + if (this.field3313 < 0) { + return null; + } else { + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3313); + if (var1 != null) { + return var1; + } else { + var1 = FillMode.SpriteBuffer_getSprite(field3300, this.field3313, 0); + if (var1 != null) { + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3313); + } + + return var1; + } + } + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "(B)Lkf;", + garbageValue = "0" ) @Export("getFont") public Font getFont() { @@ -370,49 +375,196 @@ public class HitSplatDefinition extends DualNode { if (var1 != null) { return var1; } else { - var1 = FileSystem.SpriteBuffer_getFont(GrandExchangeOfferTotalQuantityComparator.HitSplatDefinition_spritesArchive, class43.HitSplatDefinition_fontsArchive, this.fontId, 0); - if (var1 != null) { - HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId); + AbstractArchive var3 = field3300; + AbstractArchive var4 = class189.HitSplatDefinition_fontsArchive; + int var5 = this.fontId; + byte[] var7 = var3.takeFile(var5, 0); + boolean var6; + if (var7 == null) { + var6 = false; + } else { + GrandExchangeOfferWorldComparator.SpriteBuffer_decode(var7); + var6 = true; } - return var1; + Font var2; + if (!var6) { + var2 = null; + } else { + byte[] var8 = var4.takeFile(var5, 0); + Font var10; + if (var8 == null) { + var10 = null; + } else { + Font var9 = new Font(var8, class325.SpriteBuffer_xOffsets, SecureRandomCallable.SpriteBuffer_yOffsets, class325.SpriteBuffer_spriteWidths, SoundSystem.SpriteBuffer_spriteHeights, class325.SpriteBuffer_spritePalette, InvDefinition.SpriteBuffer_pixels); + class192.SpriteBuffer_clear(); + var10 = var9; + } + + var2 = var10; + } + + if (var2 != null) { + HitSplatDefinition_cachedFonts.put(var2, (long)this.fontId); + } + + return var2; } } } - @ObfuscatedName("gn") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-977763631" + signature = "([BIII)Z", + garbageValue = "-240401517" ) - static boolean method4497() { - return (Client.drawPlayerNames & 4) != 0; + static final boolean method4589(byte[] var0, int var1, int var2) { + boolean var3 = true; + Buffer var4 = new Buffer(var0); + int var5 = -1; + + label67: + while (true) { + int var6 = var4.method5480(); + 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 label67; + } + + 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) { + ObjectDefinition var15 = WallDecoration.getObjectDefinition(var5); + if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { + if (!var15.needsModelFiles()) { + ++Client.field676; + var3 = false; + } + + var8 = true; + } + } + } + + var9 = var4.readUShortSmart(); + if (var9 == 0) { + break; + } + + var4.readUnsignedByte(); + } + } } - @ObfuscatedName("ih") + @ObfuscatedName("fp") @ObfuscatedSignature( - signature = "(IIIIII)V", - garbageValue = "-380288285" + signature = "(Lbe;B)V", + garbageValue = "0" ) - @Export("drawScrollBar") - static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { - ClientPreferences.scrollBarSprites[0].drawAt(var0, var1); - ClientPreferences.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field702); - int var5 = var3 * (var3 - 32) / var4; - if (var5 < 8) { - var5 = 8; + static final void method4558(Actor var0) { + var0.isWalking = false; + SequenceDefinition var1; + if (var0.movementSequence != -1) { + var1 = class83.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; + WorldMapSectionType.addSequenceSoundEffect(var1, var0.movementFrame, var0.x * -78439701, var0.y); + } + + if (var0.movementFrame >= var1.frameIds.length) { + var0.movementFrameCycle = 0; + var0.movementFrame = 0; + WorldMapSectionType.addSequenceSoundEffect(var1, var0.movementFrame, var0.x * -78439701, var0.y); + } + } else { + var0.movementSequence = -1; + } + } + + if (var0.spotAnimation != -1 && Client.cycle >= var0.field957) { + if (var0.spotAnimationFrame < 0) { + var0.spotAnimationFrame = 0; + } + + int var3 = NetCache.SpotAnimationDefinition_get(var0.spotAnimation).sequence; + if (var3 != -1) { + SequenceDefinition var2 = class83.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; + WorldMapSectionType.addSequenceSoundEffect(var2, var0.spotAnimationFrame, var0.x * -78439701, 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 = class83.SequenceDefinition_get(var0.sequence); + if (var1.field3496 == 1 && var0.field969 > 0 && var0.field963 <= Client.cycle && var0.field964 < Client.cycle) { + var0.sequenceDelay = 1; + return; + } + } + + if (var0.sequence != -1 && var0.sequenceDelay == 0) { + var1 = class83.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; + WorldMapSectionType.addSequenceSoundEffect(var1, var0.sequenceFrame, var0.x * -78439701, var0.y); + } + + if (var0.sequenceFrame >= var1.frameIds.length) { + var0.sequenceFrame -= var1.frameCount; + ++var0.field924; + if (var0.field924 >= var1.field3492) { + var0.sequence = -1; + } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) { + WorldMapSectionType.addSequenceSoundEffect(var1, var0.sequenceFrame, var0.x * -78439701, var0.y); + } else { + var0.sequence = -1; + } + } + + var0.isWalking = var1.field3495; + } else { + var0.sequence = -1; + } + } + + if (var0.sequenceDelay > 0) { + --var0.sequenceDelay; } - int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field687); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field689); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field689); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field689); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field689); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field688); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field688); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field688); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var5 + var6 + var1 + 14, 15, Client.field688); } } diff --git a/runescape-client/src/main/java/HorizontalAlignment.java b/runescape-client/src/main/java/HorizontalAlignment.java index 4cad594e17..c9b86596c8 100644 --- a/runescape-client/src/main/java/HorizontalAlignment.java +++ b/runescape-client/src/main/java/HorizontalAlignment.java @@ -4,35 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ib") +@ObfuscatedName("ie") @Implements("HorizontalAlignment") public enum HorizontalAlignment implements Enumerated { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lib;" + signature = "Lie;" ) - field3436(2, 0), - @ObfuscatedName("j") + field3428(2, 0), + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lib;" + signature = "Lie;" ) @Export("HorizontalAlignment_centered") HorizontalAlignment_centered(1, 1), - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lib;" + signature = "Lie;" ) - field3435(0, 2); + field3430(0, 2); - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1418723399 + intValue = -490726387 ) @Export("value") public final int value; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1581275369 + intValue = 501971729 ) @Export("id") final int id; @@ -42,10 +42,10 @@ public enum HorizontalAlignment implements Enumerated { this.id = var4; } - @ObfuscatedName("j") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-32" + signature = "(I)I", + garbageValue = "-1410702910" ) @Export("rsOrdinal") public int rsOrdinal() { diff --git a/runescape-client/src/main/java/Huffman.java b/runescape-client/src/main/java/Huffman.java index 25c06bcd5e..f81b6eb22c 100644 --- a/runescape-client/src/main/java/Huffman.java +++ b/runescape-client/src/main/java/Huffman.java @@ -3,24 +3,16 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hr") +@ObfuscatedName("hq") @Implements("Huffman") public class Huffman { - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "Lhz;" - ) - @Export("Widget_modelsArchive") - static AbstractArchive Widget_modelsArchive; - @ObfuscatedName("r") - static boolean field2486; - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("masks") int[] masks; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("bits") byte[] bits; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("keys") int[] keys; @@ -107,10 +99,10 @@ public class Huffman { } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "([BII[BIB)I", - garbageValue = "75" + signature = "([BII[BII)I", + garbageValue = "-1468979642" ) @Export("compress") int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) { @@ -128,7 +120,7 @@ public class Huffman { int var11 = var7 >> 3; int var12 = var7 & 7; var6 &= -var12 >> 31; - int var13 = (var12 + var10 - 1 >> 3) + var11; + int var13 = (var10 + var12 - 1 >> 3) + var11; var12 += 24; var4[var11] = (byte)(var6 |= var9 >>> var12); if (var11 < var13) { @@ -158,10 +150,10 @@ public class Huffman { return (var7 + 7 >> 3) - var5; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "([BI[BIII)I", - garbageValue = "-1981194731" + garbageValue = "-103624284" ) @Export("decompress") int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) { @@ -302,33 +294,27 @@ public class Huffman { } } - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "762083438" + signature = "(S)V", + garbageValue = "-31428" ) - public static boolean method3901(int var0) { - return (var0 >> 30 & 1) != 0; + static void method3942() { + Players.Players_count = 0; + + for (int var0 = 0; var0 < 2048; ++var0) { + Players.field1221[var0] = null; + Players.field1220[var0] = 1; + } + } - @ObfuscatedName("r") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;B)Ljava/lang/String;", - garbageValue = "24" + signature = "(I)V", + garbageValue = "-434876538" ) - public static String method3903(CharSequence var0) { - return FontName.method5230('*', var0.length()); - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "191831617" - ) - static final void method3902(String var0) { - PacketBufferNode var1 = MenuAction.getPacketBufferNode(ClientPacket.field2275, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); + static final void method3943() { + WorldMapSection2.method283("You can't add yourself to your own ignore list"); } } diff --git a/runescape-client/src/main/java/IgnoreList.java b/runescape-client/src/main/java/IgnoreList.java index 9acce921a8..842d109974 100644 --- a/runescape-client/src/main/java/IgnoreList.java +++ b/runescape-client/src/main/java/IgnoreList.java @@ -3,60 +3,48 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jk") +@ObfuscatedName("ji") @Implements("IgnoreList") public class IgnoreList extends UserList { - @ObfuscatedName("qz") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lcq;" - ) - @Export("pcmStreamMixer") - static PcmStreamMixer pcmStreamMixer; - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "Ler;" - ) - @Export("World_request") - static UrlRequest World_request; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Llu;" + signature = "Lll;" ) @Export("loginType") final LoginType loginType; @ObfuscatedSignature( - signature = "(Llu;)V" + signature = "(Lll;)V" ) public IgnoreList(LoginType var1) { super(400); this.loginType = var1; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)Lju;", - garbageValue = "-192021045" + signature = "(I)Ljw;", + garbageValue = "-734254876" ) @Export("newInstance") User newInstance() { return new Ignored(); } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(II)[Lju;", - garbageValue = "518998026" + signature = "(II)[Ljw;", + garbageValue = "1353779565" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new Ignored[var1]; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lky;II)V", - garbageValue = "-1855918635" + signature = "(Lkz;IB)V", + garbageValue = "112" ) @Export("read") public void read(Buffer var1, int var2) { @@ -71,7 +59,7 @@ public class IgnoreList extends UserList { Ignored var7 = (Ignored)this.getByCurrentUsername(var5); if (var4) { Ignored var8 = (Ignored)this.getByCurrentUsername(var6); - if (var8 != null && var8 != var7) { + if (var8 != null && var7 != var8) { if (var7 != null) { this.remove(var8); } else { @@ -99,4 +87,14 @@ public class IgnoreList extends UserList { return; } } + + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(Ljava/lang/CharSequence;I)I", + garbageValue = "-317762275" + ) + @Export("parseInt") + public static int parseInt(CharSequence var0) { + return class51.parseIntCustomRadix(var0, 10, true); + } } diff --git a/runescape-client/src/main/java/Ignored.java b/runescape-client/src/main/java/Ignored.java index 5d90ccacc6..5f83106891 100644 --- a/runescape-client/src/main/java/Ignored.java +++ b/runescape-client/src/main/java/Ignored.java @@ -4,12 +4,17 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jb") +@ObfuscatedName("ja") @Implements("Ignored") public class Ignored extends User { - @ObfuscatedName("s") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1012205769 + intValue = -741331501 + ) + static int field3577; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 2731755 ) @Export("id") int id; @@ -17,20 +22,20 @@ public class Ignored extends User { Ignored() { } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljb;I)I", - garbageValue = "-765920098" + signature = "(Lja;I)I", + garbageValue = "-1305970112" ) @Export("compareTo_ignored") int compareTo_ignored(Ignored var1) { return this.id - var1.id; } - @ObfuscatedName("ai") + @ObfuscatedName("an") @ObfuscatedSignature( - signature = "(Lju;B)I", - garbageValue = "1" + signature = "(Ljw;B)I", + garbageValue = "-92" ) @Export("compareTo_user") public int compareTo_user(User var1) { @@ -40,70 +45,4 @@ public class Ignored extends User { public int compareTo(Object var1) { return this.compareTo_ignored((Ignored)var1); } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;IZI)I", - garbageValue = "-1916519196" - ) - @Export("parseIntCustomRadix") - public static int parseIntCustomRadix(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 = var10 + var5 * var1; - if (var9 / var1 != var5) { - throw new NumberFormatException(); - } - - var5 = var9; - var4 = true; - } - - if (!var4) { - throw new NumberFormatException(); - } else { - return var5; - } - } else { - throw new IllegalArgumentException("" + var1); - } - } } diff --git a/runescape-client/src/main/java/IndexedSprite.java b/runescape-client/src/main/java/IndexedSprite.java index 083ff62210..0236bcfce9 100644 --- a/runescape-client/src/main/java/IndexedSprite.java +++ b/runescape-client/src/main/java/IndexedSprite.java @@ -2,35 +2,35 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("lq") +@ObfuscatedName("lt") @Implements("IndexedSprite") public final class IndexedSprite extends Rasterizer2D { - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("pixels") public byte[] pixels; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("palette") public int[] palette; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("subWidth") public int subWidth; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("subHeight") public int subHeight; - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("xOffset") public int xOffset; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("yOffset") public int yOffset; - @ObfuscatedName("t") + @ObfuscatedName("j") @Export("width") public int width; - @ObfuscatedName("q") + @ObfuscatedName("v") @Export("height") public int height; - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("normalize") public void normalize() { if (this.subWidth != this.width || this.subHeight != this.height) { @@ -51,7 +51,7 @@ public final class IndexedSprite extends Rasterizer2D { } } - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("shiftColors") public void shiftColors(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.palette.length; ++var4) { @@ -84,7 +84,7 @@ public final class IndexedSprite extends Rasterizer2D { } - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("drawAt") public void drawAt(int var1, int var2) { var1 += this.xOffset; @@ -130,8 +130,8 @@ public final class IndexedSprite extends Rasterizer2D { } } - @ObfuscatedName("u") - public void method5979(int var1, int var2, int var3, int var4) { + @ObfuscatedName("l") + public void method6059(int var1, int var2, int var3, int var4) { int var5 = this.subWidth; int var6 = this.subHeight; int var7 = 0; @@ -192,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("k") + @ObfuscatedName("g") @Export("IndexedSprite_two") static void IndexedSprite_two(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = -(var5 >> 2); @@ -246,7 +246,7 @@ public final class IndexedSprite extends Rasterizer2D { } - @ObfuscatedName("n") + @ObfuscatedName("u") @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 944b158db8..4021f1ea23 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("dn") +@ObfuscatedName("dw") @Implements("Instrument") public class Instrument { - @ObfuscatedName("e") + @ObfuscatedName("q") @Export("Instrument_samples") static int[] Instrument_samples; - @ObfuscatedName("z") + @ObfuscatedName("y") @Export("Instrument_noise") static int[] Instrument_noise; - @ObfuscatedName("a") + @ObfuscatedName("r") @Export("Instrument_sine") static int[] Instrument_sine; - @ObfuscatedName("l") + @ObfuscatedName("w") @Export("Instrument_phases") static int[] Instrument_phases; - @ObfuscatedName("h") + @ObfuscatedName("m") @Export("Instrument_delays") static int[] Instrument_delays; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("Instrument_volumeSteps") static int[] Instrument_volumeSteps; - @ObfuscatedName("m") + @ObfuscatedName("a") @Export("Instrument_pitchSteps") static int[] Instrument_pitchSteps; - @ObfuscatedName("o") + @ObfuscatedName("b") @Export("Instrument_pitchBaseSteps") static int[] Instrument_pitchBaseSteps; - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Ldv;" + signature = "Ldo;" ) @Export("pitch") SoundEnvelope pitch; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Ldv;" + signature = "Ldo;" ) @Export("volume") SoundEnvelope volume; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Ldv;" + signature = "Ldo;" ) @Export("pitchModifier") SoundEnvelope pitchModifier; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Ldv;" + signature = "Ldo;" ) @Export("pitchModifierAmplitude") SoundEnvelope pitchModifierAmplitude; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Ldv;" + signature = "Ldo;" ) @Export("volumeMultiplier") SoundEnvelope volumeMultiplier; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Ldv;" + signature = "Ldo;" ) @Export("volumeMultiplierAmplitude") SoundEnvelope volumeMultiplierAmplitude; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Ldv;" + signature = "Ldo;" ) @Export("release") SoundEnvelope release; - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Ldv;" + signature = "Ldo;" ) @Export("attack") SoundEnvelope attack; - @ObfuscatedName("x") + @ObfuscatedName("d") @Export("oscillatorVolume") int[] oscillatorVolume; - @ObfuscatedName("d") + @ObfuscatedName("z") @Export("oscillatorPitch") int[] oscillatorPitch; - @ObfuscatedName("f") + @ObfuscatedName("n") @Export("oscillatorDelays") int[] oscillatorDelays; - @ObfuscatedName("c") + @ObfuscatedName("h") @Export("delayTime") int delayTime; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("delayDecay") int delayDecay; - @ObfuscatedName("y") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Ldp;" + signature = "Ldl;" ) @Export("filter") AudioFilter filter; @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Ldv;" + signature = "Ldo;" ) @Export("filterEnvelope") SoundEnvelope filterEnvelope; - @ObfuscatedName("b") + @ObfuscatedName("e") @Export("duration") int duration; - @ObfuscatedName("g") + @ObfuscatedName("i") @Export("offset") int offset; @@ -146,7 +146,7 @@ public class Instrument { this.offset = 0; } - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("synthesize") final int[] synthesize(int var1, int var2) { class300.clearIntArray(Instrument_samples, 0, var1); @@ -353,7 +353,7 @@ public class Instrument { } } - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("evaluateWave") final int evaluateWave(int var1, int var2, int var3) { if (var3 == 1) { @@ -367,9 +367,9 @@ public class Instrument { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lky;)V" + signature = "(Lkz;)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.method2637(var1, this.filterEnvelope); + this.filter.method2666(var1, this.filterEnvelope); } } diff --git a/runescape-client/src/main/java/IntHashTable.java b/runescape-client/src/main/java/IntHashTable.java index 446aafc909..c1fbf0af70 100644 --- a/runescape-client/src/main/java/IntHashTable.java +++ b/runescape-client/src/main/java/IntHashTable.java @@ -3,16 +3,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ly") +@ObfuscatedName("lv") @Implements("IntHashTable") public class IntHashTable { - @ObfuscatedName("gg") - @ObfuscatedSignature( - signature = "[Lls;" - ) - @Export("headIconPrayerSprites") - static Sprite[] headIconPrayerSprites; - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("array") int[] array; @@ -38,10 +32,10 @@ public class IntHashTable { } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IS)I", - garbageValue = "2215" + signature = "(II)I", + garbageValue = "-2041473369" ) @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 7e8c32d9d7..1da8fdfce1 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("fr") +@ObfuscatedName("fb") @Implements("IntegerNode") public class IntegerNode extends Node { - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("integer") public int integer; diff --git a/runescape-client/src/main/java/InterfaceParent.java b/runescape-client/src/main/java/InterfaceParent.java index f372064957..d802e622ed 100644 --- a/runescape-client/src/main/java/InterfaceParent.java +++ b/runescape-client/src/main/java/InterfaceParent.java @@ -1,647 +1,392 @@ -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InvalidClassException; -import java.io.ObjectInputStream; -import java.io.OptionalDataException; -import java.io.StreamCorruptedException; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bq") +@ObfuscatedName("bw") @Implements("InterfaceParent") public class InterfaceParent extends Node { - @ObfuscatedName("b") + @ObfuscatedName("pe") + @Export("ClanChat_inClanChat") + static boolean ClanChat_inClanChat; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -744478163 - ) - @Export("cacheGamebuild") - public static int cacheGamebuild; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 345321709 + intValue = 1880295191 ) @Export("group") int group; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 336963959 + intValue = 386890951 ) @Export("type") int type; - @ObfuscatedName("i") - boolean field540; + @ObfuscatedName("t") + boolean field538; InterfaceParent() { - this.field540 = false; + this.field538 = false; } - @ObfuscatedName("j") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Lkx;B)V", - garbageValue = "1" + signature = "(Lkt;I)V", + garbageValue = "-1718038251" ) - @Export("performReflectionCheck") - public static void performReflectionCheck(PacketBuffer var0) { - ReflectionCheck var1 = (ReflectionCheck)class96.reflectionChecks.last(); - if (var1 != null) { - int var2 = var0.offset; - var0.writeInt(var1.id); + static final void method1123(PacketBuffer var0) { + for (int var1 = 0; var1 < Players.Players_pendingUpdateCount; ++var1) { + int var2 = Players.Players_pendingUpdateIndices[var1]; + Player var3 = Client.players[var2]; + int var4 = var0.readUnsignedByte(); + if ((var4 & 16) != 0) { + var4 += var0.readUnsignedByte() << 8; + } - for (int var3 = 0; var3 < var1.size; ++var3) { - if (var1.creationErrors[var3] != 0) { - var0.writeByte(var1.creationErrors[var3]); + byte var5 = -1; + int var6; + if ((var4 & 512) != 0) { + for (var6 = 0; var6 < 3; ++var6) { + var3.actions[var6] = var0.readStringCp1252NullTerminated(); + } + } + + if ((var4 & 2048) != 0) { + var3.spotAnimation = var0.readUnsignedShort(); + var6 = var0.method5587(); + var3.heightOffset = var6 >> 16; + var3.field957 = (var6 & 65535) + Client.cycle; + var3.spotAnimationFrame = 0; + var3.spotAnimationFrameCycle = 0; + if (var3.field957 > Client.cycle) { + var3.spotAnimationFrame = -1; + } + + if (var3.spotAnimation == 65535) { + var3.spotAnimation = -1; + } + } + + if ((var4 & 8) != 0) { + var6 = var0.method5547(); + byte[] var7 = new byte[var6]; + Buffer var8 = new Buffer(var7); + var0.readBytes(var7, 0, var6); + Players.field1221[var2] = var8; + var3.read(var8); + } + + if ((var4 & 256) != 0) { + var5 = var0.method5497(); + } + + if ((var4 & 1024) != 0) { + Players.field1220[var2] = var0.readByte(); + } + + if ((var4 & 4096) != 0) { + var3.field959 = var0.method5634(); + var3.field961 = var0.method5497(); + var3.field960 = var0.method5634(); + var3.field962 = var0.method5498(); + var3.field963 = var0.method5514() + Client.cycle; + var3.field964 = var0.method5459() + Client.cycle; + var3.field965 = var0.method5514(); + if (var3.field607) { + var3.field959 += var3.tileX; + var3.field961 += var3.tileY; + var3.field960 += var3.tileX; + var3.field962 += var3.tileY; + var3.pathLength = 0; } 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); - } + var3.field959 += var3.pathX[0]; + var3.field961 += var3.pathY[0]; + var3.field960 += var3.pathX[0]; + var3.field962 += var3.pathY[0]; + var3.pathLength = 1; + } - Method var25; - if (var4 != 3) { - if (var4 == 4) { - var25 = var1.methods[var3]; - var6 = var25.getModifiers(); - var0.writeByte(0); - var0.writeInt(var6); - } + var3.field969 = 0; + } + + if ((var4 & 32) != 0) { + var3.targetIndex = var0.method5514(); + if (var3.targetIndex == 65535) { + var3.targetIndex = -1; + } + } + + int var14; + if ((var4 & 64) != 0) { + var6 = var0.method5459(); + if (var6 == 65535) { + var6 = -1; + } + + var14 = var0.method5494(); + FloorUnderlayDefinition.performPlayerAnimation(var3, var6, var14); + } + + if ((var4 & 4) != 0) { + var3.overheadText = var0.readStringCp1252NullTerminated(); + if (var3.overheadText.charAt(0) == '~') { + var3.overheadText = var3.overheadText.substring(1); + WorldMapCacheName.addGameMessage(2, var3.username.getName(), var3.overheadText); + } else if (var3 == Varps.localPlayer) { + WorldMapCacheName.addGameMessage(2, var3.username.getName(), var3.overheadText); + } + + var3.isAutoChatting = false; + var3.overheadTextColor = 0; + var3.overheadTextEffect = 0; + var3.overheadTextCyclesRemaining = 150; + } + + if ((var4 & 2) != 0) { + var3.field945 = var0.method5503(); + if (var3.pathLength == 0) { + var3.orientation = var3.field945; + var3.field945 = -1; + } + } + + int var9; + int var10; + int var13; + if ((var4 & 128) != 0) { + var6 = var0.readUnsignedByte(); + int var11; + int var12; + int var15; + if (var6 > 0) { + for (var14 = 0; var14 < var6; ++var14) { + var9 = -1; + var10 = -1; + var11 = -1; + var15 = var0.readUShortSmart(); + if (var15 == 32767) { + var15 = var0.readUShortSmart(); + var10 = var0.readUShortSmart(); + var9 = var0.readUShortSmart(); + var11 = var0.readUShortSmart(); + } else if (var15 != 32766) { + var10 = var0.readUShortSmart(); } 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); - } + var15 = -1; + } + + var12 = var0.readUShortSmart(); + var3.addHitSplat(var15, var10, var9, var11, Client.cycle, var12); + } + } + + var14 = var0.method5494(); + if (var14 > 0) { + for (var15 = 0; var15 < var14; ++var15) { + var9 = var0.readUShortSmart(); + var10 = var0.readUShortSmart(); + if (var10 != 32767) { + var11 = var0.readUShortSmart(); + var12 = var0.readUnsignedByteNegate(); + var13 = var10 > 0 ? var0.readUnsignedByteNegate() : var12; + var3.addHealthBar(var9, Client.cycle, var10, var11, var12, var13); + } else { + var3.removeHealthBar(var9); } - } 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(); - } - } + if ((var4 & 1) != 0) { + var6 = var0.readUnsignedShort(); + PlayerType var17 = (PlayerType)ServerPacket.findEnumerated(PlayerAppearance.PlayerType_values(), var0.method5494()); + boolean var20 = var0.readUnsignedByteNegate() == 1; + var9 = var0.method5547(); + var10 = var0.offset; + if (var3.username != null && var3.appearance != null) { + boolean var19 = false; + if (var17.isUser && class218.friendSystem.isIgnored(var3.username)) { + var19 = true; + } - @ObfuscatedName("ax") - @ObfuscatedSignature( - signature = "(ILcr;ZB)I", - garbageValue = "-76" - ) - static int method1126(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 6600) { - var3 = ItemContainer.plane; - int var9 = PacketWriter.baseX * 64 + (WorldMapIcon_1.localPlayer.x >> 7); - int var5 = RouteStrategy.baseY * 64 + (WorldMapIcon_1.localPlayer.y >> 7); - LoginScreenAnimation.getWorldMap().method6193(var3, var9, var5, true); - return 1; - } else { - WorldMapArea var11; - if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - String var16 = ""; - var11 = LoginScreenAnimation.getWorldMap().getMapArea(var3); - if (var11 != null) { - var16 = var11.getExternalName(); + if (!var19 && Client.field735 == 0 && !var3.isHidden) { + Players.field1231.offset = 0; + var0.readBytes(Players.field1231.array, 0, var9); + Players.field1231.offset = 0; + String var16 = AbstractFont.escapeBrackets(PacketBufferNode.method3616(GrandExchangeOfferWorldComparator.method60(Players.field1231))); + var3.overheadText = var16.trim(); + var3.overheadTextColor = var6 >> 8; + var3.overheadTextEffect = var6 & 255; + var3.overheadTextCyclesRemaining = 150; + var3.isAutoChatting = var20; + var3.field956 = var3 != Varps.localPlayer && var17.isUser && "" != Client.field778 && var16.toLowerCase().indexOf(Client.field778) == -1; + if (var17.isPrivileged) { + var13 = var20 ? 91 : 1; + } else { + var13 = var20 ? 90 : 2; + } + + if (var17.modIcon != -1) { + WorldMapCacheName.addGameMessage(var13, ArchiveDiskAction.method4133(var17.modIcon) + var3.username.getName(), var16); + } else { + WorldMapCacheName.addGameMessage(var13, var3.username.getName(), var16); + } + } } - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16; - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - LoginScreenAnimation.getWorldMap().setCurrentMapAreaId(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = LoginScreenAnimation.getWorldMap().getZoomLevel(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - LoginScreenAnimation.getWorldMap().setZoomPercentage(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = LoginScreenAnimation.getWorldMap().isCacheLoaded() ? 1 : 0; - return 1; - } else { - Coord var15; - if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { - var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - LoginScreenAnimation.getWorldMap().setWorldMapPositionTarget(var15.x, var15.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { - var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - LoginScreenAnimation.getWorldMap().setWorldMapPositionTargetInstant(var15.x, var15.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { - var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - LoginScreenAnimation.getWorldMap().jumpToSourceCoord(var15.plane, var15.x, var15.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { - var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - LoginScreenAnimation.getWorldMap().jumpToSourceCoordInstant(var15.plane, var15.x, var15.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = LoginScreenAnimation.getWorldMap().getDisplayX(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = LoginScreenAnimation.getWorldMap().getDisplayY(); - return 1; + var0.offset = var10 + var9; + } + + if (var3.field607) { + if (var5 == 127) { + var3.resetPath(var3.tileX, var3.tileY); } else { - WorldMapArea var13; - if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var13 = LoginScreenAnimation.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getOrigin().packed(); - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var13 = LoginScreenAnimation.getWorldMap().getMapArea(var3); - if (var13 == 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] = (var13.getRegionHighX() - var13.getRegionLowX() + 1) * 64; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var13.getRegionHighY() - var13.getRegionLowY() + 1) * 64; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var13 = LoginScreenAnimation.getWorldMap().getMapArea(var3); - if (var13 == 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] = var13.getRegionLowX() * 64; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getRegionLowY() * 64; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getRegionHighX() * 64 + 64 - 1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getRegionHighY() * 64 + 64 - 1; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var13 = LoginScreenAnimation.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getZoom(); - } - - return 1; - } else if (var0 == 6615) { - var15 = LoginScreenAnimation.getWorldMap().getDisplayCoord(); - if (var15 == 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] = var15.x; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var15.y; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = LoginScreenAnimation.getWorldMap().currentMapAreaId(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { - var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - var13 = LoginScreenAnimation.getWorldMap().getCurrentMapArea(); - if (var13 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - return 1; - } else { - int[] var14 = var13.position(var15.plane, var15.x, var15.y); - 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[0]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14[1]; - } - - return 1; - } + byte var18; + if (var5 != -1) { + var18 = var5; } else { - Coord var7; - if (var0 == 6618) { - var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - var13 = LoginScreenAnimation.getWorldMap().getCurrentMapArea(); - if (var13 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - return 1; - } else { - var7 = var13.coord(var15.x, var15.y); - if (var7 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.packed(); - } + var18 = Players.field1220[var2]; + } - return 1; + var3.method1189(var3.tileX, var3.tileY, var18); + } + } + } + + } + + @ObfuscatedName("in") + @ObfuscatedSignature( + signature = "(Lia;IIII)V", + garbageValue = "-861885358" + ) + @Export("addNpcToMenu") + static final void addNpcToMenu(NPCDefinition 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 = Varps.localPlayer.combatLevel; + int var9 = var8 - var7; + String var6; + if (var9 < -9) { + var6 = UserComparator7.colorStartTag(16711680); + } else if (var9 < -6) { + var6 = UserComparator7.colorStartTag(16723968); + } else if (var9 < -3) { + var6 = UserComparator7.colorStartTag(16740352); + } else if (var9 < 0) { + var6 = UserComparator7.colorStartTag(16756736); + } else if (var9 > 9) { + var6 = UserComparator7.colorStartTag(65280); + } else if (var9 > 6) { + var6 = UserComparator7.colorStartTag(4259584); + } else if (var9 > 3) { + var6 = UserComparator7.colorStartTag(8453888); + } else if (var9 > 0) { + var6 = UserComparator7.colorStartTag(12648192); + } else { + var6 = UserComparator7.colorStartTag(16776960); + } + + var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")"; + } + + if (var0.isFollower && Client.followerOpsLowPriority) { + FontName.insertMenuItemNoShift("Examine", UserComparator7.colorStartTag(16776960) + var4, 1003, var1, var2, var3); + } + + if (Client.isItemSelected == 1) { + FontName.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator7.colorStartTag(16776960) + var4, 7, var1, var2, var3); + } else if (Client.isSpellSelected) { + if ((BuddyRankComparator.selectedSpellFlags & 2) == 2) { + FontName.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator7.colorStartTag(16776960) + var4, 8, var1, var2, var3); } } else { - Coord var12; - if (var0 == 6619) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - class208.method3893(var3, var12, false); - return 1; - } else if (var0 == 6620) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - class208.method3893(var3, var12, true); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - var11 = LoginScreenAnimation.getWorldMap().getMapArea(var3); - if (var11 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.containsCoord(var12.plane, var12.x, var12.y) ? 1 : 0; - return 1; - } - } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = LoginScreenAnimation.getWorldMap().getDisplayWith(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = LoginScreenAnimation.getWorldMap().getDisplayHeight(); - return 1; - } else if (var0 == 6623) { - var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - var13 = LoginScreenAnimation.getWorldMap().mapAreaAtCoord(var15.plane, var15.x, var15.y); - if (var13 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13.getId(); - } - - return 1; - } else if (var0 == 6624) { - LoginScreenAnimation.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - return 1; - } else if (var0 == 6625) { - LoginScreenAnimation.getWorldMap().resetMaxFlashCount(); - return 1; - } else if (var0 == 6626) { - LoginScreenAnimation.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - return 1; - } else if (var0 == 6627) { - LoginScreenAnimation.getWorldMap().resetCyclesPerFlash(); - return 1; - } else { - boolean var10; - if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - LoginScreenAnimation.getWorldMap().setPerpetualFlash(var10); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - LoginScreenAnimation.getWorldMap().flashElement(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - LoginScreenAnimation.getWorldMap().flashCategory(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { - LoginScreenAnimation.getWorldMap().stopCurrentFlashes(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - LoginScreenAnimation.getWorldMap().setElementsDisabled(var10); - return 1; - } else { - boolean var4; - if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; - LoginScreenAnimation.getWorldMap().disableElement(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; - LoginScreenAnimation.getWorldMap().setCategoryDisabled(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = LoginScreenAnimation.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] = LoginScreenAnimation.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] = LoginScreenAnimation.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; - return 1; - } else if (var0 == 6638) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - var7 = LoginScreenAnimation.getWorldMap().method6237(var3, var12); - if (var7 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.packed(); + 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; } - return 1; - } else { - AbstractWorldMapIcon var8; - if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { - var8 = LoginScreenAnimation.getWorldMap().iconStart(); - if (var8 == 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] = var8.getElement(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.coord2.packed(); + if (var7 == 1) { + var8 = var10 + 10; + } + + if (var7 == 2) { + var8 = var10 + 11; + } + + if (var7 == 3) { + var8 = var10 + 12; + } + + if (var7 == 4) { + var8 = var10 + 13; + } + + FontName.insertMenuItemNoShift(var11[var7], UserComparator7.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 (AttackOption.AttackOption_alwaysRightClick == Client.npcAttackOption || AttackOption.AttackOption_dependsOnCombatLevels == Client.npcAttackOption && var0.combatLevel > Varps.localPlayer.combatLevel) { + var12 = 2000; } - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { - var8 = LoginScreenAnimation.getWorldMap().iconNext(); - if (var8 == 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] = var8.getElement(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var8.coord2.packed(); + var8 = 0; + if (var7 == 0) { + var8 = var12 + 9; } - return 1; - } else { - WorldMapElement var6; - if (var0 == ScriptOpcodes.MEC_TEXT) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var6 = WorldMapData_0.WorldMapElement_get(var3); - if (var6.name == null) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.name; - } - - return 1; - } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var6 = WorldMapData_0.WorldMapElement_get(var3); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.textSize; - return 1; - } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var6 = WorldMapData_0.WorldMapElement_get(var3); - if (var6 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.category; - } - - return 1; - } else if (var0 == ScriptOpcodes.MEC_SPRITE) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var6 = WorldMapData_0.WorldMapElement_get(var3); - if (var6 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.sprite1; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class162.worldMapEvent.mapElement; - return 1; - } else if (var0 == 6698) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class162.worldMapEvent.coord1.packed(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class162.worldMapEvent.coord2.packed(); - return 1; - } else { - return 2; + if (var7 == 1) { + var8 = var12 + 10; } + + if (var7 == 2) { + var8 = var12 + 11; + } + + if (var7 == 3) { + var8 = var12 + 12; + } + + if (var7 == 4) { + var8 = var12 + 13; + } + + FontName.insertMenuItemNoShift(var11[var7], UserComparator7.colorStartTag(16776960) + var4, var8, var1, var2, var3); } } } } + + if (!var0.isFollower || !Client.followerOpsLowPriority) { + FontName.insertMenuItemNoShift("Examine", UserComparator7.colorStartTag(16776960) + var4, 1003, var1, var2, var3); + } } + } } } } } - - @ObfuscatedName("ed") - @ObfuscatedSignature( - signature = "(Lid;Ljava/lang/String;I)V", - garbageValue = "-1272768850" - ) - static void method1125(Archive var0, String var1) { - ArchiveLoader var2 = new ArchiveLoader(var0, var1); - Client.archiveLoaders.add(var2); - Client.field895 += var2.groupCount; - } - - @ObfuscatedName("iy") - @ObfuscatedSignature( - signature = "(IIIILjava/lang/String;I)V", - garbageValue = "-1914919482" - ) - static void method1127(int var0, int var1, int var2, int var3, String var4) { - Widget var5 = ModelData0.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; - class81.runScriptEvent(var6); - } - - boolean var11 = true; - if (var5.contentType > 0) { - var11 = WorldMapSection1.method563(var5); - } - - if (var11) { - int var8 = ParamDefinition.getWidgetClickMask(var5); - int var9 = var0 - 1; - boolean var7 = (var8 >> var9 + 1 & 1) != 0; - if (var7) { - PacketBufferNode var10; - if (var0 == 1) { - var10 = MenuAction.getPacketBufferNode(ClientPacket.field2253, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 2) { - var10 = MenuAction.getPacketBufferNode(ClientPacket.field2206, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 3) { - var10 = MenuAction.getPacketBufferNode(ClientPacket.field2233, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 4) { - var10 = MenuAction.getPacketBufferNode(ClientPacket.field2204, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 5) { - var10 = MenuAction.getPacketBufferNode(ClientPacket.field2221, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 6) { - var10 = MenuAction.getPacketBufferNode(ClientPacket.field2244, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 7) { - var10 = MenuAction.getPacketBufferNode(ClientPacket.field2276, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 8) { - var10 = MenuAction.getPacketBufferNode(ClientPacket.field2199, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 9) { - var10 = MenuAction.getPacketBufferNode(ClientPacket.field2288, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 10) { - var10 = MenuAction.getPacketBufferNode(ClientPacket.field2245, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - } - } - } - } - - @ObfuscatedName("kr") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1999960041" - ) - @Export("FriendSystem_invalidateIgnoreds") - static final void FriendSystem_invalidateIgnoreds() { - Iterator var0 = Messages.Messages_hashTable.iterator(); - - while (var0.hasNext()) { - Message var1 = (Message)var0.next(); - var1.clearIsFromIgnored(); - } - - if (Client.clanChat != null) { - Client.clanChat.invalidateIgnoreds(); - } - - } } diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index 395fc20dc8..7ef3686885 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -4,62 +4,53 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("be") +@ObfuscatedName("bx") @Implements("Interpreter") public class Interpreter { - @ObfuscatedName("u") + @ObfuscatedName("t") + @Export("Interpreter_intLocals") + static int[] Interpreter_intLocals; + @ObfuscatedName("l") @Export("Interpreter_arrayLengths") static int[] Interpreter_arrayLengths; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("Interpreter_arrays") static int[][] Interpreter_arrays; - @ObfuscatedName("t") + @ObfuscatedName("j") @Export("Interpreter_intStack") static int[] Interpreter_intStack; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 1267204541 - ) - @Export("Interpreter_intStackSize") - static int Interpreter_intStackSize; - @ObfuscatedName("x") + @ObfuscatedName("d") @Export("Interpreter_stringStack") static String[] Interpreter_stringStack; - @ObfuscatedName("d") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1592164881 - ) - @Export("Interpreter_stringStackSize") - static int Interpreter_stringStackSize; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = 579682077 + intValue = -642929591 ) @Export("Interpreter_frameDepth") static int Interpreter_frameDepth; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "[Lbp;" + signature = "[Lbu;" ) @Export("Interpreter_frames") static ScriptFrame[] Interpreter_frames; @ObfuscatedName("p") @Export("Interpreter_calendar") static java.util.Calendar Interpreter_calendar; - @ObfuscatedName("b") + @ObfuscatedName("e") @Export("Interpreter_MONTHS") static final String[] Interpreter_MONTHS; - @ObfuscatedName("e") - static boolean field1074; - @ObfuscatedName("z") - static boolean field1072; - @ObfuscatedName("a") + @ObfuscatedName("q") + static boolean field1067; + @ObfuscatedName("y") + static boolean field1068; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1440593965 + intValue = 3372955 ) - static int field1064; - @ObfuscatedName("v") - static final double field1078; + static int field1066; + @ObfuscatedName("o") + static final double field1070; static { Interpreter_arrayLengths = new int[5]; @@ -70,9 +61,69 @@ 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"}; - field1074 = false; - field1072 = false; - field1064 = 0; - field1078 = Math.log(2.0D); + field1067 = false; + field1068 = false; + field1066 = 0; + field1070 = Math.log(2.0D); + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(II)Lic;", + garbageValue = "2054556426" + ) + @Export("HitSplatDefinition_get") + public static HitSplatDefinition HitSplatDefinition_get(int var0) { + HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); + var1 = new HitSplatDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "(Lhz;Ljava/lang/String;Ljava/lang/String;B)Llt;", + garbageValue = "105" + ) + @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); + byte[] var7 = var0.takeFile(var3, var4); + boolean var6; + if (var7 == null) { + var6 = false; + } else { + GrandExchangeOfferWorldComparator.SpriteBuffer_decode(var7); + var6 = true; + } + + IndexedSprite var5; + if (!var6) { + var5 = null; + } else { + IndexedSprite var8 = new IndexedSprite(); + var8.width = class325.SpriteBuffer_spriteWidth; + var8.height = class325.SpriteBuffer_spriteHeight; + var8.xOffset = class325.SpriteBuffer_xOffsets[0]; + var8.yOffset = SecureRandomCallable.SpriteBuffer_yOffsets[0]; + var8.subWidth = class325.SpriteBuffer_spriteWidths[0]; + var8.subHeight = SoundSystem.SpriteBuffer_spriteHeights[0]; + var8.palette = class325.SpriteBuffer_spritePalette; + var8.pixels = InvDefinition.SpriteBuffer_pixels[0]; + class192.SpriteBuffer_clear(); + var5 = var8; + } + + return var5; } } diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java index 3dc23bcb27..702db3ea7a 100644 --- a/runescape-client/src/main/java/InvDefinition.java +++ b/runescape-client/src/main/java/InvDefinition.java @@ -1,27 +1,34 @@ +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("iz") +@ObfuscatedName("ik") @Implements("InvDefinition") public class InvDefinition extends DualNode { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "Lhz;" ) @Export("InvDefinition_archive") static AbstractArchive InvDefinition_archive; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("InvDefinition_cached") static EvictingDualNodeHashTable InvDefinition_cached; - @ObfuscatedName("i") + @ObfuscatedName("l") + @Export("cacheDir") + static File cacheDir; + @ObfuscatedName("d") + @Export("SpriteBuffer_pixels") + public static byte[][] SpriteBuffer_pixels; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1030135997 + intValue = 1514382049 ) @Export("size") public int size; @@ -34,10 +41,10 @@ public class InvDefinition extends DualNode { this.size = 0; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lky;I)V", - garbageValue = "1381455080" + signature = "(Lkz;I)V", + garbageValue = "406226730" ) @Export("decode") void decode(Buffer var1) { @@ -51,10 +58,10 @@ public class InvDefinition extends DualNode { } } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lky;II)V", - garbageValue = "1993704887" + signature = "(Lkz;II)V", + garbageValue = "-289105808" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -63,32 +70,4 @@ public class InvDefinition extends DualNode { } } - - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1920949744" - ) - @Export("HealthBarDefinition_clearCached") - public static void HealthBarDefinition_clearCached() { - HealthBarDefinition.HealthBarDefinition_cached.clear(); - HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); - } - - @ObfuscatedName("gx") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "797834957" - ) - static void method4273() { - 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) { - class80.addPlayerToScene(Client.players[var1[var2]], true); - } - } - - } } diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java index a674bb824e..4bcbe0731d 100644 --- a/runescape-client/src/main/java/IsaacCipher.java +++ b/runescape-client/src/main/java/IsaacCipher.java @@ -4,36 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("le") +@ObfuscatedName("ld") @Implements("IsaacCipher") public final class IsaacCipher { - @ObfuscatedName("k") + @ObfuscatedName("es") @ObfuscatedGetter( - intValue = 2101983613 + intValue = 553718263 + ) + @Export("port2") + static int port2; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -2000673999 ) @Export("valuesRemaining") int valuesRemaining; - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("results") int[] results; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("mm") int[] mm; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1847891637 + intValue = -562212667 ) @Export("aa") int aa; - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -633737627 + intValue = 1651131677 ) @Export("bb") int bb; - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1193813871 + intValue = 1736617829 ) @Export("cc") int cc; @@ -46,13 +52,13 @@ public final class IsaacCipher { this.results[var2] = var1[var2]; } - this.method6135(); + this.method6203(); } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "226324510" + garbageValue = "361058639" ) @Export("nextInt") public final int nextInt() { @@ -64,12 +70,12 @@ public final class IsaacCipher { return this.results[--this.valuesRemaining]; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(S)I", - garbageValue = "-3994" + signature = "(I)I", + garbageValue = "-1313379717" ) - public final int method6134() { + public final int method6210() { if (this.valuesRemaining == 0) { this.generateMoreResults(); this.valuesRemaining = 256; @@ -78,10 +84,10 @@ public final class IsaacCipher { return this.results[this.valuesRemaining - 1]; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "70" + signature = "(I)V", + garbageValue = "-1660936627" ) @Export("generateMoreResults") final void generateMoreResults() { @@ -101,7 +107,7 @@ public final class IsaacCipher { this.aa ^= this.aa >>> 16; } - this.aa += this.mm[var1 + 128 & 255]; + this.aa += this.mm[128 + var1 & 255]; int var3; this.mm[var1] = var3 = this.mm[(var2 & 1020) >> 2] + this.bb + this.aa; this.results[var1] = this.bb = this.mm[(var3 >> 8 & 1020) >> 2] + var2; @@ -109,12 +115,12 @@ public final class IsaacCipher { } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "1" + signature = "(I)V", + garbageValue = "-2007825108" ) - final void method6135() { + final void method6203() { int var9 = -1640531527; int var8 = -1640531527; int var7 = -1640531527; diff --git a/runescape-client/src/main/java/ItemContainer.java b/runescape-client/src/main/java/ItemContainer.java index a9dab62006..07f4ae31a2 100644 --- a/runescape-client/src/main/java/ItemContainer.java +++ b/runescape-client/src/main/java/ItemContainer.java @@ -1,33 +1,21 @@ -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("bv") +@ObfuscatedName("bf") @Implements("ItemContainer") public class ItemContainer extends Node { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "Llm;" ) @Export("itemContainers") static NodeHashTable itemContainers; - @ObfuscatedName("jo") - @ObfuscatedGetter( - intValue = -311647147 - ) - @Export("plane") - static int plane; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("ids") int[] ids; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("quantities") int[] quantities; @@ -40,820 +28,22 @@ public class ItemContainer extends Node { this.quantities = new int[]{0}; } - @ObfuscatedName("k") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "124" + signature = "(I)[Lii;", + garbageValue = "-1732973980" ) - static void method1120() { - if (Login.Login_username == null || Login.Login_username.length() <= 0) { - if (GrandExchangeOffer.clientPreferences.rememberedUsername != null) { - Login.Login_username = GrandExchangeOffer.clientPreferences.rememberedUsername; - Client.Login_isUsernameRemembered = true; - } else { - Client.Login_isUsernameRemembered = false; - } - - } + static VerticalAlignment[] method1120() { + return new VerticalAlignment[]{VerticalAlignment.field3170, VerticalAlignment.field3172, VerticalAlignment.VerticalAlignment_centered}; } - @ObfuscatedName("q") + @ObfuscatedName("iw") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "70" + signature = "(I)Z", + garbageValue = "-476511275" ) - static void method1118() { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - GrandExchangeOfferOwnWorldComparator.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); - } else { - long var1 = ObjectSound.method1836(); - byte var0; - if (var1 == 0L) { - var0 = 5; - } else { - String var4 = Login.Login_username; - Random var5 = new Random(); - Buffer var6 = new Buffer(128); - Buffer var7 = new Buffer(128); - int[] var8 = new int[]{var5.nextInt(), var5.nextInt(), (int)(var1 >> 32), (int)var1}; - var6.writeByte(10); - - int var9; - for (var9 = 0; var9 < 4; ++var9) { - var6.writeInt(var5.nextInt()); - } - - var6.writeInt(var8[0]); - var6.writeInt(var8[1]); - var6.writeLong(var1); - var6.writeLong(0L); - - for (var9 = 0; var9 < 4; ++var9) { - var6.writeInt(var5.nextInt()); - } - - var6.encryptRsa(class80.field1108, class80.field1110); - var7.writeByte(10); - - for (var9 = 0; var9 < 3; ++var9) { - var7.writeInt(var5.nextInt()); - } - - var7.writeLong(var5.nextLong()); - var7.writeLongMedium(var5.nextLong()); - FloorDecoration.method2787(var7); - var7.writeLong(var5.nextLong()); - var7.encryptRsa(class80.field1108, class80.field1110); - var9 = Buddy.stringCp1252NullTerminatedByteSize(var4); - if (var9 % 8 != 0) { - var9 += 8 - var9 % 8; - } - - Buffer var10 = new Buffer(var9); - var10.writeStringCp1252NullTerminated(var4); - var10.offset = var9; - var10.xteaEncryptAll(var8); - Buffer var11 = new Buffer(var7.offset + var6.offset + var10.offset + 5); - var11.writeByte(2); - var11.writeByte(var6.offset); - var11.writeBytes(var6.array, 0, var6.offset); - var11.writeByte(var7.offset); - var11.writeBytes(var7.array, 0, var7.offset); - var11.writeShort(var10.offset); - var11.writeBytes(var10.array, 0, var10.offset); - String var12 = ViewportMouse.method2902(var11.array); - - byte var3; - try { - URL var13 = new URL(RouteStrategy.method3534("services", false) + "m=accountappeal/login.ws"); - URLConnection var14 = var13.openConnection(); - var14.setDoInput(true); - var14.setDoOutput(true); - var14.setConnectTimeout(5000); - OutputStreamWriter var15 = new OutputStreamWriter(var14.getOutputStream()); - var15.write("data2=" + WorldMapAreaData.method658(var12) + "&dest=" + WorldMapAreaData.method658("passwordchoice.ws")); - var15.flush(); - InputStream var16 = var14.getInputStream(); - var11 = new Buffer(new byte[1000]); - - while (true) { - int var17 = var16.read(var11.array, var11.offset, 1000 - var11.offset); - if (var17 == -1) { - var15.close(); - var16.close(); - String var18 = new String(var11.array); - if (var18.startsWith("OFFLINE")) { - var3 = 4; - } else if (var18.startsWith("WRONG")) { - var3 = 7; - } else if (var18.startsWith("RELOAD")) { - var3 = 3; - } else if (var18.startsWith("Not permitted for social network accounts.")) { - var3 = 6; - } else { - var11.xteaDecryptAll(var8); - - while (var11.offset > 0 && var11.array[var11.offset - 1] == 0) { - --var11.offset; - } - - var18 = new String(var11.array, 0, var11.offset); - if (class3.isValidURL(var18)) { - GameObject.openURL(var18, true, false); - var3 = 2; - } else { - var3 = 5; - } - } - break; - } - - var11.offset += var17; - if (var11.offset >= 1000) { - var3 = 5; - break; - } - } - } catch (Throwable var19) { - var19.printStackTrace(); - var3 = 5; - } - - var0 = var3; - } - - switch(var0) { - case 2: - GrandExchangeOfferOwnWorldComparator.setLoginResponseString(Strings.field3007, Strings.field3008, Strings.field3009); - Login.loginIndex = 6; - break; - case 3: - GrandExchangeOfferOwnWorldComparator.setLoginResponseString("", "Error connecting to server.", ""); - break; - case 4: - GrandExchangeOfferOwnWorldComparator.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); - break; - case 5: - GrandExchangeOfferOwnWorldComparator.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); - break; - case 6: - GrandExchangeOfferOwnWorldComparator.setLoginResponseString("", "Error connecting to server.", ""); - break; - case 7: - GrandExchangeOfferOwnWorldComparator.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("eb") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "22" - ) - @Export("load") - static void load() { - int var0; - if (Client.titleLoadingStage == 0) { - Player.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); - - for (var0 = 0; var0 < 4; ++var0) { - Client.collisionMaps[var0] = new CollisionMap(104, 104); - } - - ParamDefinition.sceneMinimapSprite = new Sprite(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) { - Client.archive0 = UserComparator10.newArchive(0, false, true, true); - class269.archive1 = UserComparator10.newArchive(1, false, true, true); - HealthBarUpdate.archive2 = UserComparator10.newArchive(2, true, false, true); - UserComparator8.archive3 = UserComparator10.newArchive(3, false, true, true); - WorldMapSprite.archive4 = UserComparator10.newArchive(4, false, true, true); - WorldMapDecoration.archive5 = UserComparator10.newArchive(5, true, true, true); - GrandExchangeEvent.archive6 = UserComparator10.newArchive(6, true, true, true); - class51.archive7 = UserComparator10.newArchive(7, false, true, true); - class2.archive8 = UserComparator10.newArchive(8, false, true, true); - WorldMapDecoration.archive9 = UserComparator10.newArchive(9, false, true, true); - GameObject.archive10 = UserComparator10.newArchive(10, false, true, true); - WorldMapRectangle.archive11 = UserComparator10.newArchive(11, false, true, true); - GameShell.archive12 = UserComparator10.newArchive(12, false, true, true); - WorldMapID.archive13 = UserComparator10.newArchive(13, true, false, true); - WorldMapSection1.archive14 = UserComparator10.newArchive(14, false, true, true); - GrandExchangeOfferWorldComparator.archive15 = UserComparator10.newArchive(15, false, true, true); - WorldMapIcon_1.archive17 = UserComparator10.newArchive(17, true, true, true); - class40.archive18 = UserComparator10.newArchive(18, false, true, true); - SoundCache.archive19 = UserComparator10.newArchive(19, false, true, true); - Script.archive20 = UserComparator10.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 var31 = 0; - var0 = var31 + Client.archive0.percentage() * 4 / 100; - var0 += class269.archive1.percentage() * 4 / 100; - var0 += HealthBarUpdate.archive2.percentage() * 2 / 100; - var0 += UserComparator8.archive3.percentage() * 2 / 100; - var0 += WorldMapSprite.archive4.percentage() * 6 / 100; - var0 += WorldMapDecoration.archive5.percentage() * 4 / 100; - var0 += GrandExchangeEvent.archive6.percentage() * 2 / 100; - var0 += class51.archive7.percentage() * 56 / 100; - var0 += class2.archive8.percentage() * 2 / 100; - var0 += WorldMapDecoration.archive9.percentage() * 2 / 100; - var0 += GameObject.archive10.percentage() * 2 / 100; - var0 += WorldMapRectangle.archive11.percentage() * 2 / 100; - var0 += GameShell.archive12.percentage() * 2 / 100; - var0 += WorldMapID.archive13.percentage() * 2 / 100; - var0 += WorldMapSection1.archive14.percentage() * 2 / 100; - var0 += GrandExchangeOfferWorldComparator.archive15.percentage() * 2 / 100; - var0 += SoundCache.archive19.percentage() / 100; - var0 += class40.archive18.percentage() / 100; - var0 += Script.archive20.percentage() / 100; - var0 += WorldMapIcon_1.archive17.method4177() && WorldMapIcon_1.archive17.isFullyLoaded() ? 1 : 0; - if (var0 != 100) { - if (var0 != 0) { - Login.Login_loadingText = "Checking for updates - " + var0 + "%"; - } - - Login.Login_loadingPercent = 30; - } else { - InterfaceParent.method1125(Client.archive0, "Animations"); - InterfaceParent.method1125(class269.archive1, "Skeletons"); - InterfaceParent.method1125(WorldMapSprite.archive4, "Sound FX"); - InterfaceParent.method1125(WorldMapDecoration.archive5, "Maps"); - InterfaceParent.method1125(GrandExchangeEvent.archive6, "Music Tracks"); - InterfaceParent.method1125(class51.archive7, "Models"); - InterfaceParent.method1125(class2.archive8, "Sprites"); - InterfaceParent.method1125(WorldMapRectangle.archive11, "Music Jingles"); - InterfaceParent.method1125(WorldMapSection1.archive14, "Music Samples"); - InterfaceParent.method1125(GrandExchangeOfferWorldComparator.archive15, "Music Patches"); - InterfaceParent.method1125(SoundCache.archive19, "World Map"); - InterfaceParent.method1125(class40.archive18, "World Map Geography"); - InterfaceParent.method1125(Script.archive20, "World Map Ground"); - class197.spriteIds = new GraphicsDefaults(); - class197.spriteIds.decode(WorldMapIcon_1.archive17); - Login.Login_loadingText = "Loaded update list"; - Login.Login_loadingPercent = 30; - Client.titleLoadingStage = 45; - } - } else if (Client.titleLoadingStage == 45) { - PlayerType.PcmPlayer_configure(22050, !Client.isLowDetail, 2); - MidiPcmStream var34 = new MidiPcmStream(); - var34.method3655(9, 128); - MouseRecorder.pcmPlayer0 = ArchiveDisk.method5757(GameShell.taskHandler, 0, 22050); - MouseRecorder.pcmPlayer0.setStream(var34); - PlayerType.setAudioArchives(GrandExchangeOfferWorldComparator.archive15, WorldMapSection1.archive14, WorldMapSprite.archive4, var34); - SoundCache.pcmPlayer1 = ArchiveDisk.method5757(GameShell.taskHandler, 1, 2048); - IgnoreList.pcmStreamMixer = new PcmStreamMixer(); - SoundCache.pcmPlayer1.setStream(IgnoreList.pcmStreamMixer); - class247.decimator = new Decimator(22050, PcmPlayer.PcmPlayer_sampleRate); - Login.Login_loadingText = "Prepared sound engine"; - Login.Login_loadingPercent = 35; - Client.titleLoadingStage = 50; - UserComparator7.WorldMapElement_fonts = new Fonts(class2.archive8, WorldMapID.archive13); - } else { - int var1; - if (Client.titleLoadingStage == 50) { - FontName[] var33 = new FontName[]{FontName.FontName_verdana13, FontName.FontName_bold12, FontName.FontName_plain11, FontName.FontName_verdana15, FontName.FontName_verdana11, FontName.FontName_plain12}; - var1 = var33.length; - Fonts var28 = UserComparator7.WorldMapElement_fonts; - FontName[] var29 = new FontName[]{FontName.FontName_verdana13, FontName.FontName_bold12, FontName.FontName_plain11, FontName.FontName_verdana15, FontName.FontName_verdana11, FontName.FontName_plain12}; - Client.fontsMap = var28.createMap(var29); - if (Client.fontsMap.size() < var1) { - Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var1 + "%"; - Login.Login_loadingPercent = 40; - } else { - class30.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); - ClientPacket.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); - class43.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); - World.platformInfo = Client.platformInfoProvider.get(); - Login.Login_loadingText = "Loaded fonts"; - Login.Login_loadingPercent = 40; - Client.titleLoadingStage = 60; - } - } else if (Client.titleLoadingStage == 60) { - var0 = Language.method3607(GameObject.archive10, class2.archive8); - var1 = HealthBarUpdate.method1683(); - if (var0 < var1) { - Login.Login_loadingText = "Loading title screen - " + var0 * 100 / var1 + "%"; - Login.Login_loadingPercent = 50; - } else { - Login.Login_loadingText = "Loaded title screen"; - Login.Login_loadingPercent = 50; - FloorDecoration.updateGameState(5); - Client.titleLoadingStage = 70; - } - } else { - Archive var2; - if (Client.titleLoadingStage == 70) { - if (!HealthBarUpdate.archive2.isFullyLoaded()) { - Login.Login_loadingText = "Loading config - " + HealthBarUpdate.archive2.loadPercent() + "%"; - Login.Login_loadingPercent = 60; - } else { - Archive var32 = HealthBarUpdate.archive2; - FloorOverlayDefinition.FloorOverlayDefinition_archive = var32; - CollisionMap.FloorUnderlayDefinition_setArchives(HealthBarUpdate.archive2); - Archive var35 = HealthBarUpdate.archive2; - var2 = class51.archive7; - class297.KitDefinition_archive = var35; - KitDefinition.KitDefinition_modelsArchive = var2; - KitDefinition.KitDefinition_fileCount = class297.KitDefinition_archive.getGroupFileCount(3); - Archive var3 = HealthBarUpdate.archive2; - Archive var4 = class51.archive7; - boolean var5 = Client.isLowDetail; - ObjectDefinition.ObjectDefinition_archive = var3; - ObjectDefinition.ObjectDefinition_modelsArchive = var4; - ObjectDefinition.ObjectDefinition_isLowDetail = var5; - WorldMapArea.NpcDefinition_setArchives(HealthBarUpdate.archive2, class51.archive7); - Archive var6 = HealthBarUpdate.archive2; - StructDefinition.StructDefinition_archive = var6; - class188.method3589(HealthBarUpdate.archive2, class51.archive7, Client.isMembersWorld, class30.fontPlain11); - Fonts.method5234(HealthBarUpdate.archive2, Client.archive0, class269.archive1); - Archive var30 = HealthBarUpdate.archive2; - Archive var8 = class51.archive7; - SpotAnimationDefinition.SpotAnimationDefinition_archive = var30; - SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var8; - class192.method3614(HealthBarUpdate.archive2); - Tiles.VarpDefinition_setArchives(HealthBarUpdate.archive2); - UserComparator10.Widget_setArchives(UserComparator8.archive3, class51.archive7, class2.archive8, WorldMapID.archive13); - KeyHandler.InvDefinition_setArchives(HealthBarUpdate.archive2); - Archive var9 = HealthBarUpdate.archive2; - EnumDefinition.EnumDefinition_archive = var9; - Archive var10 = HealthBarUpdate.archive2; - VarcInt.VarcInt_archive = var10; - Archive var11 = HealthBarUpdate.archive2; - class339.ParamDefinition_archive = var11; - KeyHandler.varcs = new Varcs(); - Archive var12 = HealthBarUpdate.archive2; - Archive var13 = class2.archive8; - Archive var14 = WorldMapID.archive13; - HitSplatDefinition.HitSplatDefinition_archive = var12; - GrandExchangeOfferTotalQuantityComparator.HitSplatDefinition_spritesArchive = var13; - class43.HitSplatDefinition_fontsArchive = var14; - Archive var15 = HealthBarUpdate.archive2; - Archive var16 = class2.archive8; - HealthBarDefinition.HealthBarDefinition_archive = var15; - HealthBarDefinition.HealthBarDefinition_spritesArchive = var16; - Archive var17 = HealthBarUpdate.archive2; - Archive var18 = class2.archive8; - WorldMapElement.WorldMapElement_archive = var18; - if (var17.isFullyLoaded()) { - WorldMapElement.WorldMapElement_count = var17.getGroupFileCount(35); - WorldMapElement.WorldMapElement_cached = new WorldMapElement[WorldMapElement.WorldMapElement_count]; - - for (int var19 = 0; var19 < WorldMapElement.WorldMapElement_count; ++var19) { - byte[] var20 = var17.takeFile(35, var19); - WorldMapElement.WorldMapElement_cached[var19] = new WorldMapElement(var19); - if (var20 != null) { - WorldMapElement.WorldMapElement_cached[var19].decode(new Buffer(var20)); - WorldMapElement.WorldMapElement_cached[var19].method4290(); - } - } - } - - Login.Login_loadingText = "Loaded config"; - Login.Login_loadingPercent = 60; - Client.titleLoadingStage = 80; - } - } else if (Client.titleLoadingStage == 80) { - var0 = 0; - if (class32.compass == null) { - class32.compass = TilePaint.SpriteBuffer_getSprite(class2.archive8, class197.spriteIds.compass, 0); - } else { - ++var0; - } - - if (UserComparator3.redHintArrowSprite == null) { - UserComparator3.redHintArrowSprite = TilePaint.SpriteBuffer_getSprite(class2.archive8, class197.spriteIds.field3806, 0); - } else { - ++var0; - } - - IndexedSprite var7; - IndexedSprite[] var22; - int var23; - IndexedSprite[] var24; - int var25; - if (GrandExchangeOfferOwnWorldComparator.mapSceneSprites == null) { - var2 = class2.archive8; - var23 = class197.spriteIds.mapScenes; - if (!World.SpriteBuffer_bufferFile(var2, var23, 0)) { - var22 = null; - } else { - var24 = new IndexedSprite[class325.SpriteBuffer_spriteCount]; - - for (var25 = 0; var25 < class325.SpriteBuffer_spriteCount; ++var25) { - var7 = var24[var25] = new IndexedSprite(); - var7.width = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth; - var7.height = class325.SpriteBuffer_spriteHeight; - var7.xOffset = class325.SpriteBuffer_xOffsets[var25]; - var7.yOffset = class325.SpriteBuffer_yOffsets[var25]; - var7.subWidth = class325.SpriteBuffer_spriteWidths[var25]; - var7.subHeight = class225.SpriteBuffer_spriteHeights[var25]; - var7.palette = class325.SpriteBuffer_spritePalette; - var7.pixels = WorldMapSection1.SpriteBuffer_pixels[var25]; - } - - UserComparator7.SpriteBuffer_clear(); - var22 = var24; - } - - GrandExchangeOfferOwnWorldComparator.mapSceneSprites = var22; - } else { - ++var0; - } - - if (UserComparator6.headIconPkSprites == null) { - UserComparator6.headIconPkSprites = WorldMapID.SpriteBuffer_getSpriteArray(class2.archive8, class197.spriteIds.headIconsPk, 0); - } else { - ++var0; - } - - if (IntHashTable.headIconPrayerSprites == null) { - IntHashTable.headIconPrayerSprites = WorldMapID.SpriteBuffer_getSpriteArray(class2.archive8, class197.spriteIds.field3805, 0); - } else { - ++var0; - } - - if (WorldMapData_1.headIconHintSprites == null) { - WorldMapData_1.headIconHintSprites = WorldMapID.SpriteBuffer_getSpriteArray(class2.archive8, class197.spriteIds.field3802, 0); - } else { - ++var0; - } - - if (WorldMapSection1.mapMarkerSprites == null) { - WorldMapSection1.mapMarkerSprites = WorldMapID.SpriteBuffer_getSpriteArray(class2.archive8, class197.spriteIds.field3798, 0); - } else { - ++var0; - } - - if (DefaultsGroup.crossSprites == null) { - DefaultsGroup.crossSprites = WorldMapID.SpriteBuffer_getSpriteArray(class2.archive8, class197.spriteIds.field3804, 0); - } else { - ++var0; - } - - if (WorldMapLabel.mapDotSprites == null) { - WorldMapLabel.mapDotSprites = WorldMapID.SpriteBuffer_getSpriteArray(class2.archive8, class197.spriteIds.field3797, 0); - } else { - ++var0; - } - - if (ClientPreferences.scrollBarSprites == null) { - var2 = class2.archive8; - var23 = class197.spriteIds.field3801; - if (!World.SpriteBuffer_bufferFile(var2, var23, 0)) { - var22 = null; - } else { - var24 = new IndexedSprite[class325.SpriteBuffer_spriteCount]; - - for (var25 = 0; var25 < class325.SpriteBuffer_spriteCount; ++var25) { - var7 = var24[var25] = new IndexedSprite(); - var7.width = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth; - var7.height = class325.SpriteBuffer_spriteHeight; - var7.xOffset = class325.SpriteBuffer_xOffsets[var25]; - var7.yOffset = class325.SpriteBuffer_yOffsets[var25]; - var7.subWidth = class325.SpriteBuffer_spriteWidths[var25]; - var7.subHeight = class225.SpriteBuffer_spriteHeights[var25]; - var7.palette = class325.SpriteBuffer_spritePalette; - var7.pixels = WorldMapSection1.SpriteBuffer_pixels[var25]; - } - - UserComparator7.SpriteBuffer_clear(); - var22 = var24; - } - - ClientPreferences.scrollBarSprites = var22; - } else { - ++var0; - } - - if (Messages.modIconSprites == null) { - var2 = class2.archive8; - var23 = class197.spriteIds.field3807; - if (!World.SpriteBuffer_bufferFile(var2, var23, 0)) { - var22 = null; - } else { - var24 = new IndexedSprite[class325.SpriteBuffer_spriteCount]; - - for (var25 = 0; var25 < class325.SpriteBuffer_spriteCount; ++var25) { - var7 = var24[var25] = new IndexedSprite(); - var7.width = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth; - var7.height = class325.SpriteBuffer_spriteHeight; - var7.xOffset = class325.SpriteBuffer_xOffsets[var25]; - var7.yOffset = class325.SpriteBuffer_yOffsets[var25]; - var7.subWidth = class325.SpriteBuffer_spriteWidths[var25]; - var7.subHeight = class225.SpriteBuffer_spriteHeights[var25]; - var7.palette = class325.SpriteBuffer_spritePalette; - var7.pixels = WorldMapSection1.SpriteBuffer_pixels[var25]; - } - - UserComparator7.SpriteBuffer_clear(); - var22 = var24; - } - - Messages.modIconSprites = var22; - } else { - ++var0; - } - - if (var0 < 11) { - Login.Login_loadingText = "Loading sprites - " + var0 * 100 / 12 + "%"; - Login.Login_loadingPercent = 70; - } else { - AbstractFont.AbstractFont_modIconSprites = Messages.modIconSprites; - UserComparator3.redHintArrowSprite.normalize(); - var1 = (int)(Math.random() * 21.0D) - 10; - int var26 = (int)(Math.random() * 21.0D) - 10; - var23 = (int)(Math.random() * 21.0D) - 10; - int var27 = (int)(Math.random() * 41.0D) - 20; - GrandExchangeOfferOwnWorldComparator.mapSceneSprites[0].shiftColors(var1 + var27, var26 + var27, var23 + var27); - Login.Login_loadingText = "Loaded sprites"; - Login.Login_loadingPercent = 70; - Client.titleLoadingStage = 90; - } - } else if (Client.titleLoadingStage == 90) { - if (!WorldMapDecoration.archive9.isFullyLoaded()) { - Login.Login_loadingText = "Loading textures - " + "0%"; - Login.Login_loadingPercent = 90; - } else { - MenuAction.textureProvider = new TextureProvider(WorldMapDecoration.archive9, class2.archive8, 20, 0.8D, Client.isLowDetail ? 64 : 128); - Rasterizer3D.Rasterizer3D_setTextureLoader(MenuAction.textureProvider); - Rasterizer3D.Rasterizer3D_setBrightness(0.8D); - Client.titleLoadingStage = 100; - } - } else if (Client.titleLoadingStage == 100) { - var0 = MenuAction.textureProvider.getLoadedPercentage(); - if (var0 < 100) { - Login.Login_loadingText = "Loading textures - " + var0 + "%"; - Login.Login_loadingPercent = 90; - } else { - Login.Login_loadingText = "Loaded textures"; - Login.Login_loadingPercent = 90; - Client.titleLoadingStage = 110; - } - } else if (Client.titleLoadingStage == 110) { - Language.mouseRecorder = new MouseRecorder(); - GameShell.taskHandler.newThreadTask(Language.mouseRecorder, 10); - Login.Login_loadingText = "Loaded input handler"; - Login.Login_loadingPercent = 92; - Client.titleLoadingStage = 120; - } else if (Client.titleLoadingStage == 120) { - if (!GameObject.archive10.tryLoadFileByNames("huffman", "")) { - Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; - Login.Login_loadingPercent = 94; - } else { - Huffman var21 = new Huffman(GameObject.archive10.takeFileByNames("huffman", "")); - class210.huffman = var21; - Login.Login_loadingText = "Loaded wordpack"; - Login.Login_loadingPercent = 94; - Client.titleLoadingStage = 130; - } - } else if (Client.titleLoadingStage == 130) { - if (!UserComparator8.archive3.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + UserComparator8.archive3.loadPercent() * 4 / 5 + "%"; - Login.Login_loadingPercent = 96; - } else if (!GameShell.archive12.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + (80 + GameShell.archive12.loadPercent() / 6) + "%"; - Login.Login_loadingPercent = 96; - } else if (!WorldMapID.archive13.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + (96 + WorldMapID.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 (!SoundCache.archive19.tryLoadGroupByName(WorldMapCacheName.field295.name)) { - Login.Login_loadingText = "Loading world map - " + SoundCache.archive19.groupLoadPercentByName(WorldMapCacheName.field295.name) / 10 + "%"; - } else { - if (WorldMapCacheName.worldMap == null) { - WorldMapCacheName.worldMap = new WorldMap(); - WorldMapCacheName.worldMap.init(SoundCache.archive19, class40.archive18, Script.archive20, class43.fontBold12, Client.fontsMap, GrandExchangeOfferOwnWorldComparator.mapSceneSprites); - } - - Login.Login_loadingText = "Loaded world map"; - Client.titleLoadingStage = 150; - } - } else if (Client.titleLoadingStage == 150) { - FloorDecoration.updateGameState(10); - } - } - } - } - - @ObfuscatedName("gi") - @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "-14379933" - ) - static final void method1119(int var0, int var1, int var2, int var3) { - Client.overheadTextCount = 0; - boolean var4 = false; - int var5 = -1; - int var6 = -1; - int var7 = Players.Players_count; - int[] var8 = Players.Players_indices; - - int var9; - for (var9 = 0; var9 < var7 + Client.npcCount; ++var9) { - Object var10; - if (var9 < var7) { - var10 = Client.players[var8[var9]]; - if (var8[var9] == Client.combatTargetPlayerIndex) { - var4 = true; - var5 = var9; - continue; - } - - if (var10 == WorldMapIcon_1.localPlayer) { - var6 = var9; - continue; - } - } else { - var10 = Client.npcs[Client.npcIndices[var9 - var7]]; - } - - ObjectSound.drawActor2d((Actor)var10, var9, var0, var1, var2, var3); - } - - if (Client.renderSelf && var6 != -1) { - ObjectSound.drawActor2d(WorldMapIcon_1.localPlayer, var6, var0, var1, var2, var3); - } - - if (var4) { - ObjectSound.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var5, var0, var1, var2, var3); - } - - for (var9 = 0; var9 < Client.overheadTextCount; ++var9) { - int var19 = Client.overheadTextXs[var9]; - int var11 = Client.overheadTextYs[var9]; - int var12 = Client.overheadTextXOffsets[var9]; - int var13 = Client.overheadTextAscents[var9]; - boolean var14 = true; - - while (var14) { - var14 = false; - - for (int var15 = 0; var15 < var9; ++var15) { - if (var11 + 2 > Client.overheadTextYs[var15] - Client.overheadTextAscents[var15] && var11 - var13 < Client.overheadTextYs[var15] + 2 && var19 - var12 < Client.overheadTextXs[var15] + Client.overheadTextXOffsets[var15] && var12 + var19 > Client.overheadTextXs[var15] - Client.overheadTextXOffsets[var15] && Client.overheadTextYs[var15] - Client.overheadTextAscents[var15] < var11) { - var11 = Client.overheadTextYs[var15] - Client.overheadTextAscents[var15]; - var14 = true; - } - } - } - - Client.viewportTempX = Client.overheadTextXs[var9]; - Client.viewportTempY = Client.overheadTextYs[var9] = var11; - String var20 = Client.overheadText[var9]; - if (Client.chatEffects == 0) { - int var16 = 16776960; - if (Client.overheadTextColors[var9] < 6) { - var16 = Client.field643[Client.overheadTextColors[var9]]; - } - - if (Client.overheadTextColors[var9] == 6) { - var16 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; - } - - if (Client.overheadTextColors[var9] == 7) { - var16 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; - } - - if (Client.overheadTextColors[var9] == 8) { - var16 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016; - } - - int var17; - if (Client.overheadTextColors[var9] == 9) { - var17 = 150 - Client.overheadTextCyclesRemaining[var9]; - if (var17 < 50) { - var16 = var17 * 1280 + 16711680; - } else if (var17 < 100) { - var16 = 16776960 - (var17 - 50) * 327680; - } else if (var17 < 150) { - var16 = (var17 - 100) * 5 + 65280; - } - } - - if (Client.overheadTextColors[var9] == 10) { - var17 = 150 - Client.overheadTextCyclesRemaining[var9]; - if (var17 < 50) { - var16 = var17 * 5 + 16711680; - } else if (var17 < 100) { - var16 = 16711935 - (var17 - 50) * 327680; - } else if (var17 < 150) { - var16 = (var17 - 100) * 327680 + 255 - (var17 - 100) * 5; - } - } - - if (Client.overheadTextColors[var9] == 11) { - var17 = 150 - Client.overheadTextCyclesRemaining[var9]; - if (var17 < 50) { - var16 = 16777215 - var17 * 327685; - } else if (var17 < 100) { - var16 = (var17 - 50) * 327685 + 65280; - } else if (var17 < 150) { - var16 = 16777215 - (var17 - 100) * 327680; - } - } - - if (Client.overheadTextEffects[var9] == 0) { - class43.fontBold12.drawCentered(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0); - } - - if (Client.overheadTextEffects[var9] == 1) { - class43.fontBold12.drawCenteredWave(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var9] == 2) { - class43.fontBold12.drawCenteredWave2(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var9] == 3) { - class43.fontBold12.drawCenteredShake(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var9]); - } - - if (Client.overheadTextEffects[var9] == 4) { - var17 = (150 - Client.overheadTextCyclesRemaining[var9]) * (class43.fontBold12.stringWidth(var20) + 100) / 150; - Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); - class43.fontBold12.draw(var20, var0 + Client.viewportTempX + 50 - var17, Client.viewportTempY + var1, var16, 0); - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); - } - - if (Client.overheadTextEffects[var9] == 5) { - var17 = 150 - Client.overheadTextCyclesRemaining[var9]; - int var18 = 0; - if (var17 < 25) { - var18 = var17 - 25; - } else if (var17 > 125) { - var18 = var17 - 125; - } - - Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - class43.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); - class43.fontBold12.drawCentered(var20, var0 + Client.viewportTempX, var18 + Client.viewportTempY + var1, var16, 0); - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); - } - } else { - class43.fontBold12.drawCentered(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); - } - } - - } - - @ObfuscatedName("ib") - @ObfuscatedSignature( - signature = "([Lhp;IIIZB)V", - garbageValue = "47" - ) - @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) { - NetSocket.alignWidgetSize(var6, var2, var3, var4); - Message.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) { - WorldMapAreaData.revalidateWidgetScroll(var0, var6, var4); - } - } - } - - } - - @ObfuscatedName("lf") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-829944775" - ) - static void method1111() { - if (Client.oculusOrbState == 1) { - Client.field706 = true; - } - + @Export("getTapToDrop") + static boolean getTapToDrop() { + return Client.tapToDrop; } } diff --git a/runescape-client/src/main/java/ItemDefinition.java b/runescape-client/src/main/java/ItemDefinition.java index 6d872514f3..7d4aa4c886 100644 --- a/runescape-client/src/main/java/ItemDefinition.java +++ b/runescape-client/src/main/java/ItemDefinition.java @@ -4,279 +4,288 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iu") +@ObfuscatedName("id") @Implements("ItemDefinition") public class ItemDefinition extends DualNode { - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "[Llq;" + signature = "Lhz;" ) - @Export("runesSprite") - static IndexedSprite[] runesSprite; + @Export("ItemDefinition_modelArchive") + static AbstractArchive ItemDefinition_modelArchive; + @ObfuscatedName("v") + @Export("ItemDefinition_inMembersWorld") + static boolean ItemDefinition_inMembersWorld; @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 60150897 + ) + @Export("ItemDefinition_fileCount") + public static int ItemDefinition_fileCount; + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("ItemDefinition_cached") - static EvictingDualNodeHashTable ItemDefinition_cached; - @ObfuscatedName("f") + public static EvictingDualNodeHashTable ItemDefinition_cached; + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("ItemDefinition_cachedModels") - static EvictingDualNodeHashTable ItemDefinition_cachedModels; - @ObfuscatedName("c") + public static EvictingDualNodeHashTable ItemDefinition_cachedModels; + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("ItemDefinition_cachedSprites") - static EvictingDualNodeHashTable ItemDefinition_cachedSprites; - @ObfuscatedName("y") + public static EvictingDualNodeHashTable ItemDefinition_cachedSprites; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -743623299 + intValue = 1912612409 ) @Export("id") public int id; @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 99735635 + intValue = -1313341031 ) @Export("model") int model; - @ObfuscatedName("b") + @ObfuscatedName("e") @Export("name") public String name; - @ObfuscatedName("g") + @ObfuscatedName("i") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("e") + @ObfuscatedName("q") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("z") + @ObfuscatedName("y") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("a") + @ObfuscatedName("r") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("w") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1471819061 + intValue = -2042590425 ) @Export("zoom2d") public int zoom2d; - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 2046385989 + intValue = -1743434559 ) @Export("xan2d") public int xan2d; - @ObfuscatedName("h") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -903640025 + intValue = 1085324287 ) @Export("yan2d") public int yan2d; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -2140416829 + intValue = -102718805 ) @Export("zan2d") public int zan2d; - @ObfuscatedName("m") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1948155361 + intValue = 500949901 ) @Export("offsetX2d") public int offsetX2d; - @ObfuscatedName("o") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1478685099 + intValue = -1799990123 ) @Export("offsetY2d") public int offsetY2d; - @ObfuscatedName("av") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -1354276567 + intValue = 1644008113 ) @Export("isStackable") public int isStackable; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -958289557 + intValue = 87385417 ) @Export("price") public int price; - @ObfuscatedName("ai") + @ObfuscatedName("ao") @Export("isMembersOnly") public boolean isMembersOnly; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("groundActions") public String[] groundActions; - @ObfuscatedName("az") + @ObfuscatedName("an") @Export("inventoryActions") public String[] inventoryActions; - @ObfuscatedName("an") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -1835834263 + intValue = 16259827 ) @Export("shiftClickIndex") int shiftClickIndex; - @ObfuscatedName("at") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 1757719401 + intValue = 1217765059 ) @Export("maleModel") int maleModel; - @ObfuscatedName("as") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -525657011 + intValue = 1973933317 ) @Export("maleModel1") int maleModel1; - @ObfuscatedName("ak") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -980941699 + intValue = -1646981519 ) @Export("maleOffset") int maleOffset; - @ObfuscatedName("ao") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 613539499 + intValue = -595853889 ) @Export("femaleModel") int femaleModel; - @ObfuscatedName("ac") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -414427589 + intValue = 1954751293 ) @Export("femaleModel1") int femaleModel1; - @ObfuscatedName("ar") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -718468765 + intValue = -2071227399 ) @Export("femaleOffset") int femaleOffset; - @ObfuscatedName("au") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 1212372923 + intValue = -371532613 ) @Export("maleModel2") int maleModel2; - @ObfuscatedName("ax") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 236235039 + intValue = -1430162711 ) @Export("femaleModel2") int femaleModel2; - @ObfuscatedName("ag") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 276710593 + intValue = 538104481 ) @Export("maleHeadModel") int maleHeadModel; - @ObfuscatedName("aa") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = 1055800501 + intValue = -327937313 ) @Export("maleHeadModel2") int maleHeadModel2; - @ObfuscatedName("ap") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -811931801 + intValue = -556260977 ) @Export("femaleHeadModel") int femaleHeadModel; @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -1948782947 + intValue = -963849807 ) @Export("femaleHeadModel2") int femaleHeadModel2; - @ObfuscatedName("ay") + @ObfuscatedName("ar") @Export("countobj") int[] countobj; - @ObfuscatedName("ad") + @ObfuscatedName("ac") @Export("countco") int[] countco; - @ObfuscatedName("al") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 1728909215 + intValue = 175996525 ) @Export("note") public int note; - @ObfuscatedName("ah") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = -563104197 + intValue = 1530246403 ) @Export("noteTemplate") public int noteTemplate; - @ObfuscatedName("ab") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -1992600907 + intValue = 1210123357 ) @Export("resizeX") int resizeX; @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = 1092606201 + intValue = -1429496953 ) @Export("resizeY") int resizeY; - @ObfuscatedName("ae") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 501819811 + intValue = -1015808869 ) @Export("resizeZ") int resizeZ; - @ObfuscatedName("bk") + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = -720780359 + intValue = 988691247 ) @Export("ambient") public int ambient; - @ObfuscatedName("bw") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = 1974435819 + intValue = -695693985 ) @Export("contrast") public int contrast; - @ObfuscatedName("bo") + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = -759816347 + intValue = -531040993 ) @Export("team") public int team; - @ObfuscatedName("bn") + @ObfuscatedName("bp") @ObfuscatedSignature( - signature = "Lln;" + signature = "Llj;" ) @Export("params") IterableNodeHashTable params; - @ObfuscatedName("bp") + @ObfuscatedName("bu") @Export("isTradable") public boolean isTradable; - @ObfuscatedName("bz") + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = 611554827 + intValue = 101502699 ) @Export("unnotedId") int unnotedId; - @ObfuscatedName("bh") + @ObfuscatedName("bv") @ObfuscatedGetter( - intValue = -759297675 + intValue = -1717449585 ) @Export("notedId") int notedId; - @ObfuscatedName("bv") + @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = 1761724879 + intValue = -192562421 ) @Export("placeholder") public int placeholder; - @ObfuscatedName("bj") + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = 1472577679 + intValue = 352187041 ) @Export("placeholderTemplate") public int placeholderTemplate; @@ -328,19 +337,19 @@ public class ItemDefinition extends DualNode { this.placeholderTemplate = -1; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1179170394" + garbageValue = "1647296611" ) @Export("post") void post() { } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lky;B)V", - garbageValue = "-89" + signature = "(Lkz;S)V", + garbageValue = "-4059" ) @Export("decode") void decode(Buffer var1) { @@ -354,10 +363,10 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(Lky;IB)V", - garbageValue = "1" + signature = "(Lkz;II)V", + garbageValue = "1415862705" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -476,16 +485,16 @@ public class ItemDefinition extends DualNode { } else if (var2 == 149) { this.placeholderTemplate = var1.readUnsignedShort(); } else if (var2 == 249) { - this.params = DynamicObject.readStringIntParameters(var1, this.params); + this.params = FloorOverlayDefinition.readStringIntParameters(var1, this.params); } } } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Liu;Liu;I)V", - garbageValue = "-1790253551" + signature = "(Lid;Lid;I)V", + garbageValue = "1350136104" ) @Export("genCert") void genCert(ItemDefinition var1, ItemDefinition var2) { @@ -506,10 +515,10 @@ public class ItemDefinition extends DualNode { this.isStackable = 1; } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Liu;Liu;I)V", - garbageValue = "1803564610" + signature = "(Lid;Lid;I)V", + garbageValue = "-1409711873" ) @Export("genBought") void genBought(ItemDefinition var1, ItemDefinition var2) { @@ -550,10 +559,10 @@ public class ItemDefinition extends DualNode { this.price = 0; } - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(Liu;Liu;B)V", - garbageValue = "56" + signature = "(Lid;Lid;I)V", + garbageValue = "-875564338" ) @Export("genPlaceholder") void genPlaceholder(ItemDefinition var1, ItemDefinition var2) { @@ -575,10 +584,10 @@ public class ItemDefinition extends DualNode { this.isTradable = false; } - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(II)Ldq;", - garbageValue = "-1231151583" + signature = "(IB)Lds;", + garbageValue = "-83" ) @Export("getModelData") public final ModelData getModelData(int var1) { @@ -593,11 +602,11 @@ public class ItemDefinition extends DualNode { } if (var2 != -1) { - return WorldMapData_0.ItemDefinition_get(var2).getModelData(1); + return Player.ItemDefinition_get(var2).getModelData(1); } } - ModelData var4 = ModelData.ModelData_get(Frames.ItemDefinition_modelArchive, this.model, 0); + ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); if (var4 == null) { return null; } else { @@ -621,10 +630,10 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(IB)Ldo;", - garbageValue = "108" + signature = "(IB)Ldr;", + garbageValue = "14" ) @Export("getModel") public final Model getModel(int var1) { @@ -638,7 +647,7 @@ public class ItemDefinition extends DualNode { } if (var2 != -1) { - return WorldMapData_0.ItemDefinition_get(var2).getModel(1); + return Player.ItemDefinition_get(var2).getModel(1); } } @@ -646,7 +655,7 @@ public class ItemDefinition extends DualNode { if (var5 != null) { return var5; } else { - ModelData var6 = ModelData.ModelData_get(Frames.ItemDefinition_modelArchive, this.model, 0); + ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); if (var6 == null) { return null; } else { @@ -675,10 +684,10 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(II)Liu;", - garbageValue = "-16777216" + signature = "(II)Lid;", + garbageValue = "-1719403192" ) @Export("getCountObj") public ItemDefinition getCountObj(int var1) { @@ -692,17 +701,17 @@ public class ItemDefinition extends DualNode { } if (var2 != -1) { - return WorldMapData_0.ItemDefinition_get(var2); + return Player.ItemDefinition_get(var2); } } return this; } - @ObfuscatedName("y") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(ZB)Z", - garbageValue = "14" + garbageValue = "-8" ) @Export("hasNoValidModel") public final boolean hasNoValidModel(boolean var1) { @@ -719,15 +728,15 @@ public class ItemDefinition extends DualNode { return true; } else { boolean var5 = true; - if (!Frames.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { + if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { var5 = false; } - if (var3 != -1 && !Frames.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { + if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { var5 = false; } - if (var4 != -1 && !Frames.ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { + if (var4 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { var5 = false; } @@ -735,12 +744,12 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("p") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(ZI)Ldq;", - garbageValue = "637382984" + signature = "(ZB)Lds;", + garbageValue = "-8" ) - public final ModelData method4557(boolean var1) { + public final ModelData method4657(boolean var1) { int var2 = this.maleModel; int var3 = this.maleModel1; int var4 = this.maleModel2; @@ -753,11 +762,11 @@ public class ItemDefinition extends DualNode { if (var2 == -1) { return null; } else { - ModelData var5 = ModelData.ModelData_get(Frames.ItemDefinition_modelArchive, var2, 0); + ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); if (var3 != -1) { - ModelData var6 = ModelData.ModelData_get(Frames.ItemDefinition_modelArchive, var3, 0); + ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); if (var4 != -1) { - ModelData var7 = ModelData.ModelData_get(Frames.ItemDefinition_modelArchive, var4, 0); + ModelData var7 = ModelData.ModelData_get(ItemDefinition_modelArchive, var4, 0); ModelData[] var8 = new ModelData[]{var5, var6, var7}; var5 = new ModelData(var8, 3); } else { @@ -791,12 +800,12 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("g") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(ZI)Z", - garbageValue = "-1070545015" + signature = "(ZB)Z", + garbageValue = "102" ) - public final boolean method4558(boolean var1) { + public final boolean method4665(boolean var1) { int var2 = this.maleHeadModel; int var3 = this.maleHeadModel2; if (var1) { @@ -808,11 +817,11 @@ public class ItemDefinition extends DualNode { return true; } else { boolean var4 = true; - if (!Frames.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { + if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { var4 = false; } - if (var3 != -1 && !Frames.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { + if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { var4 = false; } @@ -820,12 +829,12 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(ZI)Ldq;", - garbageValue = "1261696933" + signature = "(ZI)Lds;", + garbageValue = "-2056128490" ) - public final ModelData method4559(boolean var1) { + public final ModelData method4659(boolean var1) { int var2 = this.maleHeadModel; int var3 = this.maleHeadModel2; if (var1) { @@ -836,9 +845,9 @@ public class ItemDefinition extends DualNode { if (var2 == -1) { return null; } else { - ModelData var4 = ModelData.ModelData_get(Frames.ItemDefinition_modelArchive, var2, 0); + ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); if (var3 != -1) { - ModelData var5 = ModelData.ModelData_get(Frames.ItemDefinition_modelArchive, var3, 0); + ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); ModelData[] var6 = new ModelData[]{var4, var5}; var4 = new ModelData(var6, 2); } @@ -860,43 +869,43 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("z") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(III)I", - garbageValue = "65280" + garbageValue = "653078547" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { + return class65.method1177(this.params, var1, var2); + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(ILjava/lang/String;S)Ljava/lang/String;", + garbageValue = "19457" + ) + @Export("getStringParam") + public String getStringParam(int var1, String var2) { IterableNodeHashTable var4 = this.params; - int var3; + String var3; if (var4 == null) { var3 = var2; } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); + ObjectNode var5 = (ObjectNode)var4.get((long)var1); if (var5 == null) { var3 = var2; } else { - var3 = var5.integer; + var3 = (String)var5.obj; } } return var3; } - @ObfuscatedName("w") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1785229735" - ) - @Export("getStringParam") - public String getStringParam(int var1, String var2) { - return class227.method4041(this.params, var1, var2); - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-41" + signature = "(I)I", + garbageValue = "-2118248733" ) @Export("getShiftClickIndex") public int getShiftClickIndex() { @@ -910,17 +919,4 @@ public class ItemDefinition extends DualNode { return -1; } } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "2111287919" - ) - public static final void method4629(int var0, int var1) { - ViewportMouse.ViewportMouse_x = var0; - ViewportMouse.ViewportMouse_y = var1; - ViewportMouse.ViewportMouse_isInViewport = true; - ViewportMouse.ViewportMouse_entityCount = 0; - ViewportMouse.ViewportMouse_false0 = false; - } } diff --git a/runescape-client/src/main/java/IterableDualNodeQueue.java b/runescape-client/src/main/java/IterableDualNodeQueue.java index b6fb288953..fd3d550321 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("jm") +@ObfuscatedName("jn") @Implements("IterableDualNodeQueue") public class IterableDualNodeQueue implements Iterable { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lfe;" + signature = "Lfv;" ) @Export("sentinel") public DualNode sentinel; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lfe;" + signature = "Lfv;" ) @Export("head") DualNode head; @@ -26,7 +26,7 @@ public class IterableDualNodeQueue implements Iterable { this.sentinel.nextDual = this.sentinel; } - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("clear") public void clear() { while (this.sentinel.previousDual != this.sentinel) { @@ -35,9 +35,9 @@ public class IterableDualNodeQueue implements Iterable { } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lfe;)V" + signature = "(Lfv;)V" ) @Export("add") public void add(DualNode var1) { @@ -51,9 +51,9 @@ public class IterableDualNodeQueue implements Iterable { var1.previousDual.nextDual = var1; } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "()Lfe;" + signature = "()Lfv;" ) @Export("removeLast") public DualNode removeLast() { @@ -66,18 +66,18 @@ public class IterableDualNodeQueue implements Iterable { } } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "()Lfe;" + signature = "()Lfv;" ) @Export("last") public DualNode last() { return this.previousOrLast((DualNode)null); } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Lfe;)Lfe;" + signature = "(Lfv;)Lfv;" ) @Export("previousOrLast") DualNode previousOrLast(DualNode var1) { @@ -97,9 +97,9 @@ public class IterableDualNodeQueue implements Iterable { } } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "()Lfe;" + signature = "()Lfv;" ) @Export("previous") public DualNode previous() { @@ -117,9 +117,9 @@ public class IterableDualNodeQueue implements Iterable { return new IterableDualNodeQueueIterator(this); } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lfe;Lfe;)V" + signature = "(Lfv;Lfv;)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 3cc6eb8e6e..74d983d7d6 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("jz") +@ObfuscatedName("jf") @Implements("IterableDualNodeQueueIterator") public class IterableDualNodeQueueIterator implements Iterator { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Ljm;" + signature = "Ljn;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lfe;" + signature = "Lfv;" ) @Export("head") DualNode head; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lfe;" + signature = "Lfv;" ) @Export("last") DualNode last; @ObfuscatedSignature( - signature = "(Ljm;)V" + signature = "(Ljn;)V" ) IterableDualNodeQueueIterator(IterableDualNodeQueue var1) { this.last = null; @@ -36,19 +36,6 @@ public class IterableDualNodeQueueIterator implements Iterator { this.last = null; } - public boolean hasNext() { - return this.queue.sentinel != this.head; - } - - public void remove() { - if (this.last == null) { - throw new IllegalStateException(); - } else { - this.last.removeDual(); - this.last = null; - } - } - public Object next() { DualNode var1 = this.head; if (var1 == this.queue.sentinel) { @@ -61,4 +48,17 @@ public class IterableDualNodeQueueIterator implements Iterator { this.last = var1; return var1; } + + public boolean hasNext() { + return this.queue.sentinel != this.head; + } + + public void remove() { + if (this.last == null) { + throw new IllegalStateException(); + } else { + this.last.removeDual(); + this.last = null; + } + } } diff --git a/runescape-client/src/main/java/IterableNodeDeque.java b/runescape-client/src/main/java/IterableNodeDeque.java index 8198d99358..f4cd988b20 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("jp") +@ObfuscatedName("jd") @Implements("IterableNodeDeque") public class IterableNodeDeque implements Iterable, Collection { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lfn;" ) @Export("sentinel") Node sentinel; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lfn;" ) - Node field3511; + Node field3506; public IterableNodeDeque() { this.sentinel = new Node(); @@ -26,7 +26,7 @@ public class IterableNodeDeque implements Iterable, Collection { this.sentinel.next = this.sentinel; } - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("rsClear") public void rsClear() { while (this.sentinel.previous != this.sentinel) { @@ -35,9 +35,9 @@ public class IterableNodeDeque implements Iterable, Collection { } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lfb;)V" + signature = "(Lfn;)V" ) @Export("addFirst") public void addFirst(Node var1) { @@ -51,9 +51,9 @@ public class IterableNodeDeque implements Iterable, Collection { var1.previous.next = var1; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lfb;)V" + signature = "(Lfn;)V" ) @Export("addLast") public void addLast(Node var1) { @@ -67,20 +67,20 @@ public class IterableNodeDeque implements Iterable, Collection { var1.previous.next = var1; } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "()Lfb;" + signature = "()Lfn;" ) @Export("last") public Node last() { - return this.method4726((Node)null); + return this.method4814((Node)null); } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Lfb;)Lfb;" + signature = "(Lfn;)Lfn;" ) - Node method4726(Node var1) { + Node method4814(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.field3511 = null; + this.field3506 = null; return null; } else { - this.field3511 = var2.previous; + this.field3506 = var2.previous; return var2; } } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "()Lfb;" + signature = "()Lfn;" ) @Export("previous") public Node previous() { - Node var1 = this.field3511; + Node var1 = this.field3506; if (var1 == this.sentinel) { - this.field3511 = null; + this.field3506 = null; return null; } else { - this.field3511 = var1.previous; + this.field3506 = var1.previous; return var1; } } - @ObfuscatedName("q") - int method4728() { + @ObfuscatedName("v") + int method4816() { 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("x") - public boolean method4729() { + @ObfuscatedName("d") + public boolean method4874() { return this.sentinel.previous == this.sentinel; } - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "()[Lfb;" + signature = "()[Lfn;" ) - Node[] method4730() { - Node[] var1 = new Node[this.method4728()]; + Node[] method4818() { + Node[] var1 = new Node[this.method4816()]; int var2 = 0; for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { @@ -144,71 +144,31 @@ public class IterableNodeDeque implements Iterable, Collection { return var1; } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lfb;)Z" + signature = "(Lfn;)Z" ) - boolean method4735(Node var1) { + boolean method4819(Node var1) { this.addFirst(var1); return true; } - public boolean isEmpty() { - return this.method4729(); - } - - public int size() { - return this.method4728(); - } - - public void clear() { - this.rsClear(); - } - - public boolean remove(Object var1) { - throw new RuntimeException(); - } - - public boolean containsAll(Collection var1) { - throw new RuntimeException(); - } - - public boolean removeAll(Collection var1) { - throw new RuntimeException(); - } - - public boolean retainAll(Collection var1) { - throw new RuntimeException(); - } - public Iterator iterator() { return new IterableNodeDequeDescendingIterator(this); } - public boolean add(Object var1) { - return this.method4735((Node)var1); + public int size() { + return this.method4816(); + } + + public boolean isEmpty() { + return this.method4874(); } public boolean contains(Object var1) { throw new RuntimeException(); } - public boolean equals(Object var1) { - return super.equals(var1); - } - - public boolean addAll(Collection var1) { - throw new RuntimeException(); - } - - public int hashCode() { - return super.hashCode(); - } - - public Object[] toArray() { - return this.method4730(); - } - public Object[] toArray(Object[] var1) { int var2 = 0; @@ -219,9 +179,49 @@ public class IterableNodeDeque implements Iterable, Collection { return var1; } - @ObfuscatedName("k") + public boolean addAll(Collection var1) { + throw new RuntimeException(); + } + + public boolean add(Object var1) { + return this.method4819((Node)var1); + } + + public int hashCode() { + return super.hashCode(); + } + + public boolean removeAll(Collection var1) { + throw new RuntimeException(); + } + + public boolean remove(Object var1) { + throw new RuntimeException(); + } + + public Object[] toArray() { + return this.method4818(); + } + + public boolean retainAll(Collection var1) { + throw new RuntimeException(); + } + + public boolean containsAll(Collection var1) { + throw new RuntimeException(); + } + + public void clear() { + this.rsClear(); + } + + public boolean equals(Object var1) { + return super.equals(var1); + } + + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lfb;Lfb;)V" + signature = "(Lfn;Lfn;)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 647e023985..00933a6a53 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("jn") +@ObfuscatedName("jh") @Implements("IterableNodeDequeDescendingIterator") public class IterableNodeDequeDescendingIterator implements Iterator { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Ljp;" + signature = "Ljd;" ) @Export("deque") IterableNodeDeque deque; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lfn;" ) - Node field3521; - @ObfuscatedName("i") + Node field3516; + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lfn;" ) @Export("last") Node last; @ObfuscatedSignature( - signature = "(Ljp;)V" + signature = "(Ljd;)V" ) IterableNodeDequeDescendingIterator(IterableNodeDeque var1) { this.last = null; this.setDeque(var1); } - @ObfuscatedName("r") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Ljp;)V" + signature = "(Ljd;)V" ) @Export("setDeque") void setDeque(IterableNodeDeque var1) { @@ -43,36 +43,32 @@ public class IterableNodeDequeDescendingIterator implements Iterator { this.start(); } - @ObfuscatedName("y") + @ObfuscatedName("v") @Export("start") void start() { - this.field3521 = this.deque != null ? this.deque.sentinel.previous : null; + this.field3516 = this.deque != null ? this.deque.sentinel.previous : null; this.last = null; } public boolean hasNext() { - return this.deque.sentinel != this.field3521; - } - - public void remove() { - if (this.last == null) { - throw new IllegalStateException(); - } else { - this.last.remove(); - this.last = null; - } + return this.deque.sentinel != this.field3516; } public Object next() { - Node var1 = this.field3521; + Node var1 = this.field3516; if (var1 == this.deque.sentinel) { var1 = null; - this.field3521 = null; + this.field3516 = null; } else { - this.field3521 = var1.previous; + this.field3516 = var1.previous; } this.last = var1; return var1; } + + public void remove() { + this.last.remove(); + this.last = null; + } } diff --git a/runescape-client/src/main/java/IterableNodeHashTable.java b/runescape-client/src/main/java/IterableNodeHashTable.java index 77e982c36c..b8f453b2bb 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("ln") +@ObfuscatedName("lj") @Implements("IterableNodeHashTable") public final class IterableNodeHashTable implements Iterable { - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("size") int size; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "[Lfb;" + signature = "[Lfn;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lfn;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lfn;" ) @Export("current") Node current; - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("index") int index; @@ -45,9 +45,9 @@ public final class IterableNodeHashTable implements Iterable { } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(J)Lfb;" + signature = "(J)Lfn;" ) @Export("get") public Node get(long var1) { @@ -65,9 +65,9 @@ public final class IterableNodeHashTable implements Iterable { return null; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lfb;J)V" + signature = "(Lfn;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("i") + @ObfuscatedName("t") @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("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "()Lfb;" + signature = "()Lfn;" ) @Export("first") public Node first() { @@ -113,9 +113,9 @@ public final class IterableNodeHashTable implements Iterable { return this.next(); } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "()Lfb;" + signature = "()Lfn;" ) @Export("next") public Node next() { diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java index 72a90848c1..92670e031f 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("lo") +@ObfuscatedName("ls") @Implements("IterableNodeHashTableIterator") public class IterableNodeHashTableIterator implements Iterator { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lln;" + signature = "Llj;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lfn;" ) @Export("head") Node head; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("index") int index; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lfn;" ) @Export("last") Node last; @ObfuscatedSignature( - signature = "(Lln;)V" + signature = "(Llj;)V" ) IterableNodeHashTableIterator(IterableNodeHashTable var1) { this.last = null; @@ -38,7 +38,7 @@ public class IterableNodeHashTableIterator implements Iterator { this.start(); } - @ObfuscatedName("r") + @ObfuscatedName("j") @Export("start") void start() { this.head = this.hashTable.buckets[0].previous; @@ -69,8 +69,12 @@ public class IterableNodeHashTableIterator implements Iterator { } public void remove() { - this.last.remove(); - this.last = null; + if (this.last == null) { + throw new IllegalStateException(); + } else { + this.last.remove(); + this.last = null; + } } public boolean hasNext() { diff --git a/runescape-client/src/main/java/JagexCache.java b/runescape-client/src/main/java/JagexCache.java index f80420a340..129aa8db96 100644 --- a/runescape-client/src/main/java/JagexCache.java +++ b/runescape-client/src/main/java/JagexCache.java @@ -5,31 +5,31 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fh") +@ObfuscatedName("fy") @Implements("JagexCache") public class JagexCache { + @ObfuscatedName("g") + @Export("JagexCache_locationFile") + static File JagexCache_locationFile; @ObfuscatedName("u") - @Export("cacheDir") - public static File cacheDir; - @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1902063795 + intValue = 546367141 ) @Export("idxCount") - public static int idxCount; - @ObfuscatedName("c") + static int idxCount; + @ObfuscatedName("h") @ObfuscatedSignature( signature = "Lmw;" ) @Export("JagexCache_randomDat") public static BufferedFile JagexCache_randomDat; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedSignature( signature = "Lmw;" ) @Export("JagexCache_dat2File") public static BufferedFile JagexCache_dat2File; - @ObfuscatedName("y") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "Lmw;" ) @@ -41,339 +41,4 @@ public class JagexCache { JagexCache_dat2File = null; JagexCache_idx255File = null; } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(CLgk;I)I", - garbageValue = "57673109" - ) - @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("hr") - @ObfuscatedSignature( - signature = "(Lgt;I)V", - garbageValue = "-2026077501" - ) - static final void method3438(class185 var0) { - PacketBuffer var1 = Client.packetWriter.packetBuffer; - int var2; - int var3; - int var4; - int var5; - int var6; - int var7; - int var8; - int var9; - int var42; - if (class185.field2300 == var0) { - var2 = var1.method5438(); - var3 = var2 >> 2; - var4 = var2 & 3; - var5 = Client.field665[var3]; - var6 = var1.readUnsignedByteNegate(); - var7 = (var6 >> 4 & 7) + WorldMapSection1.field283; - var8 = (var6 & 7) + Varps.field2507; - var9 = var1.readUnsignedShort(); - if (var7 >= 0 && var8 >= 0 && var7 < 103 && var8 < 103) { - if (var5 == 0) { - BoundaryObject var10 = Player.scene.method3032(ItemContainer.plane, var7, var8); - if (var10 != null) { - var42 = BoundaryObject.Entity_unpackID(var10.tag); - if (var3 == 2) { - var10.entity1 = new DynamicObject(var42, 2, var4 + 4, ItemContainer.plane, var7, var8, var9, false, var10.entity1); - var10.entity2 = new DynamicObject(var42, 2, var4 + 1 & 3, ItemContainer.plane, var7, var8, var9, false, var10.entity2); - } else { - var10.entity1 = new DynamicObject(var42, var3, var4, ItemContainer.plane, var7, var8, var9, false, var10.entity1); - } - } - } - - if (var5 == 1) { - WallDecoration var39 = Player.scene.method3033(ItemContainer.plane, var7, var8); - if (var39 != null) { - var42 = BoundaryObject.Entity_unpackID(var39.tag); - if (var3 != 4 && var3 != 5) { - if (var3 == 6) { - var39.entity1 = new DynamicObject(var42, 4, var4 + 4, ItemContainer.plane, var7, var8, var9, false, var39.entity1); - } else if (var3 == 7) { - var39.entity1 = new DynamicObject(var42, 4, (var4 + 2 & 3) + 4, ItemContainer.plane, var7, var8, var9, false, var39.entity1); - } else if (var3 == 8) { - var39.entity1 = new DynamicObject(var42, 4, var4 + 4, ItemContainer.plane, var7, var8, var9, false, var39.entity1); - var39.entity2 = new DynamicObject(var42, 4, (var4 + 2 & 3) + 4, ItemContainer.plane, var7, var8, var9, false, var39.entity2); - } - } else { - var39.entity1 = new DynamicObject(var42, 4, var4, ItemContainer.plane, var7, var8, var9, false, var39.entity1); - } - } - } - - if (var5 == 2) { - GameObject var40 = Player.scene.method3034(ItemContainer.plane, var7, var8); - if (var3 == 11) { - var3 = 10; - } - - if (var40 != null) { - var40.entity = new DynamicObject(BoundaryObject.Entity_unpackID(var40.tag), var3, var4, ItemContainer.plane, var7, var8, var9, false, var40.entity); - } - } - - if (var5 == 3) { - FloorDecoration var41 = Player.scene.getFloorDecoration(ItemContainer.plane, var7, var8); - if (var41 != null) { - var41.entity = new DynamicObject(BoundaryObject.Entity_unpackID(var41.tag), 22, var4, ItemContainer.plane, var7, var8, var9, false, var41.entity); - } - } - } - - } else if (class185.field2301 == var0) { - var2 = var1.method5445(); - var3 = var1.method5447(); - var4 = var1.method5445(); - var5 = var1.method5436(); - var6 = (var5 >> 4 & 7) + WorldMapSection1.field283; - var7 = (var5 & 7) + Varps.field2507; - if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { - NodeDeque var45 = Client.groundItems[ItemContainer.plane][var6][var7]; - if (var45 != null) { - for (TileItem var32 = (TileItem)var45.last(); var32 != null; var32 = (TileItem)var45.previous()) { - if ((var2 & 32767) == var32.id && var4 == var32.quantity) { - var32.quantity = var3; - break; - } - } - - class189.updateItemPile(var6, var7); - } - } - - } else if (class185.field2299 == var0) { - var2 = var1.readUnsignedShort(); - var3 = var1.method5436(); - var4 = var1.method5446(); - var5 = var1.readUnsignedByte(); - var6 = (var5 >> 4 & 7) + WorldMapSection1.field283; - var7 = (var5 & 7) + Varps.field2507; - if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { - var6 = var6 * 128 + 64; - var7 = var7 * 128 + 64; - GraphicsObject var31 = new GraphicsObject(var2, ItemContainer.plane, var6, var7, GrandExchangeOfferTotalQuantityComparator.getTileHeight(var6, var7, ItemContainer.plane) - var3, var4, Client.cycle); - Client.graphicsObjects.addFirst(var31); - } - - } else { - int var12; - byte var13; - int var14; - int var33; - if (class185.field2306 == var0) { - var2 = var1.method5438() * 4; - var3 = var1.readUnsignedShort(); - var4 = var1.method5446(); - var5 = var1.method5438() * 4; - var6 = var1.method5448(); - var7 = var1.readUnsignedByte(); - var8 = var1.method5438(); - var9 = var1.method5445(); - var33 = var1.method5436(); - var42 = (var33 >> 4 & 7) + WorldMapSection1.field283; - var12 = (var33 & 7) + Varps.field2507; - var13 = var1.method5616(); - byte var43 = var1.method5421(); - var14 = var43 + var42; - int var44 = var13 + var12; - if (var42 >= 0 && var12 >= 0 && var42 < 104 && var12 < 104 && var14 >= 0 && var44 >= 0 && var14 < 104 && var44 < 104 && var4 != 65535) { - var42 = var42 * 128 + 64; - var12 = var12 * 128 + 64; - var14 = var14 * 128 + 64; - var44 = var44 * 128 + 64; - Projectile var15 = new Projectile(var4, ItemContainer.plane, var42, var12, GrandExchangeOfferTotalQuantityComparator.getTileHeight(var42, var12, ItemContainer.plane) - var5, var9 + Client.cycle, var3 + Client.cycle, var7, var8, var6, var2); - var15.setDestination(var14, var44, GrandExchangeOfferTotalQuantityComparator.getTileHeight(var14, var44, ItemContainer.plane) - var2, var9 + Client.cycle); - Client.projectiles.addFirst(var15); - } - - } else if (class185.field2302 == var0) { - var2 = var1.method5438(); - var3 = var2 >> 2; - var4 = var2 & 3; - var5 = Client.field665[var3]; - var6 = var1.method5438(); - var7 = (var6 >> 4 & 7) + WorldMapSection1.field283; - var8 = (var6 & 7) + Varps.field2507; - if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { - StudioGame.updatePendingSpawn(ItemContainer.plane, var7, var8, var5, -1, var3, var4, 0, -1); - } - - } else { - TileItem var35; - if (class185.field2297 == var0) { - var2 = var1.method5436(); - var3 = (var2 >> 4 & 7) + WorldMapSection1.field283; - var4 = (var2 & 7) + Varps.field2507; - var5 = var1.method5447(); - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { - NodeDeque var34 = Client.groundItems[ItemContainer.plane][var3][var4]; - if (var34 != null) { - for (var35 = (TileItem)var34.last(); var35 != null; var35 = (TileItem)var34.previous()) { - if ((var5 & 32767) == var35.id) { - var35.remove(); - break; - } - } - - if (var34.last() == null) { - Client.groundItems[ItemContainer.plane][var3][var4] = null; - } - - class189.updateItemPile(var3, var4); - } - } - - } else { - if (class185.field2304 == var0) { - var2 = var1.readUnsignedByte(); - var3 = (var2 >> 4 & 7) + WorldMapSection1.field283; - var4 = (var2 & 7) + Varps.field2507; - var5 = var1.method5438(); - var6 = var1.method5436(); - var7 = var6 >> 4 & 15; - var8 = var6 & 7; - var9 = var1.method5447(); - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { - var33 = var7 + 1; - if (WorldMapIcon_1.localPlayer.pathX[0] >= var3 - var33 && WorldMapIcon_1.localPlayer.pathX[0] <= var3 + var33 && WorldMapIcon_1.localPlayer.pathY[0] >= var4 - var33 && WorldMapIcon_1.localPlayer.pathY[0] <= var33 + var4 && Client.field860 != 0 && var8 > 0 && Client.soundEffectCount < 50) { - Client.soundEffectIds[Client.soundEffectCount] = var9; - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var8; - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var5; - Client.soundEffects[Client.soundEffectCount] = null; - Client.soundLocations[Client.soundEffectCount] = var7 + (var4 << 8) + (var3 << 16); - ++Client.soundEffectCount; - } - } - } - - if (class185.field2303 == var0) { - var2 = var1.method5446(); - var3 = var1.method5447(); - var4 = var1.method5436(); - var5 = (var4 >> 4 & 7) + WorldMapSection1.field283; - var6 = (var4 & 7) + Varps.field2507; - if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { - var35 = new TileItem(); - var35.id = var3; - var35.quantity = var2; - if (Client.groundItems[ItemContainer.plane][var5][var6] == null) { - Client.groundItems[ItemContainer.plane][var5][var6] = new NodeDeque(); - } - - Client.groundItems[ItemContainer.plane][var5][var6].addFirst(var35); - class189.updateItemPile(var5, var6); - } - - } else { - if (class185.field2298 == var0) { - byte var37 = var1.method5421(); - var3 = var1.method5447(); - byte var38 = var1.method5421(); - var5 = var1.method5446(); - var6 = var1.readUnsignedShort(); - var7 = var1.method5436(); - var8 = var7 >> 2; - var9 = var7 & 3; - var33 = Client.field665[var8]; - byte var11 = var1.method5616(); - var12 = var1.method5445(); - var13 = var1.method5421(); - var14 = var1.readUnsignedByteNegate(); - int var36 = (var14 >> 4 & 7) + WorldMapSection1.field283; - int var16 = (var14 & 7) + Varps.field2507; - Player var17; - if (var12 == Client.localPlayerIndex) { - var17 = WorldMapIcon_1.localPlayer; - } else { - var17 = Client.players[var12]; - } - - if (var17 != null) { - ObjectDefinition var18 = class215.getObjectDefinition(var5); - int var19; - int var20; - if (var9 != 1 && var9 != 3) { - var19 = var18.sizeX; - var20 = var18.sizeY; - } else { - var19 = var18.sizeY; - var20 = var18.sizeX; - } - - int var21 = var36 + (var19 >> 1); - int var22 = var36 + (var19 + 1 >> 1); - int var23 = var16 + (var20 >> 1); - int var24 = var16 + (var20 + 1 >> 1); - int[][] var25 = Tiles.Tiles_heights[ItemContainer.plane]; - int var26 = var25[var22][var24] + var25[var22][var23] + var25[var21][var23] + var25[var21][var24] >> 2; - int var27 = (var36 << 7) + (var19 << 6); - int var28 = (var16 << 7) + (var20 << 6); - Model var29 = var18.getModel(var8, var9, var25, var27, var26, var28); - if (var29 != null) { - StudioGame.updatePendingSpawn(ItemContainer.plane, var36, var16, var33, -1, 0, 0, var6 + 1, var3 + 1); - var17.animationCycleStart = var6 + Client.cycle; - var17.animationCycleEnd = var3 + Client.cycle; - var17.model0 = var29; - var17.field599 = var36 * 128 + var19 * 64; - var17.field601 = var16 * 128 + var20 * 64; - var17.tileHeight2 = var26; - byte var30; - if (var37 > var13) { - var30 = var37; - var37 = var13; - var13 = var30; - } - - if (var11 > var38) { - var30 = var11; - var11 = var38; - var38 = var30; - } - - var17.field603 = var37 + var36; - var17.field616 = var36 + var13; - var17.field604 = var16 + var11; - var17.field606 = var38 + var16; - } - } - } - - if (class185.field2305 == var0) { - var2 = var1.method5436(); - var3 = (var2 >> 4 & 7) + WorldMapSection1.field283; - var4 = (var2 & 7) + Varps.field2507; - var5 = var1.method5438(); - var6 = var5 >> 2; - var7 = var5 & 3; - var8 = Client.field665[var6]; - var9 = var1.method5446(); - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { - StudioGame.updatePendingSpawn(ItemContainer.plane, var3, var4, var8, var9, var6, var7, 0, -1); - } - - } - } - } - } - } - } } diff --git a/runescape-client/src/main/java/KeyHandler.java b/runescape-client/src/main/java/KeyHandler.java index 11bf8ec799..8c342d0936 100644 --- a/runescape-client/src/main/java/KeyHandler.java +++ b/runescape-client/src/main/java/KeyHandler.java @@ -1,93 +1,88 @@ +import java.awt.FontMetrics; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; -import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ay") +@ObfuscatedName("ar") @Implements("KeyHandler") public final class KeyHandler implements KeyListener, FocusListener { - @ObfuscatedName("oh") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lch;" - ) - @Export("varcs") - static Varcs varcs; - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "Lay;" + signature = "Lar;" ) @Export("KeyHandler_instance") - public static KeyHandler KeyHandler_instance; - @ObfuscatedName("t") - public static short[] field387; - @ObfuscatedName("cp") + static KeyHandler KeyHandler_instance; + @ObfuscatedName("an") + @Export("loginScreenFontMetrics") + static FontMetrics loginScreenFontMetrics; + @ObfuscatedName("ck") @Export("KeyHandler_pressedKeys") public static boolean[] KeyHandler_pressedKeys; - @ObfuscatedName("cb") - public static int[] field374; - @ObfuscatedName("ch") - @ObfuscatedGetter( - intValue = 495485409 - ) - public static int field375; @ObfuscatedName("cn") + static int[] field369; + @ObfuscatedName("cj") @ObfuscatedGetter( - intValue = -2076273353 + intValue = -2082132281 ) - public static int field378; - @ObfuscatedName("cr") - static char[] field377; - @ObfuscatedName("cl") - static int[] field376; - @ObfuscatedName("cg") - public static int[] field379; - @ObfuscatedName("cy") + static int field375; + @ObfuscatedName("cw") @ObfuscatedGetter( - intValue = -1379841439 + intValue = 787094955 + ) + static int field366; + @ObfuscatedName("cu") + static char[] field377; + @ObfuscatedName("cd") + static int[] field378; + @ObfuscatedName("cs") + public static int[] field379; + @ObfuscatedName("cx") + @ObfuscatedGetter( + intValue = 348627163 ) public static int field380; - @ObfuscatedName("cz") + @ObfuscatedName("ci") @ObfuscatedGetter( - intValue = -1494145321 + intValue = -480098305 ) - public static int field385; - @ObfuscatedName("cv") + static int field381; + @ObfuscatedName("cf") @ObfuscatedGetter( - intValue = 1845463833 + intValue = 1914330843 ) - public static int field382; + static int field382; @ObfuscatedName("cq") @ObfuscatedGetter( - intValue = 1982695045 + intValue = 1663219055 ) - public static int field383; - @ObfuscatedName("ct") + static int field383; + @ObfuscatedName("co") @ObfuscatedGetter( - intValue = 1884223821 + intValue = -1108152145 ) @Export("KeyHandler_idleCycles") public static volatile int KeyHandler_idleCycles; - @ObfuscatedName("cx") + @ObfuscatedName("cz") @Export("KeyHandler_keyCodes") static int[] KeyHandler_keyCodes; static { KeyHandler_instance = new KeyHandler(); KeyHandler_pressedKeys = new boolean[112]; - field374 = new int[128]; + field369 = new int[128]; field375 = 0; - field378 = 0; + field366 = 0; field377 = new char[128]; - field376 = new int[128]; + field378 = new int[128]; field379 = new int[128]; field380 = 0; - field385 = 0; + field381 = 0; field382 = 0; field383 = 0; KeyHandler_idleCycles = 0; @@ -97,6 +92,32 @@ 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' && class80.method2029(var2)) { + int var3 = field382 + 1 & 127; + if (var3 != field381) { + field378[field382] = -1; + field377[field382] = var2; + field382 = var3; + } + } + } + + var1.consume(); + } + + public final void focusGained(FocusEvent var1) { + } + + public final synchronized void focusLost(FocusEvent var1) { + if (KeyHandler_instance != null) { + field366 = -1; + } + + } + public final synchronized void keyPressed(KeyEvent var1) { if (KeyHandler_instance != null) { int var2 = var1.getKeyCode(); @@ -109,19 +130,19 @@ public final class KeyHandler implements KeyListener, FocusListener { var2 = -1; } - if (field378 >= 0 && var2 >= 0) { - field374[field378] = var2; - field378 = field378 + 1 & 127; - if (field375 == field378) { - field378 = -1; + if (field366 >= 0 && var2 >= 0) { + field369[field366] = var2; + field366 = field366 + 1 & 127; + if (field366 == field375) { + field366 = -1; } } int var3; if (var2 >= 0) { var3 = field382 + 1 & 127; - if (var3 != field385) { - field376[field382] = var2; + if (var3 != field381) { + field378[field382] = var2; field377[field382] = 0; field382 = var3; } @@ -144,11 +165,11 @@ public final class KeyHandler implements KeyListener, FocusListener { var2 = -1; } - if (field378 >= 0 && var2 >= 0) { - field374[field378] = ~var2; - field378 = field378 + 1 & 127; - if (field375 == field378) { - field378 = -1; + if (field366 >= 0 && var2 >= 0) { + field369[field366] = ~var2; + field366 = field366 + 1 & 127; + if (field375 == field366) { + field366 = -1; } } } @@ -156,151 +177,49 @@ public final class KeyHandler implements KeyListener, FocusListener { var1.consume(); } - public final synchronized void focusLost(FocusEvent var1) { - if (KeyHandler_instance != null) { - field378 = -1; - } + @ObfuscatedName("kv") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;ZI)V", + garbageValue = "-628936499" + ) + @Export("findItemDefinitions") + static void findItemDefinitions(String var0, boolean var1) { + var0 = var0.toLowerCase(); + short[] var2 = new short[16]; + int var3 = 0; - } - - 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' && class218.method4019(var2)) { - int var3 = field382 + 1 & 127; - if (var3 != field385) { - field376[field382] = -1; - field377[field382] = var2; - field382 = var3; + for (int var4 = 0; var4 < ItemDefinition.ItemDefinition_fileCount; ++var4) { + ItemDefinition var5 = Player.ItemDefinition_get(var4); + if ((!var1 || var5.isTradable) && var5.noteTemplate == -1 && var5.name.toLowerCase().indexOf(var0) != -1) { + if (var3 >= 250) { + GrandExchangeOfferNameComparator.foundItemIdCount = -1; + BoundaryObject.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; } } - var1.consume(); - } + BoundaryObject.foundItemIds = var2; + ArchiveLoader.foundItemIndex = 0; + GrandExchangeOfferNameComparator.foundItemIdCount = var3; + String[] var8 = new String[GrandExchangeOfferNameComparator.foundItemIdCount]; - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "([BIII)Ljava/lang/String;", - garbageValue = "1700061188" - ) - public static String method786(byte[] var0, int var1, int var2) { - char[] var3 = new char[var2]; - int var4 = 0; - int var5 = var1; - - 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; - } + for (int var9 = 0; var9 < GrandExchangeOfferNameComparator.foundItemIdCount; ++var9) { + var8[var9] = Player.ItemDefinition_get(var2[var9]).name; } - return new String(var3, 0, var4); - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "(Lhz;B)V", - garbageValue = "-71" - ) - @Export("InvDefinition_setArchives") - public static void InvDefinition_setArchives(AbstractArchive var0) { - InvDefinition.InvDefinition_archive = var0; - } - - @ObfuscatedName("gk") - @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "2136399840" - ) - @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.size * -1143635904 == 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 = WorldMapSprite.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); - var2.playerCycle = Client.cycle; - Player.scene.drawEntity(ItemContainer.plane, var2.x, var2.y, GrandExchangeOfferTotalQuantityComparator.getTileHeight(var2.size * -178253824 - 64 + var2.x, var2.size * -178253824 - 64 + var2.y, ItemContainer.plane), var2.size * -178253824 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); - } - } - } - - } - - @ObfuscatedName("gl") - @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "2032247175" - ) - static final void method787(boolean var0) { - WorldMapSectionType.playPcmPlayers(); - ++Client.packetWriter.pendingWrites; - if (Client.packetWriter.pendingWrites >= 50 || var0) { - Client.packetWriter.pendingWrites = 0; - if (!Client.field672 && Client.packetWriter.getSocket() != null) { - PacketBufferNode var1 = MenuAction.getPacketBufferNode(ClientPacket.field2207, Client.packetWriter.isaacCipher); - Client.packetWriter.addNode(var1); - - try { - Client.packetWriter.flush(); - } catch (IOException var3) { - Client.field672 = true; - } - } - - } + WorldMapRegion.method514(var8, BoundaryObject.foundItemIds); } } diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index cfd072e7e6..7371235038 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -4,58 +4,58 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("if") +@ObfuscatedName("iq") @Implements("KitDefinition") public class KitDefinition extends DualNode { - @ObfuscatedName("j") + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "Lhz;" + ) + @Export("KitDefinition_archive") + static AbstractArchive KitDefinition_archive; + @ObfuscatedName("x") @ObfuscatedSignature( signature = "Lhz;" ) @Export("KitDefinition_modelsArchive") - public static AbstractArchive KitDefinition_modelsArchive; - @ObfuscatedName("i") + static AbstractArchive KitDefinition_modelsArchive; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 542914887 + intValue = -1420370697 ) @Export("KitDefinition_fileCount") public static int KitDefinition_fileCount; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("KitDefinition_cached") public static EvictingDualNodeHashTable KitDefinition_cached; - @ObfuscatedName("v") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1059023965 - ) - @Export("canvasWidth") - public static int canvasWidth; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 131123301 + intValue = -1458485787 ) @Export("bodypartID") public int bodypartID; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("models2") int[] models2; - @ObfuscatedName("t") + @ObfuscatedName("j") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("q") + @ObfuscatedName("v") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("x") + @ObfuscatedName("d") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("d") + @ObfuscatedName("z") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("f") + @ObfuscatedName("n") @Export("models") int[] models; - @ObfuscatedName("c") + @ObfuscatedName("h") @Export("nonSelectable") public boolean nonSelectable; @@ -69,10 +69,10 @@ public class KitDefinition extends DualNode { this.nonSelectable = false; } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lky;I)V", - garbageValue = "-2134697309" + signature = "(Lkz;I)V", + garbageValue = "-1412542037" ) @Export("decode") void decode(Buffer var1) { @@ -86,10 +86,10 @@ public class KitDefinition extends DualNode { } } - @ObfuscatedName("i") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lky;IB)V", - garbageValue = "8" + signature = "(Lkz;II)V", + garbageValue = "502649905" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -132,10 +132,10 @@ public class KitDefinition extends DualNode { } - @ObfuscatedName("k") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1116849084" + garbageValue = "-1419045770" ) @Export("ready") public boolean ready() { @@ -156,8 +156,8 @@ public class KitDefinition extends DualNode { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(I)Ldq;", - garbageValue = "1270539488" + signature = "(B)Lds;", + garbageValue = "-2" ) @Export("getModelData") public ModelData getModelData() { @@ -194,12 +194,12 @@ public class KitDefinition extends DualNode { } } - @ObfuscatedName("n") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "874200774" + garbageValue = "-47118657" ) - public boolean method4360() { + public boolean method4457() { boolean var1 = true; for (int var2 = 0; var2 < 5; ++var2) { @@ -211,10 +211,10 @@ public class KitDefinition extends DualNode { return var1; } - @ObfuscatedName("t") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(I)Ldq;", - garbageValue = "-743084523" + signature = "(B)Lds;", + garbageValue = "-22" ) @Export("getKitDefinitionModels") public ModelData getKitDefinitionModels() { diff --git a/runescape-client/src/main/java/Language.java b/runescape-client/src/main/java/Language.java index e1dbbe6daa..818ee3ba92 100644 --- a/runescape-client/src/main/java/Language.java +++ b/runescape-client/src/main/java/Language.java @@ -5,90 +5,84 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gk") +@ObfuscatedName("gf") @Implements("Language") public class Language implements Enumerated { - @ObfuscatedName("sz") - @ObfuscatedGetter( - intValue = -16153155 - ) - @Export("foundItemIdCount") - static int foundItemIdCount; - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lgk;" + signature = "Lgf;" ) @Export("Language_EN") public static final Language Language_EN; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lgk;" + signature = "Lgf;" ) @Export("Language_DE") static final Language Language_DE; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lgk;" + signature = "Lgf;" ) @Export("Language_FR") public static final Language Language_FR; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lgk;" + signature = "Lgf;" ) @Export("Language_PT") static final Language Language_PT; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Lgk;" + signature = "Lgf;" ) @Export("Language_NL") static final Language Language_NL; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lgk;" + signature = "Lgf;" ) @Export("Language_ES") public static final Language Language_ES; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lgk;" + signature = "Lgf;" ) @Export("Language_ES_MX") static final Language Language_ES_MX; - @ObfuscatedName("f") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "[Lgk;" + signature = "[Lgf;" ) @Export("Language_valuesOrdered") - static final Language[] Language_valuesOrdered; - @ObfuscatedName("cu") + public static final Language[] Language_valuesOrdered; + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lbs;" + signature = "Ldy;" ) - @Export("mouseRecorder") - static MouseRecorder mouseRecorder; - @ObfuscatedName("q") - final String field2330; - @ObfuscatedName("x") + @Export("soundCache") + public static SoundCache soundCache; + @ObfuscatedName("v") + final String field2325; + @ObfuscatedName("d") @Export("language") final String language; - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 327521065 + intValue = 1512457825 ) @Export("id") final int id; static { - Language_EN = new Language("EN", "en", "English", class192.field2360, 0, "GB"); - Language_DE = new Language("DE", "de", "German", class192.field2360, 1, "DE"); - Language_FR = new Language("FR", "fr", "French", class192.field2360, 2, "FR"); - Language_PT = new Language("PT", "pt", "Portuguese", class192.field2360, 3, "BR"); - Language_NL = new Language("NL", "nl", "Dutch", class192.field2361, 4, "NL"); - Language_ES = new Language("ES", "es", "Spanish", class192.field2361, 5, "ES"); - Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", class192.field2360, 6, "MX"); - Language[] var0 = new Language[]{Language_ES_MX, Language_DE, Language_FR, Language_EN, Language_PT, Language_ES, Language_NL}; + Language_EN = new Language("EN", "en", "English", class192.field2345, 0, "GB"); + Language_DE = new Language("DE", "de", "German", class192.field2345, 1, "DE"); + Language_FR = new Language("FR", "fr", "French", class192.field2345, 2, "FR"); + Language_PT = new Language("PT", "pt", "Portuguese", class192.field2345, 3, "BR"); + Language_NL = new Language("NL", "nl", "Dutch", class192.field2340, 4, "NL"); + Language_ES = new Language("ES", "es", "Spanish", class192.field2340, 5, "ES"); + Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", class192.field2345, 6, "MX"); + Language[] var0 = new Language[]{Language_ES_MX, Language_PT, Language_NL, Language_EN, Language_FR, Language_DE, Language_ES}; Language_valuesOrdered = new Language[var0.length]; Language[] var2 = var0; @@ -104,10 +98,10 @@ public class Language implements Enumerated { } @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lgm;ILjava/lang/String;)V" + signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lgh;ILjava/lang/String;)V" ) Language(String var1, String var2, String var3, class192 var4, int var5, String var6) { - this.field2330 = var1; + this.field2325 = var1; this.language = var2; this.id = var5; if (var6 != null) { @@ -118,182 +112,79 @@ public class Language implements Enumerated { } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)Ljava/lang/String;", - garbageValue = "2" - ) - @Export("getLanguage") - String getLanguage() { - return this.language; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-32" + signature = "(I)I", + garbageValue = "-1410702910" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - public String abb() { - return this.getLanguage().toLowerCase(Locale.ENGLISH); - } - - public String abd() { - return this.getLanguage().toLowerCase(Locale.ENGLISH); + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(B)Ljava/lang/String;", + garbageValue = "109" + ) + @Export("getLanguage") + String getLanguage() { + return this.language; } public String toString() { return this.getLanguage().toLowerCase(Locale.ENGLISH); } - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "(Lhz;Lhz;B)I", - garbageValue = "7" - ) - static int method3607(AbstractArchive var0, AbstractArchive var1) { - int var2 = 0; - if (var0.tryLoadFileByNames("title.jpg", "")) { - ++var2; - } - - if (var1.tryLoadFileByNames("logo", "")) { - ++var2; - } - - if (var1.tryLoadFileByNames("logo_deadman_mode", "")) { - ++var2; - } - - if (var1.tryLoadFileByNames("titlebox", "")) { - ++var2; - } - - if (var1.tryLoadFileByNames("titlebutton", "")) { - ++var2; - } - - if (var1.tryLoadFileByNames("runes", "")) { - ++var2; - } - - if (var1.tryLoadFileByNames("title_mute", "")) { - ++var2; - } - - if (var1.tryLoadFileByNames("options_radio_buttons,0", "")) { - ++var2; - } - - if (var1.tryLoadFileByNames("options_radio_buttons,2", "")) { - ++var2; - } - - if (var1.tryLoadFileByNames("options_radio_buttons,4", "")) { - ++var2; - } - - if (var1.tryLoadFileByNames("options_radio_buttons,6", "")) { - ++var2; - } - - var1.tryLoadFileByNames("sl_back", ""); - var1.tryLoadFileByNames("sl_flags", ""); - var1.tryLoadFileByNames("sl_arrows", ""); - var1.tryLoadFileByNames("sl_stars", ""); - var1.tryLoadFileByNames("sl_button", ""); - return var2; + public String aai() { + return this.getLanguage().toLowerCase(Locale.ENGLISH); } - @ObfuscatedName("s") + public String aan() { + return this.getLanguage().toLowerCase(Locale.ENGLISH); + } + + public String aar() { + return this.getLanguage().toLowerCase(Locale.ENGLISH); + } + + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "1963190030" + signature = "(II)Lit;", + garbageValue = "120634659" ) - static int method3605(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var2 == null) { - return -1; + public static VarbitDefinition method3627(int var0) { + VarbitDefinition var1 = (VarbitDefinition)VarbitDefinition.VarbitDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; } else { - return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; - } - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(II)Lgk;", - garbageValue = "1747092797" - ) - public static Language method3602(int var0) { - return var0 >= 0 && var0 < Language_valuesOrdered.length ? Language_valuesOrdered[var0] : null; - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(IIIZIZI)V", - garbageValue = "1439063090" - ) - @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 = ChatChannel.World_worlds[var6]; - ChatChannel.World_worlds[var6] = ChatChannel.World_worlds[var1]; - ChatChannel.World_worlds[var1] = var8; - - for (int var9 = var0; var9 < var1; ++var9) { - World var11 = ChatChannel.World_worlds[var9]; - int var12 = SoundSystem.compareWorlds(var11, var8, var2, var3); - int var10; - if (var12 != 0) { - if (var3) { - var10 = -var12; - } else { - var10 = var12; - } - } else if (var4 == -1) { - var10 = 0; - } else { - int var13 = SoundSystem.compareWorlds(var11, var8, var4, var5); - if (var5) { - var10 = -var13; - } else { - var10 = var13; - } - } - - if (var10 <= 0) { - World var14 = ChatChannel.World_worlds[var9]; - ChatChannel.World_worlds[var9] = ChatChannel.World_worlds[var7]; - ChatChannel.World_worlds[var7++] = var14; - } + byte[] var2 = VarbitDefinition.VarbitDefinition_archive.takeFile(14, var0); + var1 = new VarbitDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); } - ChatChannel.World_worlds[var1] = ChatChannel.World_worlds[var7]; - ChatChannel.World_worlds[var7] = var8; - doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); - doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); + VarbitDefinition.VarbitDefinition_cached.put(var1, (long)var0); + return var1; } - } - @ObfuscatedName("q") + @ObfuscatedName("x") + @Export("ViewportMouse_unpackX") + public static int ViewportMouse_unpackX(long var0) { + return (int)(var0 >>> 7 & 127L); + } + + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "987428009" + signature = "(IIII)I", + garbageValue = "1883889552" ) - @Export("Messages_getLastChatID") - static int Messages_getLastChatID(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); - if (var1 == null) { - return -1; + static int method3634(int var0, int var1, int var2) { + if ((Tiles.Tiles_renderFlags[var0][var1][var2] & 8) != 0) { + return 0; } else { - return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; + return var0 > 0 && (Tiles.Tiles_renderFlags[1][var1][var2] & 2) != 0 ? var0 - 1 : var0; } } } diff --git a/runescape-client/src/main/java/Link.java b/runescape-client/src/main/java/Link.java index e1e6c40ff8..4d8385b5e5 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("fk") +@ObfuscatedName("fx") @Implements("Link") public class Link { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lfk;" + signature = "Lfx;" ) @Export("previous") public Link previous; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lfk;" + signature = "Lfx;" ) @Export("next") public Link next; - @ObfuscatedName("s") + @ObfuscatedName("c") @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 5714321544..2b6b5590eb 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("jf") +@ObfuscatedName("jo") @Implements("LinkDeque") public class LinkDeque { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lfk;" + signature = "Lfx;" ) @Export("sentinel") Link sentinel; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lfk;" + signature = "Lfx;" ) @Export("current") Link current; @@ -25,9 +25,9 @@ public class LinkDeque { this.sentinel.next = this.sentinel; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lfk;)V" + signature = "(Lfx;)V" ) @Export("addFirst") public void addFirst(Link var1) { @@ -41,9 +41,9 @@ public class LinkDeque { var1.previous.next = var1; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "()Lfk;" + signature = "()Lfx;" ) @Export("last") public Link last() { @@ -57,9 +57,9 @@ public class LinkDeque { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "()Lfk;" + signature = "()Lfx;" ) @Export("previous") public Link previous() { diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java index af917d4602..d4321f6355 100644 --- a/runescape-client/src/main/java/Login.java +++ b/runescape-client/src/main/java/Login.java @@ -5,160 +5,142 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cj") +@ObfuscatedName("ca") @Implements("Login") public class Login { - @ObfuscatedName("j") - static boolean field1146; - @ObfuscatedName("i") + @ObfuscatedName("x") + static boolean field1181; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1653930727 + intValue = 479838183 ) @Export("xPadding") static int xPadding; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Llq;" + signature = "Llt;" ) @Export("titleboxSprite") static IndexedSprite titleboxSprite; - @ObfuscatedName("n") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Llq;" - ) - @Export("titlebuttonSprite") - static IndexedSprite titlebuttonSprite; - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Lls;" + signature = "Lli;" ) @Export("leftTitleSprite") static Sprite leftTitleSprite; - @ObfuscatedName("q") + @ObfuscatedName("v") + @Export("ByteArrayPool_altSizeArrayCounts") + static int[] ByteArrayPool_altSizeArrayCounts; + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Lls;" + signature = "Llt;" ) - @Export("rightTitleSprite") - static Sprite rightTitleSprite; + static IndexedSprite field1153; @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Llq;" - ) - @Export("options_buttons_0Sprite") - static IndexedSprite options_buttons_0Sprite; - @ObfuscatedName("r") - @ObfuscatedSignature( - signature = "Llq;" + signature = "Llt;" ) @Export("options_buttons_2Sprite") static IndexedSprite options_buttons_2Sprite; - @ObfuscatedName("e") - public static String[] field1181; - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 751514225 + intValue = 236963295 ) @Export("loginBoxX") static int loginBoxX; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1040783223 - ) - @Export("loginBoxCenter") - static int loginBoxCenter; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 1487498995 + intValue = -1854305915 ) @Export("Login_loadingPercent") static int Login_loadingPercent; - @ObfuscatedName("h") + @ObfuscatedName("m") @Export("Login_loadingText") static String Login_loadingText; - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -577440455 + intValue = -1732800523 ) - static int field1160; - @ObfuscatedName("an") + static int field1156; + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 226287731 + intValue = 123946901 ) static int field1161; - @ObfuscatedName("ao") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -847558949 + intValue = -356113497 ) @Export("loginIndex") static int loginIndex; - @ObfuscatedName("ac") + @ObfuscatedName("ab") @Export("Login_response0") static String Login_response0; - @ObfuscatedName("ar") + @ObfuscatedName("af") @Export("Login_response1") static String Login_response1; - @ObfuscatedName("au") + @ObfuscatedName("ak") @Export("Login_response2") static String Login_response2; - @ObfuscatedName("ax") + @ObfuscatedName("ay") @Export("Login_response3") static String Login_response3; - @ObfuscatedName("ag") + @ObfuscatedName("ae") @Export("Login_username") static String Login_username; - @ObfuscatedName("aa") + @ObfuscatedName("ah") @Export("Login_password") static String Login_password; - @ObfuscatedName("ab") + @ObfuscatedName("am") static boolean field1169; @ObfuscatedName("aw") static boolean field1170; - @ObfuscatedName("bw") - static boolean field1171; - @ObfuscatedName("bo") + @ObfuscatedName("bn") + static boolean field1183; + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = -1465778129 + intValue = -533909079 ) @Export("currentLoginField") static int currentLoginField; - @ObfuscatedName("bh") + @ObfuscatedName("bv") @Export("worldSelectOpen") static boolean worldSelectOpen; - @ObfuscatedName("bd") + @ObfuscatedName("by") @ObfuscatedGetter( - intValue = 1853226103 + intValue = 574364551 ) @Export("hoveredWorldIndex") static int hoveredWorldIndex; - @ObfuscatedName("br") + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = 585792987 + intValue = -1143147941 ) @Export("worldSelectPage") static int worldSelectPage; - @ObfuscatedName("bm") + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = -2101798589 + intValue = -1385855305 ) @Export("worldSelectPagesCount") static int worldSelectPagesCount; - @ObfuscatedName("bu") + @ObfuscatedName("be") @ObfuscatedGetter( - longValue = 2127987050025711637L + longValue = 2260055487054663861L ) - static long field1179; - @ObfuscatedName("bb") + static long field1162; + @ObfuscatedName("bl") @ObfuscatedGetter( - longValue = 2452989139374894339L + longValue = -6819623631366416043L ) - static long field1150; + static long field1164; static { xPadding = 0; loginBoxX = xPadding + 202; Login_loadingPercent = 10; Login_loadingText = ""; - field1160 = -1; + field1156 = -1; field1161 = 1; loginIndex = 0; Login_response0 = ""; @@ -169,7 +151,7 @@ public class Login { Login_password = ""; field1169 = false; field1170 = false; - field1171 = true; + field1183 = true; currentLoginField = 0; worldSelectOpen = false; hoveredWorldIndex = -1; @@ -177,17 +159,65 @@ public class Login { worldSelectPagesCount = 0; new DecimalFormat("##0.00"); new class162(); - field1179 = -1L; - field1150 = -1L; + field1162 = -1L; + field1164 = -1L; } - @ObfuscatedName("kv") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lky;II)V", - garbageValue = "1329186424" + signature = "(I)V", + garbageValue = "-387768527" ) - static void method2031(Buffer var0, int var1) { - Tiles.method1088(var0.array, var1); - WorldMapIcon_1.method295(var0, var1); + public static void method2051() { + 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("ag") + @ObfuscatedSignature( + signature = "(IZII)V", + garbageValue = "-12269440" + ) + @Export("PcmPlayer_configure") + public static final void PcmPlayer_configure(int var0, boolean var1, int var2) { + if (var0 >= 8000 && var0 <= 48000) { + GrandExchangeOfferWorldComparator.PcmPlayer_sampleRate = var0; + PcmPlayer.PcmPlayer_stereo = var1; + GrandExchangeEvents.PcmPlayer_count = var2; + } else { + throw new IllegalArgumentException(); + } + } + + @ObfuscatedName("fk") + @ObfuscatedSignature( + signature = "(Lbe;I)V", + garbageValue = "697733270" + ) + static final void method2075(Actor var0) { + if (var0.field964 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > class83.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { + int var1 = var0.field964 - var0.field963; + int var2 = Client.cycle - var0.field963; + int var3 = var0.field959 * 128 + var0.size * 64; + int var4 = var0.field961 * 128 + var0.size * 64; + int var5 = var0.field960 * 128 + var0.size * 64; + int var6 = var0.field962 * 128 + var0.size * 64; + var0.x = (var5 * var2 + var3 * (var1 - var2)) / var1 * 62504387; + var0.y = (var6 * var2 + var4 * (var1 - var2)) / var1; + } + + var0.field975 = 0; + var0.orientation = var0.field965; + var0.rotation = var0.orientation; } } diff --git a/runescape-client/src/main/java/LoginPacket.java b/runescape-client/src/main/java/LoginPacket.java index c21f1974f3..8878c4e601 100644 --- a/runescape-client/src/main/java/LoginPacket.java +++ b/runescape-client/src/main/java/LoginPacket.java @@ -4,55 +4,61 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ge") +@ObfuscatedName("gz") @Implements("LoginPacket") public class LoginPacket implements class181 { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lge;" + signature = "Lgz;" ) public static final LoginPacket field2291; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lge;" + signature = "Lgz;" ) - static final LoginPacket field2293; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lge;" - ) - public static final LoginPacket field2295; - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Lge;" - ) - public static final LoginPacket field2292; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lge;" - ) - static final LoginPacket field2289; + static final LoginPacket field2288; @ObfuscatedName("t") @ObfuscatedSignature( - signature = "[Lge;" + signature = "Lgz;" + ) + public static final LoginPacket field2289; + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "Lgz;" + ) + public static final LoginPacket field2290; + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "Lgz;" + ) + static final LoginPacket field2295; + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "[Lgz;" ) @Export("LoginPacket_indexedValues") static final LoginPacket[] LoginPacket_indexedValues; - @ObfuscatedName("n") + @ObfuscatedName("ef") @ObfuscatedGetter( - intValue = 1160024949 + intValue = 922550263 + ) + @Export("port3") + static int port3; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -1283459325 ) @Export("id") public final int id; static { field2291 = new LoginPacket(14, 0); - field2293 = new LoginPacket(15, 4); - field2295 = new LoginPacket(16, -2); - field2292 = new LoginPacket(18, -2); - field2289 = new LoginPacket(27, 0); + field2288 = new LoginPacket(15, 4); + field2289 = new LoginPacket(16, -2); + field2290 = new LoginPacket(18, -2); + field2295 = new LoginPacket(27, 0); LoginPacket_indexedValues = new LoginPacket[32]; - LoginPacket[] var0 = class16.method183(); + LoginPacket[] var0 = class13.method139(); for (int var1 = 0; var1 < var0.length; ++var1) { LoginPacket_indexedValues[var0[var1].id] = var0[var1]; @@ -67,51 +73,4 @@ public class LoginPacket implements class181 { LoginPacket(int var1, int var2) { this.id = var1; } - - @ObfuscatedName("ko") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZI)V", - garbageValue = "237960990" - ) - @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 < MouseRecorder.ItemDefinition_fileCount; ++var4) { - ItemDefinition var5 = WorldMapData_0.ItemDefinition_get(var4); - if ((!var1 || var5.isTradable) && var5.noteTemplate == -1 && var5.name.toLowerCase().indexOf(var0) != -1) { - if (var3 >= 250) { - Language.foundItemIdCount = -1; - SecureRandomCallable.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; - } - } - - SecureRandomCallable.foundItemIds = var2; - GrandExchangeOffer.foundItemIndex = 0; - Language.foundItemIdCount = var3; - String[] var8 = new String[Language.foundItemIdCount]; - - for (int var9 = 0; var9 < Language.foundItemIdCount; ++var9) { - var8[var9] = WorldMapData_0.ItemDefinition_get(var2[var9]).name; - } - - short[] var10 = SecureRandomCallable.foundItemIds; - ModelData0.sortItemsByName(var8, var10, 0, var8.length - 1); - } } diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java index 73e1144f8d..b716265f56 100644 --- a/runescape-client/src/main/java/LoginScreenAnimation.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -1,212 +1,211 @@ -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("bt") +@ObfuscatedName("ba") @Implements("LoginScreenAnimation") public class LoginScreenAnimation { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "[Llq;" + signature = "[Llt;" ) @Export("sprites") IndexedSprite[] sprites; - @ObfuscatedName("t") - int[] field1010; - @ObfuscatedName("q") + @ObfuscatedName("j") + int[] field1005; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -792132795 + intValue = 1528929727 ) - int field1007; - @ObfuscatedName("x") - int[] field1012; + int field1006; @ObfuscatedName("d") - int[] field1013; + int[] field1017; + @ObfuscatedName("z") + int[] field1008; + @ObfuscatedName("n") + int[] field1009; + @ObfuscatedName("h") + int[] field1004; @ObfuscatedName("f") - int[] field1014; - @ObfuscatedName("c") - int[] field1025; - @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1331139095 + intValue = -514534825 ) - int field1016; + int field1011; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -1900853499 + ) + int field1012; + @ObfuscatedName("p") + int[] field1010; + @ObfuscatedName("e") + int[] field1001; + @ObfuscatedName("i") + int[] field1015; + @ObfuscatedName("q") + int[] field1016; @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -637921111 + intValue = 2099067717 ) - int field1017; - @ObfuscatedName("p") - int[] field1018; - @ObfuscatedName("b") - int[] field1019; - @ObfuscatedName("g") - int[] field1020; - @ObfuscatedName("e") - int[] field1024; - @ObfuscatedName("z") + int field1014; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 2061231381 + intValue = -2027806404 ) - int field1022; - @ObfuscatedName("a") + int field1018; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 580244368 + intValue = 707933173 ) - int field1023; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -801970233 - ) - int field1009; + int field1007; @ObfuscatedSignature( - signature = "([Llq;)V" + signature = "([Llt;)V" ) LoginScreenAnimation(IndexedSprite[] var1) { - this.field1010 = new int[256]; + this.field1005 = new int[256]; + this.field1006 = 0; + this.field1011 = 0; + this.field1012 = 0; + this.field1014 = 0; + this.field1018 = 0; this.field1007 = 0; - this.field1016 = 0; - this.field1017 = 0; - this.field1022 = 0; - this.field1023 = 0; - this.field1009 = 0; this.sprites = var1; this.initColors(); } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1703436788" + garbageValue = "-1074416899" ) @Export("initColors") void initColors() { - this.field1013 = new int[256]; + this.field1008 = new int[256]; int var1; for (var1 = 0; var1 < 64; ++var1) { - this.field1013[var1] = var1 * 262144; + this.field1008[var1] = var1 * 262144; } for (var1 = 0; var1 < 64; ++var1) { - this.field1013[var1 + 64] = var1 * 1024 + 16711680; + this.field1008[var1 + 64] = var1 * 1024 + 16711680; } for (var1 = 0; var1 < 64; ++var1) { - this.field1013[var1 + 128] = var1 * 4 + 16776960; + this.field1008[var1 + 128] = var1 * 4 + 16776960; } for (var1 = 0; var1 < 64; ++var1) { - this.field1013[var1 + 192] = 16777215; + this.field1008[var1 + 192] = 16777215; } - this.field1014 = new int[256]; + this.field1009 = new int[256]; for (var1 = 0; var1 < 64; ++var1) { - this.field1014[var1] = var1 * 1024; + this.field1009[var1] = var1 * 1024; } for (var1 = 0; var1 < 64; ++var1) { - this.field1014[var1 + 64] = var1 * 4 + 65280; + this.field1009[var1 + 64] = var1 * 4 + 65280; } for (var1 = 0; var1 < 64; ++var1) { - this.field1014[var1 + 128] = var1 * 262144 + 65535; + this.field1009[var1 + 128] = var1 * 262144 + 65535; } for (var1 = 0; var1 < 64; ++var1) { - this.field1014[var1 + 192] = 16777215; + this.field1009[var1 + 192] = 16777215; } - this.field1025 = new int[256]; + this.field1004 = new int[256]; for (var1 = 0; var1 < 64; ++var1) { - this.field1025[var1] = var1 * 4; + this.field1004[var1] = var1 * 4; } for (var1 = 0; var1 < 64; ++var1) { - this.field1025[var1 + 64] = var1 * 262144 + 255; + this.field1004[var1 + 64] = var1 * 262144 + 255; } for (var1 = 0; var1 < 64; ++var1) { - this.field1025[var1 + 128] = var1 * 1024 + 16711935; + this.field1004[var1 + 128] = var1 * 1024 + 16711935; } for (var1 = 0; var1 < 64; ++var1) { - this.field1025[var1 + 192] = 16777215; + this.field1004[var1 + 192] = 16777215; } - this.field1012 = new int[256]; - this.field1022 = 0; - this.field1020 = new int[32768]; - this.field1024 = new int[32768]; - this.method1738((IndexedSprite)null); - this.field1018 = new int[32768]; - this.field1019 = new int[32768]; + this.field1017 = new int[256]; + this.field1014 = 0; + this.field1015 = new int[32768]; + this.field1016 = new int[32768]; + this.method1793((IndexedSprite)null); + this.field1010 = new int[32768]; + this.field1001 = new int[32768]; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "47" + signature = "(I)V", + garbageValue = "-1305859350" ) - void method1731() { - this.field1013 = null; - this.field1014 = null; - this.field1025 = null; - this.field1012 = null; - this.field1020 = null; - this.field1024 = null; - this.field1018 = null; - this.field1019 = null; - this.field1022 = 0; - this.field1023 = 0; + void method1795() { + this.field1008 = null; + this.field1009 = null; + this.field1004 = null; + this.field1017 = null; + this.field1015 = null; + this.field1016 = null; + this.field1010 = null; + this.field1001 = null; + this.field1014 = 0; + this.field1018 = 0; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "-52" + signature = "(III)V", + garbageValue = "-1547011185" ) @Export("draw") void draw(int var1, int var2) { - if (this.field1018 == null) { + if (this.field1010 == null) { this.initColors(); } - if (this.field1009 == 0) { - this.field1009 = var2; + if (this.field1007 == 0) { + this.field1007 = var2; } - int var3 = var2 - this.field1009; + int var3 = var2 - this.field1007; if (var3 >= 256) { var3 = 0; } - this.field1009 = var2; + this.field1007 = var2; if (var3 > 0) { - this.method1756(var3); + this.method1768(var3); } - this.method1754(var1); + this.method1801(var1); } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "2129521769" + garbageValue = "640214490" ) - final void method1756(int var1) { - this.field1022 += 128 * var1; + final void method1768(int var1) { + this.field1014 += 128 * var1; int var2; - if (this.field1022 > this.field1020.length) { - this.field1022 -= this.field1020.length; + if (this.field1014 > this.field1015.length) { + this.field1014 -= this.field1015.length; var2 = (int)(Math.random() * 12.0D); - this.method1738(this.sprites[var2]); + this.method1793(this.sprites[var2]); } var2 = 0; @@ -215,12 +214,12 @@ public class LoginScreenAnimation { int var6; for (int var5 = 0; var5 < var4; ++var5) { - var6 = this.field1018[var3 + var2] - this.field1020[var2 + this.field1022 & this.field1020.length - 1] * var1 / 6; + var6 = this.field1010[var2 + var3] - this.field1015[var2 + this.field1014 & this.field1015.length - 1] * var1 / 6; if (var6 < 0) { var6 = 0; } - this.field1018[var2++] = var6; + this.field1010[var2++] = var6; } byte var15 = 10; @@ -234,42 +233,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.field1018[var8 + var9] = 255; + this.field1010[var9 + var8] = 255; } else { - this.field1018[var8 + var9] = 0; + this.field1010[var9 + var8] = 0; } } } - if (this.field1016 * 16 > 0) { - this.field1016 = this.field1016 * 16 - var1 * 4; + if (this.field1011 * 16 > 0) { + this.field1011 = this.field1011 * 16 - var1 * 4; } - if (this.field1017 * 16 > 0) { - this.field1017 = this.field1017 * 16 - var1 * 4; + if (this.field1012 * 16 > 0) { + this.field1012 = this.field1012 * 16 - var1 * 4; } - if (this.field1016 * 16 == 0 && this.field1017 * 16 == 0) { + if (this.field1011 * 16 == 0 && this.field1012 * 16 == 0) { var7 = (int)(Math.random() * (double)(2000 / var1)); if (var7 == 0) { - this.field1016 = 1024; + this.field1011 = 1024; } if (var7 == 1) { - this.field1017 = 1024; + this.field1012 = 1024; } } for (var7 = 0; var7 < 256 - var1; ++var7) { - this.field1010[var7] = this.field1010[var7 + var1]; + this.field1005[var7] = this.field1005[var7 + var1]; } for (var7 = 256 - var1; var7 < 256; ++var7) { - this.field1010[var7] = (int)(Math.sin((double)this.field1007 / 14.0D) * 16.0D + Math.sin((double)this.field1007 / 15.0D) * 14.0D + Math.sin((double)this.field1007 / 16.0D) * 12.0D); - ++this.field1007; + this.field1005[var7] = (int)(Math.sin((double)this.field1006 / 14.0D) * 16.0D + Math.sin((double)this.field1006 / 15.0D) * 14.0D + Math.sin((double)this.field1006 / 16.0D) * 12.0D); + ++this.field1006; } - this.field1023 = this.field1023 * 10000 + var1 * 10000; + this.field1018 = this.field1018 * 10000 + var1 * 100; var7 = ((Client.cycle & 1) + var1) / 2; if (var7 > 0) { short var16 = 128; @@ -279,13 +278,13 @@ public class LoginScreenAnimation { int var11; int var12; int var13; - for (var11 = 0; var11 < this.field1023 * 100; ++var11) { + for (var11 = 0; var11 < this.field1018 * 10000; ++var11) { var12 = (int)(Math.random() * (double)var10) + var17; var13 = (int)(Math.random() * (double)var16) + var16; - this.field1018[var12 + (var13 << 7)] = 192; + this.field1010[var12 + (var13 << 7)] = 192; } - this.field1023 = 0; + this.field1018 = 0; int var14; for (var11 = 0; var11 < 256; ++var11) { @@ -293,16 +292,16 @@ public class LoginScreenAnimation { var13 = var11 * 128; for (var14 = -var7; var14 < 128; ++var14) { - if (var14 + var7 < 128) { - var12 += this.field1018[var13 + var14 + var7]; + if (var7 + var14 < 128) { + var12 += this.field1010[var7 + var13 + var14]; } if (var14 - (var7 + 1) >= 0) { - var12 -= this.field1018[var14 + var13 - (var7 + 1)]; + var12 -= this.field1010[var14 + var13 - (var7 + 1)]; } if (var14 >= 0) { - this.field1019[var13 + var14] = var12 / (var7 * 2 + 1); + this.field1001[var13 + var14] = var12 / (var7 * 2 + 1); } } } @@ -313,15 +312,15 @@ public class LoginScreenAnimation { for (var13 = -var7; var13 < 256; ++var13) { var14 = var13 * 128; if (var13 + var7 < 256) { - var12 += this.field1019[var7 * 128 + var14 + var11]; + var12 += this.field1001[var11 + var14 + var7 * 128]; } if (var13 - (var7 + 1) >= 0) { - var12 -= this.field1019[var11 + var14 - (var7 + 1) * 128]; + var12 -= this.field1001[var11 + var14 - (var7 + 1) * 128]; } if (var13 >= 0) { - this.field1018[var11 + var14] = var12 / (var7 * 2 + 1); + this.field1010[var14 + var11] = var12 / (var7 * 2 + 1); } } } @@ -329,66 +328,66 @@ public class LoginScreenAnimation { } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(IIII)I", - garbageValue = "-12618056" + signature = "(IIIS)I", + garbageValue = "256" ) - final int method1734(int var1, int var2, int var3) { + final int method1769(int var1, int var2, int var3) { int var4 = 256 - var3; - return (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) + (var3 * (var2 & 65280) + var4 * (var1 & 65280) & 16711680) >> 8; + return (var3 * (var2 & 65280) + var4 * (var1 & 65280) & 16711680) + (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) >> 8; } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1298717611" + garbageValue = "-495536529" ) - final void method1754(int var1) { - int var2 = this.field1012.length; - if (this.field1016 * 16 > 0) { - this.method1736(this.field1016 * 16, this.field1014); - } else if (this.field1017 * 16 > 0) { - this.method1736(this.field1017 * 16, this.field1025); + final void method1801(int var1) { + int var2 = this.field1017.length; + if (this.field1011 * 16 > 0) { + this.method1771(this.field1011 * 16, this.field1009); + } else if (this.field1012 * 16 > 0) { + this.method1771(this.field1012 * 16, this.field1004); } else { for (int var3 = 0; var3 < var2; ++var3) { - this.field1012[var3] = this.field1013[var3]; + this.field1017[var3] = this.field1008[var3]; } } - this.method1733(var1); + this.method1770(var1); } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I[IB)V", - garbageValue = "36" + garbageValue = "-27" ) - final void method1736(int var1, int[] var2) { - int var3 = this.field1012.length; + final void method1771(int var1, int[] var2) { + int var3 = this.field1017.length; for (int var4 = 0; var4 < var3; ++var4) { if (var1 > 768) { - this.field1012[var4] = this.method1734(this.field1013[var4], var2[var4], 1024 - var1); + this.field1017[var4] = this.method1769(this.field1008[var4], var2[var4], 1024 - var1); } else if (var1 > 256) { - this.field1012[var4] = var2[var4]; + this.field1017[var4] = var2[var4]; } else { - this.field1012[var4] = this.method1734(var2[var4], this.field1013[var4], 256 - var1); + this.field1017[var4] = this.method1769(var2[var4], this.field1008[var4], 256 - var1); } } } - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "(IB)V", - garbageValue = "23" + garbageValue = "8" ) - final void method1733(int var1) { + final void method1770(int var1) { int var2 = 0; for (int var3 = 1; var3 < 255; ++var3) { - int var4 = (256 - var3) * this.field1010[var3] / 256; + int var4 = (256 - var3) * this.field1005[var3] / 256; int var5 = var4 + var1; int var6 = 0; int var7 = 128; @@ -397,22 +396,22 @@ public class LoginScreenAnimation { var5 = 0; } - if (var5 + 128 >= SpotAnimationDefinition.rasterProvider.width) { - var7 = SpotAnimationDefinition.rasterProvider.width - var5; + if (var5 + 128 >= DevicePcmPlayerProvider.rasterProvider.width) { + var7 = DevicePcmPlayerProvider.rasterProvider.width - var5; } - int var8 = var5 + (var3 + 8) * SpotAnimationDefinition.rasterProvider.width; + int var8 = var5 + (var3 + 8) * DevicePcmPlayerProvider.rasterProvider.width; var2 += var6; for (int var9 = var6; var9 < var7; ++var9) { - int var10 = this.field1018[var2++]; + int var10 = this.field1010[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.field1012[var10]; - int var14 = SpotAnimationDefinition.rasterProvider.pixels[var8]; - SpotAnimationDefinition.rasterProvider.pixels[var8++] = -16777216 | ((var10 & 16711935) * var12 + (var14 & 16711935) * var13 & -16711936) + (var12 * (var10 & 65280) + var13 * (var14 & 65280) & 16711680) >> 8; + var10 = this.field1017[var10]; + int var14 = DevicePcmPlayerProvider.rasterProvider.pixels[var8]; + DevicePcmPlayerProvider.rasterProvider.pixels[var8++] = -16777216 | (var13 * (var14 & 65280) + var12 * (var10 & 65280) & 16711680) + ((var14 & 16711935) * var13 + (var10 & 16711935) * var12 & -16711936) >> 8; } else { ++var8; } @@ -423,21 +422,21 @@ public class LoginScreenAnimation { } - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Llq;I)V", - garbageValue = "1544028562" + signature = "(Llt;I)V", + garbageValue = "833980793" ) - final void method1738(IndexedSprite var1) { + final void method1793(IndexedSprite var1) { int var2; - for (var2 = 0; var2 < this.field1020.length; ++var2) { - this.field1020[var2] = 0; + for (var2 = 0; var2 < this.field1015.length; ++var2) { + this.field1015[var2] = 0; } int var3; for (var2 = 0; var2 < 5000; ++var2) { var3 = (int)(Math.random() * 128.0D * 256.0D); - this.field1020[var3] = (int)(Math.random() * 256.0D); + this.field1015[var3] = (int)(Math.random() * 256.0D); } int var4; @@ -446,13 +445,13 @@ public class LoginScreenAnimation { for (var3 = 1; var3 < 255; ++var3) { for (var4 = 1; var4 < 127; ++var4) { var5 = var4 + (var3 << 7); - this.field1024[var5] = (this.field1020[var5 + 128] + this.field1020[var5 - 128] + this.field1020[var5 + 1] + this.field1020[var5 - 1]) / 4; + this.field1016[var5] = (this.field1015[var5 + 128] + this.field1015[var5 - 128] + this.field1015[var5 + 1] + this.field1015[var5 - 1]) / 4; } } - int[] var8 = this.field1020; - this.field1020 = this.field1024; - this.field1024 = var8; + int[] var8 = this.field1015; + this.field1015 = this.field1016; + this.field1016 = var8; } if (var1 != null) { @@ -464,7 +463,7 @@ public class LoginScreenAnimation { var5 = var4 + var1.xOffset + 16; int var6 = var3 + var1.yOffset + 16; int var7 = var5 + (var6 << 7); - this.field1020[var7] = 0; + this.field1015[var7] = 0; } } } @@ -472,118 +471,25 @@ public class LoginScreenAnimation { } - @ObfuscatedName("t") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1780006768" + signature = "([I[IB)V", + garbageValue = "60" ) - static void method1758() { - Iterator var0 = Messages.Messages_hashTable.iterator(); + public static void method1802(int[] var0, int[] var1) { + if (var0 != null && var1 != null) { + ByteArrayPool.ByteArrayPool_alternativeSizes = var0; + Login.ByteArrayPool_altSizeArrayCounts = new int[var0.length]; + WorldMapEvent.ByteArrayPool_arrays = new byte[var0.length][][]; - while (var0.hasNext()) { - Message var1 = (Message)var0.next(); - var1.clearIsFromFriend(); - } + for (int var2 = 0; var2 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var2) { + WorldMapEvent.ByteArrayPool_arrays[var2] = new byte[var1[var2]][]; + } - } - - @ObfuscatedName("ej") - @ObfuscatedSignature( - signature = "(I)Llv;", - garbageValue = "158652413" - ) - @Export("getWorldMap") - static WorldMap getWorldMap() { - return WorldMapCacheName.worldMap; - } - - @ObfuscatedName("go") - @ObfuscatedSignature( - signature = "(IIIIZI)V", - garbageValue = "1846245684" - ) - @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.field873; - } else if (var5 >= 100) { - var6 = Client.field822; } else { - var6 = (Client.field822 - Client.field873) * var5 / 100 + Client.field873; + ByteArrayPool.ByteArrayPool_alternativeSizes = null; + Login.ByteArrayPool_altSizeArrayCounts = null; + WorldMapEvent.ByteArrayPool_arrays = null; } - - int var7 = var3 * var6 * 512 / (var2 * 334); - int var8; - int var9; - short var10; - if (var7 < Client.field652) { - var10 = Client.field652; - var6 = var10 * var2 * 334 / (var3 * 512); - if (var6 > Client.field661) { - var6 = Client.field661; - var8 = var3 * var6 * 512 / (var10 * 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.field791) { - var10 = Client.field791; - var6 = var10 * var2 * 334 / (var3 * 512); - if (var6 < Client.field795) { - var6 = Client.field795; - var8 = var10 * 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) { - TilePaint.method3005(var2, var3); - } - - Client.viewportOffsetX = var0; - Client.viewportOffsetY = var1; - Client.viewportWidth = var2; - Client.viewportHeight = var3; - } - - @ObfuscatedName("hx") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "121" - ) - @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; } } diff --git a/runescape-client/src/main/java/LoginType.java b/runescape-client/src/main/java/LoginType.java index cca9f99255..bb246f7897 100644 --- a/runescape-client/src/main/java/LoginType.java +++ b/runescape-client/src/main/java/LoginType.java @@ -4,97 +4,101 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lu") +@ObfuscatedName("ll") @Implements("LoginType") public class LoginType { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Llu;" + signature = "Lll;" ) @Export("oldscape") public static final LoginType oldscape; - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "Llu;" - ) - static final LoginType field4025; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Llu;" - ) - static final LoginType field4026; - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Llu;" - ) - static final LoginType field4034; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Llu;" - ) - static final LoginType field4028; - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "Llu;" - ) - static final LoginType field4027; - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Llu;" - ) - static final LoginType field4030; - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "Llu;" - ) - static final LoginType field4029; @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Llu;" + signature = "Lll;" ) - public static final LoginType field4032; + static final LoginType field4030; + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "Lll;" + ) + static final LoginType field4032; + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "Lll;" + ) + static final LoginType field4027; + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "Lll;" + ) + static final LoginType field4028; + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Lll;" + ) + static final LoginType field4025; + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "Lll;" + ) + static final LoginType field4026; + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "Lll;" + ) + static final LoginType field4031; @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "Lll;" + ) + public static final LoginType field4024; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -327526177 + intValue = -295742569 ) final int field4033; - @ObfuscatedName("f") - final String field4024; + @ObfuscatedName("n") + final String field4034; static { - oldscape = new LoginType(7, 0, "", ""); - field4025 = new LoginType(8, 1, "", ""); - field4026 = new LoginType(0, 2, "", ""); - field4034 = new LoginType(2, 3, "", ""); - field4028 = new LoginType(5, 4, "", ""); - field4027 = new LoginType(1, 5, "", ""); - field4030 = new LoginType(3, 6, "", ""); - field4029 = new LoginType(6, 7, "", ""); - field4032 = new LoginType(4, -1, "", "", true, new LoginType[]{oldscape, field4025, field4026, field4028, field4034}); + oldscape = new LoginType(6, 0, "", ""); + field4030 = new LoginType(1, 1, "", ""); + field4032 = new LoginType(8, 2, "", ""); + field4027 = new LoginType(0, 3, "", ""); + field4028 = new LoginType(3, 4, "", ""); + field4025 = new LoginType(7, 5, "", ""); + field4026 = new LoginType(4, 6, "", ""); + field4031 = new LoginType(2, 7, "", ""); + field4024 = new LoginType(5, -1, "", "", true, new LoginType[]{oldscape, field4030, field4032, field4028, field4027}); } LoginType(int var1, int var2, String var3, String var4) { this.field4033 = var1; - this.field4024 = var4; + this.field4034 = var4; } @ObfuscatedSignature( - signature = "(IILjava/lang/String;Ljava/lang/String;Z[Llu;)V" + signature = "(IILjava/lang/String;Ljava/lang/String;Z[Lll;)V" ) LoginType(int var1, int var2, String var3, String var4, boolean var5, LoginType[] var6) { this.field4033 = var1; - this.field4024 = var4; + this.field4034 = var4; } public String toString() { - return this.field4024; + return this.field4034; } - public String abd() { - return this.field4024; + public String aai() { + return this.field4034; } - public String abb() { - return this.field4024; + public String aan() { + return this.field4034; + } + + public String aar() { + return this.field4034; } } diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java index 428ed9f31d..93ffd0482c 100644 --- a/runescape-client/src/main/java/MenuAction.java +++ b/runescape-client/src/main/java/MenuAction.java @@ -1,81 +1,252 @@ +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; -@ObfuscatedName("cd") +@ObfuscatedName("cv") @Implements("MenuAction") public class MenuAction { - @ObfuscatedName("y") - static int[] field1129; - @ObfuscatedName("jb") + @ObfuscatedName("sc") @ObfuscatedSignature( - signature = "Ldt;" + signature = "Lir;" ) - @Export("textureProvider") - static TextureProvider textureProvider; - @ObfuscatedName("s") + public static class237 field1133; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1847436075 + intValue = -957076537 ) @Export("argument1") int argument1; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -833920995 + intValue = 1185532013 ) @Export("argument2") int argument2; - @ObfuscatedName("i") + @ObfuscatedName("t") + @Export("action") + String action; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1626023363 + intValue = -1890178357 ) @Export("opcode") int opcode; - @ObfuscatedName("k") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1315061643 + intValue = -1424798217 ) @Export("argument0") int argument0; - @ObfuscatedName("u") - @Export("action") - String action; MenuAction() { } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IB)Lir;", - garbageValue = "65" + signature = "(CI)B", + garbageValue = "1656481861" ) - @Export("getEnum") - public static EnumDefinition getEnum(int var0) { - EnumDefinition var1 = (EnumDefinition)EnumDefinition.EnumDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + @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 { - byte[] var2 = EnumDefinition.EnumDefinition_archive.takeFile(8, var0); - var1 = new EnumDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); + var1 = 63; + } + + return var1; + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lgf;I)I", + garbageValue = "2140897413" + ) + @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; } - EnumDefinition.EnumDefinition_cached.put(var1, (long)var0); - return var1; + 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 = ScriptEvent.standardizeChar(var9, var2); + var10 = ScriptEvent.standardizeChar(var10, var2); + if (var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { + var9 = Character.toLowerCase(var9); + var10 = Character.toLowerCase(var10); + if (var9 != var10) { + return class286.lowercaseChar(var9, var2) - class286.lowercaseChar(var10, var2); + } + } + } + + int var16 = Math.min(var3, var4); + + int var17; + char var20; + for (var17 = 0; var17 < var16; ++var17) { + if (var2 == Language.Language_FR) { + var5 = var3 - 1 - var17; + var6 = var4 - 1 - var17; + } else { + var6 = var17; + var5 = var17; + } + + char var18 = var0.charAt(var5); + var20 = var1.charAt(var6); + if (var18 != var20 && Character.toUpperCase(var18) != Character.toUpperCase(var20)) { + var18 = Character.toLowerCase(var18); + var20 = Character.toLowerCase(var20); + if (var18 != var20) { + return class286.lowercaseChar(var18, var2) - class286.lowercaseChar(var20, var2); + } + } + } + + var17 = var3 - var4; + if (var17 != 0) { + return var17; + } else { + for (int var19 = 0; var19 < var16; ++var19) { + var20 = var0.charAt(var19); + char var13 = var1.charAt(var19); + if (var13 != var20) { + return class286.lowercaseChar(var20, var2) - class286.lowercaseChar(var13, var2); + } + } + + return 0; } } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lgv;Lle;B)Lgq;", - garbageValue = "35" + signature = "(Lgw;Lld;I)Lgj;", + garbageValue = "-1868071262" ) @Export("getPacketBufferNode") public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { - PacketBufferNode var2 = Buffer.method5567(); + PacketBufferNode var2 = Skills.method4100(); var2.clientPacket = var0; var2.clientPacketLength = var0.length; if (var2.clientPacketLength == -1) { @@ -96,17 +267,40 @@ public class MenuAction { return var2; } - @ObfuscatedName("t") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-2010675599" + garbageValue = "1306167256" ) - static void method1993() { - Players.Players_count = 0; + static void method2034() { + try { + File var0 = new File(Message.userHomeDirectory, "random.dat"); + int var2; + if (var0.exists()) { + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); + } else { + label39: + for (int var1 = 0; var1 < NetFileRequest.field3096.length; ++var1) { + for (var2 = 0; var2 < GrandExchangeOfferWorldComparator.field30.length; ++var2) { + File var3 = new File(GrandExchangeOfferWorldComparator.field30[var2] + NetFileRequest.field3096[var1] + File.separatorChar + "random.dat"); + if (var3.exists()) { + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0); + break label39; + } + } + } + } - for (int var0 = 0; var0 < 2048; ++var0) { - Players.field1219[var0] = null; - Players.field1230[var0] = 1; + 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) { } } diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java index 10d6c3950e..4241476f08 100644 --- a/runescape-client/src/main/java/Message.java +++ b/runescape-client/src/main/java/Message.java @@ -1,57 +1,64 @@ -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("bi") +@ObfuscatedName("bj") @Implements("Message") public class Message extends DualNode { - @ObfuscatedName("s") + @ObfuscatedName("m") + @Export("userHomeDirectory") + static String userHomeDirectory; + @ObfuscatedName("du") + @ObfuscatedSignature( + signature = "Lio;" + ) + @Export("archive12") + static Archive archive12; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -2140169479 + intValue = 849621615 ) @Export("count") int count; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -515858111 + intValue = 416570399 ) @Export("cycle") int cycle; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1304431151 + intValue = -1614999863 ) @Export("type") int type; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("sender") String sender; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Ljx;" + signature = "Ljt;" ) @Export("senderUsername") Username senderUsername; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Ljj;" + signature = "Ljb;" ) @Export("isFromFriend0") TriBool isFromFriend0; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Ljj;" + signature = "Ljb;" ) @Export("isFromIgnored0") TriBool isFromIgnored0; - @ObfuscatedName("q") + @ObfuscatedName("v") @Export("prefix") String prefix; - @ObfuscatedName("x") + @ObfuscatedName("d") @Export("text") String text; @@ -61,15 +68,14 @@ public class Message extends DualNode { this.set(var1, var2, var3, var4); } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-855898041" + garbageValue = "1266691950" ) @Export("set") void set(int var1, String var2, String var3, String var4) { - int var5 = ++Messages.Messages_count - 1; - this.count = var5; + this.count = WorldMapCacheName.method594(); this.cycle = Client.cycle; this.type = var1; this.sender = var2; @@ -80,20 +86,20 @@ public class Message extends DualNode { this.clearIsFromIgnored(); } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "613551051" + garbageValue = "-886481837" ) @Export("clearIsFromFriend") void clearIsFromFriend() { this.isFromFriend0 = TriBool.TriBool_unknown; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "16711680" + garbageValue = "-475593576" ) @Export("isFromFriend") final boolean isFromFriend() { @@ -104,30 +110,30 @@ public class Message extends DualNode { return this.isFromFriend0 == TriBool.TriBool_true; } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "560292414" + garbageValue = "-2097510211" ) @Export("fillIsFromFriend") void fillIsFromFriend() { - this.isFromFriend0 = class32.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isFromFriend0 = class218.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "959069374" + signature = "(B)V", + garbageValue = "-116" ) @Export("clearIsFromIgnored") void clearIsFromIgnored() { this.isFromIgnored0 = TriBool.TriBool_unknown; } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "44" + signature = "(I)Z", + garbageValue = "471055582" ) @Export("isFromIgnored") final boolean isFromIgnored() { @@ -138,399 +144,440 @@ public class Message extends DualNode { return this.isFromIgnored0 == TriBool.TriBool_true; } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "984556307" + garbageValue = "206412484" ) @Export("fillIsFromIgnored") void fillIsFromIgnored() { - this.isFromIgnored0 = class32.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isFromIgnored0 = class218.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1799643505" + garbageValue = "361058639" ) @Export("fillSenderUsername") final void fillSenderUsername() { if (this.sender != null) { - this.senderUsername = new Username(NetSocket.method3489(this.sender), FontName.loginType); + this.senderUsername = new Username(GrandExchangeEvents.method68(this.sender), class4.loginType); } else { this.senderUsername = null; } } - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "-10" + signature = "(Lkt;II)Z", + garbageValue = "-693352027" ) - public static boolean method1173(int var0) { - return (var0 >> 20 & 1) != 0; - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - signature = "(ILcr;ZS)I", - garbageValue = "13452" - ) - static int method1172(int var0, Script var1, boolean var2) { + @Export("updateExternalPlayer") + static boolean updateExternalPlayer(PacketBuffer var0, int var1) { + int var2 = var0.readBits(2); 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 var12; - if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12 == 0 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12 == 2 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12 == 5 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12 == 1 ? 1 : 0; - return 1; + 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 { - boolean var13; - if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { - var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (class2.grandExchangeEvents != null) { - class2.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var13); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { - var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (class2.grandExchangeEvents != null) { - class2.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var13); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { - Interpreter.Interpreter_intStackSize -= 2; - var13 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] == 1; - boolean var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; - if (class2.grandExchangeEvents != null) { - Client.GrandExchangeEvents_worldComparator.filterWorlds = var4; - class2.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var13); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { - var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (class2.grandExchangeEvents != null) { - class2.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var13); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { - var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (class2.grandExchangeEvents != null) { - class2.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var13); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class2.grandExchangeEvents == null ? 0 : class2.grandExchangeEvents.events.size(); - return 1; - } else { - GrandExchangeEvent var11; - if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)class2.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.world; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)class2.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.getOfferName(); - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)class2.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.getPreviousOfferName(); - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)class2.grandExchangeEvents.events.get(var3); - long var5 = SequenceDefinition.method4686() - Occluder.field1890 - var11.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[--Interpreter.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)class2.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)class2.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)class2.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id; - return 1; - } else { - return 2; - } + Player var6 = Client.players[var1] = new Player(); + var6.index = var1; + if (Players.field1221[var1] != null) { + var6.read(Players.field1221[var1]); } + + var6.orientation = Players.Players_orientations[var1]; + var6.targetIndex = Players.Players_targetIndices[var1]; + var7 = Players.Players_regions[var1]; + var8 = var7 >> 28; + var9 = var7 >> 14 & 255; + var10 = var7 & 255; + var6.pathTraversed[0] = Players.field1220[var1]; + var6.plane = (byte)var8; + var6.resetPath((var9 << 13) + var3 - class4.baseX * 64, (var10 << 13) + var4 - ScriptEvent.baseY); + var6.field607 = false; + return true; + } + } else if (var2 == 1) { + var3 = var0.readBits(2); + var4 = Players.Players_regions[var1]; + Players.Players_regions[var1] = (((var4 >> 28) + var3 & 3) << 28) + (var4 & 268435455); + return false; + } else { + int var5; + int var11; + if (var2 == 2) { + var3 = var0.readBits(5); + var4 = var3 >> 3; + var5 = var3 & 7; + var11 = Players.Players_regions[var1]; + var7 = (var11 >> 28) + var4 & 3; + var8 = var11 >> 14 & 255; + var9 = var11 & 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; + var11 = var3 & 255; + var7 = Players.Players_regions[var1]; + var8 = (var7 >> 28) + var4 & 3; + var9 = var5 + (var7 >> 14) & 255; + var10 = var7 + var11 & 255; + Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); + return false; } } } - @ObfuscatedName("az") + @ObfuscatedName("hq") @ObfuscatedSignature( - signature = "(ILcr;ZI)I", - garbageValue = "750943960" + signature = "(IIIIIIII)V", + garbageValue = "1478792847" ) - static int method1174(int var0, Script var1, boolean var2) { - String var3; - int var4; - if (var0 == ScriptOpcodes.APPEND_NUM) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var4; - return 1; - } else { - String var9; - if (var0 == ScriptOpcodes.APPEND) { - Interpreter.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var9; - return 1; - } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + Friend.intToString(var4, 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[--Interpreter.Interpreter_intStackSize]; - long var11 = (11745L + (long)var10) * 86400000L; - Interpreter.Interpreter_calendar.setTime(new Date(var11)); - var6 = Interpreter.Interpreter_calendar.get(5); - int var16 = Interpreter.Interpreter_calendar.get(2); - int var8 = Interpreter.Interpreter_calendar.get(1); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var16] + "-" + var8; - return 1; - } else if (var0 != ScriptOpcodes.TEXT_GENDER) { - if (var0 == ScriptOpcodes.TOSTRING) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.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[++Interpreter.Interpreter_intStackSize - 1] = WallDecoration.method3245(TriBool.compareStrings(Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1], class60.clientLanguage)); - return 1; + @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 != MouseRecorder.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 var39 = SecureRandomFuture.Entity_unpackID(var7); + int var40 = var12 & 31; + int var41 = var12 >> 6 & 3; + ObjectDefinition var13; + if (var1 == 0) { + WorldMapIcon_1.scene.removeBoundaryObject(var0, var2, var3); + var13 = WallDecoration.getObjectDefinition(var39); + if (var13.interactType != 0) { + Client.collisionMaps[var0].method3536(var2, var3, var40, var41, var13.boolean1); + } + } + + if (var1 == 1) { + WorldMapIcon_1.scene.removeWallDecoration(var0, var2, var3); + } + + if (var1 == 2) { + WorldMapIcon_1.scene.removeGameObject(var0, var2, var3); + var13 = WallDecoration.getObjectDefinition(var39); + 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, var41, var13.boolean1); + } + } + + if (var1 == 3) { + WorldMapIcon_1.scene.removeFloorDecoration(var0, var2, var3); + var13 = WallDecoration.getObjectDefinition(var39); + if (var13.interactType == 1) { + Client.collisionMaps[var0].method3541(var2, var3); + } + } + } + + if (var4 >= 0) { + var12 = var0; + if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { + var12 = var0 + 1; + } + + Scene var42 = WorldMapIcon_1.scene; + CollisionMap var14 = Client.collisionMaps[var0]; + ObjectDefinition var15 = WallDecoration.getObjectDefinition(var4); + int var16; + int var17; + if (var5 != 1 && var5 != 3) { + var16 = var15.sizeX; + var17 = var15.sizeY; + } else { + var16 = var15.sizeY; + var17 = var15.sizeX; + } + + int var18; + int var19; + if (var16 + var2 <= 104) { + var18 = (var16 >> 1) + var2; + var19 = var2 + (var16 + 1 >> 1); + } else { + var18 = var2; + var19 = var2 + 1; + } + + int var20; + int var21; + if (var3 + var17 <= 104) { + var20 = var3 + (var17 >> 1); + var21 = var3 + (var17 + 1 >> 1); + } else { + var20 = var3; + var21 = var3 + 1; + } + + int[][] var22 = Tiles.Tiles_heights[var12]; + int var23 = var22[var18][var21] + var22[var18][var20] + var22[var19][var20] + var22[var19][var21] >> 2; + int var24 = (var2 << 7) + (var16 << 6); + int var25 = (var3 << 7) + (var17 << 6); + long var26 = WorldMapIcon_1.calculateTag(var2, var3, 2, var15.int1 == 0, var4); + int var28 = (var5 << 6) + var6; + if (var15.int3 == 1) { + var28 += 256; + } + + Object var29; + if (var6 == 22) { + if (var15.animationId == -1 && var15.transforms == null) { + var29 = var15.getModel(22, var5, var22, var24, var23, var25); } else { - int var5; - byte[] var13; - Font var14; - if (var0 == ScriptOpcodes.PARAHEIGHT) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - Interpreter.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var13 = WorldMapID.archive13.takeFile(var5, 0); - var14 = new Font(var13); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.lineCount(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.PARAWIDTH) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - Interpreter.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var13 = WorldMapID.archive13.takeFile(var5, 0); - var14 = new Font(var13); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.lineWidth(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { - Interpreter.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; - if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3; - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9; - } + var29 = new DynamicObject(var4, 22, var5, var12, var2, var3, var15.animationId, true, (Entity)null); + } - 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]; - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + (char)var4; - return 1; - } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ArchiveDiskActionHandler.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] = RouteStrategy.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] = ClanMate.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] = NetCache.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[++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[--Interpreter.Interpreter_stringStackSize]; - Interpreter.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.substring(var4, var5); - return 1; - } else if (var0 == ScriptOpcodes.REMOVETAGS) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - StringBuilder var17 = new StringBuilder(var3.length()); - boolean var15 = false; - - for (var6 = 0; var6 < var3.length(); ++var6) { - char var7 = var3.charAt(var6); - if (var7 == '<') { - var15 = true; - } else if (var7 == '>') { - var15 = false; - } else if (!var15) { - var17.append(var7); - } - } - - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var17.toString(); - return 1; - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.indexOf(var4); - return 1; - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { - Interpreter.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.indexOf(var9, var5); - return 1; - } else if (var0 == ScriptOpcodes.UPPERCASE) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.toUpperCase(); - return 1; + var42.newFloorDecoration(var0, var2, var3, var23, (Entity)var29, var26, var28); + if (var15.interactType == 1) { + var14.setBlockedByFloorDec(var2, var3); + } + } else if (var6 != 10 && var6 != 11) { + if (var6 >= 12) { + if (var15.animationId == -1 && var15.transforms == null) { + var29 = var15.getModel(var6, var5, var22, var24, var23, var25); } else { - return 2; + var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, true, (Entity)null); + } + + var42.method3051(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28); + if (var15.interactType != 0) { + var14.addGameObject(var2, var3, var16, var17, var15.boolean1); + } + } else if (var6 == 0) { + if (var15.animationId == -1 && var15.transforms == null) { + var29 = var15.getModel(0, var5, var22, var24, var23, var25); + } else { + var29 = new DynamicObject(var4, 0, var5, var12, var2, var3, var15.animationId, true, (Entity)null); + } + + var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field480[var5], 0, var26, var28); + if (var15.interactType != 0) { + var14.method3534(var2, var3, var6, var5, var15.boolean1); + } + } else if (var6 == 1) { + if (var15.animationId == -1 && var15.transforms == null) { + var29 = var15.getModel(1, var5, var22, var24, var23, var25); + } else { + var29 = new DynamicObject(var4, 1, var5, var12, var2, var3, var15.animationId, true, (Entity)null); + } + + var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field481[var5], 0, var26, var28); + if (var15.interactType != 0) { + var14.method3534(var2, var3, var6, var5, var15.boolean1); + } + } else { + int var35; + if (var6 == 2) { + var35 = var5 + 1 & 3; + Object var30; + Object var31; + if (var15.animationId == -1 && var15.transforms == null) { + var30 = var15.getModel(2, var5 + 4, var22, var24, var23, var25); + var31 = var15.getModel(2, var35, var22, var24, var23, var25); + } else { + var30 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var15.animationId, true, (Entity)null); + var31 = new DynamicObject(var4, 2, var35, var12, var2, var3, var15.animationId, true, (Entity)null); + } + + var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var30, (Entity)var31, Tiles.field480[var5], Tiles.field480[var35], var26, var28); + if (var15.interactType != 0) { + var14.method3534(var2, var3, var6, var5, var15.boolean1); + } + } else if (var6 == 3) { + if (var15.animationId == -1 && var15.transforms == null) { + var29 = var15.getModel(3, var5, var22, var24, var23, var25); + } else { + var29 = new DynamicObject(var4, 3, var5, var12, var2, var3, var15.animationId, true, (Entity)null); + } + + var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field481[var5], 0, var26, var28); + if (var15.interactType != 0) { + var14.method3534(var2, var3, var6, var5, var15.boolean1); + } + } else if (var6 == 9) { + if (var15.animationId == -1 && var15.transforms == null) { + var29 = var15.getModel(var6, var5, var22, var24, var23, var25); + } else { + var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, true, (Entity)null); + } + + var42.method3051(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28); + if (var15.interactType != 0) { + var14.addGameObject(var2, var3, var16, var17, var15.boolean1); + } + } else if (var6 == 4) { + if (var15.animationId == -1 && var15.transforms == null) { + var29 = var15.getModel(4, var5, var22, var24, var23, var25); + } else { + var29 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, true, (Entity)null); + } + + var42.newWallDecoration(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field480[var5], 0, 0, 0, var26, var28); + } else { + Object var32; + long var36; + if (var6 == 5) { + var35 = 16; + var36 = var42.getBoundaryObjectTag(var0, var2, var3); + if (0L != var36) { + var35 = WallDecoration.getObjectDefinition(SecureRandomFuture.Entity_unpackID(var36)).int2; + } + + if (var15.animationId == -1 && var15.transforms == null) { + var32 = var15.getModel(4, var5, var22, var24, var23, var25); + } else { + var32 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, true, (Entity)null); + } + + var42.newWallDecoration(var0, var2, var3, var23, (Entity)var32, (Entity)null, Tiles.field480[var5], 0, var35 * Tiles.field482[var5], var35 * Tiles.field487[var5], var26, var28); + } else if (var6 == 6) { + var35 = 8; + var36 = var42.getBoundaryObjectTag(var0, var2, var3); + if (var36 != 0L) { + var35 = WallDecoration.getObjectDefinition(SecureRandomFuture.Entity_unpackID(var36)).int2 / 2; + } + + if (var15.animationId == -1 && var15.transforms == null) { + var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); + } else { + var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, true, (Entity)null); + } + + var42.newWallDecoration(var0, var2, var3, var23, (Entity)var32, (Entity)null, 256, var5, var35 * Tiles.field484[var5], var35 * Tiles.field485[var5], var26, var28); + } else if (var6 == 7) { + int var38 = var5 + 2 & 3; + if (var15.animationId == -1 && var15.transforms == null) { + var29 = var15.getModel(4, var38 + 4, var22, var24, var23, var25); + } else { + var29 = new DynamicObject(var4, 4, var38 + 4, var12, var2, var3, var15.animationId, true, (Entity)null); + } + + var42.newWallDecoration(var0, var2, var3, var23, (Entity)var29, (Entity)null, 256, var38, 0, 0, var26, var28); + } else if (var6 == 8) { + var35 = 8; + var36 = var42.getBoundaryObjectTag(var0, var2, var3); + if (0L != var36) { + var35 = WallDecoration.getObjectDefinition(SecureRandomFuture.Entity_unpackID(var36)).int2 / 2; + } + + int var34 = var5 + 2 & 3; + Object var33; + if (var15.animationId == -1 && var15.transforms == null) { + var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); + var33 = var15.getModel(4, var34 + 4, var22, var24, var23, var25); + } else { + var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, true, (Entity)null); + var33 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var15.animationId, true, (Entity)null); + } + + var42.newWallDecoration(var0, var2, var3, var23, (Entity)var32, (Entity)var33, 256, var5, var35 * Tiles.field484[var5], var35 * Tiles.field485[var5], var26, var28); + } } } } else { - Interpreter.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; - if (WorldMapIcon_1.localPlayer.appearance != null && WorldMapIcon_1.localPlayer.appearance.isFemale) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9; + if (var15.animationId == -1 && var15.transforms == null) { + var29 = var15.getModel(10, var5, var22, var24, var23, var25); } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3; + var29 = new DynamicObject(var4, 10, var5, var12, var2, var3, var15.animationId, true, (Entity)null); } - return 1; + if (var29 != null) { + var42.method3051(var0, var2, var3, var23, var16, var17, (Entity)var29, var6 == 11 ? 256 : 0, var26, var28); + } + + if (var15.interactType != 0) { + var14.addGameObject(var2, var3, var16, var17, var15.boolean1); + } } } } - } - - @ObfuscatedName("iv") - @ObfuscatedSignature( - signature = "(Lhp;III)V", - garbageValue = "1258326389" - ) - @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.rawY >> 14) + (var2 - var0.height) / 2; - } else { - var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); - } } } diff --git a/runescape-client/src/main/java/Messages.java b/runescape-client/src/main/java/Messages.java index 9d9165d7c7..b644b46feb 100644 --- a/runescape-client/src/main/java/Messages.java +++ b/runescape-client/src/main/java/Messages.java @@ -5,40 +5,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("cn") +@ObfuscatedName("cw") @Implements("Messages") public class Messages { - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("Messages_channels") static final Map Messages_channels; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lln;" + signature = "Llj;" ) @Export("Messages_hashTable") static final IterableNodeHashTable Messages_hashTable; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Ljm;" + signature = "Ljn;" ) @Export("Messages_queue") static final IterableDualNodeQueue Messages_queue; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1379002883 + intValue = -1338946421 ) @Export("Messages_count") static int Messages_count; - @ObfuscatedName("gw") - @Export("regionMapArchives") - static byte[][] regionMapArchives; - @ObfuscatedName("gz") - @ObfuscatedSignature( - signature = "[Llq;" - ) - @Export("modIconSprites") - static IndexedSprite[] modIconSprites; static { Messages_channels = new HashMap(); @@ -46,4 +38,355 @@ public class Messages { Messages_queue = new IterableDualNodeQueue(); Messages_count = 0; } + + @ObfuscatedName("b") + @ObfuscatedSignature( + signature = "(ILcu;ZI)I", + garbageValue = "-1499618076" + ) + static int method2194(int var0, Script var1, boolean var2) { + String var3; + if (var0 == ScriptOpcodes.MES) { + var3 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + WorldMapCacheName.addGameMessage(0, "", var3); + return 1; + } else if (var0 == ScriptOpcodes.ANIM) { + class160.Interpreter_intStackSize -= 2; + FloorUnderlayDefinition.performPlayerAnimation(Varps.localPlayer, Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize], Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]); + return 1; + } else if (var0 == ScriptOpcodes.IF_CLOSE) { + if (!Interpreter.field1068) { + Interpreter.field1067 = true; + } + + return 1; + } else { + int var10; + if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { + var3 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + var10 = 0; + if (DynamicObject.isNumber(var3)) { + var10 = IgnoreList.parseInt(var3); + } + + PacketBufferNode var12 = MenuAction.getPacketBufferNode(ClientPacket.field2239, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeInt(var10); + Client.packetWriter.addNode(var12); + return 1; + } else { + PacketBufferNode var14; + if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { + var3 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + var14 = MenuAction.getPacketBufferNode(ClientPacket.field2201, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeByte(var3.length() + 1); + var14.packetBuffer.writeStringCp1252NullTerminated(var3); + Client.packetWriter.addNode(var14); + return 1; + } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { + var3 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + var14 = MenuAction.getPacketBufferNode(ClientPacket.field2257, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeByte(var3.length() + 1); + var14.packetBuffer.writeStringCp1252NullTerminated(var3); + Client.packetWriter.addNode(var14); + return 1; + } else { + String var7; + int var15; + if (var0 == ScriptOpcodes.OPPLAYER) { + var15 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + class60.method1122(var15, var7); + return 1; + } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { + class160.Interpreter_intStackSize -= 3; + var15 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var10 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + int var9 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 2]; + Widget var13 = Player.getWidget(var9); + class83.clickWidget(var13, var15, var10); + return 1; + } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { + class160.Interpreter_intStackSize -= 2; + var15 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var10 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + Widget var11 = var2 ? UserComparator9.field1941 : MidiPcmStream.field2410; + class83.clickWidget(var11, var15, var10); + return 1; + } else if (var0 == ScriptOpcodes.MOUSECAM) { + WorldMapSection1.mouseCam = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Actor.clientPreferences.roofsHidden ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { + Actor.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + class296.savePreferences(); + return 1; + } else if (var0 == ScriptOpcodes.OPENURL) { + var3 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + boolean var4 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + WorldMapIcon_0.openURL(var3, var4, false); + return 1; + } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { + var15 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + var14 = MenuAction.getPacketBufferNode(ClientPacket.field2222, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeShort(var15); + Client.packetWriter.addNode(var14); + return 1; + } else if (var0 == ScriptOpcodes.BUG_REPORT) { + var15 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + TextureProvider.Interpreter_stringStackSize -= 2; + var7 = Interpreter.Interpreter_stringStack[TextureProvider.Interpreter_stringStackSize]; + String var5 = Interpreter.Interpreter_stringStack[TextureProvider.Interpreter_stringStackSize + 1]; + if (var7.length() > 500) { + return 1; + } else if (var5.length() > 500) { + return 1; + } else { + PacketBufferNode var6 = MenuAction.getPacketBufferNode(ClientPacket.field2236, Client.packetWriter.isaacCipher); + var6.packetBuffer.writeShort(1 + Varcs.stringCp1252NullTerminatedByteSize(var7) + Varcs.stringCp1252NullTerminatedByteSize(var5)); + var6.packetBuffer.writeStringCp1252NullTerminated(var7); + var6.packetBuffer.method5491(var15); + var6.packetBuffer.writeStringCp1252NullTerminated(var5); + Client.packetWriter.addNode(var6); + return 1; + } + } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { + Client.shiftClickDrop = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { + Client.showMouseOverText = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.RENDERSELF) { + Client.renderSelf = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 3120) { + if (Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 1; + } else { + Client.drawPlayerNames &= -2; + } + + return 1; + } else if (var0 == 3121) { + if (Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 2; + } else { + Client.drawPlayerNames &= -3; + } + + return 1; + } else if (var0 == 3122) { + if (Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 4; + } else { + Client.drawPlayerNames &= -5; + } + + return 1; + } else if (var0 == 3123) { + if (Interpreter.Interpreter_intStack[--class160.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[--class160.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { + Client.showLoadingMessages = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.SETTAPTODROP) { + FriendSystem.setTapToDrop(Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1); + return 1; + } else if (var0 == ScriptOpcodes.GETTAPTODROP) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = ItemContainer.getTapToDrop() ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.SETOCULUSORBSPEED) { + class160.Interpreter_intStackSize -= 2; + Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + return 1; + } else if (var0 == 3130) { + class160.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 3131) { + --class160.Interpreter_intStackSize; + return 1; + } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = GraphicsDefaults.canvasWidth; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = GameShell.canvasHeight; + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) { + --class160.Interpreter_intStackSize; + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { + class160.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 3136) { + Client.field784 = 3; + Client.field785 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + return 1; + } else if (var0 == 3137) { + Client.field784 = 2; + Client.field785 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + return 1; + } else if (var0 == 3138) { + Client.field784 = 0; + return 1; + } else if (var0 == 3139) { + Client.field784 = 1; + return 1; + } else if (var0 == 3140) { + Client.field784 = 3; + Client.field785 = var2 ? UserComparator9.field1941.id : MidiPcmStream.field2410.id; + return 1; + } else { + boolean var8; + if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { + var8 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + Actor.clientPreferences.hideUsername = var8; + class296.savePreferences(); + return 1; + } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Actor.clientPreferences.hideUsername ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { + var8 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + Client.Login_isUsernameRemembered = var8; + if (!var8) { + Actor.clientPreferences.rememberedUsername = ""; + class296.savePreferences(); + } + + return 1; + } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; + return 1; + } else if (var0 == 3145) { + return 1; + } else if (var0 == ScriptOpcodes.SETTITLEMUSICENABLED) { + var8 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + if (var8 == Actor.clientPreferences.titleMusicDisabled) { + Actor.clientPreferences.titleMusicDisabled = !var8; + class296.savePreferences(); + } + + return 1; + } else if (var0 == ScriptOpcodes.GETTITLEMUSICENABLED) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Actor.clientPreferences.titleMusicDisabled ? 0 : 1; + return 1; + } else if (var0 == 3148) { + return 1; + } else if (var0 == 3149) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3150) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3151) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3152) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3153) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; + return 1; + } else if (var0 == 3154) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = class189.method3626(); + return 1; + } else if (var0 == 3155) { + --TextureProvider.Interpreter_stringStackSize; + return 1; + } else if (var0 == 3156) { + return 1; + } else if (var0 == 3157) { + class160.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 3158) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3159) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3160) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3161) { + --class160.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3162) { + --class160.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3163) { + --TextureProvider.Interpreter_stringStackSize; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3164) { + --class160.Interpreter_intStackSize; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + return 1; + } else if (var0 == 3165) { + --class160.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3166) { + class160.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3167) { + class160.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3168) { + class160.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + return 1; + } else if (var0 == 3169) { + return 1; + } else if (var0 == 3170) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3171) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3172) { + --class160.Interpreter_intStackSize; + return 1; + } else if (var0 == 3173) { + --class160.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3174) { + --class160.Interpreter_intStackSize; + return 1; + } else if (var0 == 3175) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + return 1; + } else { + return var0 == 3176 ? 1 : 2; + } + } + } + } + } + } } diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java index 3911d2229e..24ae35e5ba 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("ga") +@ObfuscatedName("gp") @Implements("MidiFileReader") public class MidiFileReader { - @ObfuscatedName("d") - static final byte[] field2452; - @ObfuscatedName("s") + @ObfuscatedName("z") + static final byte[] field2434; + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lky;" + signature = "Lkz;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("division") int division; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("trackStarts") int[] trackStarts; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("trackPositions") int[] trackPositions; - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("trackLengths") int[] trackLengths; - @ObfuscatedName("n") - int[] field2446; - @ObfuscatedName("t") - int field2444; - @ObfuscatedName("x") - long field2449; + @ObfuscatedName("u") + int[] field2443; + @ObfuscatedName("j") + int field2435; + @ObfuscatedName("d") + long field2442; static { - field2452 = 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}; + field2434 = 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("c") @Export("parse") void parse(byte[] var1) { this.buffer.array = var1; this.buffer.offset = 10; int var2 = this.buffer.readUnsignedShort(); this.division = this.buffer.readUnsignedShort(); - this.field2444 = 500000; + this.field2435 = 500000; this.trackStarts = new int[var2]; Buffer var10000; @@ -70,7 +70,7 @@ public class MidiFileReader { var10000 = this.buffer; } - this.field2449 = 0L; + this.field2442 = 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.field2446 = new int[var2]; + this.field2443 = new int[var2]; } - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("clear") void clear() { this.buffer.array = null; this.trackStarts = null; this.trackPositions = null; this.trackLengths = null; - this.field2446 = null; + this.field2443 = null; } - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("isReady") boolean isReady() { return this.buffer.array != null; } - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("trackCount") int trackCount() { return this.trackPositions.length; } - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("gotoTrack") void gotoTrack(int var1) { this.buffer.offset = this.trackPositions[var1]; } - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("markTrackPosition") void markTrackPosition(int var1) { this.trackPositions[var1] = this.buffer.offset; } - @ObfuscatedName("t") + @ObfuscatedName("j") @Export("setTrackDone") void setTrackDone() { this.buffer.offset = -1; } - @ObfuscatedName("q") + @ObfuscatedName("v") @Export("readTrackLength") void readTrackLength(int var1) { int var2 = this.buffer.readVarInt(); @@ -129,36 +129,36 @@ public class MidiFileReader { var10000[var1] += var2; } - @ObfuscatedName("x") + @ObfuscatedName("d") @Export("readMessage") int readMessage(int var1) { int var2 = this.readMessage0(var1); return var2; } - @ObfuscatedName("d") + @ObfuscatedName("z") @Export("readMessage0") int readMessage0(int var1) { byte var2 = this.buffer.array[this.buffer.offset]; int var5; if (var2 < 0) { var5 = var2 & 255; - this.field2446[var1] = var5; + this.field2443[var1] = var5; ++this.buffer.offset; } else { - var5 = this.field2446[var1]; + var5 = this.field2443[var1]; } if (var5 != 240 && var5 != 247) { - return this.method3785(var1, var5); + return this.method3825(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.field2446[var1] = var4; - return this.method3785(var1, var4); + this.field2443[var1] = var4; + return this.method3825(var1, var4); } } @@ -168,8 +168,8 @@ public class MidiFileReader { } } - @ObfuscatedName("f") - int method3785(int var1, int var2) { + @ObfuscatedName("s") + int method3825(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.field2449 += (long)var6 * (long)(this.field2444 - var5); - this.field2444 = var5; + this.field2442 += (long)var6 * (long)(this.field2435 - var5); + this.field2435 = var5; var10000 = this.buffer; var10000.offset += var4; return 2; @@ -194,7 +194,7 @@ public class MidiFileReader { return 3; } } else { - byte var3 = field2452[var2 - 128]; + byte var3 = field2434[var2 - 128]; var4 = var2; if (var3 >= 1) { var4 = var2 | this.buffer.readUnsignedByte() << 8; @@ -208,12 +208,12 @@ public class MidiFileReader { } } - @ObfuscatedName("c") - long method3786(int var1) { - return this.field2449 + (long)var1 * (long)this.field2444; + @ObfuscatedName("p") + long method3857(int var1) { + return this.field2442 + (long)var1 * (long)this.field2435; } - @ObfuscatedName("r") + @ObfuscatedName("e") @Export("getPrioritizedTrack") int getPrioritizedTrack() { int var1 = this.trackPositions.length; @@ -230,7 +230,7 @@ public class MidiFileReader { return var2; } - @ObfuscatedName("y") + @ObfuscatedName("i") @Export("isDone") boolean isDone() { int var1 = this.trackPositions.length; @@ -244,15 +244,15 @@ public class MidiFileReader { return true; } - @ObfuscatedName("p") + @ObfuscatedName("q") @Export("reset") void reset(long var1) { - this.field2449 = var1; + this.field2442 = var1; int var3 = this.trackPositions.length; for (int var4 = 0; var4 < var3; ++var4) { this.trackLengths[var4] = 0; - this.field2446[var4] = 0; + this.field2443[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 9750d729a4..d0ede642c0 100644 --- a/runescape-client/src/main/java/MidiPcmStream.java +++ b/runescape-client/src/main/java/MidiPcmStream.java @@ -4,154 +4,159 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gp") +@ObfuscatedName("gt") @Implements("MidiPcmStream") public class MidiPcmStream extends PcmStream { - @ObfuscatedName("s") + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "Lhy;" + ) + static Widget field2410; + @ObfuscatedName("c") @ObfuscatedSignature( signature = "Llm;" ) @Export("musicPatches") NodeHashTable musicPatches; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 1414585865 + ) + int field2394; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 1090700352 + ) + int field2401; + @ObfuscatedName("g") + int[] field2385; + @ObfuscatedName("l") + int[] field2386; + @ObfuscatedName("u") + int[] field2387; @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 185095361 - ) - int field2390; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 1841466363 - ) - int field2391; + int[] field2388; + @ObfuscatedName("v") + int[] field2389; + @ObfuscatedName("d") + int[] field2390; + @ObfuscatedName("z") + int[] field2384; + @ObfuscatedName("n") + int[] field2392; + @ObfuscatedName("h") + int[] field2393; + @ObfuscatedName("r") + int[] field2395; @ObfuscatedName("k") int[] field2406; - @ObfuscatedName("u") - int[] field2393; - @ObfuscatedName("n") - int[] field2394; - @ObfuscatedName("t") - int[] field2395; - @ObfuscatedName("q") - int[] field2413; - @ObfuscatedName("x") - int[] field2397; - @ObfuscatedName("d") - int[] field2398; - @ObfuscatedName("f") - int[] field2399; - @ObfuscatedName("c") - int[] field2400; - @ObfuscatedName("a") - int[] field2414; @ObfuscatedName("w") - int[] field2403; - @ObfuscatedName("l") - int[] field2408; - @ObfuscatedName("h") - int[] field2389; - @ObfuscatedName("v") - int[] field2409; + int[] field2405; @ObfuscatedName("m") - int[] field2415; + int[] field2398; @ObfuscatedName("o") + int[] field2383; + @ObfuscatedName("a") + int[] field2400; + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "[[Lgd;" + signature = "[[Lgs;" ) - MusicPatchNode[][] field2405; - @ObfuscatedName("av") + MusicPatchNode[][] field2391; + @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "[[Lgd;" + signature = "[[Lgs;" ) MusicPatchNode[][] field2402; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedSignature( - signature = "Lga;" + signature = "Lgp;" ) @Export("midiFile") MidiFileReader midiFile; - @ObfuscatedName("ai") - boolean field2411; - @ObfuscatedName("af") + @ObfuscatedName("ao") + boolean field2404; + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -2055331589 + intValue = 1796077515 ) @Export("track") int track; - @ObfuscatedName("az") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -554202803 + intValue = 376067527 ) @Export("trackLength") int trackLength; - @ObfuscatedName("aj") + @ObfuscatedName("al") @ObfuscatedGetter( - longValue = 3749824554300054537L - ) - long field2396; - @ObfuscatedName("an") - @ObfuscatedGetter( - longValue = -6758315928508632083L + longValue = 3263394730300168849L ) long field2407; - @ObfuscatedName("at") + @ObfuscatedName("as") + @ObfuscatedGetter( + longValue = 3131582790426546053L + ) + long field2408; + @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "Lgh;" + signature = "Lgd;" ) @Export("patchStream") MusicPatchPcmStream patchStream; public MidiPcmStream() { - this.field2390 = 256; - this.field2391 = 1000000; - this.field2406 = new int[16]; - this.field2393 = new int[16]; - this.field2394 = new int[16]; - this.field2395 = new int[16]; - this.field2413 = new int[16]; - this.field2397 = new int[16]; - this.field2398 = new int[16]; - this.field2399 = new int[16]; - this.field2400 = new int[16]; - this.field2414 = new int[16]; - this.field2403 = new int[16]; - this.field2408 = new int[16]; + this.field2394 = 256; + this.field2401 = -727379968; + this.field2385 = new int[16]; + this.field2386 = new int[16]; + this.field2387 = new int[16]; + this.field2388 = new int[16]; this.field2389 = new int[16]; - this.field2409 = new int[16]; - this.field2415 = new int[16]; - this.field2405 = new MusicPatchNode[16][128]; + this.field2390 = new int[16]; + this.field2384 = new int[16]; + this.field2392 = new int[16]; + this.field2393 = new int[16]; + this.field2395 = new int[16]; + this.field2406 = new int[16]; + this.field2405 = new int[16]; + this.field2398 = new int[16]; + this.field2383 = new int[16]; + this.field2400 = new int[16]; + this.field2391 = new MusicPatchNode[16][128]; this.field2402 = new MusicPatchNode[16][128]; this.midiFile = new MidiFileReader(); this.patchStream = new MusicPatchPcmStream(this); this.musicPatches = new NodeHashTable(128); - this.method3746(); + this.method3706(); } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "111893823" + signature = "(IB)V", + garbageValue = "12" ) - public synchronized void method3670(int var1) { - this.field2390 = var1; + public synchronized void method3686(int var1) { + this.field2394 = var1; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "150252238" + garbageValue = "2102647071" ) - public int method3648() { - return this.field2390; + public int method3687() { + return this.field2394; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lgy;Lhz;Ldh;II)Z", - garbageValue = "2084569814" + signature = "(Lgy;Lhz;Ldy;IB)Z", + garbageValue = "-18" ) @Export("loadMusicTrack") public synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) { - var1.method3853(); + var1.method3902(); boolean var5 = true; int[] var6 = null; if (var4 > 0) { @@ -162,24 +167,16 @@ public class MidiPcmStream extends PcmStream { int var8 = (int)var7.key; MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)var8); if (var9 == null) { - byte[] var11 = var2.takeFileFlat(var8); - MusicPatch var10; - if (var11 == null) { - var10 = null; - } else { - var10 = new MusicPatch(var11); - } - - var9 = var10; - if (var10 == null) { + var9 = class4.method47(var2, var8); + if (var9 == null) { var5 = false; continue; } - this.musicPatches.put(var10, (long)var8); + this.musicPatches.put(var9, (long)var8); } - if (!var9.method3825(var3, var7.byteArray, var6)) { + if (!var9.method3868(var3, var7.byteArray, var6)) { var5 = false; } } @@ -191,10 +188,10 @@ public class MidiPcmStream extends PcmStream { return var5; } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1428915424" + signature = "(B)V", + garbageValue = "114" ) @Export("clearAll") public synchronized void clearAll() { @@ -204,10 +201,10 @@ public class MidiPcmStream extends PcmStream { } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "-65" + garbageValue = "-1" ) @Export("removeAll") public synchronized void removeAll() { @@ -217,65 +214,65 @@ public class MidiPcmStream extends PcmStream { } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "()Ldz;" + signature = "()Ldg;" ) @Export("firstSubStream") protected synchronized PcmStream firstSubStream() { return this.patchStream; } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "()Ldz;" + signature = "()Ldg;" ) @Export("nextSubStream") protected synchronized PcmStream nextSubStream() { return null; } - @ObfuscatedName("q") - protected synchronized int vmethod3834() { + @ObfuscatedName("v") + protected synchronized int vmethod3881() { return 0; } - @ObfuscatedName("x") + @ObfuscatedName("d") @Export("fill") protected synchronized void fill(int[] var1, int var2, int var3) { if (this.midiFile.isReady()) { - int var4 = this.midiFile.division * this.field2391 * -727379968 / PcmPlayer.PcmPlayer_sampleRate; + int var4 = this.midiFile.division * this.field2401 * 1000000 / GrandExchangeOfferWorldComparator.PcmPlayer_sampleRate; do { - long var5 = this.field2396 + (long)var3 * (long)var4; - if (this.field2407 - var5 >= 0L) { - this.field2396 = var5; + long var5 = this.field2407 + (long)var3 * (long)var4; + if (this.field2408 - var5 >= 0L) { + this.field2407 = var5; break; } - int var7 = (int)(((long)var4 + (this.field2407 - this.field2396) - 1L) / (long)var4); - this.field2396 += (long)var7 * (long)var4; + int var7 = (int)((this.field2408 - this.field2407 + (long)var4 - 1L) / (long)var4); + this.field2407 += (long)var4 * (long)var7; this.patchStream.fill(var1, var2, var7); var2 += var7; var3 -= var7; - this.method3679(); + this.method3719(); } while(this.midiFile.isReady()); } this.patchStream.fill(var1, var2, var3); } - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(Lgy;ZB)V", - garbageValue = "69" + signature = "(Lgy;ZI)V", + garbageValue = "-1993702143" ) @Export("setMusicTrack") public synchronized void setMusicTrack(MusicTrack var1, boolean var2) { this.clear(); this.midiFile.parse(var1.midi); - this.field2411 = var2; - this.field2396 = 0L; + this.field2404 = var2; + this.field2407 = 0L; int var3 = this.midiFile.trackCount(); for (int var4 = 0; var4 < var3; ++var4) { @@ -286,82 +283,82 @@ public class MidiPcmStream extends PcmStream { this.track = this.midiFile.getPrioritizedTrack(); this.trackLength = this.midiFile.trackLengths[this.track]; - this.field2407 = this.midiFile.method3786(this.trackLength); + this.field2408 = this.midiFile.method3857(this.trackLength); } - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("skip") protected synchronized void skip(int var1) { if (this.midiFile.isReady()) { - int var2 = this.midiFile.division * this.field2391 * -727379968 / PcmPlayer.PcmPlayer_sampleRate; + int var2 = this.midiFile.division * this.field2401 * 1000000 / GrandExchangeOfferWorldComparator.PcmPlayer_sampleRate; do { - long var3 = (long)var2 * (long)var1 + this.field2396; - if (this.field2407 - var3 >= 0L) { - this.field2396 = var3; + long var3 = (long)var2 * (long)var1 + this.field2407; + if (this.field2408 - var3 >= 0L) { + this.field2407 = var3; break; } - int var5 = (int)((this.field2407 - this.field2396 + (long)var2 - 1L) / (long)var2); - this.field2396 += (long)var2 * (long)var5; + int var5 = (int)(((long)var2 + (this.field2408 - this.field2407) - 1L) / (long)var2); + this.field2407 += (long)var2 * (long)var5; this.patchStream.skip(var5); var1 -= var5; - this.method3679(); + this.method3719(); } while(this.midiFile.isReady()); } this.patchStream.skip(var1); } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "17" + garbageValue = "41" ) @Export("clear") public synchronized void clear() { this.midiFile.clear(); - this.method3746(); + this.method3706(); } - @ObfuscatedName("r") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "52176988" + garbageValue = "1707602739" ) @Export("isReady") public synchronized boolean isReady() { return this.midiFile.isReady(); } - @ObfuscatedName("y") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-847662861" + garbageValue = "-319046618" ) - public synchronized void method3655(int var1, int var2) { - this.method3739(var1, var2); + public synchronized void method3732(int var1, int var2) { + this.method3695(var1, var2); } - @ObfuscatedName("p") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(IIB)V", - garbageValue = "-34" + garbageValue = "2" ) - void method3739(int var1, int var2) { - this.field2395[var1] = var2; - this.field2397[var1] = var2 & -128; - this.method3657(var1, var2); + void method3695(int var1, int var2) { + this.field2388[var1] = var2; + this.field2390[var1] = var2 & -128; + this.method3709(var1, var2); } - @ObfuscatedName("g") + @ObfuscatedName("r") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-958579239" + garbageValue = "1562201672" ) - void method3657(int var1, int var2) { - if (var2 != this.field2413[var1]) { - this.field2413[var1] = var2; + void method3709(int var1, int var2) { + if (var2 != this.field2389[var1]) { + this.field2389[var1] = var2; for (int var3 = 0; var3 < 128; ++var3) { this.field2402[var1][var3] = null; @@ -370,164 +367,164 @@ public class MidiPcmStream extends PcmStream { } - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(IIII)V", - garbageValue = "1813896856" + signature = "(IIIB)V", + garbageValue = "-37" ) - void method3658(int var1, int var2, int var3) { - this.method3752(var1, var2, 64); - if ((this.field2414[var1] & 2) != 0) { + void method3697(int var1, int var2, int var3) { + this.method3699(var1, var2, 64); + if ((this.field2395[var1] & 2) != 0) { for (MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) { - if (var4.field2437 == var1 && var4.field2433 < 0) { - this.field2405[var1][var4.field2424] = null; - this.field2405[var1][var2] = var4; - int var5 = (var4.field2428 * var4.field2440 >> 12) + var4.field2426; - var4.field2426 += var2 - var4.field2424 << 8; - var4.field2428 = var5 - var4.field2426; - var4.field2440 = 4096; - var4.field2424 = var2; + if (var4.field2431 == var1 && var4.field2425 < 0) { + this.field2391[var1][var4.field2413] = null; + this.field2391[var1][var2] = var4; + int var5 = (var4.field2420 * var4.field2433 >> 12) + var4.field2419; + var4.field2419 += var2 - var4.field2413 << 8; + var4.field2420 = var5 - var4.field2419; + var4.field2433 = 4096; + var4.field2413 = var2; return; } } } - MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2413[var1]); + MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2389[var1]); if (var9 != null) { RawSound var8 = var9.rawSounds[var2]; if (var8 != null) { MusicPatchNode var6 = new MusicPatchNode(); - var6.field2437 = var1; + var6.field2431 = var1; var6.patch = var9; var6.rawSound = var8; - var6.field2422 = var9.field2460[var2]; - var6.field2423 = var9.field2461[var2]; - var6.field2424 = var2; - var6.field2425 = var3 * var3 * var9.field2462[var2] * var9.field2459 + 1024 >> 11; - var6.field2429 = var9.field2463[var2] & 255; - var6.field2426 = (var2 << 8) - (var9.field2457[var2] & 32767); - var6.field2430 = 0; - var6.field2431 = 0; - var6.field2432 = 0; - var6.field2433 = -1; - var6.field2434 = 0; - if (this.field2389[var1] == 0) { - var6.stream = RawPcmStream.method2460(var8, this.method3660(var6), this.method3704(var6), this.method3673(var6)); + var6.field2415 = var9.field2449[var2]; + var6.field2426 = var9.field2454[var2]; + var6.field2413 = var2; + var6.field2417 = var3 * var3 * var9.field2451[var2] * var9.field2453 + 1024 >> 11; + var6.field2418 = var9.field2452[var2] & 255; + var6.field2419 = (var2 << 8) - (var9.field2450[var2] & 32767); + var6.field2414 = 0; + var6.field2423 = 0; + var6.field2424 = 0; + var6.field2425 = -1; + var6.field2416 = 0; + if (this.field2398[var1] == 0) { + var6.stream = RawPcmStream.method2511(var8, this.method3788(var6), this.method3786(var6), this.method3768(var6)); } else { - var6.stream = RawPcmStream.method2460(var8, this.method3660(var6), 0, this.method3673(var6)); - this.method3731(var6, var9.field2457[var2] < 0); + var6.stream = RawPcmStream.method2511(var8, this.method3788(var6), 0, this.method3768(var6)); + this.method3698(var6, var9.field2450[var2] < 0); } - if (var9.field2457[var2] < 0) { + if (var9.field2450[var2] < 0) { var6.stream.setNumLoops(-1); } - if (var6.field2423 >= 0) { - MusicPatchNode var7 = this.field2402[var1][var6.field2423]; - if (var7 != null && var7.field2433 < 0) { - this.field2405[var1][var7.field2424] = null; - var7.field2433 = 0; + if (var6.field2426 >= 0) { + MusicPatchNode var7 = this.field2402[var1][var6.field2426]; + if (var7 != null && var7.field2425 < 0) { + this.field2391[var1][var7.field2413] = null; + var7.field2425 = 0; } - this.field2402[var1][var6.field2423] = var6; + this.field2402[var1][var6.field2426] = var6; } this.patchStream.queue.addFirst(var6); - this.field2405[var1][var2] = var6; + this.field2391[var1][var2] = var6; } } } - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "(Lgd;ZI)V", - garbageValue = "942908769" - ) - void method3731(MusicPatchNode var1, boolean var2) { - int var3 = var1.rawSound.samples.length; - int var4; - if (var2 && var1.rawSound.field1362) { - int var5 = var3 + var3 - var1.rawSound.start; - var4 = (int)((long)this.field2389[var1.field2437] * (long)var5 >> 6); - var3 <<= 8; - if (var4 >= var3) { - var4 = var3 + var3 - 1 - var4; - var1.stream.method2469(); - } - } else { - var4 = (int)((long)var3 * (long)this.field2389[var1.field2437] >> 6); - } - - var1.stream.method2468(var4); - } - @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(IIIB)V", - garbageValue = "19" + signature = "(Lgs;ZI)V", + garbageValue = "751548044" ) - void method3752(int var1, int var2, int var3) { - MusicPatchNode var4 = this.field2405[var1][var2]; + void method3698(MusicPatchNode var1, boolean var2) { + int var3 = var1.rawSound.samples.length; + int var4; + if (var2 && var1.rawSound.field1358) { + int var5 = var3 + var3 - var1.rawSound.start; + var4 = (int)((long)var5 * (long)this.field2398[var1.field2431] >> 6); + var3 <<= 8; + if (var4 >= var3) { + var4 = var3 + var3 - 1 - var4; + var1.stream.method2548(); + } + } else { + var4 = (int)((long)this.field2398[var1.field2431] * (long)var3 >> 6); + } + + var1.stream.method2569(var4); + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(IIII)V", + garbageValue = "722715254" + ) + void method3699(int var1, int var2, int var3) { + MusicPatchNode var4 = this.field2391[var1][var2]; if (var4 != null) { - this.field2405[var1][var2] = null; - if ((this.field2414[var1] & 2) != 0) { + this.field2391[var1][var2] = null; + if ((this.field2395[var1] & 2) != 0) { for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var5.field2437 == var4.field2437 && var5.field2433 < 0 && var4 != var5) { - var4.field2433 = 0; + if (var4.field2431 == var5.field2431 && var5.field2425 < 0 && var4 != var5) { + var4.field2425 = 0; break; } } } else { - var4.field2433 = 0; + var4.field2425 = 0; } } } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(IIII)V", - garbageValue = "-942200921" + garbageValue = "-17345247" ) - void method3661(int var1, int var2, int var3) { + void method3700(int var1, int var2, int var3) { } - @ObfuscatedName("az") + @ObfuscatedName("a") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-12366119" + garbageValue = "197246641" ) - void method3662(int var1, int var2) { + void method3701(int var1, int var2) { } - @ObfuscatedName("at") + @ObfuscatedName("b") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-1514841200" + garbageValue = "-1303532041" ) - void method3663(int var1, int var2) { - this.field2398[var1] = var2; + void method3800(int var1, int var2) { + this.field2384[var1] = var2; } - @ObfuscatedName("as") + @ObfuscatedName("ag") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-1503846449" + garbageValue = "-5696967" ) - void method3736(int var1) { + void method3741(int var1) { for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var1 < 0 || var2.field2437 == var1) { + if (var1 < 0 || var2.field2431 == var1) { if (var2.stream != null) { - var2.stream.method2473(PcmPlayer.PcmPlayer_sampleRate / 100); - if (var2.stream.method2457()) { + var2.stream.method2541(GrandExchangeOfferWorldComparator.PcmPlayer_sampleRate / 100); + if (var2.stream.method2606()) { this.patchStream.mixer.addSubStream(var2.stream); } - var2.method3767(); + var2.method3810(); } - if (var2.field2433 < 0) { - this.field2405[var2.field2437][var2.field2424] = null; + if (var2.field2425 < 0) { + this.field2391[var2.field2431][var2.field2413] = null; } var2.remove(); @@ -536,107 +533,107 @@ public class MidiPcmStream extends PcmStream { } - @ObfuscatedName("ao") + @ObfuscatedName("at") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1795083748" + signature = "(IS)V", + garbageValue = "256" ) - void method3737(int var1) { + void method3763(int var1) { if (var1 >= 0) { - this.field2406[var1] = 12800; + this.field2385[var1] = 12800; + this.field2386[var1] = 8192; + this.field2387[var1] = 16383; + this.field2384[var1] = 8192; + this.field2392[var1] = 0; this.field2393[var1] = 8192; - this.field2394[var1] = 16383; - this.field2398[var1] = 8192; - this.field2399[var1] = 0; - this.field2400[var1] = 8192; - this.method3659(var1); - this.method3765(var1); - this.field2414[var1] = 0; - this.field2403[var1] = 32767; - this.field2408[var1] = 256; - this.field2389[var1] = 0; - this.method3671(var1, 8192); + this.method3707(var1); + this.method3708(var1); + this.field2395[var1] = 0; + this.field2406[var1] = 32767; + this.field2405[var1] = 256; + this.field2398[var1] = 0; + this.method3793(var1, 8192); } else { for (var1 = 0; var1 < 16; ++var1) { - this.method3737(var1); + this.method3763(var1); } } } - @ObfuscatedName("ac") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-2085170598" - ) - void method3685(int var1) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if ((var1 < 0 || var2.field2437 == var1) && var2.field2433 < 0) { - this.field2405[var2.field2437][var2.field2424] = null; - var2.field2433 = 0; - } - } - - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "541615354" - ) - void method3746() { - this.method3736(-1); - this.method3737(-1); - - int var1; - for (var1 = 0; var1 < 16; ++var1) { - this.field2413[var1] = this.field2395[var1]; - } - - for (var1 = 0; var1 < 16; ++var1) { - this.field2397[var1] = this.field2395[var1] & -128; - } - - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "955617478" - ) - void method3659(int var1) { - if ((this.field2414[var1] & 2) != 0) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var2.field2437 == var1 && this.field2405[var1][var2.field2424] == null && var2.field2433 < 0) { - var2.field2433 = 0; - } - } - } - - } - @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "127764810" + signature = "(IB)V", + garbageValue = "53" ) - void method3765(int var1) { - if ((this.field2414[var1] & 4) != 0) { + void method3702(int var1) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { + if ((var1 < 0 || var2.field2431 == var1) && var2.field2425 < 0) { + this.field2391[var2.field2431][var2.field2413] = null; + var2.field2425 = 0; + } + } + + } + + @ObfuscatedName("aj") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-454562685" + ) + void method3706() { + this.method3741(-1); + this.method3763(-1); + + int var1; + for (var1 = 0; var1 < 16; ++var1) { + this.field2389[var1] = this.field2388[var1]; + } + + for (var1 = 0; var1 < 16; ++var1) { + this.field2390[var1] = this.field2388[var1] & -128; + } + + } + + @ObfuscatedName("ab") + @ObfuscatedSignature( + signature = "(IB)V", + garbageValue = "-114" + ) + void method3707(int var1) { + if ((this.field2395[var1] & 2) != 0) { for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var2.field2437 == var1) { - var2.field2439 = 0; + if (var2.field2431 == var1 && this.field2391[var1][var2.field2413] == null && var2.field2425 < 0) { + var2.field2425 = 0; } } } } - @ObfuscatedName("ag") + @ObfuscatedName("ak") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-2066346211" + garbageValue = "1016524602" ) - void method3697(int var1) { + void method3708(int var1) { + if ((this.field2395[var1] & 4) != 0) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { + if (var2.field2431 == var1) { + var2.field2422 = 0; + } + } + } + + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "-1496359636" + ) + void method3735(int var1) { int var2 = var1 & 240; int var3; int var4; @@ -645,289 +642,289 @@ public class MidiPcmStream extends PcmStream { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; - this.method3752(var3, var4, var5); + this.method3699(var3, var4, var5); } else if (var2 == 144) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; if (var5 > 0) { - this.method3658(var3, var4, var5); + this.method3697(var3, var4, var5); } else { - this.method3752(var3, var4, 64); + this.method3699(var3, var4, 64); } } else if (var2 == 160) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; - this.method3661(var3, var4, var5); + this.method3700(var3, var4, var5); } else if (var2 == 176) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; if (var4 == 0) { - this.field2397[var3] = (var5 << 14) + (this.field2397[var3] & -2080769); + this.field2390[var3] = (var5 << 14) + (this.field2390[var3] & -2080769); } if (var4 == 32) { - this.field2397[var3] = (var5 << 7) + (this.field2397[var3] & -16257); + this.field2390[var3] = (var5 << 7) + (this.field2390[var3] & -16257); } if (var4 == 1) { - this.field2399[var3] = (var5 << 7) + (this.field2399[var3] & -16257); + this.field2392[var3] = (var5 << 7) + (this.field2392[var3] & -16257); } if (var4 == 33) { - this.field2399[var3] = var5 + (this.field2399[var3] & -128); + this.field2392[var3] = var5 + (this.field2392[var3] & -128); } if (var4 == 5) { - this.field2400[var3] = (var5 << 7) + (this.field2400[var3] & -16257); - } - - if (var4 == 37) { - this.field2400[var3] = var5 + (this.field2400[var3] & -128); - } - - if (var4 == 7) { - this.field2406[var3] = (var5 << 7) + (this.field2406[var3] & -16257); - } - - if (var4 == 39) { - this.field2406[var3] = var5 + (this.field2406[var3] & -128); - } - - if (var4 == 10) { this.field2393[var3] = (var5 << 7) + (this.field2393[var3] & -16257); } - if (var4 == 42) { + if (var4 == 37) { this.field2393[var3] = var5 + (this.field2393[var3] & -128); } + if (var4 == 7) { + this.field2385[var3] = (var5 << 7) + (this.field2385[var3] & -16257); + } + + if (var4 == 39) { + this.field2385[var3] = var5 + (this.field2385[var3] & -128); + } + + if (var4 == 10) { + this.field2386[var3] = (var5 << 7) + (this.field2386[var3] & -16257); + } + + if (var4 == 42) { + this.field2386[var3] = var5 + (this.field2386[var3] & -128); + } + if (var4 == 11) { - this.field2394[var3] = (var5 << 7) + (this.field2394[var3] & -16257); + this.field2387[var3] = (var5 << 7) + (this.field2387[var3] & -16257); } if (var4 == 43) { - this.field2394[var3] = var5 + (this.field2394[var3] & -128); + this.field2387[var3] = var5 + (this.field2387[var3] & -128); } int[] var10000; if (var4 == 64) { if (var5 >= 64) { - var10000 = this.field2414; + var10000 = this.field2395; var10000[var3] |= 1; } else { - var10000 = this.field2414; + var10000 = this.field2395; var10000[var3] &= -2; } } if (var4 == 65) { if (var5 >= 64) { - var10000 = this.field2414; + var10000 = this.field2395; var10000[var3] |= 2; } else { - this.method3659(var3); - var10000 = this.field2414; + this.method3707(var3); + var10000 = this.field2395; var10000[var3] &= -3; } } if (var4 == 99) { - this.field2403[var3] = (var5 << 7) + (this.field2403[var3] & 127); + this.field2406[var3] = (var5 << 7) + (this.field2406[var3] & 127); } if (var4 == 98) { - this.field2403[var3] = (this.field2403[var3] & 16256) + var5; + this.field2406[var3] = (this.field2406[var3] & 16256) + var5; } if (var4 == 101) { - this.field2403[var3] = (var5 << 7) + (this.field2403[var3] & 127) + 16384; + this.field2406[var3] = (var5 << 7) + (this.field2406[var3] & 127) + 16384; } if (var4 == 100) { - this.field2403[var3] = (this.field2403[var3] & 16256) + var5 + 16384; + this.field2406[var3] = (this.field2406[var3] & 16256) + var5 + 16384; } if (var4 == 120) { - this.method3736(var3); + this.method3741(var3); } if (var4 == 121) { - this.method3737(var3); + this.method3763(var3); } if (var4 == 123) { - this.method3685(var3); + this.method3702(var3); } int var6; if (var4 == 6) { - var6 = this.field2403[var3]; + var6 = this.field2406[var3]; if (var6 == 16384) { - this.field2408[var3] = (var5 << 7) + (this.field2408[var3] & -16257); + this.field2405[var3] = (var5 << 7) + (this.field2405[var3] & -16257); } } if (var4 == 38) { - var6 = this.field2403[var3]; + var6 = this.field2406[var3]; if (var6 == 16384) { - this.field2408[var3] = var5 + (this.field2408[var3] & -128); + this.field2405[var3] = var5 + (this.field2405[var3] & -128); } } if (var4 == 16) { - this.field2389[var3] = (var5 << 7) + (this.field2389[var3] & -16257); + this.field2398[var3] = (var5 << 7) + (this.field2398[var3] & -16257); } if (var4 == 48) { - this.field2389[var3] = var5 + (this.field2389[var3] & -128); + this.field2398[var3] = var5 + (this.field2398[var3] & -128); } if (var4 == 81) { if (var5 >= 64) { - var10000 = this.field2414; + var10000 = this.field2395; var10000[var3] |= 4; } else { - this.method3765(var3); - var10000 = this.field2414; + this.method3708(var3); + var10000 = this.field2395; var10000[var3] &= -5; } } if (var4 == 17) { - this.method3671(var3, (var5 << 7) + (this.field2409[var3] & -16257)); + this.method3793(var3, (var5 << 7) + (this.field2383[var3] & -16257)); } if (var4 == 49) { - this.method3671(var3, var5 + (this.field2409[var3] & -128)); + this.method3793(var3, var5 + (this.field2383[var3] & -128)); } } else if (var2 == 192) { var3 = var1 & 15; var4 = var1 >> 8 & 127; - this.method3657(var3, var4 + this.field2397[var3]); + this.method3709(var3, var4 + this.field2390[var3]); } else if (var2 == 208) { var3 = var1 & 15; var4 = var1 >> 8 & 127; - this.method3662(var3, var4); + this.method3701(var3, var4); } else if (var2 == 224) { var3 = var1 & 15; var4 = (var1 >> 8 & 127) + (var1 >> 9 & 16256); - this.method3663(var3, var4); + this.method3800(var3, var4); } else { var2 = var1 & 255; if (var2 == 255) { - this.method3746(); + this.method3706(); } } } + @ObfuscatedName("ae") + @ObfuscatedSignature( + signature = "(III)V", + garbageValue = "631223088" + ) + void method3793(int var1, int var2) { + this.field2383[var1] = var2; + this.field2400[var1] = (int)(2097152.0D * Math.pow(2.0D, (double)var2 * 5.4931640625E-4D) + 0.5D); + } + @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "-1884051216" + signature = "(Lgs;B)I", + garbageValue = "-78" ) - void method3671(int var1, int var2) { - this.field2409[var1] = var2; - this.field2415[var1] = (int)(2097152.0D * Math.pow(2.0D, (double)var2 * 5.4931640625E-4D) + 0.5D); - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - signature = "(Lgd;I)I", - garbageValue = "1407355408" - ) - int method3660(MusicPatchNode var1) { - int var2 = (var1.field2428 * var1.field2440 >> 12) + var1.field2426; - var2 += (this.field2398[var1.field2437] - 8192) * this.field2408[var1.field2437] >> 12; - MusicPatchNode2 var3 = var1.field2422; + int method3788(MusicPatchNode var1) { + int var2 = (var1.field2420 * var1.field2433 >> 12) + var1.field2419; + var2 += (this.field2384[var1.field2431] - 8192) * this.field2405[var1.field2431] >> 12; + MusicPatchNode2 var3 = var1.field2415; int var4; - if (var3.field2376 > 0 && (var3.field2375 > 0 || this.field2399[var1.field2437] > 0)) { - var4 = var3.field2375 << 2; - int var5 = var3.field2377 << 1; - if (var1.field2435 < var5) { - var4 = var4 * var1.field2435 / var5; + if (var3.field2367 > 0 && (var3.field2366 > 0 || this.field2392[var1.field2431] > 0)) { + var4 = var3.field2366 << 2; + int var5 = var3.field2370 << 1; + if (var1.field2427 < var5) { + var4 = var4 * var1.field2427 / var5; } - var4 += this.field2399[var1.field2437] >> 7; - double var6 = Math.sin(0.01227184630308513D * (double)(var1.field2436 & 511)); - var2 += (int)((double)var4 * var6); + var4 += this.field2392[var1.field2431] >> 7; + double var6 = Math.sin(0.01227184630308513D * (double)(var1.field2428 & 511)); + var2 += (int)(var6 * (double)var4); } - var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, (double)var2 * 3.255208333333333E-4D) / (double)PcmPlayer.PcmPlayer_sampleRate + 0.5D); + var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, (double)var2 * 3.255208333333333E-4D) / (double)GrandExchangeOfferWorldComparator.PcmPlayer_sampleRate + 0.5D); return var4 < 1 ? 1 : var4; } @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "(Lgd;B)I", - garbageValue = "114" + signature = "(Lgs;I)I", + garbageValue = "1409927700" ) - int method3704(MusicPatchNode var1) { - MusicPatchNode2 var2 = var1.field2422; - int var3 = this.field2394[var1.field2437] * this.field2406[var1.field2437] + 4096 >> 13; + int method3786(MusicPatchNode var1) { + MusicPatchNode2 var2 = var1.field2415; + int var3 = this.field2385[var1.field2431] * this.field2387[var1.field2431] + 4096 >> 13; var3 = var3 * var3 + 16384 >> 15; - var3 = var3 * var1.field2425 + 16384 >> 15; - var3 = var3 * this.field2390 + 128 >> 8; - if (var2.field2372 > 0) { - var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field2372 * 1.953125E-5D * (double)var1.field2430) + 0.5D); + var3 = var3 * var1.field2417 + 16384 >> 15; + var3 = var3 * this.field2394 + 128 >> 8; + if (var2.field2368 > 0) { + var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field2368 * 1.953125E-5D * (double)var1.field2414) + 0.5D); } int var4; int var5; int var6; int var7; - if (var2.field2369 != null) { - var4 = var1.field2431; - var5 = var2.field2369[var1.field2432 * 4 + 1]; - if (var1.field2432 * 4 < var2.field2369.length - 2) { - var6 = (var2.field2369[var1.field2432 * 4] & 255) << 8; - var7 = (var2.field2369[var1.field2432 * 4 + 2] & 255) << 8; - var5 += (var2.field2369[var1.field2432 * 4 + 3] - var5) * (var4 - var6) / (var7 - var6); + if (var2.field2365 != null) { + var4 = var1.field2423; + var5 = var2.field2365[var1.field2424 * 4 + 1]; + if (var1.field2424 * 4 < var2.field2365.length - 2) { + var6 = (var2.field2365[var1.field2424 * 4] & 255) << 8; + var7 = (var2.field2365[var1.field2424 * 4 + 2] & 255) << 8; + var5 += (var2.field2365[var1.field2424 * 4 + 3] - var5) * (var4 - var6) / (var7 - var6); } var3 = var3 * var5 + 32 >> 6; } - if (var1.field2433 > 0 && var2.field2370 != null) { - var4 = var1.field2433; - var5 = var2.field2370[var1.field2434 * 2 + 1]; - if (var1.field2434 * 2 < var2.field2370.length - 2) { - var6 = (var2.field2370[var1.field2434 * 2] & 255) << 8; - var7 = (var2.field2370[var1.field2434 * 2 + 2] & 255) << 8; - var5 += (var4 - var6) * (var2.field2370[var1.field2434 * 2 + 3] - var5) / (var7 - var6); + if (var1.field2425 > 0 && var2.field2361 != null) { + var4 = var1.field2425; + var5 = var2.field2361[var1.field2416 * 4 + 1]; + if (var1.field2416 * 4 < var2.field2361.length - 2) { + var6 = (var2.field2361[var1.field2416 * 4] & 255) << 8; + var7 = (var2.field2361[var1.field2416 * 4 + 2] & 255) << 8; + var5 += (var4 - var6) * (var2.field2361[var1.field2416 * 4 + 3] - var5) / (var7 - var6); } - var3 = var5 * var3 + 32 >> 6; + var3 = var3 * var5 + 32 >> 6; } return var3; } - @ObfuscatedName("ay") + @ObfuscatedName("ar") @ObfuscatedSignature( - signature = "(Lgd;B)I", - garbageValue = "0" + signature = "(Lgs;B)I", + garbageValue = "-84" ) - int method3673(MusicPatchNode var1) { - int var2 = this.field2393[var1.field2437]; - return var2 < 8192 ? var2 * var1.field2429 + 32 >> 6 : 16384 - ((128 - var1.field2429) * (16384 - var2) + 32 >> 6); + int method3768(MusicPatchNode var1) { + int var2 = this.field2386[var1.field2431]; + return var2 < 8192 ? var2 * var1.field2418 + 32 >> 6 : 16384 - ((128 - var1.field2418) * (16384 - var2) + 32 >> 6); } - @ObfuscatedName("ad") + @ObfuscatedName("ac") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1618427490" + garbageValue = "-1899484159" ) - void method3679() { + void method3719() { int var1 = this.track; int var2 = this.trackLength; long var3; - for (var3 = this.field2407; var2 == this.trackLength; var3 = this.midiFile.method3786(var2)) { + for (var3 = this.field2408; var2 == this.trackLength; var3 = this.midiFile.method3857(var2)) { while (var2 == this.midiFile.trackLengths[var1]) { this.midiFile.gotoTrack(var1); int var5 = this.midiFile.readMessage(var1); @@ -935,8 +932,8 @@ public class MidiPcmStream extends PcmStream { this.midiFile.setTrackDone(); this.midiFile.markTrackPosition(var1); if (this.midiFile.isDone()) { - if (!this.field2411 || var2 == 0) { - this.method3746(); + if (!this.field2404 || var2 == 0) { + this.method3706(); this.midiFile.clear(); return; } @@ -947,7 +944,7 @@ public class MidiPcmStream extends PcmStream { } if ((var5 & 128) != 0) { - this.method3697(var5); + this.method3735(var5); } this.midiFile.readTrackLength(var1); @@ -960,20 +957,20 @@ public class MidiPcmStream extends PcmStream { this.track = var1; this.trackLength = var2; - this.field2407 = var3; + this.field2408 = var3; } - @ObfuscatedName("al") + @ObfuscatedName("az") @ObfuscatedSignature( - signature = "(Lgd;B)Z", - garbageValue = "0" + signature = "(Lgs;I)Z", + garbageValue = "559345997" ) - boolean method3680(MusicPatchNode var1) { + boolean method3720(MusicPatchNode var1) { if (var1.stream == null) { - if (var1.field2433 >= 0) { + if (var1.field2425 >= 0) { var1.remove(); - if (var1.field2423 > 0 && var1 == this.field2402[var1.field2437][var1.field2423]) { - this.field2402[var1.field2437][var1.field2423] = null; + if (var1.field2426 > 0 && var1 == this.field2402[var1.field2431][var1.field2426]) { + this.field2402[var1.field2431][var1.field2426] = null; } } @@ -983,153 +980,132 @@ public class MidiPcmStream extends PcmStream { } } - @ObfuscatedName("ah") + @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(Lgd;[IIIB)Z", - garbageValue = "96" + signature = "(Lgs;[IIII)Z", + garbageValue = "-647308789" ) - boolean method3665(MusicPatchNode var1, int[] var2, int var3, int var4) { - var1.field2438 = PcmPlayer.PcmPlayer_sampleRate / 100; - if (var1.field2433 < 0 || var1.stream != null && !var1.stream.method2476()) { - int var5 = var1.field2440; + boolean method3721(MusicPatchNode var1, int[] var2, int var3, int var4) { + var1.field2430 = GrandExchangeOfferWorldComparator.PcmPlayer_sampleRate / 100; + if (var1.field2425 < 0 || var1.stream != null && !var1.stream.method2583()) { + int var5 = var1.field2433; if (var5 > 0) { - var5 -= (int)(16.0D * Math.pow(2.0D, 4.921259842519685E-4D * (double)this.field2400[var1.field2437]) + 0.5D); + var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.field2393[var1.field2431] * 4.921259842519685E-4D) + 0.5D); if (var5 < 0) { var5 = 0; } - var1.field2440 = var5; + var1.field2433 = var5; } - var1.stream.method2474(this.method3660(var1)); - MusicPatchNode2 var6 = var1.field2422; + var1.stream.method2525(this.method3788(var1)); + MusicPatchNode2 var6 = var1.field2415; boolean var7 = false; - ++var1.field2435; - var1.field2436 += var6.field2376; - double var8 = (double)((var1.field2424 - 60 << 8) + (var1.field2428 * var1.field2440 >> 12)) * 5.086263020833333E-6D; - if (var6.field2372 > 0) { - if (var6.field2374 > 0) { - var1.field2430 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2374 * var8) + 0.5D); + ++var1.field2427; + var1.field2428 += var6.field2367; + double var8 = (double)((var1.field2413 - 60 << 8) + (var1.field2433 * var1.field2420 >> 12)) * 5.086263020833333E-6D; + if (var6.field2368 > 0) { + if (var6.field2363 > 0) { + var1.field2414 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2363 * var8) + 0.5D); } else { - var1.field2430 += 128; + var1.field2414 += 128; } } - if (var6.field2369 != null) { - if (var6.field2371 > 0) { - var1.field2431 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2371 * var8) + 0.5D); + if (var6.field2365 != null) { + if (var6.field2360 > 0) { + var1.field2423 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2360) + 0.5D); } else { - var1.field2431 += 128; + var1.field2423 += 128; } - while (var1.field2432 * 4 < var6.field2369.length - 2 && var1.field2431 > (var6.field2369[var1.field2432 * 4 + 2] & 255) << 8) { - var1.field2432 = var1.field2432 * 4 + 2; + while (var1.field2424 * 4 < var6.field2365.length - 2 && var1.field2423 > (var6.field2365[var1.field2424 * 4 + 2] & 255) << 8) { + var1.field2424 = var1.field2424 * 4 + 2; } - if (var1.field2432 * 4 == var6.field2369.length - 2 && var6.field2369[var1.field2432 * 4 + 1] == 0) { + if (var1.field2424 * 4 == var6.field2365.length - 2 && var6.field2365[var1.field2424 * 4 + 1] == 0) { var7 = true; } } - if (var1.field2433 >= 0 && var6.field2370 != null && (this.field2414[var1.field2437] & 1) == 0 && (var1.field2423 < 0 || var1 != this.field2402[var1.field2437][var1.field2423])) { - if (var6.field2373 > 0) { - var1.field2433 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2373) + 0.5D); + if (var1.field2425 >= 0 && var6.field2361 != null && (this.field2395[var1.field2431] & 1) == 0 && (var1.field2426 < 0 || var1 != this.field2402[var1.field2431][var1.field2426])) { + if (var6.field2364 > 0) { + var1.field2425 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2364) + 0.5D); } else { - var1.field2433 += 128; + var1.field2425 += 128; } - while (var1.field2434 * 2 < var6.field2370.length - 2 && var1.field2433 > (var6.field2370[var1.field2434 * 2 + 2] & 255) << 8) { - var1.field2434 = var1.field2434 * 4 + 4; + while (var1.field2416 * 4 < var6.field2361.length - 2 && var1.field2425 > (var6.field2361[var1.field2416 * 4 + 2] & 255) << 8) { + var1.field2416 = var1.field2416 * 4 + 2; } - if (var1.field2434 * 2 == var6.field2370.length - 2) { + if (var1.field2416 * 4 == var6.field2361.length - 2) { var7 = true; } } if (var7) { - var1.stream.method2473(var1.field2438); + var1.stream.method2541(var1.field2430); if (var2 != null) { var1.stream.fill(var2, var3, var4); } else { var1.stream.skip(var4); } - if (var1.stream.method2457()) { + if (var1.stream.method2606()) { this.patchStream.mixer.addSubStream(var1.stream); } - var1.method3767(); - if (var1.field2433 >= 0) { + var1.method3810(); + if (var1.field2425 >= 0) { var1.remove(); - if (var1.field2423 > 0 && var1 == this.field2402[var1.field2437][var1.field2423]) { - this.field2402[var1.field2437][var1.field2423] = null; + if (var1.field2426 > 0 && var1 == this.field2402[var1.field2431][var1.field2426]) { + this.field2402[var1.field2431][var1.field2426] = null; } } return true; } else { - var1.stream.method2472(var1.field2438, this.method3704(var1), this.method3673(var1)); + var1.stream.method2523(var1.field2430, this.method3786(var1), this.method3768(var1)); return false; } } else { - var1.method3767(); + var1.method3810(); var1.remove(); - if (var1.field2423 > 0 && var1 == this.field2402[var1.field2437][var1.field2423]) { - this.field2402[var1.field2437][var1.field2423] = null; + if (var1.field2426 > 0 && var1 == this.field2402[var1.field2431][var1.field2426]) { + this.field2402[var1.field2431][var1.field2426] = null; } return true; } } - @ObfuscatedName("fo") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lhp;III)V", - garbageValue = "-799494099" + signature = "(I)V", + garbageValue = "-1312373259" ) - @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 || !FriendSystem.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 = var4 * var8 + var5 * var7 >> 11; - int var10 = var8 * var5 - var7 * var4 >> 11; - int var11 = var9 + WorldMapIcon_1.localPlayer.x >> 7; - int var12 = WorldMapIcon_1.localPlayer.y - var10 >> 7; - PacketBufferNode var13 = MenuAction.getPacketBufferNode(ClientPacket.field2237, Client.packetWriter.isaacCipher); - var13.packetBuffer.writeByte(18); - var13.packetBuffer.method5443(RouteStrategy.baseY * 64 + var12); - var13.packetBuffer.method5443(PacketWriter.baseX * 64 + var11); - var13.packetBuffer.method5433(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(WorldMapIcon_1.localPlayer.x); - var13.packetBuffer.writeShort(WorldMapIcon_1.localPlayer.y); - var13.packetBuffer.writeByte(63); - Client.packetWriter.addNode(var13); - Client.destinationX = var11; - Client.destinationY = var12; - } - } + static void method3769() { + GrandExchangeOffer.field67 = new int[2000]; + int var0 = 0; + int var1 = 240; + int var3; + for (byte var2 = 12; var0 < 16; var1 -= var2) { + var3 = FontName.method5287((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)(0.425F * (float)var0 / 16.0F + 0.075F)); + GrandExchangeOffer.field67[var0] = var3; + ++var0; } + + var1 = 48; + + for (int var5 = var1 / 6; var0 < GrandExchangeOffer.field67.length; var1 -= var5) { + var3 = var0 * 2; + + for (int var4 = FontName.method5287((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var3 && var0 < GrandExchangeOffer.field67.length; ++var0) { + GrandExchangeOffer.field67[var0] = var4; + } + } + } } diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java index 7eef410229..596e2438d1 100644 --- a/runescape-client/src/main/java/MilliClock.java +++ b/runescape-client/src/main/java/MilliClock.java @@ -4,324 +4,158 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fg") +@ObfuscatedName("fs") @Implements("MilliClock") public class MilliClock extends Clock { - @ObfuscatedName("kh") + @ObfuscatedName("qb") @ObfuscatedGetter( - intValue = 145701519 + intValue = -669204480 ) - @Export("menuX") - static int menuX; - @ObfuscatedName("s") - long[] field2002; - @ObfuscatedName("j") + static int field1990; + @ObfuscatedName("c") + long[] field1982; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -986799109 + intValue = -1242742979 ) - int field1999; - @ObfuscatedName("i") + int field1983; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1675223211 + intValue = 1756511381 ) - int field2000; - @ObfuscatedName("k") + int field1991; + @ObfuscatedName("g") @ObfuscatedGetter( - longValue = 5516400529090944549L + longValue = 2067357926353532881L ) - long field2003; + long field1985; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1118758251 + ) + int field1986; @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1296421545 + intValue = 1868084299 ) - int field2001; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 1277322541 - ) - int field1998; + int field1987; MilliClock() { - this.field2002 = new long[10]; - this.field1999 = 256; - this.field2000 = 1; - this.field2001 = 0; - this.field2003 = SequenceDefinition.method4686(); + this.field1982 = new long[10]; + this.field1983 = 256; + this.field1991 = 1; + this.field1986 = 0; + this.field1985 = SoundCache.method2480(); for (int var1 = 0; var1 < 10; ++var1) { - this.field2002[var1] = this.field2003; + this.field1982[var1] = this.field1985; } } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-779324795" + garbageValue = "-250719361" ) @Export("mark") public void mark() { for (int var1 = 0; var1 < 10; ++var1) { - this.field2002[var1] = 0L; + this.field1982[var1] = 0L; } } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(III)I", - garbageValue = "930751718" + garbageValue = "1652957447" ) @Export("wait") public int wait(int var1, int var2) { - int var3 = this.field1999; - int var4 = this.field2000; - this.field1999 = 300; - this.field2000 = 1; - this.field2003 = SequenceDefinition.method4686(); - if (this.field2002[this.field1998] == 0L) { - this.field1999 = var3; - this.field2000 = var4; - } else if (this.field2003 > this.field2002[this.field1998]) { - this.field1999 = (int)((long)(var1 * 2560) / (this.field2003 - this.field2002[this.field1998])); + int var3 = this.field1983; + int var4 = this.field1991; + this.field1983 = 300; + this.field1991 = 1; + this.field1985 = SoundCache.method2480(); + if (this.field1982[this.field1987] == 0L) { + this.field1983 = var3; + this.field1991 = var4; + } else if (this.field1985 > this.field1982[this.field1987]) { + this.field1983 = (int)((long)(var1 * 2560) / (this.field1985 - this.field1982[this.field1987])); } - if (this.field1999 < 25) { - this.field1999 = 25; + if (this.field1983 < 25) { + this.field1983 = 25; } - if (this.field1999 > 256) { - this.field1999 = 256; - this.field2000 = (int)((long)var1 - (this.field2003 - this.field2002[this.field1998]) / 10L); + if (this.field1983 > 256) { + this.field1983 = 256; + this.field1991 = (int)((long)var1 - (this.field1985 - this.field1982[this.field1987]) / 10L); } - if (this.field2000 > var1) { - this.field2000 = var1; + if (this.field1991 > var1) { + this.field1991 = var1; } - this.field2002[this.field1998] = this.field2003; - this.field1998 = (this.field1998 + 1) % 10; + this.field1982[this.field1987] = this.field1985; + this.field1987 = (this.field1987 + 1) % 10; int var5; - if (this.field2000 > 1) { + if (this.field1991 > 1) { for (var5 = 0; var5 < 10; ++var5) { - if (0L != this.field2002[var5]) { - this.field2002[var5] += (long)this.field2000; + if (0L != this.field1982[var5]) { + this.field1982[var5] += (long)this.field1991; } } } - if (this.field2000 < var2) { - this.field2000 = var2; + if (this.field1991 < var2) { + this.field1991 = var2; } - UserList.sleepMillis((long)this.field2000); + FriendsList.sleepMillis((long)this.field1991); - for (var5 = 0; this.field2001 < 256; this.field2001 += this.field1999) { + for (var5 = 0; this.field1986 < 256; this.field1986 += this.field1983) { ++var5; } - this.field2001 &= 255; + this.field1986 &= 255; return var5; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-1790253551" + signature = "(Ljava/lang/Object;ZB)[B", + garbageValue = "-72" ) - @Export("addChatMessage") - static void addChatMessage(int var0, String var1, String var2, String var3) { - ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); - if (var4 == null) { - var4 = new ChatChannel(); - Messages.Messages_channels.put(var0, var4); + @Export("serialize") + public static byte[] serialize(Object var0, boolean var1) { + if (var0 == null) { + return null; + } else if (var0 instanceof byte[]) { + byte[] var6 = (byte[])((byte[])var0); + if (var1) { + int var4 = var6.length; + byte[] var5 = new byte[var4]; + System.arraycopy(var6, 0, var5, 0, var4); + return var5; + } else { + return var6; + } + } else if (var0 instanceof AbstractByteArrayCopier) { + AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; + return var2.get(); + } else { + throw new IllegalArgumentException(); } - - 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("fm") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1981832610" + signature = "(II)Z", + garbageValue = "578447595" ) - static final void method3405() { - int var0; - int var1; - int var2; - int var3; - int var4; - int var5; - if (Client.oculusOrbState == 0) { - var0 = WorldMapIcon_1.localPlayer.x; - var1 = WorldMapIcon_1.localPlayer.y; - if (DynamicObject.oculusOrbFocalPointX - var0 < -500 || DynamicObject.oculusOrbFocalPointX - var0 > 500 || FriendSystem.oculusOrbFocalPointY - var1 < -500 || FriendSystem.oculusOrbFocalPointY - var1 > 500) { - DynamicObject.oculusOrbFocalPointX = var0; - FriendSystem.oculusOrbFocalPointY = var1; - } - - if (var0 != DynamicObject.oculusOrbFocalPointX) { - DynamicObject.oculusOrbFocalPointX += (var0 - DynamicObject.oculusOrbFocalPointX) / 16; - } - - if (var1 != FriendSystem.oculusOrbFocalPointY) { - FriendSystem.oculusOrbFocalPointY += (var1 - FriendSystem.oculusOrbFocalPointY) / 16; - } - - var2 = DynamicObject.oculusOrbFocalPointX >> 7; - var3 = FriendSystem.oculusOrbFocalPointY >> 7; - var4 = GrandExchangeOfferTotalQuantityComparator.getTileHeight(DynamicObject.oculusOrbFocalPointX, FriendSystem.oculusOrbFocalPointY, ItemContainer.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 = ItemContainer.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.field635) { - Client.field635 += (var6 - Client.field635) / 24; - } else if (var6 < Client.field635) { - Client.field635 += (var6 - Client.field635) / 80; - } - - ScriptEvent.field559 = GrandExchangeOfferTotalQuantityComparator.getTileHeight(WorldMapIcon_1.localPlayer.x, WorldMapIcon_1.localPlayer.y, ItemContainer.plane) - Client.camFollowHeight; - } else if (Client.oculusOrbState == 1) { - GrandExchangeOffer.method122(); - 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 : Client.oculusOrbNormalSpeed; - var2 *= 16; - Client.field701 = var10; - Client.field680 = var11; - } - - if (Client.field700 < var2) { - Client.field700 += var2 / 8; - if (Client.field700 > var2) { - Client.field700 = var2; - } - } else if (Client.field700 > var2) { - Client.field700 = Client.field700 * 9 / 10; - } - - if (Client.field700 > 0) { - var3 = Client.field700 / 16; - if (Client.field701 >= 0) { - var0 = Client.field701 - class40.cameraYaw & 2047; - var4 = Rasterizer3D.Rasterizer3D_sine[var0]; - var5 = Rasterizer3D.Rasterizer3D_cosine[var0]; - DynamicObject.oculusOrbFocalPointX += var4 * var3 / 65536; - FriendSystem.oculusOrbFocalPointY += var5 * var3 / 65536; - } - - if (Client.field680 != 0) { - ScriptEvent.field559 += var3 * Client.field680; - if (ScriptEvent.field559 > 0) { - ScriptEvent.field559 = 0; - } - } - } else { - Client.field701 = -1; - Client.field680 = -1; - } - - if (KeyHandler.KeyHandler_pressedKeys[13]) { - WorldMapSection0.method221(); - } - } - - if (MouseHandler.MouseHandler_currentButton == 4 && FriendSystem.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; - 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; - } 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; - } - + public static boolean method3432(int var0) { + return (var0 >> 30 & 1) != 0; } } diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java index f11411dbf3..e9d797eb16 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("do") +@ObfuscatedName("dr") @Implements("Model") public class Model extends Entity { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Ldo;" + signature = "Ldr;" ) @Export("Model_sharedSequenceModel") static Model Model_sharedSequenceModel; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("Model_sharedSequenceModelFaceAlphas") static byte[] Model_sharedSequenceModelFaceAlphas; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Ldo;" + signature = "Ldr;" ) @Export("Model_sharedSpotAnimationModel") static Model Model_sharedSpotAnimationModel; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("Model_sharedSpotAnimationModelFaceAlphas") static byte[] Model_sharedSpotAnimationModelFaceAlphas; - @ObfuscatedName("au") - static boolean[] field1670; - @ObfuscatedName("ax") - static boolean[] field1689; - @ObfuscatedName("ag") + @ObfuscatedName("ak") + static boolean[] field1697; + @ObfuscatedName("ay") + static boolean[] field1685; + @ObfuscatedName("ae") @Export("modelViewportXs") static int[] modelViewportXs; - @ObfuscatedName("aa") + @ObfuscatedName("ah") @Export("modelViewportYs") static int[] modelViewportYs; - @ObfuscatedName("ap") - static int[] field1692; + @ObfuscatedName("aa") + static int[] field1680; @ObfuscatedName("aq") - static int[] field1708; - @ObfuscatedName("ay") - static int[] field1663; - @ObfuscatedName("ad") - static int[] field1695; - @ObfuscatedName("ah") - static int[] field1696; - @ObfuscatedName("ab") - static int[][] field1698; - @ObfuscatedName("aw") static int[] field1669; - @ObfuscatedName("ae") - static int[][] field1700; - @ObfuscatedName("bk") - static int[] field1701; - @ObfuscatedName("bw") - static int[] field1660; - @ObfuscatedName("bo") - static int[] field1703; + @ObfuscatedName("ar") + static int[] field1654; + @ObfuscatedName("ac") + static int[] field1683; + @ObfuscatedName("ai") + static int[] field1692; + @ObfuscatedName("am") + static int[][] field1678; + @ObfuscatedName("aw") + static int[] field1687; + @ObfuscatedName("au") + static int[][] field1688; + @ObfuscatedName("bg") + static int[] field1689; @ObfuscatedName("bn") - static int[] field1704; + static int[] field1690; + @ObfuscatedName("bk") + static int[] field1691; @ObfuscatedName("bp") - static int[] field1705; - @ObfuscatedName("bz") - static int[] field1706; - @ObfuscatedName("bh") + static int[] field1694; + @ObfuscatedName("bu") + static int[] field1693; + @ObfuscatedName("bi") + static int[] field1645; + @ObfuscatedName("bv") @Export("Model_transformTempX") static int Model_transformTempX; - @ObfuscatedName("bv") + @ObfuscatedName("bf") @Export("Model_transformTempY") static int Model_transformTempY; - @ObfuscatedName("bj") + @ObfuscatedName("bm") @Export("Model_transformTempZ") static int Model_transformTempZ; - @ObfuscatedName("bq") - static boolean field1710; - @ObfuscatedName("bi") + @ObfuscatedName("bw") + static boolean field1698; + @ObfuscatedName("bj") @Export("Model_sine") static int[] Model_sine; - @ObfuscatedName("bf") + @ObfuscatedName("bd") @Export("Model_cosine") static int[] Model_cosine; - @ObfuscatedName("bd") - static int[] field1715; - @ObfuscatedName("br") - static int[] field1716; - @ObfuscatedName("u") + @ObfuscatedName("by") + static int[] field1703; + @ObfuscatedName("bh") + static int[] field1704; + @ObfuscatedName("l") @Export("verticesCount") int verticesCount; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("verticesX") int[] verticesX; - @ObfuscatedName("t") + @ObfuscatedName("j") @Export("verticesY") int[] verticesY; - @ObfuscatedName("q") + @ObfuscatedName("v") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("x") + @ObfuscatedName("d") @Export("indicesCount") int indicesCount; - @ObfuscatedName("d") + @ObfuscatedName("z") @Export("indices1") int[] indices1; - @ObfuscatedName("f") + @ObfuscatedName("n") @Export("indices2") int[] indices2; - @ObfuscatedName("c") + @ObfuscatedName("h") @Export("indices3") int[] indices3; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("faceColors1") int[] faceColors1; - @ObfuscatedName("y") + @ObfuscatedName("s") @Export("faceColors2") int[] faceColors2; @ObfuscatedName("p") @Export("faceColors3") int[] faceColors3; - @ObfuscatedName("b") + @ObfuscatedName("e") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("g") + @ObfuscatedName("i") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("e") - byte[] field1666; - @ObfuscatedName("z") + @ObfuscatedName("q") + byte[] field1701; + @ObfuscatedName("y") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("a") - byte field1690; + @ObfuscatedName("r") + byte field1656; + @ObfuscatedName("k") + int field1657; @ObfuscatedName("w") - int field1699; - @ObfuscatedName("l") - int[] field1691; - @ObfuscatedName("h") - int[] field1671; - @ObfuscatedName("v") - int[] field1672; + int[] field1658; @ObfuscatedName("m") + int[] field1659; + @ObfuscatedName("o") + int[] field1660; + @ObfuscatedName("a") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("o") + @ObfuscatedName("b") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("av") + @ObfuscatedName("ag") @Export("isSingleTile") public boolean isSingleTile; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("boundsType") int boundsType; - @ObfuscatedName("ai") + @ObfuscatedName("ao") @Export("bottomY") int bottomY; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("xzRadius") int xzRadius; - @ObfuscatedName("az") + @ObfuscatedName("an") @Export("diameter") int diameter; - @ObfuscatedName("aj") + @ObfuscatedName("al") @Export("radius") int radius; - @ObfuscatedName("an") + @ObfuscatedName("as") @Export("xMid") int xMid; - @ObfuscatedName("at") + @ObfuscatedName("ad") @Export("yMid") int yMid; - @ObfuscatedName("as") + @ObfuscatedName("ap") @Export("zMid") int zMid; - @ObfuscatedName("ak") + @ObfuscatedName("ax") @Export("xMidOffset") int xMidOffset; - @ObfuscatedName("ao") + @ObfuscatedName("aj") @Export("yMidOffset") int yMidOffset; - @ObfuscatedName("ac") + @ObfuscatedName("ab") @Export("zMidOffset") int zMidOffset; @@ -185,36 +185,36 @@ public class Model extends Entity { Model_sharedSequenceModelFaceAlphas = new byte[1]; Model_sharedSpotAnimationModel = new Model(); Model_sharedSpotAnimationModelFaceAlphas = new byte[1]; - field1670 = new boolean[4700]; - field1689 = new boolean[4700]; + field1697 = new boolean[4700]; + field1685 = new boolean[4700]; modelViewportXs = new int[4700]; modelViewportYs = new int[4700]; - field1692 = new int[4700]; - field1708 = new int[4700]; - field1663 = new int[4700]; - field1695 = new int[4700]; - field1696 = new int[1600]; - field1698 = new int[1600][512]; - field1669 = new int[12]; - field1700 = new int[12][2000]; - field1701 = new int[2000]; - field1660 = new int[2000]; - field1703 = new int[12]; - field1704 = new int[10]; - field1705 = new int[10]; - field1706 = new int[10]; - field1710 = true; + field1680 = new int[4700]; + field1669 = new int[4700]; + field1654 = new int[4700]; + field1683 = new int[4700]; + field1692 = new int[1600]; + field1678 = new int[1600][512]; + field1687 = new int[12]; + field1688 = new int[12][2000]; + field1689 = new int[2000]; + field1690 = new int[2000]; + field1691 = new int[12]; + field1694 = new int[10]; + field1693 = new int[10]; + field1645 = new int[10]; + field1698 = true; Model_sine = Rasterizer3D.Rasterizer3D_sine; Model_cosine = Rasterizer3D.Rasterizer3D_cosine; - field1715 = Rasterizer3D.Rasterizer3D_colorPalette; - field1716 = Rasterizer3D.field1765; + field1703 = Rasterizer3D.Rasterizer3D_colorPalette; + field1704 = Rasterizer3D.field1752; } Model() { this.verticesCount = 0; this.indicesCount = 0; - this.field1690 = 0; - this.field1699 = 0; + this.field1656 = 0; + this.field1657 = 0; this.isSingleTile = false; this.xMidOffset = -1; this.yMidOffset = -1; @@ -222,13 +222,13 @@ public class Model extends Entity { } @ObfuscatedSignature( - signature = "([Ldo;I)V" + signature = "([Ldr;I)V" ) public Model(Model[] var1, int var2) { this.verticesCount = 0; this.indicesCount = 0; - this.field1690 = 0; - this.field1699 = 0; + this.field1656 = 0; + this.field1657 = 0; this.isSingleTile = false; this.xMidOffset = -1; this.yMidOffset = -1; @@ -239,8 +239,8 @@ public class Model extends Entity { boolean var6 = false; this.verticesCount = 0; this.indicesCount = 0; - this.field1699 = 0; - this.field1690 = -1; + this.field1657 = 0; + this.field1656 = -1; int var7; Model var8; @@ -249,22 +249,22 @@ public class Model extends Entity { if (var8 != null) { this.verticesCount += var8.verticesCount; this.indicesCount += var8.indicesCount; - this.field1699 += var8.field1699; + this.field1657 += var8.field1657; if (var8.faceRenderPriorities != null) { var3 = true; } else { - if (this.field1690 == -1) { - this.field1690 = var8.field1690; + if (this.field1656 == -1) { + this.field1656 = var8.field1656; } - if (this.field1690 != var8.field1690) { + if (this.field1656 != var8.field1656) { var3 = true; } } var4 |= var8.faceAlphas != null; var5 |= var8.faceTextures != null; - var6 |= var8.field1666 != null; + var6 |= var8.field1701 != null; } } @@ -290,18 +290,18 @@ public class Model extends Entity { } if (var6) { - this.field1666 = new byte[this.indicesCount]; + this.field1701 = new byte[this.indicesCount]; } - if (this.field1699 > 0) { - this.field1691 = new int[this.field1699]; - this.field1671 = new int[this.field1699]; - this.field1672 = new int[this.field1699]; + if (this.field1657 > 0) { + this.field1658 = new int[this.field1657]; + this.field1659 = new int[this.field1657]; + this.field1660 = new int[this.field1657]; } this.verticesCount = 0; this.indicesCount = 0; - this.field1699 = 0; + this.field1657 = 0; for (var7 = 0; var7 < var2; ++var7) { var8 = var1[var7]; @@ -318,7 +318,7 @@ public class Model extends Entity { if (var8.faceRenderPriorities != null) { this.faceRenderPriorities[this.indicesCount] = var8.faceRenderPriorities[var9]; } else { - this.faceRenderPriorities[this.indicesCount] = var8.field1690; + this.faceRenderPriorities[this.indicesCount] = var8.field1656; } } @@ -335,21 +335,21 @@ public class Model extends Entity { } if (var6) { - if (var8.field1666 != null && var8.field1666[var9] != -1) { - this.field1666[this.indicesCount] = (byte)(this.field1699 + var8.field1666[var9]); + if (var8.field1701 != null && var8.field1701[var9] != -1) { + this.field1701[this.indicesCount] = (byte)(this.field1657 + var8.field1701[var9]); } else { - this.field1666[this.indicesCount] = -1; + this.field1701[this.indicesCount] = -1; } } ++this.indicesCount; } - for (var9 = 0; var9 < var8.field1699; ++var9) { - this.field1691[this.field1699] = this.verticesCount + var8.field1691[var9]; - this.field1671[this.field1699] = this.verticesCount + var8.field1671[var9]; - this.field1672[this.field1699] = this.verticesCount + var8.field1672[var9]; - ++this.field1699; + for (var9 = 0; var9 < var8.field1657; ++var9) { + this.field1658[this.field1657] = this.verticesCount + var8.field1658[var9]; + this.field1659[this.field1657] = this.verticesCount + var8.field1659[var9]; + this.field1660[this.field1657] = this.verticesCount + var8.field1660[var9]; + ++this.field1657; } for (var9 = 0; var9 < var8.verticesCount; ++var9) { @@ -363,9 +363,9 @@ public class Model extends Entity { } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "([[IIIIZI)Ldo;" + signature = "([[IIIIZI)Ldr;" ) @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 Entity { var11 = new Model(); var11.verticesCount = this.verticesCount; var11.indicesCount = this.indicesCount; - var11.field1699 = this.field1699; + var11.field1657 = this.field1657; var11.verticesX = this.verticesX; var11.verticesZ = this.verticesZ; var11.indices1 = this.indices1; @@ -398,12 +398,12 @@ public class Model extends Entity { var11.faceColors3 = this.faceColors3; var11.faceRenderPriorities = this.faceRenderPriorities; var11.faceAlphas = this.faceAlphas; - var11.field1666 = this.field1666; + var11.field1701 = this.field1701; var11.faceTextures = this.faceTextures; - var11.field1690 = this.field1690; - var11.field1691 = this.field1691; - var11.field1671 = this.field1671; - var11.field1672 = this.field1672; + var11.field1656 = this.field1656; + var11.field1658 = this.field1658; + var11.field1659 = this.field1659; + var11.field1660 = this.field1660; var11.vertexLabels = this.vertexLabels; var11.faceLabelsAlpha = this.faceLabelsAlpha; var11.isSingleTile = this.isSingleTile; @@ -461,9 +461,9 @@ public class Model extends Entity { } } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Z)Ldo;" + signature = "(Z)Ldr;" ) @Export("toSharedSequenceModel") public Model toSharedSequenceModel(boolean var1) { @@ -474,9 +474,9 @@ public class Model extends Entity { return this.buildSharedModel(var1, Model_sharedSequenceModel, Model_sharedSequenceModelFaceAlphas); } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Z)Ldo;" + signature = "(Z)Ldr;" ) @Export("toSharedSpotAnimationModel") public Model toSharedSpotAnimationModel(boolean var1) { @@ -487,15 +487,15 @@ public class Model extends Entity { return this.buildSharedModel(var1, Model_sharedSpotAnimationModel, Model_sharedSpotAnimationModelFaceAlphas); } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(ZLdo;[B)Ldo;" + signature = "(ZLdr;[B)Ldr;" ) @Export("buildSharedModel") Model buildSharedModel(boolean var1, Model var2, byte[] var3) { var2.verticesCount = this.verticesCount; var2.indicesCount = this.indicesCount; - var2.field1699 = this.field1699; + var2.field1657 = this.field1657; 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 Entity { var2.faceColors2 = this.faceColors2; var2.faceColors3 = this.faceColors3; var2.faceRenderPriorities = this.faceRenderPriorities; - var2.field1666 = this.field1666; + var2.field1701 = this.field1701; var2.faceTextures = this.faceTextures; - var2.field1690 = this.field1690; - var2.field1691 = this.field1691; - var2.field1671 = this.field1671; - var2.field1672 = this.field1672; + var2.field1656 = this.field1656; + var2.field1658 = this.field1658; + var2.field1659 = this.field1659; + var2.field1660 = this.field1660; var2.vertexLabels = this.vertexLabels; var2.faceLabelsAlpha = this.faceLabelsAlpha; var2.isSingleTile = this.isSingleTile; @@ -544,7 +544,7 @@ public class Model extends Entity { return var2; } - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("calculateBoundingBox") void calculateBoundingBox(int var1) { if (this.xMidOffset == -1) { @@ -558,9 +558,9 @@ public class Model extends Entity { int var9 = Model_sine[var1]; for (int var10 = 0; var10 < this.verticesCount; ++var10) { - int var11 = Rasterizer3D.method2943(this.verticesX[var10], this.verticesZ[var10], var8, var9); + int var11 = Rasterizer3D.method2980(this.verticesX[var10], this.verticesZ[var10], var8, var9); int var12 = this.verticesY[var10]; - int var13 = Rasterizer3D.method2944(this.verticesX[var10], this.verticesZ[var10], var8, var9); + int var13 = Rasterizer3D.method2981(this.verticesX[var10], this.verticesZ[var10], var8, var9); if (var11 < var2) { var2 = var11; } @@ -608,7 +608,7 @@ public class Model extends Entity { } } - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("calculateBoundsCylinder") public void calculateBoundsCylinder() { if (this.boundsType != 1) { @@ -641,8 +641,8 @@ public class Model extends Entity { } } - @ObfuscatedName("t") - void method2887() { + @ObfuscatedName("j") + void method2838() { if (this.boundsType != 2) { this.boundsType = 2; this.xzRadius = 0; @@ -663,22 +663,22 @@ public class Model extends Entity { } } - @ObfuscatedName("q") - public int method2839() { + @ObfuscatedName("v") + public int method2849() { this.calculateBoundsCylinder(); return this.xzRadius; } - @ObfuscatedName("d") + @ObfuscatedName("z") @Export("resetBounds") void resetBounds() { this.boundsType = 0; this.xMidOffset = -1; } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lee;I)V" + signature = "(Lev;I)V" ) @Export("animate") public void animate(Frames var1, int var2) { @@ -700,9 +700,9 @@ public class Model extends Entity { } } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Lee;ILee;I[I)V" + signature = "(Lev;ILev;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 Entity { } } - @ObfuscatedName("r") + @ObfuscatedName("e") @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 Entity { } } - @ObfuscatedName("y") + @ObfuscatedName("i") @Export("rotateY90Ccw") public void rotateY90Ccw() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { @@ -932,7 +932,7 @@ public class Model extends Entity { this.resetBounds(); } - @ObfuscatedName("p") + @ObfuscatedName("q") @Export("rotateY180") public void rotateY180() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { @@ -943,7 +943,7 @@ public class Model extends Entity { this.resetBounds(); } - @ObfuscatedName("g") + @ObfuscatedName("r") @Export("rotateY270Ccw") public void rotateY270Ccw() { for (int var1 = 0; var1 < this.verticesCount; ++var1) { @@ -955,7 +955,7 @@ public class Model extends Entity { this.resetBounds(); } - @ObfuscatedName("e") + @ObfuscatedName("k") @Export("rotateZ") public void rotateZ(int var1) { int var2 = Model_sine[var1]; @@ -970,7 +970,7 @@ public class Model extends Entity { this.resetBounds(); } - @ObfuscatedName("z") + @ObfuscatedName("w") @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 Entity { this.resetBounds(); } - @ObfuscatedName("w") + @ObfuscatedName("m") @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 Entity { this.resetBounds(); } - @ObfuscatedName("l") - public final void method2874(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - field1696[0] = -1; + @ObfuscatedName("o") + public final void method2854(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + field1692[0] = -1; if (this.boundsType != 2 && this.boundsType != 1) { - this.method2887(); + this.method2838(); } int var8 = Rasterizer3D.Rasterizer3D_clipMidX; @@ -1044,13 +1044,13 @@ public class Model extends Entity { var22 += var7; var23 = var21 * var17 - var22 * var16 >> 16; var22 = var21 * var16 + var22 * var17 >> 16; - field1692[var19] = var22 - var18; + field1680[var19] = var22 - var18; modelViewportXs[var19] = var20 * Rasterizer3D.Rasterizer3D_zoom / var22 + var8; modelViewportYs[var19] = var23 * Rasterizer3D.Rasterizer3D_zoom / var22 + var9; - if (this.field1699 > 0) { - field1708[var19] = var20; - field1663[var19] = var23; - field1695[var19] = var22; + if (this.field1657 > 0) { + field1669[var19] = var20; + field1654[var19] = var23; + field1683[var19] = var22; } } @@ -1061,11 +1061,11 @@ public class Model extends Entity { } - @ObfuscatedName("h") - public final void method2810(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - field1696[0] = -1; + @ObfuscatedName("a") + public final void method2921(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + field1692[0] = -1; if (this.boundsType != 2 && this.boundsType != 1) { - this.method2887(); + this.method2838(); } int var9 = Rasterizer3D.Rasterizer3D_clipMidX; @@ -1108,13 +1108,13 @@ public class Model extends Entity { var23 += var7; var24 = var22 * var18 - var23 * var17 >> 16; var23 = var22 * var17 + var23 * var18 >> 16; - field1692[var20] = var23 - var19; + field1680[var20] = var23 - var19; modelViewportXs[var20] = var9 + var21 * Rasterizer3D.Rasterizer3D_zoom / var8; modelViewportYs[var20] = var10 + var24 * Rasterizer3D.Rasterizer3D_zoom / var8; - if (this.field1699 > 0) { - field1708[var20] = var21; - field1663[var20] = var24; - field1695[var20] = var23; + if (this.field1657 > 0) { + field1669[var20] = var21; + field1654[var20] = var24; + field1683[var20] = var23; } } @@ -1125,13 +1125,13 @@ public class Model extends Entity { } - @ObfuscatedName("v") + @ObfuscatedName("b") @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) { - field1696[var6] = 0; + field1692[var6] = 0; } var6 = var3 ? 20 : 5; @@ -1155,62 +1155,16 @@ public class Model extends Entity { var12 = modelViewportXs[var27]; var13 = modelViewportXs[var10]; int var14; - int var17; - if (!var1 || var11 != -5000 && var12 != -5000 && var13 != -5000) { - if (var2) { - var15 = modelViewportYs[var8]; - var16 = modelViewportYs[var27]; - var17 = modelViewportYs[var10]; - var18 = var6 + ViewportMouse.ViewportMouse_y; - boolean var32; - if (var18 < var15 && var18 < var16 && var18 < var17) { - var32 = false; - } else { - var18 = ViewportMouse.ViewportMouse_y - var6; - if (var18 > var15 && var18 > var16 && var18 > var17) { - var32 = false; - } else { - var18 = var6 + ViewportMouse.ViewportMouse_x; - if (var18 < var11 && var18 < var12 && var18 < var13) { - var32 = false; - } else { - var18 = ViewportMouse.ViewportMouse_x - var6; - if (var18 > var11 && var18 > var12 && var18 > var13) { - var32 = false; - } else { - var32 = true; - } - } - } - } - - if (var32) { - class42.method752(var4); - var2 = false; - } - } - - if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var27]) - (var13 - var12) * (modelViewportYs[var8] - modelViewportYs[var27]) > 0) { - field1689[var7] = false; - if (var11 >= 0 && var12 >= 0 && var13 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var13 <= Rasterizer3D.Rasterizer3D_clipWidth) { - field1670[var7] = false; - } else { - field1670[var7] = true; - } - - var14 = (field1692[var8] + field1692[var27] + field1692[var10]) / 3 + this.radius; - field1698[var14][field1696[var14]++] = var7; - } - } else { - var14 = field1708[var8]; - var15 = field1708[var27]; - var16 = field1708[var10]; - var17 = field1663[var8]; - var18 = field1663[var27]; - int var19 = field1663[var10]; - int var20 = field1695[var8]; - int var21 = field1695[var27]; - int var22 = field1695[var10]; + if (var1 && (var11 == -5000 || var12 == -5000 || var13 == -5000)) { + var14 = field1669[var8]; + var15 = field1669[var27]; + var16 = field1669[var10]; + int var17 = field1654[var8]; + var18 = field1654[var27]; + int var19 = field1654[var10]; + int var20 = field1683[var8]; + int var21 = field1683[var27]; + int var22 = field1683[var10]; var14 -= var15; var16 -= var15; var17 -= var18; @@ -1221,9 +1175,26 @@ public class Model extends Entity { int var24 = var20 * var16 - var14 * var22; int var25 = var14 * var19 - var17 * var16; if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { - field1689[var7] = true; - int var26 = (field1692[var8] + field1692[var27] + field1692[var10]) / 3 + this.radius; - field1698[var26][field1696[var26]++] = var7; + field1685[var7] = true; + int var26 = (field1680[var8] + field1680[var27] + field1680[var10]) / 3 + this.radius; + field1678[var26][field1692[var26]++] = var7; + } + } else { + if (var2 && WorldMapAreaData.method671(modelViewportYs[var8], modelViewportYs[var27], modelViewportYs[var10], var11, var12, var13, var6)) { + DirectByteArrayCopier.method3932(var4); + var2 = false; + } + + if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var27]) - (var13 - var12) * (modelViewportYs[var8] - modelViewportYs[var27]) > 0) { + field1685[var7] = false; + if (var11 >= 0 && var12 >= 0 && var13 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var13 <= Rasterizer3D.Rasterizer3D_clipWidth) { + field1697[var7] = false; + } else { + field1697[var7] = true; + } + + var14 = (field1680[var8] + field1680[var27] + field1680[var10]) / 3 + this.radius; + field1678[var14][field1692[var14]++] = var7; } } } @@ -1232,68 +1203,68 @@ public class Model extends Entity { int[] var9; if (this.faceRenderPriorities == null) { for (var7 = this.diameter - 1; var7 >= 0; --var7) { - var8 = field1696[var7]; + var8 = field1692[var7]; if (var8 > 0) { - var9 = field1698[var7]; + var9 = field1678[var7]; for (var10 = 0; var10 < var8; ++var10) { - this.method2830(var9[var10]); + this.method2858(var9[var10]); } } } } else { for (var7 = 0; var7 < 12; ++var7) { - field1669[var7] = 0; - field1703[var7] = 0; + field1687[var7] = 0; + field1691[var7] = 0; } for (var7 = this.diameter - 1; var7 >= 0; --var7) { - var8 = field1696[var7]; + var8 = field1692[var7]; if (var8 > 0) { - var9 = field1698[var7]; + var9 = field1678[var7]; for (var10 = 0; var10 < var8; ++var10) { var11 = var9[var10]; byte var31 = this.faceRenderPriorities[var11]; - var13 = field1669[var31]++; - field1700[var31][var13] = var11; + var13 = field1687[var31]++; + field1688[var31][var13] = var11; if (var31 < 10) { - int[] var10000 = field1703; + int[] var10000 = field1691; var10000[var31] += var7; } else if (var31 == 10) { - field1701[var13] = var7; + field1689[var13] = var7; } else { - field1660[var13] = var7; + field1690[var13] = var7; } } } } var7 = 0; - if (field1669[1] > 0 || field1669[2] > 0) { - var7 = (field1703[1] + field1703[2]) / (field1669[1] + field1669[2]); + if (field1687[1] > 0 || field1687[2] > 0) { + var7 = (field1691[1] + field1691[2]) / (field1687[1] + field1687[2]); } var8 = 0; - if (field1669[3] > 0 || field1669[4] > 0) { - var8 = (field1703[3] + field1703[4]) / (field1669[3] + field1669[4]); + if (field1687[3] > 0 || field1687[4] > 0) { + var8 = (field1691[3] + field1691[4]) / (field1687[3] + field1687[4]); } var27 = 0; - if (field1669[6] > 0 || field1669[8] > 0) { - var27 = (field1703[8] + field1703[6]) / (field1669[8] + field1669[6]); + if (field1687[6] > 0 || field1687[8] > 0) { + var27 = (field1691[8] + field1691[6]) / (field1687[8] + field1687[6]); } var11 = 0; - var12 = field1669[10]; - int[] var28 = field1700[10]; - int[] var29 = field1701; + var12 = field1687[10]; + int[] var28 = field1688[10]; + int[] var29 = field1689; if (var11 == var12) { var11 = 0; - var12 = field1669[11]; - var28 = field1700[11]; - var29 = field1660; + var12 = field1687[11]; + var28 = field1688[11]; + var29 = field1690; } if (var11 < var12) { @@ -1304,12 +1275,12 @@ public class Model extends Entity { for (var15 = 0; var15 < 10; ++var15) { while (var15 == 0 && var10 > var7) { - this.method2830(var28[var11++]); - if (var11 == var12 && var28 != field1700[11]) { + this.method2858(var28[var11++]); + if (var11 == var12 && var28 != field1688[11]) { var11 = 0; - var12 = field1669[11]; - var28 = field1700[11]; - var29 = field1660; + var12 = field1687[11]; + var28 = field1688[11]; + var29 = field1690; } if (var11 < var12) { @@ -1320,12 +1291,12 @@ public class Model extends Entity { } while (var15 == 3 && var10 > var8) { - this.method2830(var28[var11++]); - if (var11 == var12 && var28 != field1700[11]) { + this.method2858(var28[var11++]); + if (var11 == var12 && var28 != field1688[11]) { var11 = 0; - var12 = field1669[11]; - var28 = field1700[11]; - var29 = field1660; + var12 = field1687[11]; + var28 = field1688[11]; + var29 = field1690; } if (var11 < var12) { @@ -1336,12 +1307,12 @@ public class Model extends Entity { } while (var15 == 5 && var10 > var27) { - this.method2830(var28[var11++]); - if (var11 == var12 && var28 != field1700[11]) { + this.method2858(var28[var11++]); + if (var11 == var12 && var28 != field1688[11]) { var11 = 0; - var12 = field1669[11]; - var28 = field1700[11]; - var29 = field1660; + var12 = field1687[11]; + var28 = field1688[11]; + var29 = field1690; } if (var11 < var12) { @@ -1351,21 +1322,21 @@ public class Model extends Entity { } } - var16 = field1669[var15]; - int[] var30 = field1700[var15]; + var16 = field1687[var15]; + int[] var30 = field1688[var15]; for (var18 = 0; var18 < var16; ++var18) { - this.method2830(var30[var18]); + this.method2858(var30[var18]); } } while (var10 != -1000) { - this.method2830(var28[var11++]); - if (var11 == var12 && var28 != field1700[11]) { + this.method2858(var28[var11++]); + if (var11 == var12 && var28 != field1688[11]) { var11 = 0; - var28 = field1700[11]; - var12 = field1669[11]; - var29 = field1660; + var28 = field1688[11]; + var12 = field1687[11]; + var29 = field1690; } if (var11 < var12) { @@ -1379,15 +1350,15 @@ public class Model extends Entity { } } - @ObfuscatedName("m") - final void method2830(int var1) { - if (field1689[var1]) { - this.method2829(var1); + @ObfuscatedName("ag") + final void method2858(int var1) { + if (field1685[var1]) { + this.method2859(var1); } else { int var2 = this.indices1[var1]; int var3 = this.indices2[var1]; int var4 = this.indices3[var1]; - Rasterizer3D.field1760 = field1670[var1]; + Rasterizer3D.field1735 = field1697[var1]; if (this.faceAlphas == null) { Rasterizer3D.Rasterizer3D_alpha = 0; } else { @@ -1398,11 +1369,11 @@ public class Model extends Entity { int var5; int var6; int var7; - if (this.field1666 != null && this.field1666[var1] != -1) { - int var8 = this.field1666[var1] & 255; - var5 = this.field1691[var8]; - var6 = this.field1671[var8]; - var7 = this.field1672[var8]; + if (this.field1701 != null && this.field1701[var1] != -1) { + int var8 = this.field1701[var1] & 255; + var5 = this.field1658[var8]; + var6 = this.field1659[var8]; + var7 = this.field1660[var8]; } else { var5 = var2; var6 = var3; @@ -1410,30 +1381,30 @@ public class Model extends Entity { } if (this.faceColors3[var1] == -1) { - Rasterizer3D.method2938(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1708[var5], field1708[var6], field1708[var7], field1663[var5], field1663[var6], field1663[var7], field1695[var5], field1695[var6], field1695[var7], this.faceTextures[var1]); + Rasterizer3D.method3020(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1669[var5], field1669[var6], field1669[var7], field1654[var5], field1654[var6], field1654[var7], field1683[var5], field1683[var6], field1683[var7], this.faceTextures[var1]); } else { - Rasterizer3D.method2938(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field1708[var5], field1708[var6], field1708[var7], field1663[var5], field1663[var6], field1663[var7], field1695[var5], field1695[var6], field1695[var7], this.faceTextures[var1]); + Rasterizer3D.method3020(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field1669[var5], field1669[var6], field1669[var7], field1654[var5], field1654[var6], field1654[var7], field1683[var5], field1683[var6], field1683[var7], this.faceTextures[var1]); } } else if (this.faceColors3[var1] == -1) { - Rasterizer3D.method2936(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field1715[this.faceColors1[var1]]); + Rasterizer3D.method2990(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field1703[this.faceColors1[var1]]); } else { - Rasterizer3D.method2934(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); + Rasterizer3D.method2971(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); } } } - @ObfuscatedName("o") - final void method2829(int var1) { + @ObfuscatedName("at") + final void method2859(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 = field1695[var5]; - int var9 = field1695[var6]; - int var10 = field1695[var7]; + int var8 = field1683[var5]; + int var9 = field1683[var6]; + int var10 = field1683[var7]; if (this.faceAlphas == null) { Rasterizer3D.Rasterizer3D_alpha = 0; } else { @@ -1445,96 +1416,96 @@ public class Model extends Entity { int var13; int var14; if (var8 >= 50) { - field1704[var4] = modelViewportXs[var5]; - field1705[var4] = modelViewportYs[var5]; - field1706[var4++] = this.faceColors1[var1]; + field1694[var4] = modelViewportXs[var5]; + field1693[var4] = modelViewportYs[var5]; + field1645[var4++] = this.faceColors1[var1]; } else { - var11 = field1708[var5]; - var12 = field1663[var5]; + var11 = field1669[var5]; + var12 = field1654[var5]; var13 = this.faceColors1[var1]; if (var10 >= 50) { - var14 = field1716[var10 - var8] * (50 - var8); - field1704[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1708[var7] - var11) * var14 >> 16)) / 50; - field1705[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1663[var7] - var12) * var14 >> 16)) / 50; - field1706[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); + var14 = field1704[var10 - var8] * (50 - var8); + field1694[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1669[var7] - var11) * var14 >> 16)) / 50; + field1693[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1654[var7] - var12) * var14 >> 16)) / 50; + field1645[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); } if (var9 >= 50) { - var14 = field1716[var9 - var8] * (50 - var8); - field1704[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1708[var6] - var11) * var14 >> 16)) / 50; - field1705[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1663[var6] - var12) * var14 >> 16)) / 50; - field1706[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); + var14 = field1704[var9 - var8] * (50 - var8); + field1694[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1669[var6] - var11) * var14 >> 16)) / 50; + field1693[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1654[var6] - var12) * var14 >> 16)) / 50; + field1645[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); } } if (var9 >= 50) { - field1704[var4] = modelViewportXs[var6]; - field1705[var4] = modelViewportYs[var6]; - field1706[var4++] = this.faceColors2[var1]; + field1694[var4] = modelViewportXs[var6]; + field1693[var4] = modelViewportYs[var6]; + field1645[var4++] = this.faceColors2[var1]; } else { - var11 = field1708[var6]; - var12 = field1663[var6]; + var11 = field1669[var6]; + var12 = field1654[var6]; var13 = this.faceColors2[var1]; if (var8 >= 50) { - var14 = field1716[var8 - var9] * (50 - var9); - field1704[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1708[var5] - var11) * var14 >> 16)) / 50; - field1705[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1663[var5] - var12) * var14 >> 16)) / 50; - field1706[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); + var14 = field1704[var8 - var9] * (50 - var9); + field1694[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1669[var5] - var11) * var14 >> 16)) / 50; + field1693[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1654[var5] - var12) * var14 >> 16)) / 50; + field1645[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); } if (var10 >= 50) { - var14 = field1716[var10 - var9] * (50 - var9); - field1704[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1708[var7] - var11) * var14 >> 16)) / 50; - field1705[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1663[var7] - var12) * var14 >> 16)) / 50; - field1706[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); + var14 = field1704[var10 - var9] * (50 - var9); + field1694[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1669[var7] - var11) * var14 >> 16)) / 50; + field1693[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1654[var7] - var12) * var14 >> 16)) / 50; + field1645[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); } } if (var10 >= 50) { - field1704[var4] = modelViewportXs[var7]; - field1705[var4] = modelViewportYs[var7]; - field1706[var4++] = this.faceColors3[var1]; + field1694[var4] = modelViewportXs[var7]; + field1693[var4] = modelViewportYs[var7]; + field1645[var4++] = this.faceColors3[var1]; } else { - var11 = field1708[var7]; - var12 = field1663[var7]; + var11 = field1669[var7]; + var12 = field1654[var7]; var13 = this.faceColors3[var1]; if (var9 >= 50) { - var14 = field1716[var9 - var10] * (50 - var10); - field1704[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1708[var6] - var11) * var14 >> 16)) / 50; - field1705[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1663[var6] - var12) * var14 >> 16)) / 50; - field1706[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); + var14 = field1704[var9 - var10] * (50 - var10); + field1694[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1669[var6] - var11) * var14 >> 16)) / 50; + field1693[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1654[var6] - var12) * var14 >> 16)) / 50; + field1645[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); } if (var8 >= 50) { - var14 = field1716[var8 - var10] * (50 - var10); - field1704[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1708[var5] - var11) * var14 >> 16)) / 50; - field1705[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1663[var5] - var12) * var14 >> 16)) / 50; - field1706[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); + var14 = field1704[var8 - var10] * (50 - var10); + field1694[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1669[var5] - var11) * var14 >> 16)) / 50; + field1693[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1654[var5] - var12) * var14 >> 16)) / 50; + field1645[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); } } - var11 = field1704[0]; - var12 = field1704[1]; - var13 = field1704[2]; - var14 = field1705[0]; - int var15 = field1705[1]; - int var16 = field1705[2]; - Rasterizer3D.field1760 = false; + var11 = field1694[0]; + var12 = field1694[1]; + var13 = field1694[2]; + var14 = field1693[0]; + int var15 = field1693[1]; + int var16 = field1693[2]; + Rasterizer3D.field1735 = 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.field1760 = true; + Rasterizer3D.field1735 = true; } if (this.faceTextures != null && this.faceTextures[var1] != -1) { - if (this.field1666 != null && this.field1666[var1] != -1) { - var20 = this.field1666[var1] & 255; - var17 = this.field1691[var20]; - var18 = this.field1671[var20]; - var19 = this.field1672[var20]; + if (this.field1701 != null && this.field1701[var1] != -1) { + var20 = this.field1701[var1] & 255; + var17 = this.field1658[var20]; + var18 = this.field1659[var20]; + var19 = this.field1660[var20]; } else { var17 = var5; var18 = var6; @@ -1542,28 +1513,28 @@ public class Model extends Entity { } if (this.faceColors3[var1] == -1) { - Rasterizer3D.method2938(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1708[var17], field1708[var18], field1708[var19], field1663[var17], field1663[var18], field1663[var19], field1695[var17], field1695[var18], field1695[var19], this.faceTextures[var1]); + Rasterizer3D.method3020(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1669[var17], field1669[var18], field1669[var19], field1654[var17], field1654[var18], field1654[var19], field1683[var17], field1683[var18], field1683[var19], this.faceTextures[var1]); } else { - Rasterizer3D.method2938(var14, var15, var16, var11, var12, var13, field1706[0], field1706[1], field1706[2], field1708[var17], field1708[var18], field1708[var19], field1663[var17], field1663[var18], field1663[var19], field1695[var17], field1695[var18], field1695[var19], this.faceTextures[var1]); + Rasterizer3D.method3020(var14, var15, var16, var11, var12, var13, field1645[0], field1645[1], field1645[2], field1669[var17], field1669[var18], field1669[var19], field1654[var17], field1654[var18], field1654[var19], field1683[var17], field1683[var18], field1683[var19], this.faceTextures[var1]); } } else if (this.faceColors3[var1] == -1) { - Rasterizer3D.method2936(var14, var15, var16, var11, var12, var13, field1715[this.faceColors1[var1]]); + Rasterizer3D.method2990(var14, var15, var16, var11, var12, var13, field1703[this.faceColors1[var1]]); } else { - Rasterizer3D.method2934(var14, var15, var16, var11, var12, var13, field1706[0], field1706[1], field1706[2]); + Rasterizer3D.method2971(var14, var15, var16, var11, var12, var13, field1645[0], field1645[1], field1645[2]); } } if (var4 == 4) { - if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field1704[3] < 0 || field1704[3] > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field1760 = true; + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field1694[3] < 0 || field1694[3] > Rasterizer3D.Rasterizer3D_clipWidth) { + Rasterizer3D.field1735 = true; } if (this.faceTextures != null && this.faceTextures[var1] != -1) { - if (this.field1666 != null && this.field1666[var1] != -1) { - var20 = this.field1666[var1] & 255; - var17 = this.field1691[var20]; - var18 = this.field1671[var20]; - var19 = this.field1672[var20]; + if (this.field1701 != null && this.field1701[var1] != -1) { + var20 = this.field1701[var1] & 255; + var17 = this.field1658[var20]; + var18 = this.field1659[var20]; + var19 = this.field1660[var20]; } else { var17 = var5; var18 = var6; @@ -1572,19 +1543,19 @@ public class Model extends Entity { short var21 = this.faceTextures[var1]; if (this.faceColors3[var1] == -1) { - Rasterizer3D.method2938(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1708[var17], field1708[var18], field1708[var19], field1663[var17], field1663[var18], field1663[var19], field1695[var17], field1695[var18], field1695[var19], var21); - Rasterizer3D.method2938(var14, var16, field1705[3], var11, var13, field1704[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1708[var17], field1708[var18], field1708[var19], field1663[var17], field1663[var18], field1663[var19], field1695[var17], field1695[var18], field1695[var19], var21); + Rasterizer3D.method3020(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1669[var17], field1669[var18], field1669[var19], field1654[var17], field1654[var18], field1654[var19], field1683[var17], field1683[var18], field1683[var19], var21); + Rasterizer3D.method3020(var14, var16, field1693[3], var11, var13, field1694[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1669[var17], field1669[var18], field1669[var19], field1654[var17], field1654[var18], field1654[var19], field1683[var17], field1683[var18], field1683[var19], var21); } else { - Rasterizer3D.method2938(var14, var15, var16, var11, var12, var13, field1706[0], field1706[1], field1706[2], field1708[var17], field1708[var18], field1708[var19], field1663[var17], field1663[var18], field1663[var19], field1695[var17], field1695[var18], field1695[var19], var21); - Rasterizer3D.method2938(var14, var16, field1705[3], var11, var13, field1704[3], field1706[0], field1706[2], field1706[3], field1708[var17], field1708[var18], field1708[var19], field1663[var17], field1663[var18], field1663[var19], field1695[var17], field1695[var18], field1695[var19], var21); + Rasterizer3D.method3020(var14, var15, var16, var11, var12, var13, field1645[0], field1645[1], field1645[2], field1669[var17], field1669[var18], field1669[var19], field1654[var17], field1654[var18], field1654[var19], field1683[var17], field1683[var18], field1683[var19], var21); + Rasterizer3D.method3020(var14, var16, field1693[3], var11, var13, field1694[3], field1645[0], field1645[2], field1645[3], field1669[var17], field1669[var18], field1669[var19], field1654[var17], field1654[var18], field1654[var19], field1683[var17], field1683[var18], field1683[var19], var21); } } else if (this.faceColors3[var1] == -1) { - var17 = field1715[this.faceColors1[var1]]; - Rasterizer3D.method2936(var14, var15, var16, var11, var12, var13, var17); - Rasterizer3D.method2936(var14, var16, field1705[3], var11, var13, field1704[3], var17); + var17 = field1703[this.faceColors1[var1]]; + Rasterizer3D.method2990(var14, var15, var16, var11, var12, var13, var17); + Rasterizer3D.method2990(var14, var16, field1693[3], var11, var13, field1694[3], var17); } else { - Rasterizer3D.method2934(var14, var15, var16, var11, var12, var13, field1706[0], field1706[1], field1706[2]); - Rasterizer3D.method2934(var14, var16, field1705[3], var11, var13, field1704[3], field1706[0], field1706[2], field1706[3]); + Rasterizer3D.method2971(var14, var15, var16, var11, var12, var13, field1645[0], field1645[1], field1645[2]); + Rasterizer3D.method2971(var14, var16, field1693[3], var11, var13, field1694[3], field1645[0], field1645[2], field1645[3]); } } @@ -1593,7 +1564,7 @@ public class Model extends Entity { @ObfuscatedName("cm") @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { - field1696[0] = -1; + field1692[0] = -1; if (this.boundsType != 1) { this.calculateBoundsCylinder(); } @@ -1623,174 +1594,145 @@ public class Model extends Entity { var25 = true; } - boolean var26 = var25 || this.field1699 > 0; - int var27 = class65.method1180(); + boolean var26 = var25 || this.field1657 > 0; + int var27 = SoundCache.method2479(); int var28 = ViewportMouse.ViewportMouse_y; - boolean var30 = class188.method3588(); - boolean var31 = SpotAnimationDefinition.method4333(var9); - boolean var32 = false; - int var36; + boolean var30 = ArchiveLoader.method1099(); + boolean var32 = var9 != 0L; + boolean var33; + if (var32) { + var33 = (int)(var9 >>> 16 & 1L) == 1; + var32 = !var33; + } + + var33 = false; int var37; int var38; int var39; - int var47; - int var51; - int var52; - int var53; - if (var31 && var30) { - boolean var33 = false; - if (field1710) { - boolean var34; - if (!class188.method3588()) { - var34 = false; + int var40; + int var41; + int var42; + int var46; + int var50; + if (var32 && var30) { + boolean var34 = false; + if (field1698) { + boolean var35; + if (!ArchiveLoader.method1099()) { + var35 = false; } else { - int var42; - int var43; - int var44; - if (!ViewportMouse.ViewportMouse_false0) { - var36 = Scene.Scene_cameraPitchSine; - var37 = Scene.Scene_cameraPitchCosine; - var38 = Scene.Scene_cameraYawSine; - var39 = Scene.Scene_cameraYawCosine; - byte var40 = 50; - short var41 = 3500; - var42 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var40 / Rasterizer3D.Rasterizer3D_zoom; - var43 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var40 / Rasterizer3D.Rasterizer3D_zoom; - var44 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var41 / Rasterizer3D.Rasterizer3D_zoom; - int var45 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var41 / Rasterizer3D.Rasterizer3D_zoom; - int var46 = Rasterizer3D.method2947(var43, var40, var37, var36); - var52 = Rasterizer3D.method2946(var43, var40, var37, var36); - var43 = var46; - var46 = Rasterizer3D.method2947(var45, var41, var37, var36); - var53 = Rasterizer3D.method2946(var45, var41, var37, var36); - var45 = var46; - var46 = Rasterizer3D.method2945(var42, var52, var39, var38); - var52 = Rasterizer3D.method2963(var42, var52, var39, var38); - var42 = var46; - var46 = Rasterizer3D.method2945(var44, var53, var39, var38); - var53 = Rasterizer3D.method2963(var44, var53, var39, var38); - ViewportMouse.field1723 = (var46 + var42) / 2; - ViewportMouse.field1724 = (var45 + var43) / 2; - class189.field2328 = (var52 + var53) / 2; - ViewportMouse.field1725 = (var46 - var42) / 2; - ViewportMouse.field1726 = (var45 - var43) / 2; - GrandExchangeEvent.field50 = (var53 - var52) / 2; - SoundCache.field1424 = Math.abs(ViewportMouse.field1725); - Canvas.field389 = Math.abs(ViewportMouse.field1726); - ViewportMouse.field1727 = Math.abs(GrandExchangeEvent.field50); - } - - var36 = this.xMid + var6; - var37 = var7 + this.yMid; - var38 = var8 + this.zMid; - var39 = this.xMidOffset; - var52 = this.yMidOffset; - var53 = this.zMidOffset; - var42 = ViewportMouse.field1723 - var36; - var43 = ViewportMouse.field1724 - var37; - var44 = class189.field2328 - var38; - if (Math.abs(var42) > var39 + SoundCache.field1424) { - var34 = false; - } else if (Math.abs(var43) > var52 + Canvas.field389) { - var34 = false; - } else if (Math.abs(var44) > var53 + ViewportMouse.field1727) { - var34 = false; - } else if (Math.abs(var44 * ViewportMouse.field1726 - var43 * GrandExchangeEvent.field50) > var53 * Canvas.field389 + var52 * ViewportMouse.field1727) { - var34 = false; - } else if (Math.abs(var42 * GrandExchangeEvent.field50 - var44 * ViewportMouse.field1725) > var39 * ViewportMouse.field1727 + var53 * SoundCache.field1424) { - var34 = false; - } else if (Math.abs(var43 * ViewportMouse.field1725 - var42 * ViewportMouse.field1726) > var52 * SoundCache.field1424 + var39 * Canvas.field389) { - var34 = false; + class225.method4105(); + var37 = this.xMid + var6; + var38 = var7 + this.yMid; + var39 = var8 + this.zMid; + var40 = this.xMidOffset; + var41 = this.yMidOffset; + var42 = this.zMidOffset; + int var43 = ViewportMouse.field1711 - var37; + int var44 = Ignored.field3577 - var38; + int var45 = class222.field2726 - var39; + if (Math.abs(var43) > var40 + ArchiveLoader.field510) { + var35 = false; + } else if (Math.abs(var44) > var41 + GrandExchangeOfferUnitPriceComparator.field75) { + var35 = false; + } else if (Math.abs(var45) > var42 + class222.field2724) { + var35 = false; + } else if (Math.abs(var45 * ViewportMouse.field1712 - var44 * ServerBuild.field3079) > var41 * class222.field2724 + var42 * GrandExchangeOfferUnitPriceComparator.field75) { + var35 = false; + } else if (Math.abs(var43 * ServerBuild.field3079 - var45 * class4.field20) > var40 * class222.field2724 + var42 * ArchiveLoader.field510) { + var35 = false; + } else if (Math.abs(var44 * class4.field20 - var43 * ViewportMouse.field1712) > var40 * GrandExchangeOfferUnitPriceComparator.field75 + var41 * ArchiveLoader.field510) { + var35 = false; } else { - var34 = true; + var35 = true; } } - var33 = var34; + var34 = var35; } else { - var51 = var12 - var13; - if (var51 <= 50) { - var51 = 50; + var50 = var12 - var13; + if (var50 <= 50) { + var50 = 50; } if (var15 > 0) { var16 /= var14; - var17 /= var51; + var17 /= var50; } else { var17 /= var14; - var16 /= var51; + var16 /= var50; } if (var18 > 0) { var22 /= var14; - var20 /= var51; + var20 /= var50; } else { var20 /= var14; - var22 /= var51; + var22 /= var50; } - var47 = var27 - Rasterizer3D.Rasterizer3D_clipMidX; - var36 = var28 - Rasterizer3D.Rasterizer3D_clipMidY; - if (var47 > var16 && var47 < var17 && var36 > var22 && var36 < var20) { + var46 = var27 - Rasterizer3D.Rasterizer3D_clipMidX; + var37 = var28 - Rasterizer3D.Rasterizer3D_clipMidY; + if (var46 > var16 && var46 < var17 && var37 > var22 && var37 < var20) { + var34 = true; + } + } + + if (var34) { + if (this.isSingleTile) { + DirectByteArrayCopier.method3932(var9); + } else { var33 = true; } } - - if (var33) { - if (this.isSingleTile) { - class42.method752(var9); - } else { - var32 = true; - } - } } - int var50 = Rasterizer3D.Rasterizer3D_clipMidX; - var51 = Rasterizer3D.Rasterizer3D_clipMidY; - var47 = 0; - var36 = 0; + int var49 = Rasterizer3D.Rasterizer3D_clipMidX; + var50 = Rasterizer3D.Rasterizer3D_clipMidY; + var46 = 0; + var37 = 0; if (var1 != 0) { - var47 = Model_sine[var1]; - var36 = Model_cosine[var1]; + var46 = Model_sine[var1]; + var37 = Model_cosine[var1]; } - for (var37 = 0; var37 < this.verticesCount; ++var37) { - var38 = this.verticesX[var37]; - var39 = this.verticesY[var37]; - var52 = this.verticesZ[var37]; + for (var38 = 0; var38 < this.verticesCount; ++var38) { + var39 = this.verticesX[var38]; + var40 = this.verticesY[var38]; + var41 = this.verticesZ[var38]; if (var1 != 0) { - var53 = var52 * var47 + var38 * var36 >> 16; - var52 = var52 * var36 - var38 * var47 >> 16; - var38 = var53; + var42 = var41 * var46 + var39 * var37 >> 16; + var41 = var41 * var37 - var39 * var46 >> 16; + var39 = var42; } - var38 += var6; - var39 += var7; - var52 += var8; - var53 = var52 * var4 + var5 * var38 >> 16; - var52 = var5 * var52 - var38 * var4 >> 16; - var38 = var53; - var53 = var3 * var39 - var52 * var2 >> 16; - var52 = var39 * var2 + var3 * var52 >> 16; - field1692[var37] = var52 - var12; - if (var52 >= 50) { - modelViewportXs[var37] = var38 * Rasterizer3D.Rasterizer3D_zoom / var52 + var50; - modelViewportYs[var37] = var53 * Rasterizer3D.Rasterizer3D_zoom / var52 + var51; + var39 += var6; + var40 += var7; + var41 += var8; + var42 = var41 * var4 + var5 * var39 >> 16; + var41 = var5 * var41 - var39 * var4 >> 16; + var39 = var42; + var42 = var3 * var40 - var41 * var2 >> 16; + var41 = var40 * var2 + var3 * var41 >> 16; + field1680[var38] = var41 - var12; + if (var41 >= 50) { + modelViewportXs[var38] = var39 * Rasterizer3D.Rasterizer3D_zoom / var41 + var49; + modelViewportYs[var38] = var42 * Rasterizer3D.Rasterizer3D_zoom / var41 + var50; } else { - modelViewportXs[var37] = -5000; + modelViewportXs[var38] = -5000; var24 = true; } if (var26) { - field1708[var37] = var38; - field1663[var37] = var53; - field1695[var37] = var52; + field1669[var38] = var39; + field1654[var38] = var42; + field1683[var38] = var41; } } try { - this.draw0(var24, var32, this.isSingleTile, var9); - } catch (Exception var49) { + this.draw0(var24, var33, this.isSingleTile, var9); + } catch (Exception var48) { } } diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java index 9bf14319ca..5c525a3c59 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("dq") +@ObfuscatedName("ds") @Implements("ModelData") public class ModelData extends Entity { - @ObfuscatedName("ak") - static int[] field1563; - @ObfuscatedName("ao") - static int[] field1564; - @ObfuscatedName("ac") - static int field1565; - @ObfuscatedName("ar") + @ObfuscatedName("ax") + static int[] field1551; + @ObfuscatedName("aj") + static int[] field1552; + @ObfuscatedName("ab") + static int field1553; + @ObfuscatedName("af") @Export("ModelData_sine") static int[] ModelData_sine; - @ObfuscatedName("au") + @ObfuscatedName("ak") @Export("ModelData_cosine") static int[] ModelData_cosine; - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("verticesCount") int verticesCount; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("verticesX") int[] verticesX; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("verticesY") int[] verticesY; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("faceCount") int faceCount; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("indices1") int[] indices1; - @ObfuscatedName("t") + @ObfuscatedName("j") @Export("indices2") int[] indices2; - @ObfuscatedName("q") + @ObfuscatedName("v") @Export("indices3") int[] indices3; - @ObfuscatedName("x") + @ObfuscatedName("d") @Export("faceRenderTypes") byte[] faceRenderTypes; - @ObfuscatedName("d") + @ObfuscatedName("z") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("f") + @ObfuscatedName("n") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("c") + @ObfuscatedName("h") @Export("textureCoords") byte[] textureCoords; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("faceColors") short[] faceColors; - @ObfuscatedName("y") + @ObfuscatedName("s") @Export("faceTextures") short[] faceTextures; @ObfuscatedName("p") @Export("priority") byte priority; - @ObfuscatedName("b") + @ObfuscatedName("e") @Export("textureTriangleCount") int textureTriangleCount; - @ObfuscatedName("g") + @ObfuscatedName("i") @Export("textureRenderTypes") byte[] textureRenderTypes; - @ObfuscatedName("e") + @ObfuscatedName("q") @Export("texTriangleX") short[] texTriangleX; - @ObfuscatedName("z") + @ObfuscatedName("y") @Export("texTriangleY") short[] texTriangleY; - @ObfuscatedName("a") + @ObfuscatedName("r") @Export("texTriangleZ") short[] texTriangleZ; - @ObfuscatedName("w") + @ObfuscatedName("k") @Export("vertexSkins") int[] vertexSkins; - @ObfuscatedName("l") + @ObfuscatedName("w") @Export("faceSkins") int[] faceSkins; - @ObfuscatedName("h") + @ObfuscatedName("m") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("m") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "[Lei;" + signature = "[Lem;" ) @Export("faceNormals") FaceNormal[] faceNormals; - @ObfuscatedName("o") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "[Ldl;" + signature = "[Ldf;" ) @Export("vertexNormals") VertexNormal[] vertexNormals; - @ObfuscatedName("av") + @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "[Ldl;" + signature = "[Ldf;" ) - VertexNormal[] field1566; - @ObfuscatedName("am") + VertexNormal[] field1542; + @ObfuscatedName("at") @Export("ambient") public short ambient; - @ObfuscatedName("ai") + @ObfuscatedName("ao") @Export("contrast") public short contrast; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("isBoundsCalculated") boolean isBoundsCalculated; - @ObfuscatedName("az") - int field1558; - @ObfuscatedName("aj") - int field1559; @ObfuscatedName("an") - int field1560; - @ObfuscatedName("at") - int field1535; + int field1546; + @ObfuscatedName("al") + int field1531; @ObfuscatedName("as") - int field1562; + int field1526; + @ObfuscatedName("ad") + int field1548; + @ObfuscatedName("ap") + int field1520; static { - field1563 = new int[10000]; - field1564 = new int[10000]; - field1565 = 0; + field1551 = new int[10000]; + field1552 = new int[10000]; + field1553 = 0; ModelData_sine = Rasterizer3D.Rasterizer3D_sine; ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; } @@ -143,7 +143,7 @@ public class ModelData extends Entity { } @ObfuscatedSignature( - signature = "([Ldq;I)V" + signature = "([Lds;I)V" ) public ModelData(ModelData[] var1, int var2) { this.verticesCount = 0; @@ -274,18 +274,18 @@ public class ModelData extends Entity { } this.faceColors[this.faceCount] = var10.faceColors[var11]; - this.indices1[this.faceCount] = this.method2707(var10, var10.indices1[var11]); - this.indices2[this.faceCount] = this.method2707(var10, var10.indices2[var11]); - this.indices3[this.faceCount] = this.method2707(var10, var10.indices3[var11]); + this.indices1[this.faceCount] = this.method2734(var10, var10.indices1[var11]); + this.indices2[this.faceCount] = this.method2734(var10, var10.indices2[var11]); + this.indices3[this.faceCount] = this.method2734(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.method2707(var10, var10.texTriangleX[var11]); - this.texTriangleY[this.textureTriangleCount] = (short)this.method2707(var10, var10.texTriangleY[var11]); - this.texTriangleZ[this.textureTriangleCount] = (short)this.method2707(var10, var10.texTriangleZ[var11]); + this.texTriangleX[this.textureTriangleCount] = (short)this.method2734(var10, var10.texTriangleX[var11]); + this.texTriangleY[this.textureTriangleCount] = (short)this.method2734(var10, var10.texTriangleY[var11]); + this.texTriangleZ[this.textureTriangleCount] = (short)this.method2734(var10, var10.texTriangleZ[var11]); } ++this.textureTriangleCount; @@ -301,15 +301,15 @@ public class ModelData extends Entity { this.priority = 0; this.isBoundsCalculated = false; if (var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) { - this.method2705(var1); + this.method2732(var1); } else { - this.method2706(var1); + this.method2782(var1); } } @ObfuscatedSignature( - signature = "(Ldq;ZZZZ)V", + signature = "(Lds;ZZZZ)V", garbageValue = "1" ) public ModelData(ModelData var1, boolean var2, boolean var3, boolean var4, boolean var5) { @@ -375,13 +375,13 @@ public class ModelData extends Entity { this.faceLabelsAlpha = var1.faceLabelsAlpha; this.vertexNormals = var1.vertexNormals; this.faceNormals = var1.faceNormals; - this.field1566 = var1.field1566; + this.field1542 = var1.field1542; this.ambient = var1.ambient; this.contrast = var1.contrast; } - @ObfuscatedName("j") - void method2705(byte[] var1) { + @ObfuscatedName("x") + void method2732(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 Entity { } - @ObfuscatedName("i") - void method2706(byte[] var1) { + @ObfuscatedName("t") + void method2782(byte[] var1) { boolean var2 = false; boolean var3 = false; Buffer var4 = new Buffer(var1); @@ -963,11 +963,11 @@ public class ModelData extends Entity { } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Ldq;I)I" + signature = "(Lds;I)I" ) - final int method2707(ModelData var1, int var2) { + final int method2734(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 Entity { return var3; } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "()Ldq;" + signature = "()Lds;" ) - public ModelData method2708() { + public ModelData method2735() { ModelData var1 = new ModelData(); if (this.faceRenderTypes != null) { var1.faceRenderTypes = new byte[this.faceCount]; @@ -1038,16 +1038,16 @@ public class ModelData extends Entity { return var1; } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "([[IIIIZI)Ldq;" + signature = "([[IIIIZI)Lds;" ) - public ModelData method2709(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { + public ModelData method2733(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { this.calculateBounds(); - int var7 = var2 + this.field1559; - int var8 = var2 + this.field1560; - int var9 = var4 + this.field1562; - int var10 = var4 + this.field1535; + int var7 = var2 + this.field1531; + int var8 = var2 + this.field1526; + int var9 = var4 + this.field1520; + int var10 = var4 + this.field1548; 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 Entity { } } - @ObfuscatedName("t") - void method2710() { + @ObfuscatedName("j") + void method2737() { int[] var1; int var2; int var10002; @@ -1193,8 +1193,8 @@ public class ModelData extends Entity { } - @ObfuscatedName("q") - public void method2769() { + @ObfuscatedName("v") + public void method2738() { 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 Entity { this.invalidate(); } - @ObfuscatedName("d") - public void method2712() { + @ObfuscatedName("z") + public void method2739() { 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 Entity { this.invalidate(); } - @ObfuscatedName("f") - public void method2713() { + @ObfuscatedName("s") + public void method2740() { 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 Entity { this.invalidate(); } - @ObfuscatedName("c") - public void method2714(int var1) { + @ObfuscatedName("p") + public void method2741(int var1) { int var2 = ModelData_sine[var1]; int var3 = ModelData_cosine[var1]; @@ -1239,7 +1239,7 @@ public class ModelData extends Entity { this.invalidate(); } - @ObfuscatedName("r") + @ObfuscatedName("e") @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 Entity { this.invalidate(); } - @ObfuscatedName("y") + @ObfuscatedName("i") @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 Entity { } - @ObfuscatedName("p") + @ObfuscatedName("q") @Export("retexture") public void retexture(short var1, short var2) { if (this.faceTextures != null) { @@ -1278,8 +1278,8 @@ public class ModelData extends Entity { } } - @ObfuscatedName("g") - public void method2718() { + @ObfuscatedName("r") + public void method2776() { int var1; for (var1 = 0; var1 < this.verticesCount; ++var1) { this.verticesZ[var1] = -this.verticesZ[var1]; @@ -1294,7 +1294,7 @@ public class ModelData extends Entity { this.invalidate(); } - @ObfuscatedName("e") + @ObfuscatedName("k") @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 Entity { this.invalidate(); } - @ObfuscatedName("z") + @ObfuscatedName("w") @Export("calculateVertexNormals") public void calculateVertexNormals() { if (this.vertexNormals == null) { @@ -1382,52 +1382,52 @@ public class ModelData extends Entity { } } - @ObfuscatedName("w") + @ObfuscatedName("m") @Export("invalidate") void invalidate() { this.vertexNormals = null; - this.field1566 = null; + this.field1542 = null; this.faceNormals = null; this.isBoundsCalculated = false; } - @ObfuscatedName("l") + @ObfuscatedName("o") @Export("calculateBounds") void calculateBounds() { if (!this.isBoundsCalculated) { super.height = 0; - this.field1558 = 0; - this.field1559 = 999999; - this.field1560 = -999999; - this.field1535 = -99999; - this.field1562 = 99999; + this.field1546 = 0; + this.field1531 = 999999; + this.field1526 = -999999; + this.field1548 = -99999; + this.field1520 = 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.field1559) { - this.field1559 = var2; + if (var2 < this.field1531) { + this.field1531 = var2; } - if (var2 > this.field1560) { - this.field1560 = var2; + if (var2 > this.field1526) { + this.field1526 = var2; } - if (var4 < this.field1562) { - this.field1562 = var4; + if (var4 < this.field1520) { + this.field1520 = var4; } - if (var4 > this.field1535) { - this.field1535 = var4; + if (var4 > this.field1548) { + this.field1548 = var4; } if (-var3 > super.height) { super.height = -var3; } - if (var3 > this.field1558) { - this.field1558 = var3; + if (var3 > this.field1546) { + this.field1546 = var3; } } @@ -1435,9 +1435,9 @@ public class ModelData extends Entity { } } - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(IIIII)Ldo;" + signature = "(IIIII)Ldr;" ) @Export("toModel") public final Model toModel(int var1, int var2, int var3, int var4, int var5) { @@ -1458,38 +1458,38 @@ public class ModelData extends Entity { } } - var8.field1699 = 0; + var8.field1657 = 0; for (var10 = 0; var10 < this.textureTriangleCount; ++var10) { if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { - ++var8.field1699; + ++var8.field1657; } } - var8.field1691 = new int[var8.field1699]; - var8.field1671 = new int[var8.field1699]; - var8.field1672 = new int[var8.field1699]; + var8.field1658 = new int[var8.field1657]; + var8.field1659 = new int[var8.field1657]; + var8.field1660 = new int[var8.field1657]; var10 = 0; int var11; for (var11 = 0; var11 < this.textureTriangleCount; ++var11) { if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) { - var8.field1691[var10] = this.texTriangleX[var11] & '\uffff'; - var8.field1671[var10] = this.texTriangleY[var11] & '\uffff'; - var8.field1672[var10] = this.texTriangleZ[var11] & '\uffff'; + var8.field1658[var10] = this.texTriangleX[var11] & '\uffff'; + var8.field1659[var10] = this.texTriangleY[var11] & '\uffff'; + var8.field1660[var10] = this.texTriangleZ[var11] & '\uffff'; var9[var11] = var10++; } else { var9[var11] = -1; } } - var8.field1666 = new byte[this.faceCount]; + var8.field1701 = new byte[this.faceCount]; for (var11 = 0; var11 < this.faceCount; ++var11) { if (this.textureCoords[var11] != -1) { - var8.field1666[var11] = (byte)var9[this.textureCoords[var11] & 255]; + var8.field1701[var11] = (byte)var9[this.textureCoords[var11] & 255]; } else { - var8.field1666[var11] = -1; + var8.field1701[var11] = -1; } } } @@ -1532,7 +1532,7 @@ public class ModelData extends Entity { if (var17 == 1) { var19 = this.faceNormals[var16]; var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; - var8.faceColors1[var16] = method2725(this.faceColors[var16] & '\uffff', var14); + var8.faceColors1[var16] = method2752(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 Entity { } } else { int var15 = this.faceColors[var16] & '\uffff'; - if (this.field1566 != null && this.field1566[this.indices1[var16]] != null) { - var13 = this.field1566[this.indices1[var16]]; + if (this.field1542 != null && this.field1542[this.indices1[var16]] != null) { + var13 = this.field1542[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] = method2725(var15, var14); - if (this.field1566 != null && this.field1566[this.indices2[var16]] != null) { - var13 = this.field1566[this.indices2[var16]]; + var8.faceColors1[var16] = method2752(var15, var14); + if (this.field1542 != null && this.field1542[this.indices2[var16]] != null) { + var13 = this.field1542[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] = method2725(var15, var14); - if (this.field1566 != null && this.field1566[this.indices3[var16]] != null) { - var13 = this.field1566[this.indices3[var16]]; + var8.faceColors2[var16] = method2752(var15, var14); + if (this.field1542 != null && this.field1542[this.indices3[var16]] != null) { + var13 = this.field1542[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] = method2725(var15, var14); + var8.faceColors3[var16] = method2752(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] = method2741(var14); + var8.faceColors1[var16] = method2783(var14); var8.faceColors3[var16] = -1; } else { var8.faceColors3[var16] = -2; } } else { - if (this.field1566 != null && this.field1566[this.indices1[var16]] != null) { - var13 = this.field1566[this.indices1[var16]]; + if (this.field1542 != null && this.field1542[this.indices1[var16]] != null) { + var13 = this.field1542[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] = method2741(var14); - if (this.field1566 != null && this.field1566[this.indices2[var16]] != null) { - var13 = this.field1566[this.indices2[var16]]; + var8.faceColors1[var16] = method2783(var14); + if (this.field1542 != null && this.field1542[this.indices2[var16]] != null) { + var13 = this.field1542[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] = method2741(var14); - if (this.field1566 != null && this.field1566[this.indices3[var16]] != null) { - var13 = this.field1566[this.indices3[var16]]; + var8.faceColors2[var16] = method2783(var14); + if (this.field1542 != null && this.field1542[this.indices3[var16]] != null) { + var13 = this.field1542[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] = method2741(var14); + var8.faceColors3[var16] = method2783(var14); } } - this.method2710(); + this.method2737(); var8.verticesCount = this.verticesCount; var8.verticesX = this.verticesX; var8.verticesY = this.verticesY; @@ -1615,16 +1615,16 @@ public class ModelData extends Entity { var8.indices3 = this.indices3; var8.faceRenderPriorities = this.faceRenderPriorities; var8.faceAlphas = this.faceAlphas; - var8.field1690 = this.priority; + var8.field1656 = this.priority; var8.vertexLabels = this.vertexLabels; var8.faceLabelsAlpha = this.faceLabelsAlpha; var8.faceTextures = this.faceTextures; return var8; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lhz;II)Ldq;" + signature = "(Lhz;II)Lds;" ) @Export("ModelData_get") public static ModelData ModelData_get(AbstractArchive var0, int var1, int var2) { @@ -1632,16 +1632,16 @@ public class ModelData extends Entity { return var3 == null ? null : new ModelData(var3); } - @ObfuscatedName("h") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(Ldq;Ldq;IIIZ)V" + signature = "(Lds;Lds;IIIZ)V" ) - static void method2745(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { + static void method2807(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { var0.calculateBounds(); var0.calculateVertexNormals(); var1.calculateBounds(); var1.calculateVertexNormals(); - ++field1565; + ++field1553; int var6 = 0; int[] var7 = var1.verticesX; int var8 = var1.verticesCount; @@ -1651,30 +1651,30 @@ public class ModelData extends Entity { VertexNormal var10 = var0.vertexNormals[var9]; if (var10.magnitude != 0) { int var11 = var0.verticesY[var9] - var3; - if (var11 <= var1.field1558) { + if (var11 <= var1.field1546) { int var12 = var0.verticesX[var9] - var2; - if (var12 >= var1.field1559 && var12 <= var1.field1560) { + if (var12 >= var1.field1531 && var12 <= var1.field1526) { int var13 = var0.verticesZ[var9] - var4; - if (var13 >= var1.field1562 && var13 <= var1.field1535) { + if (var13 >= var1.field1520 && var13 <= var1.field1548) { 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.field1566 == null) { - var0.field1566 = new VertexNormal[var0.verticesCount]; + if (var0.field1542 == null) { + var0.field1542 = new VertexNormal[var0.verticesCount]; } - if (var1.field1566 == null) { - var1.field1566 = new VertexNormal[var8]; + if (var1.field1542 == null) { + var1.field1542 = new VertexNormal[var8]; } - VertexNormal var16 = var0.field1566[var9]; + VertexNormal var16 = var0.field1542[var9]; if (var16 == null) { - var16 = var0.field1566[var9] = new VertexNormal(var10); + var16 = var0.field1542[var9] = new VertexNormal(var10); } - VertexNormal var17 = var1.field1566[var14]; + VertexNormal var17 = var1.field1542[var14]; if (var17 == null) { - var17 = var1.field1566[var14] = new VertexNormal(var15); + var17 = var1.field1542[var14] = new VertexNormal(var15); } var16.x += var15.x; @@ -1686,8 +1686,8 @@ public class ModelData extends Entity { var17.z += var10.z; var17.magnitude += var10.magnitude; ++var6; - field1563[var9] = field1565; - field1564[var14] = field1565; + field1551[var9] = field1553; + field1552[var14] = field1553; } } } @@ -1698,7 +1698,7 @@ public class ModelData extends Entity { if (var6 >= 3 && var5) { for (var9 = 0; var9 < var0.faceCount; ++var9) { - if (field1563[var0.indices1[var9]] == field1565 && field1563[var0.indices2[var9]] == field1565 && field1563[var0.indices3[var9]] == field1565) { + if (field1551[var0.indices1[var9]] == field1553 && field1551[var0.indices2[var9]] == field1553 && field1551[var0.indices3[var9]] == field1553) { if (var0.faceRenderTypes == null) { var0.faceRenderTypes = new byte[var0.faceCount]; } @@ -1708,7 +1708,7 @@ public class ModelData extends Entity { } for (var9 = 0; var9 < var1.faceCount; ++var9) { - if (field1565 == field1564[var1.indices1[var9]] && field1565 == field1564[var1.indices2[var9]] && field1565 == field1564[var1.indices3[var9]]) { + if (field1553 == field1552[var1.indices1[var9]] && field1553 == field1552[var1.indices2[var9]] && field1553 == field1552[var1.indices3[var9]]) { if (var1.faceRenderTypes == null) { var1.faceRenderTypes = new byte[var1.faceCount]; } @@ -1720,8 +1720,8 @@ public class ModelData extends Entity { } } - @ObfuscatedName("m") - static final int method2725(int var0, int var1) { + @ObfuscatedName("ag") + static final int method2752(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; if (var1 < 2) { var1 = 2; @@ -1732,8 +1732,8 @@ public class ModelData extends Entity { return (var0 & 65408) + var1; } - @ObfuscatedName("o") - static final int method2741(int var0) { + @ObfuscatedName("at") + static final int method2783(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 c301765947..bafda49f7b 100644 --- a/runescape-client/src/main/java/ModelData0.java +++ b/runescape-client/src/main/java/ModelData0.java @@ -1,273 +1,330 @@ import 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("em") +@ObfuscatedName("eo") @Implements("ModelData0") public class ModelData0 { - @ObfuscatedName("gq") - @Export("xteaKeys") - static int[][] xteaKeys; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -80152223 + ) + public static int field1833; + @ObfuscatedName("lv") + @ObfuscatedGetter( + intValue = 1005444901 + ) + @Export("selectedItemSlot") + static int selectedItemSlot; ModelData0() { } - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "([Ljava/lang/String;[SIII)V", - garbageValue = "-2014451002" - ) - @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("i") @ObfuscatedSignature( - signature = "(III)Lhp;", - garbageValue = "927119221" + signature = "(ILcu;ZI)I", + garbageValue = "-1253284688" ) - @Export("getWidgetChild") - public static Widget getWidgetChild(int var0, int var1) { - Widget var2 = WorldMapElement.getWidget(var0); - if (var1 == -1) { - return var2; + static int method3221(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? UserComparator9.field1941 : MidiPcmStream.field2410; + if (var0 == ScriptOpcodes.CC_GETSCROLLX) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.scrollX; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.scrollY; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETTEXT) { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3.text; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.scrollWidth; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.scrollHeight; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.modelZoom; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.modelAngleX; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.modelAngleZ; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.modelAngleY; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETTRANSTOP) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.transparencyTop; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETTRANSBOT) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.transparencyBot; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.color; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.color2; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETFILLMODE) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; + return 1; } else { - return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; + return 2; } } - @ObfuscatedName("gr") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1772928872" + signature = "(ILcu;ZB)I", + garbageValue = "44" ) - @Export("drawProjectiles") - static final void drawProjectiles() { - for (Projectile var0 = (Projectile)Client.projectiles.last(); var0 != null; var0 = (Projectile)Client.projectiles.previous()) { - if (var0.plane == ItemContainer.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, GrandExchangeOfferTotalQuantityComparator.getTileHeight(var1.x, var1.y, var0.plane) - var0.endHeight, Client.cycle); - } - } + static int method3219(int var0, Script var1, boolean var2) { + Widget var3 = Player.getWidget(Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]); + if (var0 == ScriptOpcodes.IF_GETX) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.x; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETY) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.y; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.width; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.height; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETHIDE) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETLAYER) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.parentId; + return 1; + } else { + return 2; + } + } - if (var0.targetIndex < 0) { - int var2 = -var0.targetIndex - 1; - Player var3; - if (var2 == Client.localPlayerIndex) { - var3 = WorldMapIcon_1.localPlayer; - } else { - var3 = Client.players[var2]; - } + @ObfuscatedName("fh") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "1" + ) + @Export("playPcmPlayers") + static final void playPcmPlayers() { + if (ClientPreferences.pcmPlayer1 != null) { + ClientPreferences.pcmPlayer1.run(); + } - if (var3 != null && var3.x >= 0 && var3.x < 13312 && var3.y >= 0 && var3.y < 13312) { - var0.setDestination(var3.x, var3.y, GrandExchangeOfferTotalQuantityComparator.getTileHeight(var3.x, var3.y, var0.plane) - var0.endHeight, Client.cycle); - } - } - - var0.advance(Client.field879); - Player.scene.drawEntity(ItemContainer.plane, (int)var0.x, (int)var0.y, (int)var0.z, 60, var0, var0.yaw, -1L, false); - } - } else { - var0.remove(); - } + if (WorldMapIcon_1.pcmPlayer0 != null) { + WorldMapIcon_1.pcmPlayer0.run(); } } - @ObfuscatedName("gs") + @ObfuscatedName("io") @ObfuscatedSignature( - signature = "(IIZI)V", - garbageValue = "1845013682" + signature = "(IIIII)V", + garbageValue = "353830109" ) - static final void method3198(int var0, int var1, boolean var2) { - if (!var2 || var0 != class13.field86 || class16.field101 != var1) { - class13.field86 = var0; - class16.field101 = var1; - FloorDecoration.updateGameState(25); - MusicPatch.drawLoadingMessage("Loading - please wait.", true); - int var3 = PacketWriter.baseX * 64; - int var4 = RouteStrategy.baseY * 64; - PacketWriter.baseX = (var0 - 6) * 8; - RouteStrategy.baseY = (var1 - 6) * 8; - int var5 = PacketWriter.baseX * 64 - var3; - int var6 = RouteStrategy.baseY * 64 - var4; - var3 = PacketWriter.baseX * 64; - var4 = RouteStrategy.baseY * 64; + @Export("addSceneMenuOptions") + static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { + if (Client.isItemSelected == 0 && !Client.isSpellSelected) { + FontName.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); + } - int var7; - int var9; - int[] var10000; - for (var7 = 0; var7 < 32768; ++var7) { - NPC var8 = Client.npcs[var7]; - if (var8 != null) { - for (var9 = 0; var9 < 10; ++var9) { - var10000 = var8.pathX; - var10000[var9] -= var5; - var10000 = var8.pathY; - var10000[var9] -= var6; + long var4 = -1L; + long var6 = -1L; + + int var8; + for (var8 = 0; var8 < WorldMapSection2.method300(); ++var8) { + long var9 = ViewportMouse.ViewportMouse_entityTags[var8]; + if (var9 != var6) { + var6 = var9; + long var15 = ViewportMouse.ViewportMouse_entityTags[var8]; + int var14 = (int)(var15 >>> 0 & 127L); + var14 = var14; + int var28 = Language.ViewportMouse_unpackX(ViewportMouse.ViewportMouse_entityTags[var8]); + int var16 = var28; + int var17 = UserComparator2.ViewportMouse_unpackY(ViewportMouse.ViewportMouse_entityTags[var8]); + int var19 = SecureRandomFuture.method2101(var8); + if (var17 == 2 && WorldMapIcon_1.scene.getObjectFlags(MouseRecorder.plane, var14, var28, var9) >= 0) { + ObjectDefinition var20 = WallDecoration.getObjectDefinition(var19); + if (var20.transforms != null) { + var20 = var20.transform(); } - var8.x -= var5 * 128; - var8.y -= var6 * 128; - } - } - - for (var7 = 0; var7 < 2048; ++var7) { - Player var21 = Client.players[var7]; - if (var21 != null) { - for (var9 = 0; var9 < 10; ++var9) { - var10000 = var21.pathX; - var10000[var9] -= var5; - var10000 = var21.pathY; - var10000[var9] -= var6; + if (var20 == null) { + continue; } - var21.x -= var5 * 128; - var21.y -= var6 * 128; + if (Client.isItemSelected == 1) { + FontName.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator7.colorStartTag(65535) + var20.name, 1, var19, var14, var28); + } else if (Client.isSpellSelected) { + if ((BuddyRankComparator.selectedSpellFlags & 4) == 4) { + FontName.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator7.colorStartTag(65535) + var20.name, 2, var19, var14, var28); + } + } else { + String[] var29 = var20.actions; + if (var29 != null) { + for (int var30 = 4; var30 >= 0; --var30) { + if (var29[var30] != null) { + short var23 = 0; + if (var30 == 0) { + var23 = 3; + } + + if (var30 == 1) { + var23 = 4; + } + + if (var30 == 2) { + var23 = 5; + } + + if (var30 == 3) { + var23 = 6; + } + + if (var30 == 4) { + var23 = 1001; + } + + FontName.insertMenuItemNoShift(var29[var30], UserComparator7.colorStartTag(65535) + var20.name, var23, var19, var14, var16); + } + } + } + + FontName.insertMenuItemNoShift("Examine", UserComparator7.colorStartTag(65535) + var20.name, 1002, var20.id, var14, var16); + } } - } - byte var20 = 0; - byte var18 = 104; - byte var22 = 1; - if (var5 < 0) { - var20 = 103; - var18 = -1; - var22 = -1; - } + int var21; + NPC var22; + Player var24; + int[] var36; + int var38; + if (var17 == 1) { + NPC var33 = Client.npcs[var19]; + if (var33 == null) { + continue; + } - byte var10 = 0; - byte var11 = 104; - byte var12 = 1; - if (var6 < 0) { - var10 = 103; - var11 = -1; - var12 = -1; - } + if (var33.definition.size == 1 && (var33.x * -78439701 & 127) == 64 && (var33.y & 127) == 64) { + for (var21 = 0; var21 < Client.npcCount; ++var21) { + var22 = Client.npcs[Client.npcIndices[var21]]; + if (var22 != null && var22 != var33 && var22.definition.size == 1 && var33.x * -78439701 == var22.x * -78439701 && var33.y == var22.y) { + InterfaceParent.addNpcToMenu(var22.definition, Client.npcIndices[var21], var14, var16); + } + } - int var14; - for (int var13 = var20; var18 != var13; var13 += var22) { - for (var14 = var10; var11 != var14; var14 += var12) { - int var15 = var5 + var13; - int var16 = var6 + var14; + var21 = Players.Players_count; + var36 = Players.Players_indices; - 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 (var38 = 0; var38 < var21; ++var38) { + var24 = Client.players[var36[var38]]; + if (var24 != null && var24.x * -78439701 == var33.x * -78439701 && var24.y == var33.y) { + NetFileRequest.addPlayerToMenu(var24, var36[var38], var14, var16); + } + } + } + + InterfaceParent.addNpcToMenu(var33.definition, var19, var14, var16); + } + + if (var17 == 0) { + Player var34 = Client.players[var19]; + if (var34 == null) { + continue; + } + + if ((var34.x * -78439701 & 127) == 64 && (var34.y & 127) == 64) { + for (var21 = 0; var21 < Client.npcCount; ++var21) { + var22 = Client.npcs[Client.npcIndices[var21]]; + if (var22 != null && var22.definition.size == 1 && var34.x * -78439701 == var22.x * -78439701 && var34.y == var22.y) { + InterfaceParent.addNpcToMenu(var22.definition, Client.npcIndices[var21], var14, var16); + } + } + + var21 = Players.Players_count; + var36 = Players.Players_indices; + + for (var38 = 0; var38 < var21; ++var38) { + var24 = Client.players[var36[var38]]; + if (var24 != null && var24 != var34 && var34.x * -78439701 == var24.x * -78439701 && var34.y == var24.y) { + NetFileRequest.addPlayerToMenu(var24, var36[var38], var14, var16); + } + } + } + + if (var19 != Client.combatTargetPlayerIndex) { + NetFileRequest.addPlayerToMenu(var34, var19, var14, var16); + } else { + var4 = var9; + } + } + + if (var17 == 3) { + NodeDeque var35 = Client.groundItems[MouseRecorder.plane][var14][var16]; + if (var35 != null) { + for (TileItem var39 = (TileItem)var35.first(); var39 != null; var39 = (TileItem)var35.next()) { + ItemDefinition var37 = Player.ItemDefinition_get(var39.id); + if (Client.isItemSelected == 1) { + FontName.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator7.colorStartTag(16748608) + var37.name, 16, var39.id, var14, var16); + } else if (Client.isSpellSelected) { + if ((BuddyRankComparator.selectedSpellFlags & 1) == 1) { + FontName.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator7.colorStartTag(16748608) + var37.name, 17, var39.id, var14, var16); + } + } else { + String[] var31 = var37.groundActions; + + for (int var32 = 4; var32 >= 0; --var32) { + if (var31 != null && var31[var32] != null) { + byte var25 = 0; + if (var32 == 0) { + var25 = 18; + } + + if (var32 == 1) { + var25 = 19; + } + + if (var32 == 2) { + var25 = 20; + } + + if (var32 == 3) { + var25 = 21; + } + + if (var32 == 4) { + var25 = 22; + } + + FontName.insertMenuItemNoShift(var31[var32], UserComparator7.colorStartTag(16748608) + var37.name, var25, var39.id, var14, var16); + } else if (var32 == 2) { + FontName.insertMenuItemNoShift("Take", UserComparator7.colorStartTag(16748608) + var37.name, 20, var39.id, var14, var16); + } + } + + FontName.insertMenuItemNoShift("Examine", UserComparator7.colorStartTag(16748608) + var37.name, 1004, var39.id, var14, var16); + } } } } } - - for (PendingSpawn var19 = (PendingSpawn)Client.pendingSpawns.last(); var19 != null; var19 = (PendingSpawn)Client.pendingSpawns.previous()) { - var19.x -= var5; - var19.y -= var6; - if (var19.x < 0 || var19.y < 0 || var19.x >= 104 || var19.y >= 104) { - var19.remove(); - } - } - - if (Client.destinationX != 0) { - Client.destinationX -= var5; - Client.destinationY -= var6; - } - - Client.soundEffectCount = 0; - Client.isCameraLocked = false; - WallDecoration.cameraX -= var5 << 7; - UserComparator7.cameraZ -= var6 << 7; - DynamicObject.oculusOrbFocalPointX -= var5 << 7; - FriendSystem.oculusOrbFocalPointY -= var6 << 7; - Client.field651 = -1; - Client.graphicsObjects.clear(); - Client.projectiles.clear(); - - for (var14 = 0; var14 < 4; ++var14) { - Client.collisionMaps[var14].clear(); - } - - } - } - - @ObfuscatedName("hl") - @ObfuscatedSignature( - signature = "(ILjava/lang/String;B)V", - garbageValue = "-38" - ) - static void method3201(int var0, String var1) { - int var2 = Players.Players_count; - int[] var3 = Players.Players_indices; - boolean var4 = false; - Username var5 = new Username(var1, FontName.loginType); - - for (int var6 = 0; var6 < var2; ++var6) { - Player var7 = Client.players[var3[var6]]; - if (var7 != null && var7 != WorldMapIcon_1.localPlayer && var7.username != null && var7.username.equals(var5)) { - PacketBufferNode var8; - if (var0 == 1) { - var8 = MenuAction.getPacketBufferNode(ClientPacket.field2272, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var3[var6]); - var8.packetBuffer.method5545(0); - Client.packetWriter.addNode(var8); - } else if (var0 == 4) { - var8 = MenuAction.getPacketBufferNode(ClientPacket.field2279, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5432(var3[var6]); - var8.packetBuffer.method5545(0); - Client.packetWriter.addNode(var8); - } else if (var0 == 6) { - var8 = MenuAction.getPacketBufferNode(ClientPacket.field2249, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5443(var3[var6]); - var8.packetBuffer.method5435(0); - Client.packetWriter.addNode(var8); - } else if (var0 == 7) { - var8 = MenuAction.getPacketBufferNode(ClientPacket.field2260, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5435(0); - var8.packetBuffer.writeShortLE(var3[var6]); - Client.packetWriter.addNode(var8); - } - - var4 = true; - break; - } } - if (!var4) { - DirectByteArrayCopier.addGameMessage(4, "", "Unable to find " + var1); + if (var4 != -1L) { + var8 = (int)(var4 >>> 0 & 127L); + int var10 = Language.ViewportMouse_unpackX(var4); + Player var27 = Client.players[Client.combatTargetPlayerIndex]; + NetFileRequest.addPlayerToMenu(var27, Client.combatTargetPlayerIndex, var8, var10); } } diff --git a/runescape-client/src/main/java/MouseHandler.java b/runescape-client/src/main/java/MouseHandler.java index 0ce53da7c7..f7c57354a8 100644 --- a/runescape-client/src/main/java/MouseHandler.java +++ b/runescape-client/src/main/java/MouseHandler.java @@ -3,129 +3,125 @@ import java.awt.event.FocusListener; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; -import java.io.File; -import java.io.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("bo") +@ObfuscatedName("bk") @Implements("MouseHandler") public class MouseHandler implements MouseListener, MouseMotionListener, FocusListener { - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -93099155 - ) - @Export("MouseHandler_x") - public static int MouseHandler_x; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lbo;" - ) - @Export("MouseHandler_instance") - public static MouseHandler MouseHandler_instance; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -1641933139 - ) - @Export("MouseHandler_idleCycles") - public static volatile int MouseHandler_idleCycles; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -1870128511 - ) - @Export("MouseHandler_currentButtonVolatile") - static volatile int MouseHandler_currentButtonVolatile; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 1230571699 - ) - @Export("MouseHandler_xVolatile") - static volatile int MouseHandler_xVolatile; @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1059786001 + intValue = -455222981 ) @Export("MouseHandler_y") public static int MouseHandler_y; + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "Lbk;" + ) + @Export("MouseHandler_instance") + public static MouseHandler MouseHandler_instance; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 625092859 + ) + @Export("MouseHandler_idleCycles") + public static volatile int MouseHandler_idleCycles; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 928358491 + ) + @Export("MouseHandler_currentButtonVolatile") + public static volatile int MouseHandler_currentButtonVolatile; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 1059127459 + ) + @Export("MouseHandler_xVolatile") + public static volatile int MouseHandler_xVolatile; @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 311656783 + intValue = -871019493 ) @Export("MouseHandler_yVolatile") - static volatile int MouseHandler_yVolatile; - @ObfuscatedName("f") + public static volatile int MouseHandler_yVolatile; + @ObfuscatedName("z") @ObfuscatedGetter( - longValue = 7196021325649186919L + longValue = 3807665102305942221L ) @Export("MouseHandler_lastMovedVolatile") - static volatile long MouseHandler_lastMovedVolatile; - @ObfuscatedName("c") + public static volatile long MouseHandler_lastMovedVolatile; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1297098921 + intValue = 1642264725 ) @Export("MouseHandler_currentButton") public static int MouseHandler_currentButton; - @ObfuscatedName("r") + @ObfuscatedName("h") @ObfuscatedGetter( - longValue = 619055357369552987L + intValue = -1689480427 + ) + @Export("MouseHandler_x") + public static int MouseHandler_x; + @ObfuscatedName("f") + @ObfuscatedGetter( + longValue = 921142150895567199L ) @Export("MouseHandler_millis") public static long MouseHandler_millis; - @ObfuscatedName("y") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1157657453 + intValue = -1873074137 ) @Export("MouseHandler_lastButtonVolatile") - static volatile int MouseHandler_lastButtonVolatile; + public static volatile int MouseHandler_lastButtonVolatile; @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1268176769 + intValue = -378293713 ) @Export("MouseHandler_lastPressedXVolatile") - static volatile int MouseHandler_lastPressedXVolatile; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 73180775 - ) - @Export("MouseHandler_lastPressedYVolatile") - static volatile int MouseHandler_lastPressedYVolatile; - @ObfuscatedName("g") - @ObfuscatedGetter( - longValue = 8295957419767528369L - ) - @Export("MouseHandler_lastPressedTimeMillisVolatile") - static volatile long MouseHandler_lastPressedTimeMillisVolatile; + public static volatile int MouseHandler_lastPressedXVolatile; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1949699637 + intValue = -1121450119 + ) + @Export("MouseHandler_lastPressedYVolatile") + public static volatile int MouseHandler_lastPressedYVolatile; + @ObfuscatedName("i") + @ObfuscatedGetter( + longValue = 5125421124027992709L + ) + @Export("MouseHandler_lastPressedTimeMillisVolatile") + public static volatile long MouseHandler_lastPressedTimeMillisVolatile; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 1837968933 ) @Export("MouseHandler_lastButton") public static int MouseHandler_lastButton; - @ObfuscatedName("z") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 683803083 + intValue = 1940866651 ) @Export("MouseHandler_lastPressedX") public static int MouseHandler_lastPressedX; - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1446302593 + intValue = -1513587311 ) @Export("MouseHandler_lastPressedY") public static int MouseHandler_lastPressedY; - @ObfuscatedName("w") + @ObfuscatedName("k") @ObfuscatedGetter( - longValue = 1144028975339776835L + longValue = 7385005168310629291L ) @Export("MouseHandler_lastPressedTimeMillis") public static long MouseHandler_lastPressedTimeMillis; - @ObfuscatedName("gt") - @Export("regionMapArchiveIds") - static int[] regionMapArchiveIds; + @ObfuscatedName("bw") + static String field464; static { MouseHandler_instance = new MouseHandler(); @@ -151,10 +147,10 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi MouseHandler() { } - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/awt/event/MouseEvent;S)I", - garbageValue = "-1859" + signature = "(Ljava/awt/event/MouseEvent;I)I", + garbageValue = "1169015688" ) @Export("getButton") final int getButton(MouseEvent var1) { @@ -181,7 +177,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi MouseHandler_idleCycles = 0; MouseHandler_lastPressedXVolatile = var1.getX(); MouseHandler_lastPressedYVolatile = var1.getY(); - MouseHandler_lastPressedTimeMillisVolatile = SequenceDefinition.method4686(); + MouseHandler_lastPressedTimeMillisVolatile = SoundCache.method2480(); MouseHandler_lastButtonVolatile = this.getButton(var1); if (MouseHandler_lastButtonVolatile != 0) { MouseHandler_currentButtonVolatile = MouseHandler_lastButtonVolatile; @@ -194,34 +190,6 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi } - public final synchronized void mouseEntered(MouseEvent var1) { - this.mouseMoved(var1); - } - - public final void mouseClicked(MouseEvent var1) { - if (var1.isPopupTrigger()) { - var1.consume(); - } - - } - - public final synchronized void mouseExited(MouseEvent var1) { - if (MouseHandler_instance != null) { - MouseHandler_idleCycles = 0; - MouseHandler_xVolatile = -1; - MouseHandler_yVolatile = -1; - MouseHandler_lastMovedVolatile = var1.getWhen(); - } - - } - - public final synchronized void mouseDragged(MouseEvent var1) { - this.mouseMoved(var1); - } - - public final void focusGained(FocusEvent var1) { - } - public final synchronized void mouseReleased(MouseEvent var1) { if (MouseHandler_instance != null) { MouseHandler_idleCycles = 0; @@ -234,6 +202,34 @@ 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 synchronized void mouseExited(MouseEvent var1) { + if (MouseHandler_instance != null) { + MouseHandler_idleCycles = 0; + MouseHandler_xVolatile = -1; + MouseHandler_yVolatile = -1; + MouseHandler_lastMovedVolatile = var1.getWhen(); + } + + } + + public final void focusGained(FocusEvent var1) { + } + public final synchronized void focusLost(FocusEvent var1) { if (MouseHandler_instance != null) { MouseHandler_currentButtonVolatile = 0; @@ -241,201 +237,35 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi } - @ObfuscatedName("j") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/io/File;Ljava/io/File;I)V", - garbageValue = "-768479838" + signature = "(Ljava/lang/CharSequence;I)J", + garbageValue = "-1429364535" ) - static void method1041(File var0, File var1) { - try { - AccessFile var2 = new AccessFile(class290.JagexCache_locationFile, "rw", 10000L); - Buffer var3 = new Buffer(500); - var3.writeByte(3); - var3.writeByte(var1 != null ? 1 : 0); - var3.writeCESU8(var0.getPath()); - if (var1 != null) { - var3.writeCESU8(""); + public static long method1041(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); } - var2.write(var3.array, 0, var3.offset); - var2.close(); - } catch (IOException var4) { - var4.printStackTrace(); - } - - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "-409012679" - ) - public static void method1040(int var0, int var1) { - VarbitDefinition var3 = (VarbitDefinition)VarbitDefinition.VarbitDefinition_cached.get((long)var0); - VarbitDefinition var2; - if (var3 != null) { - var2 = var3; - } else { - byte[] var8 = VarbitDefinition.VarbitDefinition_archive.takeFile(14, var0); - var3 = new VarbitDefinition(); - if (var8 != null) { - var3.decode(new Buffer(var8)); - } - - VarbitDefinition.VarbitDefinition_cached.put(var3, (long)var0); - var2 = var3; - } - - int var4 = 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[var4] = Varps.Varps_main[var4] & ~var7 | var1 << var5 & var7; - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "(IZIZB)V", - garbageValue = "43" - ) - @Export("sortWorldList") - static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { - if (ChatChannel.World_worlds != null) { - Language.doWorldSorting(0, ChatChannel.World_worlds.length - 1, var0, var1, var2, var3); - } - - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - signature = "(ILcr;ZB)I", - garbageValue = "96" - ) - static int method1043(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.OC_NAME) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = WorldMapData_0.ItemDefinition_get(var3).name; - return 1; - } else { - int var4; - ItemDefinition 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 = WorldMapData_0.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) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var5 = WorldMapData_0.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[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapData_0.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] = WorldMapData_0.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; - return 1; - } else { - ItemDefinition var6; - if (var0 == ScriptOpcodes.OC_CERT) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var6 = WorldMapData_0.ItemDefinition_get(var3); - if (var6.noteTemplate == -1 && var6.note >= 0) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.note; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_UNCERT) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var6 = WorldMapData_0.ItemDefinition_get(var3); - if (var6.noteTemplate >= 0 && var6.note >= 0) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.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] = WorldMapData_0.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var6 = WorldMapData_0.ItemDefinition_get(var3); - if (var6.placeholderTemplate == -1 && var6.placeholder >= 0) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.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]; - var6 = WorldMapData_0.ItemDefinition_get(var3); - if (var6.placeholderTemplate >= 0 && var6.placeholder >= 0) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.placeholder; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_FIND) { - String var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - LoginPacket.findItemDefinitions(var7, var4 == 1); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Language.foundItemIdCount; - return 1; - } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { - if (var0 == ScriptOpcodes.OC_FINDRESET) { - GrandExchangeOffer.foundItemIndex = 0; - return 1; - } else { - return 2; - } - } else { - if (SecureRandomCallable.foundItemIds != null && GrandExchangeOffer.foundItemIndex < Language.foundItemIdCount) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SecureRandomCallable.foundItemIds[++GrandExchangeOffer.foundItemIndex - 1] & '\uffff'; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } - - return 1; - } + if (var1 >= 177917621779460413L) { + break; } } - } - @ObfuscatedName("jh") - @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "-23" - ) - @Export("getTapToDrop") - static boolean getTapToDrop() { - return Client.tapToDrop; + while (var1 % 37L == 0L && 0L != var1) { + var1 /= 37L; + } + + return var1; } } diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java index 738849a9b0..557586d716 100644 --- a/runescape-client/src/main/java/MouseRecorder.java +++ b/runescape-client/src/main/java/MouseRecorder.java @@ -1,43 +1,47 @@ +import java.net.MalformedURLException; +import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bs") +@ObfuscatedName("bt") @Implements("MouseRecorder") public class MouseRecorder implements Runnable { - @ObfuscatedName("qs") - @ObfuscatedSignature( - signature = "Ldd;" - ) - @Export("pcmPlayer0") - static PcmPlayer pcmPlayer0; - @ObfuscatedName("x") + @ObfuscatedName("n") + @Export("musicTrackBoolean") + public static boolean musicTrackBoolean; + @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = -694423597 + intValue = -2032808157 ) - @Export("ItemDefinition_fileCount") - public static int ItemDefinition_fileCount; - @ObfuscatedName("s") + static int field565; + @ObfuscatedName("jx") + @ObfuscatedGetter( + intValue = -1873727163 + ) + @Export("plane") + static int plane; + @ObfuscatedName("c") @Export("isRunning") boolean isRunning; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("lock") Object lock; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -958051971 + intValue = 675918873 ) @Export("index") int index; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("xs") int[] xs; - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("ys") int[] ys; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("millis") long[] millis; @@ -51,7 +55,7 @@ public class MouseRecorder implements Runnable { } public void run() { - for (; this.isRunning; UserList.sleepMillis(50L)) { + for (; this.isRunning; FriendsList.sleepMillis(50L)) { synchronized(this.lock) { if (this.index < 500) { this.xs[this.index] = MouseHandler.MouseHandler_x; @@ -64,39 +68,44 @@ public class MouseRecorder implements Runnable { } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)[Lgj;", - garbageValue = "58" + signature = "(Ljava/lang/String;I)Z", + garbageValue = "-1211827795" ) - @Export("ServerPacket_values") - public static ServerPacket[] ServerPacket_values() { - return new ServerPacket[]{ServerPacket.field2102, ServerPacket.field2098, ServerPacket.field2099, ServerPacket.field2183, ServerPacket.field2101, ServerPacket.field2170, ServerPacket.field2100, ServerPacket.field2158, ServerPacket.field2105, ServerPacket.field2106, ServerPacket.field2107, ServerPacket.field2108, ServerPacket.field2161, ServerPacket.field2184, ServerPacket.field2178, ServerPacket.field2112, ServerPacket.field2137, ServerPacket.field2114, ServerPacket.field2104, ServerPacket.field2116, ServerPacket.field2115, ServerPacket.field2134, ServerPacket.field2119, ServerPacket.field2120, ServerPacket.field2121, ServerPacket.field2122, ServerPacket.field2123, ServerPacket.field2124, ServerPacket.field2159, ServerPacket.field2126, ServerPacket.field2136, ServerPacket.field2128, ServerPacket.field2163, ServerPacket.field2117, ServerPacket.field2131, ServerPacket.field2130, ServerPacket.field2133, ServerPacket.field2129, ServerPacket.field2135, ServerPacket.field2148, ServerPacket.field2175, ServerPacket.field2138, ServerPacket.field2139, ServerPacket.field2140, ServerPacket.field2141, ServerPacket.field2142, ServerPacket.field2143, ServerPacket.field2144, ServerPacket.field2145, ServerPacket.field2146, ServerPacket.field2147, ServerPacket.field2125, ServerPacket.field2149, ServerPacket.field2150, ServerPacket.field2151, ServerPacket.field2152, ServerPacket.field2162, ServerPacket.field2097, ServerPacket.field2155, ServerPacket.field2156, ServerPacket.field2118, ServerPacket.field2132, ServerPacket.field2110, ServerPacket.field2160, ServerPacket.field2103, ServerPacket.field2127, ServerPacket.field2154, ServerPacket.field2164, ServerPacket.field2165, ServerPacket.field2179, ServerPacket.field2167, ServerPacket.field2168, ServerPacket.field2169, ServerPacket.field2166, ServerPacket.field2171, ServerPacket.field2172, ServerPacket.field2173, ServerPacket.field2174, ServerPacket.field2153, ServerPacket.field2176, ServerPacket.field2177, ServerPacket.field2113, ServerPacket.field2157, ServerPacket.field2180, ServerPacket.field2181, ServerPacket.field2182}; + @Export("isValidURL") + static boolean isValidURL(String var0) { + if (var0 == null) { + return false; + } else { + try { + new URL(var0); + return true; + } catch (MalformedURLException var2) { + return false; + } + } } - @ObfuscatedName("fu") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "-5" + signature = "(I)V", + garbageValue = "1986117019" ) - @Export("playSoundJingle") - static void playSoundJingle(int var0, int var1) { - if (Client.field856 != 0 && var0 != -1) { - PacketBufferNode.method3574(WorldMapRectangle.archive11, var0, 0, Client.field856, false); - Client.field858 = true; - } - + public static void method1139() { + FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); } - @ObfuscatedName("jq") + @ObfuscatedName("fl") @ObfuscatedSignature( - signature = "(IIIIIIIB)V", - garbageValue = "-63" + signature = "(I)V", + garbageValue = "-1208312235" ) - @Export("updateRootInterface") - static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (Projectile.loadInterface(var0)) { - Occluder.updateInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); - } + static void method1145() { + PacketBufferNode var0 = MenuAction.getPacketBufferNode(ClientPacket.field2270, Client.packetWriter.isaacCipher); + var0.packetBuffer.writeByte(class43.getWindowedMode()); + var0.packetBuffer.writeShort(GraphicsDefaults.canvasWidth); + var0.packetBuffer.writeShort(GameShell.canvasHeight); + Client.packetWriter.addNode(var0); } } diff --git a/runescape-client/src/main/java/MouseWheel.java b/runescape-client/src/main/java/MouseWheel.java index 38b2bbe60f..12bead018d 100644 --- a/runescape-client/src/main/java/MouseWheel.java +++ b/runescape-client/src/main/java/MouseWheel.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fo") +@ObfuscatedName("fa") @Implements("MouseWheel") public interface MouseWheel { - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "286451237" + garbageValue = "-495916017" ) @Export("useRotation") int useRotation(); diff --git a/runescape-client/src/main/java/MouseWheelHandler.java b/runescape-client/src/main/java/MouseWheelHandler.java index 311162e1f9..65803b7075 100644 --- a/runescape-client/src/main/java/MouseWheelHandler.java +++ b/runescape-client/src/main/java/MouseWheelHandler.java @@ -10,9 +10,9 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("aq") @Implements("MouseWheelHandler") public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 2022124205 + intValue = 1710824769 ) @Export("rotation") int rotation; @@ -21,30 +21,30 @@ public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { this.rotation = 0; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(Ljava/awt/Component;I)V", - garbageValue = "-110983172" + garbageValue = "-1548191195" ) @Export("addTo") void addTo(Component var1) { var1.addMouseWheelListener(this); } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(Ljava/awt/Component;I)V", - garbageValue = "1653862050" + garbageValue = "1923589438" ) @Export("removeFrom") void removeFrom(Component var1) { var1.removeMouseWheelListener(this); } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "286451237" + garbageValue = "-495916017" ) @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 3eb476a394..001e97908d 100644 --- a/runescape-client/src/main/java/MusicPatch.java +++ b/runescape-client/src/main/java/MusicPatch.java @@ -4,43 +4,43 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gg") +@ObfuscatedName("gc") @Implements("MusicPatch") public class MusicPatch extends Node { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1055401795 + intValue = 653745577 ) - int field2459; - @ObfuscatedName("j") + int field2453; + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "[Lco;" + signature = "[Lcg;" ) @Export("rawSounds") RawSound[] rawSounds; - @ObfuscatedName("i") - short[] field2457; - @ObfuscatedName("k") - byte[] field2462; - @ObfuscatedName("u") - byte[] field2463; - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "[Lgf;" - ) - MusicPatchNode2[] field2460; @ObfuscatedName("t") - byte[] field2461; - @ObfuscatedName("q") + short[] field2450; + @ObfuscatedName("g") + byte[] field2451; + @ObfuscatedName("l") + byte[] field2452; + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "[Lgg;" + ) + MusicPatchNode2[] field2449; + @ObfuscatedName("j") + byte[] field2454; + @ObfuscatedName("v") int[] field2455; MusicPatch(byte[] var1) { this.rawSounds = new RawSound[128]; - this.field2457 = new short[128]; - this.field2462 = new byte[128]; - this.field2463 = new byte[128]; - this.field2460 = new MusicPatchNode2[128]; - this.field2461 = new byte[128]; + this.field2450 = new short[128]; + this.field2451 = new byte[128]; + this.field2452 = new byte[128]; + this.field2449 = new MusicPatchNode2[128]; + this.field2454 = new byte[128]; this.field2455 = new int[128]; Buffer var2 = new Buffer(var1); @@ -121,13 +121,13 @@ public class MusicPatch extends Node { var38 = var37[var14] = new MusicPatchNode2(); int var16 = var2.readUnsignedByte(); if (var16 > 0) { - var38.field2369 = new byte[var16 * 2]; + var38.field2365 = new byte[var16 * 2]; } var16 = var2.readUnsignedByte(); if (var16 > 0) { - var38.field2370 = new byte[var16 * 2 + 2]; - var38.field2370[1] = 64; + var38.field2361 = new byte[var16 * 2 + 2]; + var38.field2361[1] = 64; } } @@ -154,7 +154,7 @@ public class MusicPatch extends Node { int var20; for (var20 = 0; var20 < 128; ++var20) { var19 += var2.readUnsignedByte(); - this.field2457[var20] = (short)var19; + this.field2450[var20] = (short)var19; } var19 = 0; @@ -162,7 +162,7 @@ public class MusicPatch extends Node { short[] var48; for (var20 = 0; var20 < 128; ++var20) { var19 += var2.readUnsignedByte(); - var48 = this.field2457; + var48 = this.field2450; var48[var20] = (short)(var48[var20] + (var19 << 8)); } @@ -182,7 +182,7 @@ public class MusicPatch extends Node { var22 = var2.readVarInt(); } - var48 = this.field2457; + var48 = this.field2450; var48[var23] = (short)(var48[var23] + ((var22 - 1 & 2) << 14)); this.field2455[var23] = var22; --var20; @@ -205,7 +205,7 @@ public class MusicPatch extends Node { var23 = var2.array[var5++] - 1; } - this.field2461[var24] = (byte)var23; + this.field2454[var24] = (byte)var23; --var20; } } @@ -226,7 +226,7 @@ public class MusicPatch extends Node { var24 = var2.array[var8++] + 16 << 2; } - this.field2463[var25] = (byte)var24; + this.field2452[var25] = (byte)var24; --var20; } } @@ -247,7 +247,7 @@ public class MusicPatch extends Node { } } - this.field2460[var26] = var40; + this.field2449[var26] = var40; --var20; } } @@ -270,25 +270,25 @@ public class MusicPatch extends Node { } } - this.field2462[var27] = (byte)var26; + this.field2451[var27] = (byte)var26; --var20; } - this.field2459 = var2.readUnsignedByte() + 1; + this.field2453 = var2.readUnsignedByte() + 1; MusicPatchNode2 var28; int var29; for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; - if (var28.field2369 != null) { - for (var29 = 1; var29 < var28.field2369.length; var29 += 2) { - var28.field2369[var29] = var2.readByte(); + if (var28.field2365 != null) { + for (var29 = 1; var29 < var28.field2365.length; var29 += 2) { + var28.field2365[var29] = var2.readByte(); } } - if (var28.field2370 != null) { - for (var29 = 3; var29 < var28.field2370.length - 2; var29 += 2) { - var28.field2370[var29] = var2.readByte(); + if (var28.field2361 != null) { + for (var29 = 3; var29 < var28.field2361.length - 2; var29 += 2) { + var28.field2361[var29] = var2.readByte(); } } } @@ -307,24 +307,24 @@ public class MusicPatch extends Node { for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; - if (var28.field2370 != null) { + if (var28.field2361 != null) { var19 = 0; - for (var29 = 2; var29 < var28.field2370.length; var29 += 2) { + for (var29 = 2; var29 < var28.field2361.length; var29 += 2) { var19 = var19 + 1 + var2.readUnsignedByte(); - var28.field2370[var29] = (byte)var19; + var28.field2361[var29] = (byte)var19; } } } for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; - if (var28.field2369 != null) { + if (var28.field2365 != null) { var19 = 0; - for (var29 = 2; var29 < var28.field2369.length; var29 += 2) { - var19 = var19 + 1 + var2.readUnsignedByte(); - var28.field2369[var29] = (byte)var19; + for (var29 = 2; var29 < var28.field2365.length; var29 += 2) { + var19 = 1 + var19 + var2.readUnsignedByte(); + var28.field2365[var29] = (byte)var19; } } } @@ -340,7 +340,7 @@ public class MusicPatch extends Node { var45[0] = (byte)var19; for (var27 = 2; var27 < var45.length; var27 += 2) { - var19 = var19 + 1 + var2.readUnsignedByte(); + var19 = 1 + var19 + var2.readUnsignedByte(); var45[var27] = (byte)var19; } @@ -348,7 +348,7 @@ public class MusicPatch extends Node { byte var41 = var45[1]; for (var29 = 0; var29 < var44; ++var29) { - this.field2462[var29] = (byte)(var41 * this.field2462[var29] + 32 >> 6); + this.field2451[var29] = (byte)(var41 * this.field2451[var29] + 32 >> 6); } for (var29 = 2; var29 < var45.length; var29 += 2) { @@ -357,8 +357,8 @@ public class MusicPatch extends Node { var32 = var41 * (var30 - var44) + (var30 - var44) / 2; for (var33 = var44; var33 < var30; ++var33) { - var34 = TaskHandler.method3411(var32, var30 - var44); - this.field2462[var33] = (byte)(var34 * this.field2462[var33] + 32 >> 6); + var34 = ObjectDefinition.method4644(var32, var30 - var44); + this.field2451[var33] = (byte)(var34 * this.field2451[var33] + 32 >> 6); var32 += var31 - var41; } @@ -367,7 +367,7 @@ public class MusicPatch extends Node { } for (var42 = var44; var42 < 128; ++var42) { - this.field2462[var42] = (byte)(var41 * this.field2462[var42] + 32 >> 6); + this.field2451[var42] = (byte)(var41 * this.field2451[var42] + 32 >> 6); } var38 = null; @@ -386,7 +386,7 @@ public class MusicPatch extends Node { int var47 = var39[1] << 1; for (var29 = 0; var29 < var44; ++var29) { - var42 = var47 + (this.field2463[var29] & 255); + var42 = var47 + (this.field2452[var29] & 255); if (var42 < 0) { var42 = 0; } @@ -395,7 +395,7 @@ public class MusicPatch extends Node { var42 = 128; } - this.field2463[var29] = (byte)var42; + this.field2452[var29] = (byte)var42; } int var43; @@ -405,8 +405,8 @@ public class MusicPatch extends Node { var32 = var47 * (var30 - var44) + (var30 - var44) / 2; for (var33 = var44; var33 < var30; ++var33) { - var34 = TaskHandler.method3411(var32, var30 - var44); - int var35 = var34 + (this.field2463[var33] & 255); + var34 = ObjectDefinition.method4644(var32, var30 - var44); + int var35 = var34 + (this.field2452[var33] & 255); if (var35 < 0) { var35 = 0; } @@ -415,7 +415,7 @@ public class MusicPatch extends Node { var35 = 128; } - this.field2463[var33] = (byte)var35; + this.field2452[var33] = (byte)var35; var32 += var43 - var47; } @@ -424,7 +424,7 @@ public class MusicPatch extends Node { } for (var42 = var44; var42 < 128; ++var42) { - var43 = var47 + (this.field2463[var42] & 255); + var43 = var47 + (this.field2452[var42] & 255); if (var43 < 0) { var43 = 0; } @@ -433,57 +433,57 @@ public class MusicPatch extends Node { var43 = 128; } - this.field2463[var42] = (byte)var43; + this.field2452[var42] = (byte)var43; } Object var46 = null; } for (var27 = 0; var27 < var12; ++var27) { - var37[var27].field2372 = var2.readUnsignedByte(); + var37[var27].field2368 = var2.readUnsignedByte(); } for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; - if (var28.field2369 != null) { - var28.field2371 = var2.readUnsignedByte(); + if (var28.field2365 != null) { + var28.field2360 = var2.readUnsignedByte(); } - if (var28.field2370 != null) { - var28.field2373 = var2.readUnsignedByte(); + if (var28.field2361 != null) { + var28.field2364 = var2.readUnsignedByte(); } - if (var28.field2372 > 0) { - var28.field2374 = var2.readUnsignedByte(); + if (var28.field2368 > 0) { + var28.field2363 = var2.readUnsignedByte(); } } for (var27 = 0; var27 < var12; ++var27) { - var37[var27].field2376 = var2.readUnsignedByte(); + var37[var27].field2367 = var2.readUnsignedByte(); } for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; - if (var28.field2376 > 0) { - var28.field2375 = var2.readUnsignedByte(); + if (var28.field2367 > 0) { + var28.field2366 = var2.readUnsignedByte(); } } for (var27 = 0; var27 < var12; ++var27) { var28 = var37[var27]; - if (var28.field2375 > 0) { - var28.field2377 = var2.readUnsignedByte(); + if (var28.field2366 > 0) { + var28.field2370 = var2.readUnsignedByte(); } } } - @ObfuscatedName("s") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ldh;[B[II)Z", - garbageValue = "-291456557" + signature = "(Ldy;[B[IB)Z", + garbageValue = "78" ) - boolean method3825(SoundCache var1, byte[] var2, int[] var3) { + boolean method3868(SoundCache var1, byte[] var2, int[] var3) { boolean var4 = true; int var5 = 0; RawSound var6 = null; @@ -516,39 +516,27 @@ public class MusicPatch extends Node { return var4; } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1724066088" + signature = "(B)V", + garbageValue = "25" ) @Export("clear") void clear() { this.field2455 = null; } - @ObfuscatedName("ge") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZB)V", - garbageValue = "0" + signature = "(III)I", + garbageValue = "2016011070" ) - @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 = ClientPacket.fontPlain12.lineWidth(var0, 250); - int var6 = ClientPacket.fontPlain12.lineCount(var0, 250) * 13; - Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var6 + var2 + var2, 0); - Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var2 + var5, var2 + var6 + var2, 16777215); - ClientPacket.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); - FloorDecoration.method2786(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var6 + var2); - if (var1) { - SpotAnimationDefinition.rasterProvider.drawFull(0, 0); - } else { - FriendsList.method5102(var3, var4, var5, var6); - } - + static int method3877(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; } } } diff --git a/runescape-client/src/main/java/MusicPatchNode.java b/runescape-client/src/main/java/MusicPatchNode.java index f73b2d7b4d..e498085aec 100644 --- a/runescape-client/src/main/java/MusicPatchNode.java +++ b/runescape-client/src/main/java/MusicPatchNode.java @@ -4,241 +4,192 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gd") +@ObfuscatedName("gs") @Implements("MusicPatchNode") public class MusicPatchNode extends Node { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1897745195 + intValue = -1620633945 ) - int field2437; - @ObfuscatedName("j") + int field2431; + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lgg;" + signature = "Lgc;" ) @Export("patch") MusicPatch patch; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lco;" + signature = "Lcg;" ) @Export("rawSound") RawSound rawSound; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lgf;" + signature = "Lgg;" ) - MusicPatchNode2 field2422; - @ObfuscatedName("u") + MusicPatchNode2 field2415; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1864243687 - ) - int field2423; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -1872653771 - ) - int field2424; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 1424781673 - ) - int field2425; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 923985799 - ) - int field2429; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -1213046501 + intValue = 360732481 ) int field2426; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 1173675801 + ) + int field2413; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -51671167 + ) + int field2417; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 1916698407 + ) + int field2418; @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -322919449 + intValue = 1571144209 ) - int field2428; - @ObfuscatedName("f") + int field2419; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1828519475 + intValue = 1866086819 ) - int field2440; - @ObfuscatedName("c") + int field2420; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1131883179 - ) - int field2430; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = -392347845 - ) - int field2431; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = -610654257 - ) - int field2432; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -1442847957 + intValue = -994523657 ) int field2433; - @ObfuscatedName("b") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1807257146 + intValue = 47399593 ) - int field2434; - @ObfuscatedName("g") + int field2414; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1173270761 + intValue = 86626141 ) - int field2435; + int field2423; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 707055873 + ) + int field2424; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -497269847 + ) + int field2425; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -549746549 + intValue = 1087437009 ) - int field2436; - @ObfuscatedName("z") + int field2416; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 830088765 + ) + int field2427; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 819729093 + ) + int field2428; + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Ldx;" + signature = "Lda;" ) @Export("stream") RawPcmStream stream; - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1101531435 + intValue = -2114516523 ) - int field2438; - @ObfuscatedName("l") + int field2430; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 994945393 + intValue = -98902085 ) - int field2439; + int field2422; MusicPatchNode() { } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "87" + signature = "(I)V", + garbageValue = "-1763442476" ) - void method3767() { + void method3810() { this.patch = null; this.rawSound = null; - this.field2422 = null; + this.field2415 = null; this.stream = null; } - @ObfuscatedName("f") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(Lbw;I)V", - garbageValue = "-313141068" + signature = "(IIB)I", + garbageValue = "1" ) - static void method3772(GameShell var0) { - while (FontName.isKeyDown()) { - if (ReflectionCheck.field1307 == 13) { - class13.method163(); - return; - } - - if (ReflectionCheck.field1307 == 96) { - if (Login.worldSelectPage > 0 && AbstractWorldMapIcon.worldSelectLeftSprite != null) { - --Login.worldSelectPage; - } - } else if (ReflectionCheck.field1307 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && ClanChat.worldSelectRightSprite != null) { - ++Login.worldSelectPage; - } - } - - if (MouseHandler.MouseHandler_lastButton == 1 || !FriendSystem.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { - int var1 = Login.xPadding + 280; - if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class65.changeWorldSelectSorting(0, 0); - return; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class65.changeWorldSelectSorting(0, 1); - return; - } - - int var2 = Login.xPadding + 390; - if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class65.changeWorldSelectSorting(1, 0); - return; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class65.changeWorldSelectSorting(1, 1); - return; - } - - int var3 = Login.xPadding + 500; - if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class65.changeWorldSelectSorting(2, 0); - return; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class65.changeWorldSelectSorting(2, 1); - return; - } - - int var4 = Login.xPadding + 610; - if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class65.changeWorldSelectSorting(3, 0); - return; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - class65.changeWorldSelectSorting(3, 1); - return; - } - - if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { - class13.method163(); - return; - } - - if (Login.hoveredWorldIndex != -1) { - World var5 = ChatChannel.World_worlds[Login.hoveredWorldIndex]; - class65.changeWorld(var5); - class13.method163(); - return; - } - - if (Login.worldSelectPage > 0 && AbstractWorldMapIcon.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= AbstractWorldMapIcon.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= class30.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class30.canvasHeight / 2 + 50) { - --Login.worldSelectPage; - } - - if (Login.worldSelectPage < Login.worldSelectPagesCount && ClanChat.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= KitDefinition.canvasWidth - ClanChat.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= KitDefinition.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= class30.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class30.canvasHeight / 2 + 50) { - ++Login.worldSelectPage; - } + static final int method3811(int var0, int var1) { + int var2 = SoundCache.method2467(var0 + 45365, 91923 + var1, 4) - 128 + (SoundCache.method2467(10294 + var0, 37821 + var1, 2) - 128 >> 1) + (SoundCache.method2467(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; } - @ObfuscatedName("gp") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "-1852337060" + signature = "(III)I", + garbageValue = "-640083852" ) - static final void method3771(int var0, int var1, int var2, int var3) { - Client.field737 = 0; - int var4 = PacketWriter.baseX * 64 + (WorldMapIcon_1.localPlayer.x >> 7); - int var5 = RouteStrategy.baseY * 64 + (WorldMapIcon_1.localPlayer.y >> 7); - if (var4 >= 3053 && var4 <= 3156 && var5 >= 3056 && var5 <= 3136) { - Client.field737 = 1; + static final int method3812(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("fv") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "-1280184446" + ) + @Export("setWindowedMode") + static void setWindowedMode(int var0) { + Client.field835 = 0L; + if (var0 >= 2) { + Client.isResizable = true; + } else { + Client.isResizable = false; } - if (var4 >= 3072 && var4 <= 3118 && var5 >= 9492 && var5 <= 9535) { - Client.field737 = 1; + if (class43.getWindowedMode() == 1) { + Coord.client.setMaxCanvasSize(765, 503); + } else { + Coord.client.setMaxCanvasSize(7680, 2160); } - if (Client.field737 == 1 && var4 >= 3139 && var4 <= 3199 && var5 >= 3008 && var5 <= 3062) { - Client.field737 = 0; + if (Client.gameState >= 25) { + MouseRecorder.method1145(); } } diff --git a/runescape-client/src/main/java/MusicPatchNode2.java b/runescape-client/src/main/java/MusicPatchNode2.java index f8aff5e331..b8a3a9fed3 100644 --- a/runescape-client/src/main/java/MusicPatchNode2.java +++ b/runescape-client/src/main/java/MusicPatchNode2.java @@ -1,50 +1,192 @@ +import 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("gf") +@ObfuscatedName("gg") @Implements("MusicPatchNode2") public class MusicPatchNode2 { - @ObfuscatedName("s") - byte[] field2369; - @ObfuscatedName("j") - byte[] field2370; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 978792497 + @ObfuscatedName("ap") + @ObfuscatedSignature( + signature = "Llr;" ) - int field2372; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 517757635 - ) - int field2371; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 17424383 - ) - int field2373; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 1999348799 - ) - int field2374; + static Bounds field2369; + @ObfuscatedName("c") + byte[] field2365; + @ObfuscatedName("x") + byte[] field2361; @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 221013475 + intValue = 111263501 ) - int field2375; - @ObfuscatedName("q") + int field2368; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1667955655 + intValue = 618770801 ) - int field2376; - @ObfuscatedName("x") + int field2360; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1659265709 + intValue = 616473833 ) - int field2377; + int field2364; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -479359019 + ) + int field2363; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 1576699207 + ) + int field2366; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -2126224299 + ) + int field2367; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 339059033 + ) + int field2370; MusicPatchNode2() { } + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(CI)Z", + garbageValue = "-634952153" + ) + @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("ad") + @ObfuscatedSignature( + signature = "(ILcu;ZB)I", + garbageValue = "-15" + ) + static int method3666(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.OC_NAME) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = Player.ItemDefinition_get(var3).name; + return 1; + } else { + int var4; + ItemDefinition var5; + if (var0 == ScriptOpcodes.OC_OP) { + class160.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + var5 = Player.ItemDefinition_get(var3); + if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_IOP) { + class160.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + var5 = Player.ItemDefinition_get(var3); + if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_COST) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Player.ItemDefinition_get(var3).price; + return 1; + } else if (var0 == ScriptOpcodes.OC_STACKABLE) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Player.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; + return 1; + } else { + ItemDefinition var6; + if (var0 == ScriptOpcodes.OC_CERT) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + var6 = Player.ItemDefinition_get(var3); + if (var6.noteTemplate == -1 && var6.note >= 0) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var6.note; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_UNCERT) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + var6 = Player.ItemDefinition_get(var3); + if (var6.noteTemplate >= 0 && var6.note >= 0) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var6.note; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_MEMBERS) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Player.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + var6 = Player.ItemDefinition_get(var3); + if (var6.placeholderTemplate == -1 && var6.placeholder >= 0) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var6.placeholder; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + var6 = Player.ItemDefinition_get(var3); + if (var6.placeholderTemplate >= 0 && var6.placeholder >= 0) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var6.placeholder; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_FIND) { + String var7 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + KeyHandler.findItemDefinitions(var7, var4 == 1); + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = GrandExchangeOfferNameComparator.foundItemIdCount; + return 1; + } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { + if (var0 == ScriptOpcodes.OC_FINDRESET) { + ArchiveLoader.foundItemIndex = 0; + return 1; + } else { + return 2; + } + } else { + if (BoundaryObject.foundItemIds != null && ArchiveLoader.foundItemIndex < GrandExchangeOfferNameComparator.foundItemIdCount) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = BoundaryObject.foundItemIds[++ArchiveLoader.foundItemIndex - 1] & '\uffff'; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1; + } + + return 1; + } + } + } + } } diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java index 2ed16bd80b..3f6a9de70e 100644 --- a/runescape-client/src/main/java/MusicPatchPcmStream.java +++ b/runescape-client/src/main/java/MusicPatchPcmStream.java @@ -1,30 +1,34 @@ -import java.util.Date; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gh") +@ObfuscatedName("gd") @Implements("MusicPatchPcmStream") public class MusicPatchPcmStream extends PcmStream { - @ObfuscatedName("ak") - @ObfuscatedSignature( - signature = "Llh;" + @ObfuscatedName("gl") + @Export("regionLandArchives") + static byte[][] regionLandArchives; + @ObfuscatedName("ix") + @ObfuscatedGetter( + intValue = 221806607 ) - static Bounds field2466; - @ObfuscatedName("s") + @Export("selectedItemWidget") + static int selectedItemWidget; + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lgp;" + signature = "Lgt;" ) @Export("superStream") MidiPcmStream superStream; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Ljc;" + signature = "Ljv;" ) @Export("queue") NodeDeque queue; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "Lcq;" ) @@ -32,7 +36,7 @@ public class MusicPatchPcmStream extends PcmStream { PcmStreamMixer mixer; @ObfuscatedSignature( - signature = "(Lgp;)V" + signature = "(Lgt;)V" ) MusicPatchPcmStream(MidiPcmStream var1) { this.queue = new NodeDeque(); @@ -40,48 +44,48 @@ public class MusicPatchPcmStream extends PcmStream { this.superStream = var1; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lgd;[IIIII)V", - garbageValue = "-1894415083" + signature = "(Lgs;[IIIII)V", + garbageValue = "-1588228900" ) - void method3846(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { - if ((this.superStream.field2414[var1.field2437] & 4) != 0 && var1.field2433 < 0) { - int var6 = this.superStream.field2415[var1.field2437] / PcmPlayer.PcmPlayer_sampleRate; + void method3884(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { + if ((this.superStream.field2395[var1.field2431] & 4) != 0 && var1.field2425 < 0) { + int var6 = this.superStream.field2400[var1.field2431] / GrandExchangeOfferWorldComparator.PcmPlayer_sampleRate; while (true) { - int var7 = (var6 + 1048575 - var1.field2439) / var6; + int var7 = (var6 + 1048575 - var1.field2422) / var6; if (var7 > var4) { - var1.field2439 += var6 * var4; + var1.field2422 += var6 * var4; break; } var1.stream.fill(var2, var3, var7); var3 += var7; var4 -= var7; - var1.field2439 += var7 * var6 - 1048576; - int var8 = PcmPlayer.PcmPlayer_sampleRate / 100; + var1.field2422 += var6 * var7 - 1048576; + int var8 = GrandExchangeOfferWorldComparator.PcmPlayer_sampleRate / 100; int var9 = 262144 / var6; if (var9 < var8) { var8 = var9; } RawPcmStream var10 = var1.stream; - if (this.superStream.field2389[var1.field2437] == 0) { - var1.stream = RawPcmStream.method2460(var1.rawSound, var10.method2603(), var10.method2455(), var10.method2467()); + if (this.superStream.field2398[var1.field2431] == 0) { + var1.stream = RawPcmStream.method2511(var1.rawSound, var10.method2604(), var10.method2517(), var10.method2518()); } else { - var1.stream = RawPcmStream.method2460(var1.rawSound, var10.method2603(), 0, var10.method2467()); - this.superStream.method3731(var1, var1.patch.field2457[var1.field2424] < 0); - var1.stream.method2470(var8, var10.method2455()); + var1.stream = RawPcmStream.method2511(var1.rawSound, var10.method2604(), 0, var10.method2518()); + this.superStream.method3698(var1, var1.patch.field2450[var1.field2413] < 0); + var1.stream.method2522(var8, var10.method2517()); } - if (var1.patch.field2457[var1.field2424] < 0) { + if (var1.patch.field2450[var1.field2413] < 0) { var1.stream.setNumLoops(-1); } - var10.method2473(var8); + var10.method2541(var8); var10.fill(var2, var3, var5 - var3); - if (var10.method2457()) { + if (var10.method2606()) { this.mixer.addSubStream(var10); } } @@ -90,38 +94,38 @@ public class MusicPatchPcmStream extends PcmStream { var1.stream.fill(var2, var3, var4); } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lgd;II)V", - garbageValue = "1679066242" + signature = "(Lgs;IS)V", + garbageValue = "-4402" ) - void method3837(MusicPatchNode var1, int var2) { - if ((this.superStream.field2414[var1.field2437] & 4) != 0 && var1.field2433 < 0) { - int var3 = this.superStream.field2415[var1.field2437] / PcmPlayer.PcmPlayer_sampleRate; - int var4 = (var3 + 1048575 - var1.field2439) / var3; - var1.field2439 = var3 * var2 + var1.field2439 & 1048575; + void method3885(MusicPatchNode var1, int var2) { + if ((this.superStream.field2395[var1.field2431] & 4) != 0 && var1.field2425 < 0) { + int var3 = this.superStream.field2400[var1.field2431] / GrandExchangeOfferWorldComparator.PcmPlayer_sampleRate; + int var4 = (var3 + 1048575 - var1.field2422) / var3; + var1.field2422 = var3 * var2 + var1.field2422 & 1048575; if (var4 <= var2) { - if (this.superStream.field2389[var1.field2437] == 0) { - var1.stream = RawPcmStream.method2460(var1.rawSound, var1.stream.method2603(), var1.stream.method2455(), var1.stream.method2467()); + if (this.superStream.field2398[var1.field2431] == 0) { + var1.stream = RawPcmStream.method2511(var1.rawSound, var1.stream.method2604(), var1.stream.method2517(), var1.stream.method2518()); } else { - var1.stream = RawPcmStream.method2460(var1.rawSound, var1.stream.method2603(), 0, var1.stream.method2467()); - this.superStream.method3731(var1, var1.patch.field2457[var1.field2424] < 0); + var1.stream = RawPcmStream.method2511(var1.rawSound, var1.stream.method2604(), 0, var1.stream.method2518()); + this.superStream.method3698(var1, var1.patch.field2450[var1.field2413] < 0); } - if (var1.patch.field2457[var1.field2424] < 0) { + if (var1.patch.field2450[var1.field2413] < 0) { var1.stream.setNumLoops(-1); } - var2 = var1.field2439 / var3; + var2 = var1.field2422 / var3; } } var1.stream.skip(var2); } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "()Ldz;" + signature = "()Ldg;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { @@ -133,9 +137,9 @@ public class MusicPatchPcmStream extends PcmStream { } } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "()Ldz;" + signature = "()Ldg;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { @@ -150,71 +154,689 @@ public class MusicPatchPcmStream extends PcmStream { return var1.stream; } - @ObfuscatedName("q") - protected int vmethod3834() { + @ObfuscatedName("v") + protected int vmethod3881() { return 0; } - @ObfuscatedName("x") + @ObfuscatedName("d") @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.method3680(var6)) { + if (!this.superStream.method3720(var6)) { int var4 = var2; int var5 = var3; do { - if (var5 <= var6.field2438) { - this.method3846(var6, var1, var4, var5, var5 + var4); - var6.field2438 -= var5; + if (var5 <= var6.field2430) { + this.method3884(var6, var1, var4, var5, var5 + var4); + var6.field2430 -= var5; break; } - this.method3846(var6, var1, var4, var6.field2438, var5 + var4); - var4 += var6.field2438; - var5 -= var6.field2438; - } while(!this.superStream.method3665(var6, var1, var4, var5)); - } - } - - } - - @ObfuscatedName("f") - @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.method3680(var3)) { - int var2 = var1; - - do { - if (var2 <= var3.field2438) { - this.method3837(var3, var2); - var3.field2438 -= var2; - break; - } - - this.method3837(var3, var3.field2438); - var2 -= var3.field2438; - } while(!this.superStream.method3665(var3, (int[])null, 0, var2)); + this.method3884(var6, var1, var4, var6.field2430, var4 + var5); + var4 += var6.field2430; + var5 -= var6.field2430; + } while(!this.superStream.method3721(var6, var1, var4, var5)); } } } @ObfuscatedName("s") - public static String method3831(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"; + @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.method3720(var3)) { + int var2 = var1; + + do { + if (var2 <= var3.field2430) { + this.method3885(var3, var2); + var3.field2430 -= var2; + break; + } + + this.method3885(var3, var3.field2430); + var2 -= var3.field2430; + } while(!this.superStream.method3721(var3, (int[])null, 0, var2)); + } + } + + } + + @ObfuscatedName("ik") + @ObfuscatedSignature( + signature = "([Lhy;IIIIIIIII)V", + garbageValue = "-1121461534" + ) + @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 || !NetCache.isComponentHidden(var10)) { + if (var10.contentType > 0) { + class14.method143(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) { + SoundCache.field1410 = var0; + WorldMapSection0.field138 = var6; + GrandExchangeOfferNameComparator.field79 = var7; + continue; + } + + if (Client.isDraggingWidget && Client.field800) { + var15 = MouseHandler.MouseHandler_x; + var16 = MouseHandler.MouseHandler_y; + var15 -= Client.widgetClickX; + var16 -= Client.widgetClickY; + if (var15 < Client.field801) { + var15 = Client.field801; + } + + if (var15 + var10.width > Client.field801 + Client.clickedWidgetParent.width) { + var15 = Client.field801 + Client.clickedWidgetParent.width - var10.width; + } + + if (var16 < Client.field706) { + var16 = Client.field706; + } + + if (var16 + var10.height > Client.field706 + Client.clickedWidgetParent.height) { + var16 = Client.field706 + 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; + class197.fontPlain12.drawRightAligned("Fps:" + GameShell.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; + } + + class197.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); + var13 += 15; + } + continue; + } + + if (var10.contentType == 1337) { + Client.viewportX = var12; + Client.viewportY = var13; + ScriptEvent.drawEntities(var12, var13, var10.width, var10.height); + Client.field827[var10.rootIndex] = true; + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + continue; + } + + if (var10.contentType == 1338) { + class65.drawMinimap(var10, var12, var13, var11); + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + continue; + } + + if (var10.contentType == 1339) { + ScriptEvent.drawCompass(var10, var12, var13, var11); + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + continue; + } + + if (var10.contentType == 1400) { + GrandExchangeOfferUnitPriceComparator.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); + } + + if (var10.contentType == 1401) { + GrandExchangeOfferUnitPriceComparator.worldMap.drawOverview(var12, var13, var10.width, var10.height); + } + + if (var10.contentType == 1402) { + UserComparator5.loginScreenRunesAnimation.draw(var12, Client.cycle); + } + } + + if (var10.type == 0) { + if (!var10.isIf3 && NetCache.isComponentHidden(var10) && var10 != class32.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) { + AbstractWorldMapIcon.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); + } + + if (Client.isResizable || Client.field647[var11] || Client.gameDrawingMode > 1) { + if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { + ServerPacket.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) { + Sprite var45 = var10.getInventorySprite(var19); + if (var45 != null) { + var45.drawTransBgAt(var22, var23); + } else if (Widget.field2668) { + WorldMapID.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 == class4.dragInventoryWidget && var19 == Client.dragItemSlotSource) { + Sprite var27; + if (Client.isItemSelected == 1 && var19 == ModelData0.selectedItemSlot && var10.id == selectedItemWidget) { + var27 = Player.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false); + } else { + var27 = Player.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); + } + + if (var27 != null) { + if (var10 == class4.dragInventoryWidget && var19 == Client.dragItemSlotSource) { + var24 = MouseHandler.MouseHandler_x - Client.field730; + var25 = MouseHandler.MouseHandler_y - Client.field870; + if (var24 < 5 && var24 > -5) { + var24 = 0; + } + + if (var25 < 5 && var25 > -5) { + var25 = 0; + } + + if (Client.itemDragDuration < 5) { + var24 = 0; + var25 = 0; + } + + var27.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.field683 / 3; + if (var29 > Client.field683 * 10) { + var29 = Client.field683 * 10; + } + + if (var29 > var28.scrollY) { + var29 = var28.scrollY; + } + + var28.scrollY -= var29; + Client.field870 += var29; + WorldMapID.invalidateWidget(var28); + } + + if (var23 + var25 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { + var29 = (var25 + var23 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field683 / 3; + if (var29 > Client.field683 * 10) { + var29 = Client.field683 * 10; + } + + if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { + var29 = var28.scrollHeight - var28.height - var28.scrollY; + } + + var28.scrollY += var29; + Client.field870 -= var29; + WorldMapID.invalidateWidget(var28); + } + } + } else if (var10 == Entity.field1835 && var19 == Client.field728) { + var27.drawTransAt(var22, var23, 128); + } else { + var27.drawTransBgAt(var22, var23); + } + } else { + WorldMapID.invalidateWidget(var10); + } + } + } + + ++var19; + } + } + } else if (var10.type == 3) { + if (Tile.runCs1(var10)) { + var19 = var10.color2; + if (var10 == class32.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { + var19 = var10.mouseOverColor2; + } + } else { + var19 = var10.color; + if (var10 == class32.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { + var19 = var10.mouseOverColor; + } + } + + if (var10.fill) { + switch(var10.fillMode.value) { + 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.field2668) { + WorldMapID.invalidateWidget(var10); + } + } else { + String var44 = var10.text; + if (Tile.runCs1(var10)) { + var20 = var10.color2; + if (var10 == class32.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { + var20 = var10.mouseOverColor2; + } + + if (var10.text2.length() > 0) { + var44 = var10.text2; + } + } else { + var20 = var10.color; + if (var10 == class32.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { + var20 = var10.mouseOverColor; + } + } + + if (var10.isIf3 && var10.itemId != -1) { + ItemDefinition var47 = Player.ItemDefinition_get(var10.itemId); + var44 = var47.name; + if (var44 == null) { + var44 = "null"; + } + + if ((var47.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { + var44 = UserComparator7.colorStartTag(16748608) + var44 + "" + " " + 'x' + FriendSystem.formatItemStacks(var10.itemQuantity); + } + } + + if (var10 == Client.meslayerContinueWidget) { + var44 = "Please wait..."; + var20 = var10.color; + } + + if (!var10.isIf3) { + var44 = WorldMapSection1.method551(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) { + Sprite var40; + if (!var10.isIf3) { + var40 = var10.getSprite(Tile.runCs1(var10)); + if (var40 != null) { + var40.drawTransBgAt(var12, var13); + } else if (Widget.field2668) { + WorldMapID.invalidateWidget(var10); + } + } else { + if (var10.itemId != -1) { + var40 = Player.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); + } else { + var40 = var10.getSprite(false); + } + + if (var40 == null) { + if (Widget.field2668) { + WorldMapID.invalidateWidget(var10); + } + } else { + var20 = var40.width; + var21 = var40.height; + if (!var10.spriteTiling) { + var22 = var10.width * 4096 / var20; + if (var10.spriteAngle != 0) { + var40.method6105(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.method6105(var20 / 2 + var12 + var20 * var24, var21 / 2 + var13 + var21 * var25, var10.spriteAngle, 4096); + } else if (var14 != 0) { + var40.drawTransAt(var12 + var20 * var24, var13 + var21 * var25, 256 - (var14 & 255)); + } else { + var40.drawTransBgAt(var12 + var20 * var24, var13 + var25 * var21); + } + } + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + } + } + } + } else { + ItemDefinition var32; + if (var10.type == 6) { + boolean var36 = Tile.runCs1(var10); + if (var36) { + var20 = var10.sequenceId2; + } else { + var20 = var10.sequenceId; + } + + Model var41 = null; + var22 = 0; + if (var10.itemId != -1) { + var32 = Player.ItemDefinition_get(var10.itemId); + if (var32 != null) { + var32 = var32.getCountObj(var10.itemQuantity); + var41 = var32.getModel(1); + if (var41 != null) { + var41.calculateBoundsCylinder(); + var22 = var41.height / 2; + } else { + WorldMapID.invalidateWidget(var10); + } + } + } else if (var10.modelType == 5) { + if (var10.modelId == 0) { + var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); + } else { + var41 = Varps.localPlayer.getModel(); + } + } else if (var20 == -1) { + var41 = var10.getModel((SequenceDefinition)null, -1, var36, Varps.localPlayer.appearance); + if (var41 == null && Widget.field2668) { + WorldMapID.invalidateWidget(var10); + } + } else { + SequenceDefinition var46 = class83.SequenceDefinition_get(var20); + var41 = var10.getModel(var46, var10.modelFrame, var36, Varps.localPlayer.appearance); + if (var41 == null && Widget.field2668) { + WorldMapID.invalidateWidget(var10); + } + } + + Rasterizer3D.method3033(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.method2854(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); + } else { + var41.calculateBoundsCylinder(); + if (var10.modelOrthog) { + var41.method2921(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); + } else { + var41.method2854(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.field2668) { + WorldMapID.invalidateWidget(var10); + } + continue; + } + + var20 = 0; + + for (var21 = 0; var21 < var10.rawHeight; ++var21) { + for (var22 = 0; var22 < var10.rawWidth; ++var22) { + if (var10.itemIds[var20] > 0) { + var32 = Player.ItemDefinition_get(var10.itemIds[var20] - 1); + String var33; + if (var32.isStackable != 1 && var10.itemQuantities[var20] == 1) { + var33 = UserComparator7.colorStartTag(16748608) + var32.name + ""; + } else { + var33 = UserComparator7.colorStartTag(16748608) + var32.name + "" + " " + 'x' + FriendSystem.formatItemStacks(var10.itemQuantities[var20]); + } + + var25 = var12 + var22 * (var10.paddingX + 115); + var26 = var13 + (var10.paddingY + 12) * var21; + if (var10.textXAlignment == 0) { + var39.draw(var33, var25, var26, var10.color, var10.textShadowed ? 0 : -1); + } else if (var10.textXAlignment == 1) { + var39.drawCentered(var33, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1); + } else { + var39.drawRightAligned(var33, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1); + } + } + + ++var20; + } + } + } + + if (var10.type == 8 && var10 == AbstractWorldMapIcon.field292 && Client.field738 == Client.field773) { + var19 = 0; + var20 = 0; + Font var31 = class197.fontPlain12; + String var34 = var10.text; + + String var43; + for (var34 = WorldMapSection1.method551(var34, var10); var34.length() > 0; var20 = var20 + var31.ascent + 1) { + var24 = var34.indexOf("
"); + if (var24 != -1) { + var43 = var34.substring(0, var24); + var34 = var34.substring(var24 + 4); + } else { + var43 = var34; + var34 = ""; + } + + 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 (var19 + var24 > 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); + var34 = var10.text; + var26 = var25 + var31.ascent + 2; + + for (var34 = WorldMapSection1.method551(var34, var10); var34.length() > 0; var26 = var26 + var31.ascent + 1) { + int var35 = var34.indexOf("
"); + if (var35 != -1) { + var43 = var34.substring(0, var35); + var34 = var34.substring(var35 + 4); + } else { + var43 = var34; + var34 = ""; + } + + var31.draw(var43, var24 + 3, var26, 0, -1); + } + } + + if (var10.type == 9) { + if (var10.field2675) { + 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 { + WorldMapIcon_1.method278(var19, var20, var21, var22, var10.color, var10.lineWid); + } + } + } + } + } + } + } + } + } + } + } + } } diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java index 61b7eed9af..1d5986291d 100644 --- a/runescape-client/src/main/java/MusicTrack.java +++ b/runescape-client/src/main/java/MusicTrack.java @@ -6,18 +6,18 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("gy") @Implements("MusicTrack") public class MusicTrack extends Node { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "Llm;" ) @Export("table") NodeHashTable table; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("midi") byte[] midi; @ObfuscatedSignature( - signature = "(Lky;)V" + signature = "(Lkz;)V" ) MusicTrack(Buffer var1) { var1.offset = var1.array.length - 3; @@ -196,7 +196,7 @@ public class MusicTrack extends Node { int[] var59 = new int[128]; var28 = 0; - label224: + label230: for (int var60 = 0; var60 < var2; ++var60) { var51.writeInt(1297379947); var51.offset += 4; @@ -218,7 +218,7 @@ public class MusicTrack extends Node { var51.writeByte(47); var51.writeByte(0); var51.writeLengthInt(var51.offset - var61); - continue label224; + continue label230; } if (var64 == 23) { @@ -335,8 +335,8 @@ public class MusicTrack extends Node { } - @ObfuscatedName("j") - void method3853() { + @ObfuscatedName("x") + void method3902() { if (this.table == null) { this.table = new NodeHashTable(16); int[] var1 = new int[16]; @@ -353,7 +353,7 @@ public class MusicTrack extends Node { var4.markTrackPosition(var6); } - label52: + label53: do { while (true) { var6 = var4.getPrioritizedTrack(); @@ -365,7 +365,7 @@ public class MusicTrack extends Node { if (var8 == 1) { var4.setTrackDone(); var4.markTrackPosition(var6); - continue label52; + continue label53; } int var9 = var8 & 240; @@ -416,13 +416,13 @@ public class MusicTrack extends Node { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("clear") void clear() { this.table = null; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(Lhz;II)Lgy;" ) diff --git a/runescape-client/src/main/java/NPC.java b/runescape-client/src/main/java/NPC.java index 64b56c43e6..0cf3d44d84 100644 --- a/runescape-client/src/main/java/NPC.java +++ b/runescape-client/src/main/java/NPC.java @@ -1,16 +1,14 @@ -import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ci") +@ObfuscatedName("ct") @Implements("NPC") public final class NPC extends Actor { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lii;" + signature = "Lia;" ) @Export("definition") NPCDefinition definition; @@ -18,12 +16,12 @@ public final class NPC extends Actor { NPC() { } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IBB)V", - garbageValue = "24" + signature = "(IBI)V", + garbageValue = "-267690393" ) - final void method1961(int var1, byte var2) { + final void method2010(int var1, byte var2) { int var3 = super.pathX[0]; int var4 = super.pathY[0]; if (var1 == 0) { @@ -62,7 +60,7 @@ public final class NPC extends Actor { --var4; } - if (super.sequence != -1 && Widget.SequenceDefinition_get(super.sequence).field3505 == 1) { + if (super.sequence != -1 && class83.SequenceDefinition_get(super.sequence).field3501 == 1) { super.sequence = -1; } @@ -81,13 +79,13 @@ public final class NPC extends Actor { super.pathTraversed[0] = var2; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IIZI)V", - garbageValue = "-1744737453" + signature = "(IIZB)V", + garbageValue = "14" ) - final void method1970(int var1, int var2, boolean var3) { - if (super.sequence != -1 && Widget.SequenceDefinition_get(super.sequence).field3505 == 1) { + final void method2011(int var1, int var2, boolean var3) { + if (super.sequence != -1 && class83.SequenceDefinition_get(super.sequence).field3501 == 1) { super.sequence = -1; } @@ -113,26 +111,26 @@ public final class NPC extends Actor { } super.pathLength = 0; - super.field947 = 0; - super.field976 = 0; + super.field969 = 0; + super.field975 = 0; super.pathX[0] = var1; super.pathY[0] = var2; - super.x = super.size * -178253824 + super.pathX[0] * 128; - super.y = super.pathY[0] * 128 + super.size * -178253824; + super.x = super.size * -294686528 + super.pathX[0] * -589373056; + super.y = super.size * 64 + super.pathY[0] * 128; } - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)Ldo;", - garbageValue = "-419920513" + signature = "(B)Ldr;", + garbageValue = "-35" ) @Export("getModel") protected final Model getModel() { if (this.definition == null) { return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? Widget.SequenceDefinition_get(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence != -1 && (super.movementSequence != super.readySequence || var1 == null) ? Widget.SequenceDefinition_get(super.movementSequence) : null; + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? class83.SequenceDefinition_get(super.sequence) : null; + SequenceDefinition var2 = super.movementSequence != -1 && (super.movementSequence != super.readySequence || var1 == null) ? class83.SequenceDefinition_get(super.movementSequence) : null; Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); if (var3 == null) { return null; @@ -140,7 +138,7 @@ public final class NPC extends Actor { var3.calculateBoundsCylinder(); super.defaultHeight = var3.height; if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { - Model var4 = HealthBarUpdate.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); + Model var4 = NetCache.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); if (var4 != null) { var4.offsetBy(0, -super.heightOffset, 0); Model[] var5 = new Model[]{var3, var4}; @@ -157,208 +155,48 @@ public final class NPC extends Actor { } } - @ObfuscatedName("r") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(B)Z", - garbageValue = "-110" + garbageValue = "93" ) @Export("isVisible") final boolean isVisible() { return this.definition != null; } - @ObfuscatedName("j") + @ObfuscatedName("gv") @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "-352307564" + signature = "(IIIB)V", + garbageValue = "116" ) - public static void method1977(boolean var0) { - if (NetCache.NetCache_socket != null) { - try { - Buffer var1 = new Buffer(4); - var1.writeByte(var0 ? 2 : 3); - var1.writeMedium(0); - NetCache.NetCache_socket.write(var1.array, 0, 4); - } catch (IOException var4) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var3) { - } - - ++NetCache.NetCache_ioExceptions; - NetCache.NetCache_socket = null; - } - - } - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "106013450" - ) - static final void method1976(String var0) { - StringBuilder var10000 = (new StringBuilder()).append(var0); - Object var10001 = null; - String var1 = var10000.append(" is already on your friend list").toString(); - DirectByteArrayCopier.addGameMessage(30, "", var1); - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(ILcr;ZI)I", - garbageValue = "594681676" - ) - static int method1968(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var3 = WorldMapElement.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - } else { - var3 = var2 ? class286.field3623 : class297.field3693; - } - - 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[--Interpreter.Interpreter_intStackSize]; - if (var6 > 0) { - for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]) { - } - } - - var4 = var4.substring(0, var4.length() - 1); - } - - Object[] var8 = new Object[var4.length() + 1]; - - int var7; - for (var7 = var8.length - 1; var7 >= 1; --var7) { - if (var4.charAt(var7 - 1) == 's') { - var8[var7] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; + @Export("worldToScreen") + static final void worldToScreen(int var0, int var1, int var2) { + if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { + int var3 = WorldMapAreaData.getTileHeight(var0, var1, MouseRecorder.plane) - var2; + var0 -= ScriptFrame.cameraX; + var3 -= GrandExchangeOfferTotalQuantityComparator.cameraY; + var1 -= class14.cameraZ; + int var4 = Rasterizer3D.Rasterizer3D_sine[class319.cameraPitch]; + int var5 = Rasterizer3D.Rasterizer3D_cosine[class319.cameraPitch]; + int var6 = Rasterizer3D.Rasterizer3D_sine[Tile.cameraYaw]; + int var7 = Rasterizer3D.Rasterizer3D_cosine[Tile.cameraYaw]; + int var8 = var6 * var1 + var0 * var7 >> 16; + var1 = var7 * var1 - var0 * var6 >> 16; + var0 = var8; + var8 = var3 * var5 - var4 * var1 >> 16; + var1 = var5 * var1 + var4 * var3 >> 16; + if (var1 >= 50) { + Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; + Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2; } else { - var8[var7] = new Integer(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + Client.viewportTempX = -1; + Client.viewportTempY = -1; } - } - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var7 != -1) { - var8[0] = new Integer(var7); } else { - var8 = null; + Client.viewportTempX = -1; + Client.viewportTempY = -1; } - - 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.field2663 = var8; - } else { - if (var0 != ScriptOpcodes.CC_SETONRESIZE) { - return 2; - } - - var3.onResize = var8; - } - - var3.hasListener = true; - return 1; - } - - @ObfuscatedName("jl") - @ObfuscatedSignature( - signature = "(IIII)Lbq;", - garbageValue = "-1663571720" - ) - static final InterfaceParent method1967(int var0, int var1, int var2) { - InterfaceParent var3 = new InterfaceParent(); - var3.group = var1; - var3.type = var2; - Client.interfaceParents.put(var3, (long)var0); - WorldMapSectionType.Widget_resetModelFrames(var1); - Widget var4 = WorldMapElement.getWidget(var0); - FriendSystem.invalidateWidget(var4); - if (Client.meslayerContinueWidget != null) { - FriendSystem.invalidateWidget(Client.meslayerContinueWidget); - Client.meslayerContinueWidget = null; - } - - for (int var5 = 0; var5 < Client.menuOptionsCount; ++var5) { - if (PendingSpawn.isWidgetMenuOpcode(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; - } - } - - GrandExchangeOfferNameComparator.calculateMenuBounds(); - WorldMapAreaData.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var0 >> 16], var4, false); - class51.runWidgetOnLoadListener(var1); - if (Client.rootInterface != -1) { - UserComparator6.runIntfCloseListeners(Client.rootInterface, 1); - } - - return var3; } } diff --git a/runescape-client/src/main/java/NPCDefinition.java b/runescape-client/src/main/java/NPCDefinition.java index 7e1d1e667c..eee7638180 100644 --- a/runescape-client/src/main/java/NPCDefinition.java +++ b/runescape-client/src/main/java/NPCDefinition.java @@ -4,185 +4,185 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ii") +@ObfuscatedName("ia") @Implements("NPCDefinition") public class NPCDefinition extends DualNode { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "Lhz;" ) @Export("NpcDefinition_archive") static AbstractArchive NpcDefinition_archive; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "Lhz;" ) @Export("NpcDefinition_modelArchive") static AbstractArchive NpcDefinition_modelArchive; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("NpcDefinition_cached") - static EvictingDualNodeHashTable NpcDefinition_cached; - @ObfuscatedName("k") + public static EvictingDualNodeHashTable NpcDefinition_cached; + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("NpcDefinition_cachedModels") - static EvictingDualNodeHashTable NpcDefinition_cachedModels; - @ObfuscatedName("u") + public static EvictingDualNodeHashTable NpcDefinition_cachedModels; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 909788379 + intValue = 1179562569 ) @Export("id") public int id; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("name") public String name; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 2025988457 + intValue = 1130309811 ) @Export("size") public int size; - @ObfuscatedName("q") + @ObfuscatedName("v") @Export("models") int[] models; - @ObfuscatedName("x") - int[] field3448; @ObfuscatedName("d") + int[] field3442; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 993852285 + intValue = 1926244731 ) @Export("readySequence") public int readySequence; - @ObfuscatedName("f") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -141085445 + intValue = 1860203865 ) @Export("turnLeftSequence") public int turnLeftSequence; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1332043893 + intValue = 1645839893 ) @Export("turnRightSequence") public int turnRightSequence; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 827227809 + intValue = -1654352409 ) @Export("walkSequence") public int walkSequence; - @ObfuscatedName("y") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -367253213 + intValue = -481831155 ) @Export("walkBackSequence") public int walkBackSequence; @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -183779609 + intValue = 1281358171 ) @Export("walkLeftSequence") public int walkLeftSequence; - @ObfuscatedName("b") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 340140115 + intValue = 635151657 ) @Export("walkRightSequence") public int walkRightSequence; - @ObfuscatedName("g") + @ObfuscatedName("i") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("e") + @ObfuscatedName("q") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("z") + @ObfuscatedName("y") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("a") + @ObfuscatedName("r") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("w") + @ObfuscatedName("k") @Export("actions") public String[] actions; - @ObfuscatedName("l") + @ObfuscatedName("w") @Export("drawMapDot") public boolean drawMapDot; - @ObfuscatedName("h") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 242918317 + intValue = 1016212355 ) @Export("combatLevel") public int combatLevel; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1595385295 + intValue = 1692227669 ) @Export("widthScale") int widthScale; - @ObfuscatedName("m") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1524499683 + intValue = -865473463 ) @Export("heightScale") int heightScale; - @ObfuscatedName("o") + @ObfuscatedName("b") @Export("isVisible") public boolean isVisible; - @ObfuscatedName("av") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 2030927353 + intValue = 1170326303 ) @Export("ambient") int ambient; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 332932319 + intValue = 1272255561 ) @Export("contrast") int contrast; - @ObfuscatedName("ai") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -2075013729 + intValue = -559174833 ) @Export("headIconPrayer") public int headIconPrayer; - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 429117763 + intValue = -1537984033 ) @Export("rotation") public int rotation; - @ObfuscatedName("az") + @ObfuscatedName("an") @Export("transforms") public int[] transforms; - @ObfuscatedName("aj") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 1155103799 + intValue = -1455750217 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("an") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 494584381 + intValue = -1354222713 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("at") + @ObfuscatedName("ad") @Export("isInteractable") public boolean isInteractable; - @ObfuscatedName("as") + @ObfuscatedName("ap") @Export("isClickable") public boolean isClickable; - @ObfuscatedName("ak") + @ObfuscatedName("ax") @Export("isFollower") public boolean isFollower; - @ObfuscatedName("ao") + @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "Lln;" + signature = "Llj;" ) @Export("params") IterableNodeHashTable params; @@ -219,19 +219,19 @@ public class NPCDefinition extends DualNode { this.isFollower = false; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-111" + signature = "(I)V", + garbageValue = "-772276819" ) @Export("postDecode") void postDecode() { } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lky;B)V", - garbageValue = "-127" + signature = "(Lkz;S)V", + garbageValue = "510" ) @Export("decode") void decode(Buffer var1) { @@ -245,10 +245,10 @@ public class NPCDefinition extends DualNode { } } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(Lky;II)V", - garbageValue = "-760565224" + signature = "(Lkz;IB)V", + garbageValue = "18" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -303,10 +303,10 @@ public class NPCDefinition extends DualNode { } } else if (var2 == 60) { var3 = var1.readUnsignedByte(); - this.field3448 = new int[var3]; + this.field3442 = new int[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.field3448[var4] = var1.readUnsignedShort(); + this.field3442[var4] = var1.readUnsignedShort(); } } else if (var2 == 93) { this.drawMapDot = false; @@ -334,7 +334,7 @@ public class NPCDefinition extends DualNode { } else if (var2 == 111) { this.isFollower = true; } else if (var2 == 249) { - this.params = DynamicObject.readStringIntParameters(var1, this.params); + this.params = FloorOverlayDefinition.readStringIntParameters(var1, this.params); } } else { this.transformVarbit = var1.readUnsignedShort(); @@ -370,10 +370,10 @@ public class NPCDefinition extends DualNode { } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Lij;ILij;II)Ldo;", - garbageValue = "1604729882" + signature = "(Liw;ILiw;II)Ldr;", + garbageValue = "-248037111" ) @Export("getModel") public final Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { @@ -444,23 +444,23 @@ public class NPCDefinition extends DualNode { } } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)Ldq;", - garbageValue = "-542363103" + signature = "(S)Lds;", + garbageValue = "25216" ) @Export("getModelData") public final ModelData getModelData() { if (this.transforms != null) { NPCDefinition var1 = this.transform(); return var1 == null ? null : var1.getModelData(); - } else if (this.field3448 == null) { + } else if (this.field3442 == null) { return null; } else { boolean var5 = false; - for (int var2 = 0; var2 < this.field3448.length; ++var2) { - if (!NpcDefinition_modelArchive.tryLoadFile(this.field3448[var2], 0)) { + for (int var2 = 0; var2 < this.field3442.length; ++var2) { + if (!NpcDefinition_modelArchive.tryLoadFile(this.field3442[var2], 0)) { var5 = true; } } @@ -468,10 +468,10 @@ public class NPCDefinition extends DualNode { if (var5) { return null; } else { - ModelData[] var6 = new ModelData[this.field3448.length]; + ModelData[] var6 = new ModelData[this.field3442.length]; - for (int var3 = 0; var3 < this.field3448.length; ++var3) { - var6[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field3448[var3], 0); + for (int var3 = 0; var3 < this.field3442.length; ++var3) { + var6[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field3442[var3], 0); } ModelData var7; @@ -499,16 +499,16 @@ public class NPCDefinition extends DualNode { } } - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(B)Lii;", - garbageValue = "6" + signature = "(I)Lia;", + garbageValue = "816548420" ) @Export("transform") public final NPCDefinition transform() { int var1 = -1; if (this.transformVarbit != -1) { - var1 = class208.getVarbit(this.transformVarbit); + var1 = WorldMapCacheName.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -520,13 +520,13 @@ public class NPCDefinition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? ViewportMouse.getNpcDefinition(var2) : null; + return var2 != -1 ? FontName.getNpcDefinition(var2) : null; } - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(S)Z", - garbageValue = "-10586" + signature = "(I)Z", + garbageValue = "-1304116843" ) @Export("transformIsVisible") public boolean transformIsVisible() { @@ -535,7 +535,7 @@ public class NPCDefinition extends DualNode { } else { int var1 = -1; if (this.transformVarbit != -1) { - var1 = class208.getVarbit(this.transformVarbit); + var1 = WorldMapCacheName.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -548,36 +548,55 @@ public class NPCDefinition extends DualNode { } } - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "-2056976913" + signature = "(IIB)I", + garbageValue = "1" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { + return class65.method1177(this.params, var1, var2); + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "(ILjava/lang/String;B)Ljava/lang/String;", + garbageValue = "88" + ) + @Export("getStringParam") + public String getStringParam(int var1, String var2) { IterableNodeHashTable var4 = this.params; - int var3; + String var3; if (var4 == null) { var3 = var2; } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); + ObjectNode var5 = (ObjectNode)var4.get((long)var1); if (var5 == null) { var3 = var2; } else { - var3 = var5.integer; + var3 = (String)var5.obj; } } return var3; } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(ILjava/lang/String;B)Ljava/lang/String;", - garbageValue = "-42" + signature = "(Lhz;Lhz;B)V", + garbageValue = "0" ) - @Export("getStringParam") - public String getStringParam(int var1, String var2) { - return class227.method4041(this.params, var1, var2); + public static void method4749(AbstractArchive var0, AbstractArchive var1) { + HealthBarDefinition.HealthBarDefinition_archive = var0; + HealthBarDefinition.HitSplatDefinition_spritesArchive = var1; + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(II)Z", + garbageValue = "-265097719" + ) + public static boolean method4750(int var0) { + return var0 >= WorldMapDecorationType.field2704.id && var0 <= WorldMapDecorationType.field2697.id || var0 == WorldMapDecorationType.field2698.id; } } diff --git a/runescape-client/src/main/java/NanoClock.java b/runescape-client/src/main/java/NanoClock.java index 5349641b0c..f5cd5bd3a0 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("fy") +@ObfuscatedName("fz") @Implements("NanoClock") public class NanoClock extends Clock { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedGetter( - longValue = -485242875267144609L + longValue = -2766745709479662017L ) @Export("lastTimeNano") long lastTimeNano; @@ -18,30 +18,30 @@ public class NanoClock extends Clock { this.lastTimeNano = System.nanoTime(); } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-779324795" + garbageValue = "-250719361" ) @Export("mark") public void mark() { this.lastTimeNano = System.nanoTime(); } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(III)I", - garbageValue = "930751718" + garbageValue = "1652957447" ) @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; } - UserList.sleepMillis(var5 / 1000000L); + FriendsList.sleepMillis(var5 / 1000000L); long var7 = System.nanoTime(); int var9; diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java index 84ab1865f0..b0fbcf1ed7 100644 --- a/runescape-client/src/main/java/NetCache.java +++ b/runescape-client/src/main/java/NetCache.java @@ -5,131 +5,122 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iy") +@ObfuscatedName("in") @Implements("NetCache") public class NetCache { - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -824273879 - ) - @Export("NetCache_loadTime") - static int NetCache_loadTime; - @ObfuscatedName("j") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lkg;" + signature = "Lks;" ) @Export("NetCache_socket") public static AbstractSocket NetCache_socket; - @ObfuscatedName("i") + @ObfuscatedName("x") @ObfuscatedGetter( - longValue = -8280419898275786329L + intValue = 1834591969 ) - static long field3145; - @ObfuscatedName("k") + @Export("NetCache_loadTime") + public static int NetCache_loadTime; + @ObfuscatedName("t") + @ObfuscatedGetter( + longValue = -4753750507167035977L + ) + public static long field3145; + @ObfuscatedName("g") @ObfuscatedSignature( signature = "Llm;" ) @Export("NetCache_pendingPriorityWrites") - static NodeHashTable NetCache_pendingPriorityWrites; - @ObfuscatedName("u") + public static NodeHashTable NetCache_pendingPriorityWrites; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -971608393 + intValue = -433484907 ) @Export("NetCache_pendingPriorityWritesCount") - static int NetCache_pendingPriorityWritesCount; - @ObfuscatedName("n") + public static int NetCache_pendingPriorityWritesCount; + @ObfuscatedName("u") @ObfuscatedSignature( signature = "Llm;" ) @Export("NetCache_pendingPriorityResponses") - static NodeHashTable NetCache_pendingPriorityResponses; - @ObfuscatedName("t") + public static NodeHashTable NetCache_pendingPriorityResponses; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1662423267 + intValue = 1725604983 ) @Export("NetCache_pendingPriorityResponsesCount") - static int NetCache_pendingPriorityResponsesCount; - @ObfuscatedName("q") + public static int NetCache_pendingPriorityResponsesCount; + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lih;" + signature = "Lig;" ) @Export("NetCache_pendingWritesQueue") - static DualNodeDeque NetCache_pendingWritesQueue; - @ObfuscatedName("x") + public static DualNodeDeque NetCache_pendingWritesQueue; + @ObfuscatedName("d") @ObfuscatedSignature( signature = "Llm;" ) @Export("NetCache_pendingWrites") - static NodeHashTable NetCache_pendingWrites; - @ObfuscatedName("d") + public static NodeHashTable NetCache_pendingWrites; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1308098009 + intValue = 379281979 ) @Export("NetCache_pendingWritesCount") - static int NetCache_pendingWritesCount; - @ObfuscatedName("f") + public static int NetCache_pendingWritesCount; + @ObfuscatedName("n") @ObfuscatedSignature( signature = "Llm;" ) @Export("NetCache_pendingResponses") - static NodeHashTable NetCache_pendingResponses; - @ObfuscatedName("c") + public static NodeHashTable NetCache_pendingResponses; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1727306885 + intValue = 2084128285 ) @Export("NetCache_pendingResponsesCount") - static int NetCache_pendingResponsesCount; - @ObfuscatedName("y") + public static int NetCache_pendingResponsesCount; + @ObfuscatedName("f") + static boolean field3156; + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lhl;" + signature = "Lhg;" ) @Export("NetCache_currentResponse") - static NetFileRequest NetCache_currentResponse; + public static NetFileRequest NetCache_currentResponse; @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lky;" + signature = "Lkz;" ) @Export("NetCache_responseHeaderBuffer") - static Buffer NetCache_responseHeaderBuffer; - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Lky;" - ) - @Export("NetCache_responseArchiveBuffer") - static Buffer NetCache_responseArchiveBuffer; - @ObfuscatedName("g") + public static Buffer NetCache_responseHeaderBuffer; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 788483417 + intValue = 1063353551 ) - static int field3156; - @ObfuscatedName("z") + public static int field3154; + @ObfuscatedName("y") @Export("NetCache_crc") static CRC32 NetCache_crc; - @ObfuscatedName("w") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "[Lid;" + signature = "[Lio;" ) @Export("NetCache_archives") static Archive[] NetCache_archives; - @ObfuscatedName("l") - static byte field3159; - @ObfuscatedName("h") + @ObfuscatedName("w") + public static byte field3158; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 2084935355 + intValue = -660950913 ) @Export("NetCache_crcMismatches") public static int NetCache_crcMismatches; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -117498157 + intValue = -1715585873 ) @Export("NetCache_ioExceptions") public static int NetCache_ioExceptions; - @ObfuscatedName("lr") - @ObfuscatedGetter( - intValue = 1642839291 - ) - static int field3162; static { NetCache_loadTime = 0; @@ -143,43 +134,44 @@ public class NetCache { NetCache_pendingResponses = new NodeHashTable(4096); NetCache_pendingResponsesCount = 0; NetCache_responseHeaderBuffer = new Buffer(8); - field3156 = 0; + field3154 = 0; NetCache_crc = new CRC32(); NetCache_archives = new Archive[256]; - field3159 = 0; + field3158 = 0; NetCache_crcMismatches = 0; NetCache_ioExceptions = 0; } - @ObfuscatedName("x") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(CI)Z", - garbageValue = "-1171318227" + signature = "(II)Lim;", + garbageValue = "-202532712" ) - @Export("isDigit") - public static boolean isDigit(char var0) { - return var0 >= '0' && var0 <= '9'; - } - - @ObfuscatedName("iz") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;IIIIZB)V", - garbageValue = "-34" - ) - @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; + @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("kj") + @ObfuscatedSignature( + signature = "(Lhy;B)Z", + garbageValue = "-91" + ) + @Export("isComponentHidden") + static boolean isComponentHidden(Widget var0) { + return var0.isHidden; + } } diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java index f4ebc0fd62..5cca47f57d 100644 --- a/runescape-client/src/main/java/NetFileRequest.java +++ b/runescape-client/src/main/java/NetFileRequest.java @@ -4,34 +4,142 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hl") +@ObfuscatedName("hg") @Implements("NetFileRequest") public class NetFileRequest extends DualNode { - @ObfuscatedName("by") + @ObfuscatedName("q") + static String[] field3096; + @ObfuscatedName("w") + static String field3101; + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "[Llq;" - ) - @Export("worldSelectStars") - static IndexedSprite[] worldSelectStars; - @ObfuscatedName("eh") - @Export("worldHost") - static String worldHost; - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "Lid;" + signature = "Lio;" ) @Export("archive") Archive archive; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 450253051 + intValue = 1552948799 ) @Export("crc") int crc; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("padding") byte padding; NetFileRequest() { } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(II)Liz;", + garbageValue = "1206500813" + ) + @Export("getEnum") + public static EnumDefinition getEnum(int var0) { + EnumDefinition var1 = (EnumDefinition)EnumDefinition.EnumDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = EnumDefinition.EnumDefinition_archive.takeFile(8, var0); + var1 = new EnumDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + EnumDefinition.EnumDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("ir") + @ObfuscatedSignature( + signature = "(Lby;IIIB)V", + garbageValue = "-27" + ) + @Export("addPlayerToMenu") + static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { + if (Varps.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 = Varps.localPlayer.combatLevel; + int var9 = var8 - var7; + String var6; + if (var9 < -9) { + var6 = UserComparator7.colorStartTag(16711680); + } else if (var9 < -6) { + var6 = UserComparator7.colorStartTag(16723968); + } else if (var9 < -3) { + var6 = UserComparator7.colorStartTag(16740352); + } else if (var9 < 0) { + var6 = UserComparator7.colorStartTag(16756736); + } else if (var9 > 9) { + var6 = UserComparator7.colorStartTag(65280); + } else if (var9 > 6) { + var6 = UserComparator7.colorStartTag(4259584); + } else if (var9 > 3) { + var6 = UserComparator7.colorStartTag(8453888); + } else if (var9 > 0) { + var6 = UserComparator7.colorStartTag(12648192); + } else { + var6 = UserComparator7.colorStartTag(16776960); + } + + var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; + } else { + var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; + } + + int var10; + if (Client.isItemSelected == 1) { + FontName.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator7.colorStartTag(16777215) + var4, 14, var1, var2, var3); + } else if (Client.isSpellSelected) { + if ((BuddyRankComparator.selectedSpellFlags & 8) == 8) { + FontName.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator7.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 (Client.playerAttackOption == AttackOption.AttackOption_hidden) { + continue; + } + + if (Client.playerAttackOption == AttackOption.AttackOption_alwaysRightClick || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > Varps.localPlayer.combatLevel) { + var11 = 2000; + } + + if (Varps.localPlayer.team != 0 && var0.team != 0) { + if (var0.team == Varps.localPlayer.team) { + var11 = 2000; + } else { + var11 = 0; + } + } + } else if (Client.playerOptionsPriorities[var10]) { + var11 = 2000; + } + + boolean var12 = false; + var7 = Client.playerMenuOpcodes[var10] + var11; + FontName.insertMenuItemNoShift(Client.playerMenuActions[var10], UserComparator7.colorStartTag(16777215) + var4, var7, var1, var2, var3); + } + } + } + + for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) { + if (Client.menuOpcodes[var10] == 23) { + Client.menuTargets[var10] = UserComparator7.colorStartTag(16777215) + var4; + break; + } + } + + } + } + } } diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index 9972cba618..2ef7ba414a 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -12,63 +12,63 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("fp") @Implements("NetSocket") public final class NetSocket extends AbstractSocket implements Runnable { - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("inputStream") InputStream inputStream; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("outputStream") OutputStream outputStream; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("socket") Socket socket; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("isClosed") boolean isClosed; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Lfu;" + signature = "Lfq;" ) @Export("taskHandler") TaskHandler taskHandler; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lft;" + signature = "Lfc;" ) @Export("task") Task task; - @ObfuscatedName("t") + @ObfuscatedName("j") @Export("outBuffer") byte[] outBuffer; - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -2034750073 + intValue = 507236183 ) @Export("outLength") int outLength; - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 944271121 + intValue = 33510263 ) @Export("outOffset") int outOffset; - @ObfuscatedName("d") + @ObfuscatedName("z") @Export("exceptionWriting") boolean exceptionWriting; - @ObfuscatedName("f") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1855971629 + intValue = -687559731 ) @Export("bufferLength") final int bufferLength; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 234092539 + intValue = 1564055385 ) @Export("maxPacketLength") final int maxPacketLength; @ObfuscatedSignature( - signature = "(Ljava/net/Socket;Lfu;I)V" + signature = "(Ljava/net/Socket;Lfq;I)V" ) public NetSocket(Socket var1, TaskHandler var2, int var3) throws IOException { this.isClosed = false; @@ -87,10 +87,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { this.outputStream = this.socket.getOutputStream(); } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1798752769" + signature = "(B)V", + garbageValue = "-75" ) @Export("close") public void close() { @@ -102,7 +102,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { if (this.task != null) { while (this.task.status == 0) { - UserList.sleepMillis(1L); + FriendsList.sleepMillis(1L); } if (this.task.status == 1) { @@ -117,30 +117,30 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "547465689" + garbageValue = "1827163357" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { return this.isClosed ? 0 : this.inputStream.read(); } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "83" + signature = "(I)I", + garbageValue = "-1354053248" ) @Export("available") public int available() throws IOException { return this.isClosed ? 0 : this.inputStream.available(); } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "156087109" + garbageValue = "-377412375" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { @@ -151,10 +151,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "([BIIB)I", - garbageValue = "100" + signature = "([BIII)I", + garbageValue = "2063129771" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { @@ -176,10 +176,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "([BIII)V", - garbageValue = "-1945962644" + signature = "([BIIB)V", + garbageValue = "-25" ) @Export("write0") void write0(byte[] var1, int var2, int var3) throws IOException { @@ -196,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(); } } @@ -211,10 +211,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "([BIII)V", - garbageValue = "638463675" + signature = "([BIIB)V", + garbageValue = "9" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { @@ -225,7 +225,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { this.close(); } - protected void abt() { + protected void aaj() { this.close(); } @@ -268,7 +268,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { this.outLength = (var1 + this.outLength) % this.bufferLength; try { - if (this.outLength == this.outOffset) { + if (this.outOffset == this.outLength) { this.outputStream.flush(); } } catch (IOException var8) { @@ -296,77 +296,24 @@ public final class NetSocket extends AbstractSocket implements Runnable { break; } } catch (Exception var12) { - class3.RunException_sendStackTrace((String)null, var12); + class188.RunException_sendStackTrace((String)null, var12); } } - protected void abi() { - this.close(); - } - - @ObfuscatedName("ii") + @ObfuscatedName("gh") @ObfuscatedSignature( - signature = "(Lhp;IIZB)V", - garbageValue = "-62" + signature = "(Lby;I)Z", + garbageValue = "1278760398" ) - @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 boolean method3531(Player var0) { + if (Client.drawPlayerNames == 0) { + return false; + } else if (Varps.localPlayer != var0) { + boolean var1 = (Client.drawPlayerNames & 4) != 0; + return var1 || class160.method3419() && var0.isFriend() || Projectile.method2087() && var0.isClanMember(); + } else { + return UrlRequester.method3273(); } - - 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.field2538 * var0.height / var0.field2612; - } - - if (var0.heightAlignment == 4) { - var0.height = var0.width * var0.field2612 / var0.field2538; - } - - if (var0.contentType == 1337) { - Client.viewportWidget = var0; - } - - if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { - ScriptEvent var6 = new ScriptEvent(); - var6.widget = var0; - var6.args = var0.onResize; - Client.scriptEvents.addFirst(var6); - } - - } - - @ObfuscatedName("ln") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "549032388" - ) - static String method3489(String var0) { - PlayerType[] var1 = class191.PlayerType_values(); - - for (int var2 = 0; var2 < var1.length; ++var2) { - PlayerType var3 = var1[var2]; - if (var3.modIcon * 714577229 != -1 && var0.startsWith(AbstractWorldMapData.method278(var3.modIcon * 714577229))) { - var0 = var0.substring(6 + Integer.toString(var3.modIcon * 714577229).length()); - break; - } - } - - return var0; } } diff --git a/runescape-client/src/main/java/Node.java b/runescape-client/src/main/java/Node.java index fbbd43e908..9b022b17d0 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("fb") +@ObfuscatedName("fn") @Implements("Node") public class Node { - @ObfuscatedName("cy") + @ObfuscatedName("cx") @Export("key") public long key; - @ObfuscatedName("cz") + @ObfuscatedName("ci") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lfn;" ) @Export("previous") public Node previous; - @ObfuscatedName("cv") + @ObfuscatedName("cf") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lfn;" ) @Export("next") public Node next; - @ObfuscatedName("fm") + @ObfuscatedName("ft") @Export("remove") public void remove() { if (this.next != null) { @@ -33,7 +33,7 @@ public class Node { } } - @ObfuscatedName("fx") + @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 f43a08df74..466e5d21be 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("jc") +@ObfuscatedName("jv") @Implements("NodeDeque") public class NodeDeque { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lfn;" ) @Export("sentinel") public Node sentinel; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lfn;" ) @Export("current") Node current; @@ -25,7 +25,7 @@ public class NodeDeque { this.sentinel.next = this.sentinel; } - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("clear") public void clear() { while (true) { @@ -39,9 +39,9 @@ public class NodeDeque { } } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lfb;)V" + signature = "(Lfn;)V" ) @Export("addFirst") public void addFirst(Node var1) { @@ -55,9 +55,9 @@ public class NodeDeque { var1.previous.next = var1; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lfb;)V" + signature = "(Lfn;)V" ) @Export("addLast") public void addLast(Node var1) { @@ -71,9 +71,9 @@ public class NodeDeque { var1.previous.next = var1; } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "()Lfb;" + signature = "()Lfn;" ) @Export("removeLast") public Node removeLast() { @@ -86,9 +86,9 @@ public class NodeDeque { } } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "()Lfb;" + signature = "()Lfn;" ) @Export("removeFirst") public Node removeFirst() { @@ -101,9 +101,9 @@ public class NodeDeque { } } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "()Lfb;" + signature = "()Lfn;" ) @Export("last") public Node last() { @@ -117,9 +117,9 @@ public class NodeDeque { } } - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "()Lfb;" + signature = "()Lfn;" ) @Export("first") public Node first() { @@ -133,9 +133,9 @@ public class NodeDeque { } } - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "()Lfb;" + signature = "()Lfn;" ) @Export("previous") public Node previous() { @@ -149,9 +149,9 @@ public class NodeDeque { } } - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "()Lfb;" + signature = "()Lfn;" ) @Export("next") public Node next() { @@ -165,9 +165,9 @@ public class NodeDeque { } } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lfb;Lfb;)V" + signature = "(Lfn;Lfn;)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 ae24a60fcd..2b69ca43b1 100644 --- a/runescape-client/src/main/java/NodeHashTable.java +++ b/runescape-client/src/main/java/NodeHashTable.java @@ -6,28 +6,28 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("lm") @Implements("NodeHashTable") public final class NodeHashTable { - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("size") int size; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "[Lfb;" + signature = "[Lfn;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lfn;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Lfn;" ) @Export("current") Node current; - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("index") int index; @@ -44,9 +44,9 @@ public final class NodeHashTable { } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(J)Lfb;" + signature = "(J)Lfn;" ) @Export("get") public Node get(long var1) { @@ -64,9 +64,9 @@ public final class NodeHashTable { return null; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lfb;J)V" + signature = "(Lfn;J)V" ) @Export("put") public void put(Node var1, long var2) { @@ -82,9 +82,9 @@ public final class NodeHashTable { var1.key = var2; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "()Lfb;" + signature = "()Lfn;" ) @Export("first") public Node first() { @@ -92,9 +92,9 @@ public final class NodeHashTable { return this.next(); } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "()Lfb;" + signature = "()Lfn;" ) @Export("next") public Node next() { diff --git a/runescape-client/src/main/java/ObjectDefinition.java b/runescape-client/src/main/java/ObjectDefinition.java index ed85077340..69a84514dc 100644 --- a/runescape-client/src/main/java/ObjectDefinition.java +++ b/runescape-client/src/main/java/ObjectDefinition.java @@ -4,257 +4,251 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ik") +@ObfuscatedName("iy") @Implements("ObjectDefinition") public class ObjectDefinition extends DualNode { - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("ObjectDefinition_isLowDetail") public static boolean ObjectDefinition_isLowDetail; - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "Lhz;" - ) - @Export("ObjectDefinition_archive") - public static AbstractArchive ObjectDefinition_archive; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "Lhz;" ) @Export("ObjectDefinition_modelsArchive") public static AbstractArchive ObjectDefinition_modelsArchive; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("ObjectDefinition_cached") - static EvictingDualNodeHashTable ObjectDefinition_cached; - @ObfuscatedName("u") + public static EvictingDualNodeHashTable ObjectDefinition_cached; + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("ObjectDefinition_cachedModelData") public static EvictingDualNodeHashTable ObjectDefinition_cachedModelData; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("ObjectDefinition_cachedEntities") - static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; - @ObfuscatedName("t") + public static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("ObjectDefinition_cachedModels") - static EvictingDualNodeHashTable ObjectDefinition_cachedModels; - @ObfuscatedName("q") + public static EvictingDualNodeHashTable ObjectDefinition_cachedModels; + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "[Ldq;" + signature = "[Lds;" ) - static ModelData[] field3364; - @ObfuscatedName("x") + static ModelData[] field3327; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1417245107 + intValue = -545591347 ) @Export("id") public int id; - @ObfuscatedName("d") + @ObfuscatedName("z") @Export("modelIds") int[] modelIds; - @ObfuscatedName("f") + @ObfuscatedName("n") @Export("models") int[] models; - @ObfuscatedName("c") + @ObfuscatedName("h") @Export("name") public String name; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("y") + @ObfuscatedName("s") @Export("recolorTo") short[] recolorTo; @ObfuscatedName("p") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("b") + @ObfuscatedName("e") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 950062565 + intValue = -990983821 ) @Export("sizeX") public int sizeX; - @ObfuscatedName("e") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1522492745 + intValue = 1188301771 ) @Export("sizeY") public int sizeY; - @ObfuscatedName("z") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1421419631 + intValue = -1383285113 ) @Export("interactType") public int interactType; - @ObfuscatedName("a") + @ObfuscatedName("r") @Export("boolean1") public boolean boolean1; - @ObfuscatedName("w") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -302869057 + intValue = -1653553991 ) @Export("int1") public int int1; - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 56177517 + intValue = -1147145001 ) @Export("clipType") int clipType; - @ObfuscatedName("h") + @ObfuscatedName("m") @Export("nonFlatShading") boolean nonFlatShading; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("modelClipped") public boolean modelClipped; - @ObfuscatedName("m") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -796877595 + intValue = 1639970711 ) @Export("animationId") public int animationId; - @ObfuscatedName("o") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1920170119 + intValue = 24923255 ) @Export("int2") public int int2; - @ObfuscatedName("av") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 1091050737 + intValue = -220594225 ) @Export("ambient") int ambient; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 147368649 + intValue = 1695913497 ) @Export("contrast") int contrast; - @ObfuscatedName("ai") + @ObfuscatedName("ao") @Export("actions") public String[] actions; - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 2069147423 + intValue = -472672021 ) @Export("mapIconId") public int mapIconId; - @ObfuscatedName("az") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -1917085051 + intValue = 1963389165 ) @Export("mapSceneId") public int mapSceneId; - @ObfuscatedName("aj") + @ObfuscatedName("al") @Export("isRotated") boolean isRotated; - @ObfuscatedName("an") + @ObfuscatedName("as") @Export("clipped") public boolean clipped; - @ObfuscatedName("at") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 260729967 + intValue = -268077835 ) @Export("modelSizeX") int modelSizeX; - @ObfuscatedName("as") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -1929825155 + intValue = -836159353 ) @Export("modelHeight") int modelHeight; - @ObfuscatedName("ak") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 1921180203 + intValue = -1200492277 ) @Export("modelSizeY") int modelSizeY; - @ObfuscatedName("ao") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -487926215 + intValue = -1725405821 ) @Export("offsetX") int offsetX; - @ObfuscatedName("ac") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 2096022607 + intValue = -21640863 ) @Export("offsetHeight") int offsetHeight; - @ObfuscatedName("ar") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 531318875 + intValue = 1871035727 ) @Export("offsetY") int offsetY; - @ObfuscatedName("au") + @ObfuscatedName("ak") @Export("boolean2") public boolean boolean2; - @ObfuscatedName("ax") + @ObfuscatedName("ay") @Export("isSolid") boolean isSolid; - @ObfuscatedName("ag") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 1688064541 + intValue = -1373058007 ) @Export("int3") public int int3; - @ObfuscatedName("aa") + @ObfuscatedName("ah") @Export("transforms") public int[] transforms; - @ObfuscatedName("ap") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -338512887 + intValue = 373593885 ) @Export("transformVarbit") int transformVarbit; @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 1932503727 + intValue = 204174799 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("ay") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -2074842335 + intValue = -570641919 ) @Export("ambientSoundId") public int ambientSoundId; - @ObfuscatedName("ad") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -595012719 + intValue = 858779645 ) @Export("int4") public int int4; - @ObfuscatedName("al") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -1860442499 + intValue = -515993299 ) @Export("int5") public int int5; - @ObfuscatedName("ah") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = -1597544155 + intValue = 1628227829 ) @Export("int6") public int int6; - @ObfuscatedName("ab") + @ObfuscatedName("am") @Export("soundEffectIds") public int[] soundEffectIds; @ObfuscatedName("aw") @ObfuscatedSignature( - signature = "Lln;" + signature = "Llj;" ) @Export("params") IterableNodeHashTable params; @@ -265,7 +259,7 @@ public class ObjectDefinition extends DualNode { ObjectDefinition_cachedModelData = new EvictingDualNodeHashTable(500); ObjectDefinition_cachedEntities = new EvictingDualNodeHashTable(30); ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30); - field3364 = new ModelData[4]; + field3327 = new ModelData[4]; } ObjectDefinition() { @@ -304,10 +298,10 @@ public class ObjectDefinition extends DualNode { this.int6 = 0; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1177883713" + garbageValue = "496885162" ) @Export("postDecode") void postDecode() { @@ -330,10 +324,10 @@ public class ObjectDefinition extends DualNode { } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lky;I)V", - garbageValue = "1500766173" + signature = "(Lkz;I)V", + garbageValue = "-436591818" ) @Export("decode") void decode(Buffer var1) { @@ -347,10 +341,10 @@ public class ObjectDefinition extends DualNode { } } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lky;IB)V", - garbageValue = "0" + signature = "(Lkz;II)V", + garbageValue = "1935097280" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -485,7 +479,7 @@ public class ObjectDefinition extends DualNode { } else if (var2 == 82) { this.mapIconId = var1.readUnsignedShort(); } else if (var2 == 249) { - this.params = DynamicObject.readStringIntParameters(var1, this.params); + this.params = FloorOverlayDefinition.readStringIntParameters(var1, this.params); } } else { this.transformVarbit = var1.readUnsignedShort(); @@ -521,12 +515,12 @@ public class ObjectDefinition extends DualNode { } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "-2065499599" + garbageValue = "-1028274806" ) - public final boolean method4505(int var1) { + public final boolean method4599(int var1) { if (this.models != null) { for (int var4 = 0; var4 < this.models.length; ++var4) { if (this.models[var4] == var1) { @@ -550,10 +544,10 @@ public class ObjectDefinition extends DualNode { } } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "1513696522" + garbageValue = "422089001" ) @Export("needsModelFiles") public final boolean needsModelFiles() { @@ -570,10 +564,10 @@ public class ObjectDefinition extends DualNode { } } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(II[[IIIIB)Len;", - garbageValue = "-26" + signature = "(II[[IIIII)Lel;", + garbageValue = "887035835" ) @Export("getEntity") public final Entity getEntity(int var1, int var2, int[][] var3, int var4, int var5, int var6) { @@ -604,24 +598,24 @@ public class ObjectDefinition extends DualNode { } if (this.nonFlatShading) { - var9 = ((ModelData)var9).method2708(); + var9 = ((ModelData)var9).method2735(); } if (this.clipType * 65536 >= 0) { if (var9 instanceof Model) { var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType * 65536); } else if (var9 instanceof ModelData) { - var9 = ((ModelData)var9).method2709(var3, var4, var5, var6, true, this.clipType * 65536); + var9 = ((ModelData)var9).method2733(var3, var4, var5, var6, true, this.clipType * 65536); } } return (Entity)var9; } - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(II[[IIIII)Ldo;", - garbageValue = "-1392170814" + signature = "(II[[IIIII)Ldr;", + garbageValue = "-670018760" ) @Export("getModel") public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5, int var6) { @@ -650,10 +644,10 @@ public class ObjectDefinition extends DualNode { return var9; } - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(II[[IIIILij;II)Ldo;", - garbageValue = "687830026" + signature = "(II[[IIIILiw;II)Ldr;", + garbageValue = "1509494247" ) @Export("getModelDynamic") public final Model getModelDynamic(int var1, int var2, int[][] var3, int var4, int var5, int var6, SequenceDefinition var7, int var8) { @@ -692,10 +686,10 @@ public class ObjectDefinition extends DualNode { } } - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(III)Ldq;", - garbageValue = "976816708" + signature = "(III)Lds;", + garbageValue = "2075456813" ) @Export("getModelData") final ModelData getModelData(int var1, int var2) { @@ -733,19 +727,19 @@ public class ObjectDefinition extends DualNode { } if (var4) { - var3.method2718(); + var3.method2776(); } ObjectDefinition_cachedModelData.put(var3, (long)var7); } if (var5 > 1) { - field3364[var6] = var3; + field3327[var6] = var3; } } if (var5 > 1) { - var3 = new ModelData(field3364, var5); + var3 = new ModelData(field3327, var5); } } else { int var9 = -1; @@ -775,7 +769,7 @@ public class ObjectDefinition extends DualNode { } if (var10) { - var3.method2718(); + var3.method2776(); } ObjectDefinition_cachedModelData.put(var3, (long)var5); @@ -797,17 +791,17 @@ public class ObjectDefinition extends DualNode { ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, this.recolorFrom == null, null == this.retextureFrom, true); if (var1 == 4 && var2 > 3) { - var8.method2714(256); + var8.method2741(256); var8.changeOffset(45, 0, -45); } var2 &= 3; if (var2 == 1) { - var8.method2769(); + var8.method2738(); } else if (var2 == 2) { - var8.method2712(); + var8.method2739(); } else if (var2 == 3) { - var8.method2713(); + var8.method2740(); } if (this.recolorFrom != null) { @@ -833,16 +827,16 @@ public class ObjectDefinition extends DualNode { return var8; } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(I)Lik;", - garbageValue = "-1654967679" + signature = "(I)Liy;", + garbageValue = "-464070462" ) @Export("transform") public final ObjectDefinition transform() { int var1 = -1; if (this.transformVarbit != -1) { - var1 = class208.getVarbit(this.transformVarbit); + var1 = WorldMapCacheName.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -854,46 +848,46 @@ public class ObjectDefinition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? class215.getObjectDefinition(var2) : null; + return var2 != -1 ? WallDecoration.getObjectDefinition(var2) : null; } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(III)I", - garbageValue = "-802928447" + garbageValue = "1219134228" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { + return class65.method1177(this.params, var1, var2); + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "(ILjava/lang/String;I)Ljava/lang/String;", + garbageValue = "-1108527519" + ) + @Export("getStringParam") + public String getStringParam(int var1, String var2) { IterableNodeHashTable var4 = this.params; - int var3; + String var3; if (var4 == null) { var3 = var2; } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); + ObjectNode var5 = (ObjectNode)var4.get((long)var1); if (var5 == null) { var3 = var2; } else { - var3 = var5.integer; + var3 = (String)var5.obj; } } return var3; } - @ObfuscatedName("r") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1652503760" - ) - @Export("getStringParam") - public String getStringParam(int var1, String var2) { - return class227.method4041(this.params, var1, var2); - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-2084886497" + signature = "(B)Z", + garbageValue = "-110" ) @Export("hasSound") public boolean hasSound() { @@ -902,7 +896,7 @@ public class ObjectDefinition extends DualNode { } else { for (int var1 = 0; var1 < this.transforms.length; ++var1) { if (this.transforms[var1] != -1) { - ObjectDefinition var2 = class215.getObjectDefinition(this.transforms[var1]); + ObjectDefinition var2 = WallDecoration.getObjectDefinition(this.transforms[var1]); if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { return true; } @@ -913,16 +907,18 @@ public class ObjectDefinition extends DualNode { } } - @ObfuscatedName("x") + @ObfuscatedName("c") + static double method4645(double var0) { + return Math.exp(var0 * -var0 / 2.0D) / Math.sqrt(6.283185307179586D); + } + + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IIII)I", - garbageValue = "-669374888" + signature = "(III)I", + garbageValue = "-1689171043" ) - static int method4545(int var0, int var1, int var2) { - if ((Tiles.Tiles_renderFlags[var0][var1][var2] & 8) != 0) { - return 0; - } else { - return var0 > 0 && (Tiles.Tiles_renderFlags[1][var1][var2] & 2) != 0 ? var0 - 1 : var0; - } + public static int method4644(int var0, int var1) { + int var2 = var0 >>> 31; + return (var0 + var2) / var1 - var2; } } diff --git a/runescape-client/src/main/java/ObjectNode.java b/runescape-client/src/main/java/ObjectNode.java index b20c226aff..11c6be3f77 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("fa") +@ObfuscatedName("fl") @Implements("ObjectNode") public class ObjectNode extends Node { - @ObfuscatedName("s") + @ObfuscatedName("c") @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 7719865d77..dbc2bd3970 100644 --- a/runescape-client/src/main/java/ObjectSound.java +++ b/runescape-client/src/main/java/ObjectSound.java @@ -1,97 +1,99 @@ -import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.net.URL; -import java.net.URLConnection; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bg") +@ObfuscatedName("br") @Implements("ObjectSound") public final class ObjectSound extends Node { - @ObfuscatedName("j") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Ljc;" + signature = "Ljv;" ) @Export("objectSounds") static NodeDeque objectSounds; - @ObfuscatedName("s") + @ObfuscatedName("fm") @ObfuscatedGetter( - intValue = 100138419 + longValue = 3707891332291918019L ) - int field1057; - @ObfuscatedName("i") + static long field1055; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -520446837 - ) - @Export("plane") - int plane; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -902080545 - ) - @Export("x") - int x; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -1320380601 + intValue = -131681461 ) @Export("y") int y; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 1376822595 - ) - int field1052; @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 925684059 + intValue = -847535653 ) - int field1053; - @ObfuscatedName("q") + @Export("plane") + int plane; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -980426623 + intValue = -296755339 ) - int field1054; - @ObfuscatedName("x") + @Export("x") + int x; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -752039095 + intValue = 433341051 + ) + int field1043; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -558893015 + ) + int field1051; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 1563858607 + ) + int field1039; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -1387482755 ) @Export("soundEffectId") int soundEffectId; @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Ldx;" + signature = "Lda;" ) @Export("stream1") RawPcmStream stream1; - @ObfuscatedName("f") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 708593769 + intValue = -1081184403 ) - int field1058; - @ObfuscatedName("c") + int field1048; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 348352431 + ) + int field1049; + @ObfuscatedName("h") @Export("soundEffectIds") int[] soundEffectIds; - @ObfuscatedName("r") - @ObfuscatedSignature( - signature = "Lik;" - ) - @Export("obj") - ObjectDefinition obj; - @ObfuscatedName("y") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1871367873 + intValue = -1879322163 ) - int field1056; - @ObfuscatedName("p") + int field1042; + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Ldx;" + signature = "Lda;" ) @Export("stream2") RawPcmStream stream2; + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "Liy;" + ) + @Export("obj") + ObjectDefinition obj; static { objectSounds = new NodeDeque(); @@ -100,10 +102,10 @@ public final class ObjectSound extends Node { ObjectSound() { } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-68" + signature = "(I)V", + garbageValue = "43406199" ) @Export("set") void set() { @@ -111,839 +113,520 @@ public final class ObjectSound extends Node { ObjectDefinition var2 = this.obj.transform(); if (var2 != null) { this.soundEffectId = var2.ambientSoundId; - this.field1054 = var2.int4 * 128; - this.field1057 = var2.int5; - this.field1058 = var2.int6; + this.field1039 = var2.int4 * 128; + this.field1048 = var2.int5; + this.field1049 = var2.int6; this.soundEffectIds = var2.soundEffectIds; } else { this.soundEffectId = -1; - this.field1054 = 0; - this.field1057 = 0; - this.field1058 = 0; + this.field1039 = 0; + this.field1048 = 0; + this.field1049 = 0; this.soundEffectIds = null; } if (var1 != this.soundEffectId && this.stream1 != null) { - IgnoreList.pcmStreamMixer.removeSubStream(this.stream1); + class51.pcmStreamMixer.removeSubStream(this.stream1); this.stream1 = null; } } - @ObfuscatedName("s") + @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(B)J", - garbageValue = "14" + signature = "(ILcu;ZI)I", + garbageValue = "-1423312068" ) - static long method1836() { - try { - URL var0 = new URL(RouteStrategy.method3534("services", false) + "m=accountappeal/login.ws"); - URLConnection var1 = var0.openConnection(); - var1.setRequestProperty("connection", "close"); - var1.setDoInput(true); - var1.setDoOutput(true); - var1.setConnectTimeout(5000); - OutputStreamWriter var2 = new OutputStreamWriter(var1.getOutputStream()); - var2.write("data1=req"); - var2.flush(); - InputStream var3 = var1.getInputStream(); - Buffer var4 = new Buffer(new byte[1000]); - - do { - int var5 = var3.read(var4.array, var4.offset, 1000 - var4.offset); - if (var5 == -1) { - var4.offset = 0; - long var7 = var4.readLong(); - return var7; + static int method1884(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 6600) { + var3 = MouseRecorder.plane; + int var9 = class4.baseX * 64 + (Varps.localPlayer.x * -78439701 >> 7); + int var5 = ScriptEvent.baseY + (Varps.localPlayer.y >> 7); + class1.getWorldMap().method6275(var3, var9, var5, true); + return 1; + } else { + WorldMapArea var11; + if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + String var16 = ""; + var11 = class1.getWorldMap().getMapArea(var3); + if (var11 != null) { + var16 = var11.getExternalName(); } - var4.offset += var5; - } while(var4.offset < 1000); - - return 0L; - } catch (Exception var9) { - return 0L; - } - } - - @ObfuscatedName("gf") - @ObfuscatedSignature( - signature = "(Lbu;IIIIIB)V", - garbageValue = "7" - ) - @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) { - NPCDefinition var6 = ((NPC)var0).definition; - if (var6.transforms != null) { - var6 = var6.transform(); - } - - if (var6 == null) { - return; - } - } - - int var75 = Players.Players_count; - int[] var7 = Players.Players_indices; - byte var8 = 0; - Player var10; - if (var1 < var75 && var0.playerCycle == Client.cycle) { - var10 = (Player)var0; - boolean var9; - if (Client.drawPlayerNames == 0) { - var9 = false; - } else { - boolean var76; - if (var10 == WorldMapIcon_1.localPlayer) { - var76 = (Client.drawPlayerNames & 8) != 0; - var9 = var76; - } else { - var76 = HitSplatDefinition.method4497() || GrandExchangeEvents.method81() && var10.isFriend(); - if (!var76) { - boolean var77 = (Client.drawPlayerNames & 2) != 0; - var76 = var77 && var10.isClanMember(); - } - - var9 = var76; - } - } - - if (var9) { - Player var11 = (Player)var0; - if (var1 < var75) { - Entity.getActorScreenLocation(var0, var0.defaultHeight + 15); - AbstractFont var12 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); - byte var13 = 9; - var12.drawCentered(var11.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var13, 16777215, 0); - var8 = 18; - } - } - } - - int var87 = -2; - int var15; - int var22; - int var23; - if (!var0.healthBars.method4729()) { - Entity.getActorScreenLocation(var0, var0.defaultHeight + 15); - - for (HealthBar var88 = (HealthBar)var0.healthBars.last(); var88 != null; var88 = (HealthBar)var0.healthBars.previous()) { - HealthBarUpdate var89 = var88.get(Client.cycle); - if (var89 == null) { - if (var88.isEmpty()) { - var88.remove(); - } - } else { - HealthBarDefinition var91 = var88.definition; - Sprite var78 = var91.getBackSprite(); - Sprite var14 = var91.getFrontSprite(); - int var16 = 0; - if (var78 != null && var14 != null) { - if (var91.widthPadding * 2 < var14.subWidth) { - var16 = var91.widthPadding; - } - - var15 = var14.subWidth - var16 * 2; - } else { - var15 = var91.width; - } - - int var17 = 255; - boolean var18 = true; - int var19 = Client.cycle - var89.cycle; - int var20 = var15 * var89.health2 / var91.width; - int var21; - int var92; - if (var89.cycleOffset > var19) { - var21 = var91.int4 == 0 ? 0 : var91.int4 * (var19 / var91.int4); - var22 = var15 * var89.health / var91.width; - var92 = var21 * (var20 - var22) / var89.cycleOffset + var22; - } else { - var92 = var20; - var21 = var89.cycleOffset + var91.int5 - var19; - if (var91.int3 >= 0) { - var17 = (var21 << 8) / (var91.int5 - var91.int3); - } - } - - if (var89.health2 > 0 && var92 < 1) { - var92 = 1; - } - - if (var78 != null && var14 != null) { - if (var92 == var15) { - var92 += var16 * 2; - } else { - var92 += var16; - } - - var21 = var78.subHeight; - var87 += var21; - var22 = var2 + Client.viewportTempX - (var15 >> 1); - var23 = var3 + Client.viewportTempY - var87; - var22 -= var16; - if (var17 >= 0 && var17 < 255) { - var78.drawTransAt(var22, var23, var17); - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var92 + var22, var21 + var23); - var14.drawTransAt(var22, var23, var17); - } else { - var78.drawTransBgAt(var22, var23); - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var92 + var22, var23 + var21); - var14.drawTransBgAt(var22, var23); - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); - var87 += 2; - } else { - var87 += 5; - if (Client.viewportTempX > -1) { - var21 = var2 + Client.viewportTempX - (var15 >> 1); - var22 = var3 + Client.viewportTempY - var87; - Rasterizer2D.Rasterizer2D_fillRectangle(var21, var22, var92, 5, 65280); - Rasterizer2D.Rasterizer2D_fillRectangle(var92 + var21, var22, var15 - var92, 5, 16711680); - } - - var87 += 2; - } - } - } - } - - if (var87 == -2) { - var87 += 7; - } - - var87 += var8; - if (var1 < var75) { - var10 = (Player)var0; - if (var10.isHidden) { - return; - } - - if (var10.headIconPk != -1 || var10.headIconPrayer != -1) { - Entity.getActorScreenLocation(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - if (var10.headIconPk != -1) { - var87 += 25; - UserComparator6.headIconPkSprites[var10.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); - } - - if (var10.headIconPrayer != -1) { - var87 += 25; - IntHashTable.headIconPrayerSprites[var10.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); - } - } - } - - if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { - Entity.getActorScreenLocation(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - var87 += WorldMapData_1.headIconHintSprites[1].subHeight; - WorldMapData_1.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); - } - } + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var16; + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + class1.getWorldMap().setCurrentMapAreaId(var3); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = class1.getWorldMap().getZoomLevel(); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + class1.getWorldMap().setZoomPercentage(var3); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = class1.getWorldMap().isCacheLoaded() ? 1 : 0; + return 1; } else { - NPCDefinition var90 = ((NPC)var0).definition; - if (var90.transforms != null) { - var90 = var90.transform(); - } - - if (var90.headIconPrayer >= 0 && var90.headIconPrayer < IntHashTable.headIconPrayerSprites.length) { - Entity.getActorScreenLocation(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - IntHashTable.headIconPrayerSprites[var90.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); - } - } - - if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { - Entity.getActorScreenLocation(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - WorldMapData_1.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); - } - } - } - - if (var0.overheadText != null && (var1 >= var75 || !var0.field926 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { - Entity.getActorScreenLocation(var0, var0.defaultHeight); - if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { - Client.overheadTextXOffsets[Client.overheadTextCount] = class43.fontBold12.stringWidth(var0.overheadText) / 2; - Client.overheadTextAscents[Client.overheadTextCount] = class43.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 var79 = 0; var79 < 4; ++var79) { - int var94 = var0.hitSplatCycles[var79]; - int var95 = var0.hitSplatTypes[var79]; - HitSplatDefinition var96 = null; - int var80 = 0; - if (var95 >= 0) { - if (var94 <= Client.cycle) { - continue; - } - - var96 = StructDefinition.HitSplatDefinition_get(var0.hitSplatTypes[var79]); - var80 = var96.field3314; - if (var96 != null && var96.transforms != null) { - var96 = var96.transform(); - if (var96 == null) { - var0.hitSplatCycles[var79] = -1; - continue; + Coord var15; + if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { + var15 = new Coord(Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]); + class1.getWorldMap().setWorldMapPositionTarget(var15.x, var15.y); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { + var15 = new Coord(Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]); + class1.getWorldMap().setWorldMapPositionTargetInstant(var15.x, var15.y); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { + var15 = new Coord(Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]); + class1.getWorldMap().jumpToSourceCoord(var15.plane, var15.x, var15.y); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { + var15 = new Coord(Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]); + class1.getWorldMap().jumpToSourceCoordInstant(var15.plane, var15.x, var15.y); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = class1.getWorldMap().getDisplayX(); + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = class1.getWorldMap().getDisplayY(); + return 1; + } else { + WorldMapArea var13; + if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + var13 = class1.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var13.getOrigin().packed(); } - } - } else if (var94 < 0) { - continue; - } - var15 = var0.hitSplatTypes2[var79]; - HitSplatDefinition var81 = null; - if (var15 >= 0) { - var81 = StructDefinition.HitSplatDefinition_get(var15); - if (var81 != null && var81.transforms != null) { - var81 = var81.transform(); - } - } + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + var13 = class1.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = (var13.getRegionHighX() - var13.getRegionLowX() + 1) * 64; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = (var13.getRegionHighY() - var13.getRegionLowY() + 1) * 64; + } - if (var94 - var80 <= Client.cycle) { - if (var96 == null) { - var0.hitSplatCycles[var79] = -1; + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + var13 = class1.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var13.getRegionLowX() * 64; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var13.getRegionLowY() * 64; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var13.getRegionHighX() * 64 + 64 - 1; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var13.getRegionHighY() * 64 + 64 - 1; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + var13 = class1.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var13.getZoom(); + } + + return 1; + } else if (var0 == 6615) { + var15 = class1.getWorldMap().getDisplayCoord(); + if (var15 == null) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var15.x; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var15.y; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = class1.getWorldMap().currentMapAreaId(); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { + var15 = new Coord(Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]); + var13 = class1.getWorldMap().getCurrentMapArea(); + if (var13 == null) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1; + return 1; + } else { + int[] var14 = var13.position(var15.plane, var15.x, var15.y); + if (var14 == null) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var14[0]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var14[1]; + } + + return 1; + } } else { - Entity.getActorScreenLocation(var0, var0.defaultHeight / 2); - if (Client.viewportTempX > -1) { - if (var79 == 1) { - Client.viewportTempY -= 20; - } - - if (var79 == 2) { - Client.viewportTempX -= 15; - Client.viewportTempY -= 10; - } - - if (var79 == 3) { - Client.viewportTempX += 15; - Client.viewportTempY -= 10; - } - - Sprite var82 = null; - Sprite var83 = null; - Sprite var84 = null; - Sprite var85 = null; - var22 = 0; - var23 = 0; - int var24 = 0; - int var25 = 0; - int var26 = 0; - int var27 = 0; - int var28 = 0; - int var29 = 0; - Sprite var30 = null; - Sprite var31 = null; - Sprite var32 = null; - Sprite 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; - var82 = var96.method4494(); - int var43; - if (var82 != null) { - var22 = var82.subWidth; - var43 = var82.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var26 = var82.xOffset; - } - - var83 = var96.method4468(); - if (var83 != null) { - var23 = var83.subWidth; - var43 = var83.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var27 = var83.xOffset; - } - - var84 = var96.method4472(); - if (var84 != null) { - var24 = var84.subWidth; - var43 = var84.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var28 = var84.xOffset; - } - - var85 = var96.method4470(); - if (var85 != null) { - var25 = var85.subWidth; - var43 = var85.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var29 = var85.xOffset; - } - - if (var81 != null) { - var30 = var81.method4494(); - if (var30 != null) { - var34 = var30.subWidth; - var43 = var30.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var38 = var30.xOffset; - } - - var31 = var81.method4468(); - if (var31 != null) { - var35 = var31.subWidth; - var43 = var31.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var39 = var31.xOffset; - } - - var32 = var81.method4472(); - if (var32 != null) { - var36 = var32.subWidth; - var43 = var32.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var40 = var32.xOffset; - } - - var33 = var81.method4470(); - if (var33 != null) { - var37 = var33.subWidth; - var43 = var33.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var41 = var33.xOffset; - } - } - - Font var86 = var96.getFont(); - if (var86 == null) { - var86 = class30.fontPlain11; - } - - Font var44; - if (var81 != null) { - var44 = var81.getFont(); - if (var44 == null) { - var44 = class30.fontPlain11; - } + Coord var7; + if (var0 == 6618) { + var15 = new Coord(Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]); + var13 = class1.getWorldMap().getCurrentMapArea(); + if (var13 == null) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1; + return 1; } else { - var44 = class30.fontPlain11; - } - - String var45 = null; - String var46 = null; - boolean var47 = false; - int var48 = 0; - var45 = var96.getString(var0.hitSplatValues[var79]); - int var93 = var86.stringWidth(var45); - if (var81 != null) { - var46 = var81.getString(var0.hitSplatValues2[var79]); - var48 = var44.stringWidth(var46); - } - - int var49 = 0; - int var50 = 0; - if (var23 > 0) { - if (var84 == null && var85 == null) { - var49 = 1; + var7 = var13.coord(var15.x, var15.y); + if (var7 == null) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1; } else { - var49 = var93 / var23 + 1; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var7.packed(); } - } - if (var81 != null && var35 > 0) { - if (var32 == null && var33 == null) { - var50 = 1; + return 1; + } + } else { + Coord var12; + if (var0 == 6619) { + class160.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var12 = new Coord(Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]); + WorldMapSprite.method380(var3, var12, false); + return 1; + } else if (var0 == 6620) { + class160.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var12 = new Coord(Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]); + WorldMapSprite.method380(var3, var12, true); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { + class160.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var12 = new Coord(Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]); + var11 = class1.getWorldMap().getMapArea(var3); + if (var11 == null) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + return 1; } else { - var50 = var48 / var35 + 1; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var11.containsCoord(var12.plane, var12.x, var12.y) ? 1 : 0; + return 1; + } + } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = class1.getWorldMap().getDisplayWith(); + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = class1.getWorldMap().getDisplayHeight(); + return 1; + } else if (var0 == 6623) { + var15 = new Coord(Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]); + var13 = class1.getWorldMap().mapAreaAtCoord(var15.plane, var15.x, var15.y); + if (var13 == null) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var13.getId(); } - } - 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 - var93) / 2; + return 1; + } else if (var0 == 6624) { + class1.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]); + return 1; + } else if (var0 == 6625) { + class1.getWorldMap().resetMaxFlashCount(); + return 1; + } else if (var0 == 6626) { + class1.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]); + return 1; + } else if (var0 == 6627) { + class1.getWorldMap().resetCyclesPerFlash(); + return 1; } 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 (var81 != 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 = var35 * var50; - var51 += var62; - var61 += (var62 - var48) / 2; + boolean var10; + if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { + var10 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + class1.getWorldMap().setPerpetualFlash(var10); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + class1.getWorldMap().flashElement(var3); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + class1.getWorldMap().flashCategory(var3); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { + class1.getWorldMap().stopCurrentFlashes(); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { + var10 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + class1.getWorldMap().setElementsDisabled(var10); + return 1; } else { - var51 += var48; - } + boolean var4; + if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { + class160.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1] == 1; + class1.getWorldMap().disableElement(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { + class160.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1] == 1; + class1.getWorldMap().setCategoryDisabled(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = class1.getWorldMap().getElementsDisabled() ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = class1.getWorldMap().isElementDisabled(var3) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = class1.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; + return 1; + } else if (var0 == 6638) { + class160.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var12 = new Coord(Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]); + var7 = class1.getWorldMap().method6319(var3, var12); + if (var7 == null) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var7.packed(); + } - var60 = var51; - if (var37 > 0) { - var51 += var37; - } - } + return 1; + } else { + AbstractWorldMapIcon var8; + if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { + var8 = class1.getWorldMap().iconStart(); + if (var8 == null) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var8.getElement(); + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var8.coord2.packed(); + } - var62 = var0.hitSplatCycles[var79] - Client.cycle; - int var63 = var96.field3319 - var62 * var96.field3319 / var96.field3314; - int var64 = var62 * var96.field3307 / var96.field3314 + -var96.field3307; - int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1)); - int var66 = var64 + (var3 + Client.viewportTempY - 12); - int var67 = var66; - int var68 = var66 + var42; - int var69 = var66 + var96.field3324 + 15; - int var70 = var69 - var86.maxAscent; - int var71 = var69 + var86.maxDescent; - if (var70 < var66) { - var67 = var70; - } + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { + var8 = class1.getWorldMap().iconNext(); + if (var8 == null) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var8.getElement(); + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var8.coord2.packed(); + } - if (var71 > var68) { - var68 = var71; - } + return 1; + } else { + WorldMapElement var6; + if (var0 == ScriptOpcodes.MEC_TEXT) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + var6 = WorldMapSection1.WorldMapElement_get(var3); + if (var6.name == null) { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var6.name; + } - int var72 = 0; - int var73; - int var74; - if (var81 != null) { - var72 = var66 + var81.field3324 + 15; - var73 = var72 - var44.maxAscent; - var74 = var72 + var44.maxDescent; - if (var73 < var67) { - ; - } + return 1; + } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + var6 = WorldMapSection1.WorldMapElement_get(var3); + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var6.textSize; + return 1; + } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + var6 = WorldMapSection1.WorldMapElement_get(var3); + if (var6 == null) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var6.category; + } - if (var74 > var68) { - ; - } - } + return 1; + } else if (var0 == ScriptOpcodes.MEC_SPRITE) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + var6 = WorldMapSection1.WorldMapElement_get(var3); + if (var6 == null) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var6.sprite1; + } - var73 = 255; - if (var96.field3318 >= 0) { - var73 = (var62 << 8) / (var96.field3314 - var96.field3318); - } - - if (var73 >= 0 && var73 < 255) { - if (var82 != null) { - var82.drawTransAt(var65 + var52 - var26, var66, var73); - } - - if (var84 != null) { - var84.drawTransAt(var65 + var53 - var28, var66, var73); - } - - if (var83 != null) { - for (var74 = 0; var74 < var49; ++var74) { - var83.drawTransAt(var74 * var23 + (var65 + var54 - var27), var66, var73); - } - } - - if (var85 != null) { - var85.drawTransAt(var65 + var56 - var29, var66, var73); - } - - var86.drawAlpha(var45, var55 + var65, var69, var96.textColor, 0, var73); - if (var81 != null) { - if (var30 != null) { - var30.drawTransAt(var57 + var65 - 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 + (var65 + var59 - var39), var66, var73); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = class32.worldMapEvent.mapElement; + return 1; + } else if (var0 == 6698) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = class32.worldMapEvent.coord1.packed(); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = class32.worldMapEvent.coord2.packed(); + return 1; + } else { + return 2; + } } } - - if (var33 != null) { - var33.drawTransAt(var65 + var60 - var41, var66, var73); - } - - var44.drawAlpha(var46, var61 + var65, var72, var81.textColor, 0, var73); - } - } else { - if (var82 != null) { - var82.drawTransBgAt(var65 + var52 - var26, var66); - } - - if (var84 != null) { - var84.drawTransBgAt(var65 + var53 - var28, var66); - } - - if (var83 != null) { - for (var74 = 0; var74 < var49; ++var74) { - var83.drawTransBgAt(var74 * var23 + (var54 + var65 - var27), var66); - } - } - - if (var85 != null) { - var85.drawTransBgAt(var65 + var56 - var29, var66); - } - - var86.draw(var45, var65 + var55, var69, var96.textColor | -16777216, 0); - if (var81 != 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 + (var65 + var59 - var39), var66); - } - } - - if (var33 != null) { - var33.drawTransBgAt(var60 + var65 - var41, var66); - } - - var44.draw(var46, var65 + var61, var72, var81.textColor | -16777216, 0); } } } } } } - } } - @ObfuscatedName("jo") + @ObfuscatedName("hj") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "-103" + signature = "(Lkt;I)V", + garbageValue = "-1146990373" ) - static final void method1837(int var0) { - WorldMapIcon_0.method207(); - class49.method810(); - int var1 = class16.method180(var0).type; - if (var1 != 0) { - int var2 = Varps.Varps_main[var0]; - if (var1 == 1) { - if (var2 == 1) { - Rasterizer3D.Rasterizer3D_setBrightness(0.9D); - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.9D); + static final void method1888(PacketBuffer var0) { + for (int var1 = 0; var1 < Client.field666; ++var1) { + int var2 = Client.field881[var1]; + NPC var3 = Client.npcs[var2]; + int var4 = var0.readUnsignedByte(); + int var5; + if ((var4 & 4) != 0) { + var3.spotAnimation = var0.method5459(); + var5 = var0.method5587(); + var3.heightOffset = var5 >> 16; + var3.field957 = (var5 & 65535) + Client.cycle; + var3.spotAnimationFrame = 0; + var3.spotAnimationFrameCycle = 0; + if (var3.field957 > Client.cycle) { + var3.spotAnimationFrame = -1; } - if (var2 == 2) { - Rasterizer3D.Rasterizer3D_setBrightness(0.8D); - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.8D); + if (var3.spotAnimation == 65535) { + var3.spotAnimation = -1; } - - if (var2 == 3) { - Rasterizer3D.Rasterizer3D_setBrightness(0.7D); - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.7D); - } - - if (var2 == 4) { - Rasterizer3D.Rasterizer3D_setBrightness(0.6D); - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.6D); - } - - class42.method753(); } - if (var1 == 3) { - short var3 = 0; - if (var2 == 0) { - var3 = 255; + int var6; + int var7; + int var8; + if ((var4 & 1) != 0) { + var5 = var0.method5503(); + var6 = var0.method5503(); + var7 = var3.x * -78439701 - (var5 - class4.baseX * 64 - class4.baseX * 64) * 64; + var8 = var3.y - (var6 - ScriptEvent.baseY - ScriptEvent.baseY) * 64; + if (var7 != 0 || var8 != 0) { + var3.field945 = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047; + } + } + + if ((var4 & 64) != 0) { + var3.overheadText = var0.readStringCp1252NullTerminated(); + var3.overheadTextCyclesRemaining = 100; + } + + if ((var4 & 8) != 0) { + var3.targetIndex = var0.method5459(); + if (var3.targetIndex == 65535) { + var3.targetIndex = -1; + } + } + + if ((var4 & 2) != 0) { + var5 = var0.method5547(); + 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); + } } - if (var2 == 1) { - var3 = 192; + var6 = var0.method5494(); + if (var6 > 0) { + for (var7 = 0; var7 < var6; ++var7) { + var8 = var0.readUShortSmart(); + var9 = var0.readUShortSmart(); + if (var9 != 32767) { + var10 = var0.readUShortSmart(); + var11 = var0.readUnsignedByte(); + int var12 = var9 > 0 ? var0.method5547() : var11; + var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12); + } else { + var3.removeHealthBar(var8); + } + } + } + } + + if ((var4 & 32) != 0) { + var5 = var0.method5514(); + if (var5 == 65535) { + var5 = -1; } - if (var2 == 2) { - var3 = 128; - } - - if (var2 == 3) { - var3 = 64; - } - - if (var2 == 4) { - var3 = 0; - } - - if (var3 != Client.field856) { - if (Client.field856 == 0 && Client.field857 != -1) { - PacketBufferNode.method3574(GrandExchangeEvent.archive6, Client.field857, 0, var3, false); - Client.field858 = false; - } else if (var3 == 0) { - class197.midiPcmStream.clear(); - class197.field2378 = 1; - WorldMapDecoration.musicTrackArchive = null; - Client.field858 = false; - } else { - ChatChannel.method2163(var3); + var6 = var0.readUnsignedByteNegate(); + if (var5 == var3.sequence && var5 != -1) { + var7 = class83.SequenceDefinition_get(var5).field3502; + if (var7 == 1) { + var3.sequenceFrame = 0; + var3.sequenceFrameCycle = 0; + var3.sequenceDelay = var6; + var3.field924 = 0; } - Client.field856 = var3; + if (var7 == 2) { + var3.field924 = 0; + } + } else if (var5 == -1 || var3.sequence == -1 || class83.SequenceDefinition_get(var5).field3504 >= class83.SequenceDefinition_get(var3.sequence).field3504) { + var3.sequence = var5; + var3.sequenceFrame = 0; + var3.sequenceFrameCycle = 0; + var3.sequenceDelay = var6; + var3.field924 = 0; + var3.field969 = var3.pathLength; } } - if (var1 == 4) { - if (var2 == 0) { - Client.soundEffectVolume = 127; - } - - if (var2 == 1) { - Client.soundEffectVolume = 96; - } - - if (var2 == 2) { - Client.soundEffectVolume = 64; - } - - if (var2 == 3) { - Client.soundEffectVolume = 32; - } - - if (var2 == 4) { - Client.soundEffectVolume = 0; - } + if ((var4 & 16) != 0) { + var3.definition = FontName.getNpcDefinition(var0.method5514()); + var3.size = var3.definition.size; + var3.field953 = var3.definition.rotation; + var3.walkSequence = var3.definition.walkSequence; + var3.walkBackSequence = var3.definition.walkBackSequence; + var3.walkLeftSequence = var3.definition.walkLeftSequence; + var3.walkRightSequence = var3.definition.walkRightSequence; + var3.readySequence = var3.definition.readySequence; + var3.turnLeftSequence = var3.definition.turnLeftSequence; + var3.turnRightSequence = var3.definition.turnRightSequence; } - - if (var1 == 5) { - Client.leftClickOpensMenu = var2; - } - - if (var1 == 6) { - Client.chatEffects = var2; - } - - if (var1 == 9) { - Client.field788 = var2; - } - - if (var1 == 10) { - if (var2 == 0) { - Client.field860 = 127; - } - - if (var2 == 1) { - Client.field860 = 96; - } - - if (var2 == 2) { - Client.field860 = 64; - } - - if (var2 == 3) { - Client.field860 = 32; - } - - if (var2 == 4) { - Client.field860 = 0; - } - } - - if (var1 == 17) { - Client.followerIndex = var2 & 65535; - } - - AttackOption[] var4; - if (var1 == 18) { - var4 = new AttackOption[]{AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_hidden, AttackOption.AttackOption_leftClickWhereAvailable}; - Client.playerAttackOption = (AttackOption)FriendSystem.findEnumerated(var4, 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) { - var4 = new AttackOption[]{AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_hidden, AttackOption.AttackOption_leftClickWhereAvailable}; - Client.npcAttackOption = (AttackOption)FriendSystem.findEnumerated(var4, var2); - if (Client.npcAttackOption == null) { - Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } - } - } + } } diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java index 33ed6c694b..c8e59e7f6b 100644 --- a/runescape-client/src/main/java/Occluder.java +++ b/runescape-client/src/main/java/Occluder.java @@ -4,667 +4,146 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eq") +@ObfuscatedName("ek") @Implements("Occluder") public final class Occluder { - @ObfuscatedName("sy") + @ObfuscatedName("c") @ObfuscatedGetter( - longValue = 8542381925418177619L - ) - static long field1890; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 969777385 + intValue = 362641763 ) @Export("minTileX") int minTileX; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1553227311 + intValue = 1829777649 ) @Export("maxTileX") int maxTileX; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1059981865 + intValue = -990403321 ) @Export("minTileY") int minTileY; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -448814067 + intValue = 2788625 ) @Export("maxTileY") int maxTileY; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 234253745 + intValue = 2035384345 ) @Export("type") int type; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1608934267 + intValue = -37921347 ) @Export("minX") int minX; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -610653481 + intValue = -774956393 ) @Export("maxX") int maxX; - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 399594661 + intValue = -1495961471 ) @Export("minZ") int minZ; - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1267632165 + intValue = -1326985595 ) @Export("maxZ") int maxZ; - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 912132207 + intValue = -790456829 ) @Export("minY") int minY; - @ObfuscatedName("f") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -646575611 + intValue = -1754197059 ) @Export("maxY") int maxY; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 2144638079 - ) - int field1883; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = -1502602097 - ) - int field1882; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = -21293905 - ) - int field1885; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -2138791857 - ) - int field1886; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 1127843117 - ) - int field1887; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 1866279201 + intValue = 1722833995 ) int field1872; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -112821165 + ) + int field1873; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -226733423 + ) + int field1861; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 387341237 + ) + int field1879; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -650664545 + intValue = 1097243593 ) - int field1888; + int field1876; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 1639828993 + ) + int field1871; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 218753559 + ) + int field1878; Occluder() { } - @ObfuscatedName("jy") + @ObfuscatedName("go") @ObfuscatedSignature( - signature = "([Lhp;IIIIIIII)V", - garbageValue = "-438614783" + signature = "(B)V", + garbageValue = "8" ) - @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 || ParamDefinition.getWidgetClickMask(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { - if (var9.isIf3) { - if (WorldMapRectangle.isComponentHidden(var9)) { - continue; - } - } else if (var9.type == 0 && var9 != class65.mousedOverWidgetIf1 && WorldMapRectangle.isComponentHidden(var9)) { - continue; - } + static final void method3253() { + Client.field735 = 0; + int var0 = class4.baseX * 64 + (Varps.localPlayer.x * -78439701 >> 7); + int var1 = (Varps.localPlayer.y >> 7) + ScriptEvent.baseY; + if (var0 >= 3053 && var0 <= 3156 && var1 >= 3056 && var1 <= 3136) { + Client.field735 = 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 (var0 >= 3072 && var0 <= 3118 && var1 >= 9492 && var1 <= 9535) { + Client.field735 = 1; + } - 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.field804 = true; - Client.field805 = var10; - Client.field806 = var11; - } - - boolean var32 = false; - if (var9.field2620) { - switch(Client.field638) { - case 0: - var32 = true; - case 1: - default: - break; - case 2: - if (Client.field786 == var9.id >>> 16) { - var32 = true; - } - break; - case 3: - if (var9.id == Client.field786) { - var32 = true; - } - } - } - - if (var32 || !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 (class60.widgetDragDuration == 0) { - Client.clickedWidget = null; - Client.clickedWidgetParent = null; - } - - if (!Client.isMenuOpen) { - LoginScreenAnimation.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 var33 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; - if (var9.contentType == 1337) { - if (!Client.isLoading && !Client.isMenuOpen && var33) { - Calendar.addSceneMenuOptions(var17, var18, var12, var13); - } - } else if (var9.contentType == 1338) { - MidiPcmStream.checkIfMinimapClicked(var9, var10, var11); - } else { - if (var9.contentType == 1400) { - WorldMapCacheName.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var33, var10, var11, var9.width, var9.height); - } - - if (!Client.isMenuOpen && var33) { - if (var9.contentType == 1400) { - WorldMapCacheName.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18); - } else { - ClientPacket.method3558(var9, var17 - var10, var18 - var11); - } - } - - boolean var21; - int var23; - if (var32) { - for (int var20 = 0; var20 < var9.field2631.length; ++var20) { - var21 = false; - boolean var22 = false; - if (!var21 && var9.field2631[var20] != null) { - for (var23 = 0; var23 < var9.field2631[var20].length; ++var23) { - boolean var24 = false; - if (var9.field2685 != null) { - var24 = KeyHandler.KeyHandler_pressedKeys[var9.field2631[var20][var23]]; - } - - if (class2.method40(var9.field2631[var20][var23]) || var24) { - var21 = true; - if (var9.field2685 != null && var9.field2685[var20] > Client.cycle) { - break; - } - - byte var25 = var9.field2622[var20][var23]; - if (var25 == 0 || ((var25 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var25 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var25 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var25 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { - var22 = true; - break; - } - } - } - } - - if (var22) { - if (var20 < 10) { - InterfaceParent.method1127(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); - } else if (var20 == 10) { - WorldMapRegion.Widget_runOnTargetLeave(); - class223.method4036(var9.id, var9.childIndex, WorldMapRegion.method530(ParamDefinition.getWidgetClickMask(var9)), var9.itemId); - Client.selectedSpellActionName = class173.method3529(var9); - if (Client.selectedSpellActionName == null) { - Client.selectedSpellActionName = "null"; - } - - Client.selectedSpellName = var9.dataText + class16.colorStartTag(16777215); - } - - var23 = var9.field2623[var20]; - if (var9.field2685 == null) { - var9.field2685 = new int[var9.field2631.length]; - } - - if (var9.field2581 == null) { - var9.field2581 = new int[var9.field2631.length]; - } - - if (var23 != 0) { - if (var9.field2685[var20] == 0) { - var9.field2685[var20] = var23 + Client.cycle + var9.field2581[var20]; - } else { - var9.field2685[var20] = var23 + Client.cycle; - } - } else { - var9.field2685[var20] = Integer.MAX_VALUE; - } - } - - if (!var21 && var9.field2685 != null) { - var9.field2685[var20] = 0; - } - } - } - - if (var9.isIf3) { - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - var33 = true; - } else { - var33 = false; - } - - boolean var34 = false; - if ((MouseHandler.MouseHandler_currentButton == 1 || !FriendSystem.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var33) { - var34 = true; - } - - var21 = false; - if ((MouseHandler.MouseHandler_lastButton == 1 || !FriendSystem.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) { - WorldMapRegion.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11); - } - - if (var9.contentType == 1400) { - WorldMapCacheName.worldMap.method6185(var17, var18, var33 & var34, var33 & var21); - } - - if (Client.clickedWidget != null && var9 != Client.clickedWidget && var33 && Message.method1173(ParamDefinition.getWidgetClickMask(var9))) { - Client.draggedOnWidget = var9; - } - - if (var9 == Client.clickedWidgetParent) { - Client.field641 = true; - Client.field802 = var10; - Client.field803 = var11; - } - - if (var9.hasListener) { - ScriptEvent var27; - if (var33 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { - var27 = new ScriptEvent(); - var27.isMouseInputEvent = true; - var27.widget = var9; - var27.mouseY = Client.mouseWheelRotation; - var27.args = var9.onScroll; - Client.scriptEvents.addFirst(var27); - } - - if (Client.clickedWidget != null || class188.dragInventoryWidget != null || Client.isMenuOpen) { - var21 = false; - var34 = false; - var33 = false; - } - - if (!var9.isClicked && var21) { - var9.isClicked = true; - if (var9.onClick != null) { - var27 = new ScriptEvent(); - var27.isMouseInputEvent = true; - var27.widget = var9; - var27.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; - var27.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; - var27.args = var9.onClick; - Client.scriptEvents.addFirst(var27); - } - } - - if (var9.isClicked && var34 && var9.onClickRepeat != null) { - var27 = new ScriptEvent(); - var27.isMouseInputEvent = true; - var27.widget = var9; - var27.mouseX = MouseHandler.MouseHandler_x - var10; - var27.mouseY = MouseHandler.MouseHandler_y - var11; - var27.args = var9.onClickRepeat; - Client.scriptEvents.addFirst(var27); - } - - if (var9.isClicked && !var34) { - var9.isClicked = false; - if (var9.onRelease != null) { - var27 = new ScriptEvent(); - var27.isMouseInputEvent = true; - var27.widget = var9; - var27.mouseX = MouseHandler.MouseHandler_x - var10; - var27.mouseY = MouseHandler.MouseHandler_y - var11; - var27.args = var9.onRelease; - Client.field824.addFirst(var27); - } - } - - if (var34 && var9.onHold != null) { - var27 = new ScriptEvent(); - var27.isMouseInputEvent = true; - var27.widget = var9; - var27.mouseX = MouseHandler.MouseHandler_x - var10; - var27.mouseY = MouseHandler.MouseHandler_y - var11; - var27.args = var9.onHold; - Client.scriptEvents.addFirst(var27); - } - - if (!var9.containsMouse && var33) { - var9.containsMouse = true; - if (var9.onMouseOver != null) { - var27 = new ScriptEvent(); - var27.isMouseInputEvent = true; - var27.widget = var9; - var27.mouseX = MouseHandler.MouseHandler_x - var10; - var27.mouseY = MouseHandler.MouseHandler_y - var11; - var27.args = var9.onMouseOver; - Client.scriptEvents.addFirst(var27); - } - } - - if (var9.containsMouse && var33 && var9.onMouseRepeat != null) { - var27 = new ScriptEvent(); - var27.isMouseInputEvent = true; - var27.widget = var9; - var27.mouseX = MouseHandler.MouseHandler_x - var10; - var27.mouseY = MouseHandler.MouseHandler_y - var11; - var27.args = var9.onMouseRepeat; - Client.scriptEvents.addFirst(var27); - } - - if (var9.containsMouse && !var33) { - var9.containsMouse = false; - if (var9.onMouseLeave != null) { - var27 = new ScriptEvent(); - var27.isMouseInputEvent = true; - var27.widget = var9; - var27.mouseX = MouseHandler.MouseHandler_x - var10; - var27.mouseY = MouseHandler.MouseHandler_y - var11; - var27.args = var9.onMouseLeave; - Client.field824.addFirst(var27); - } - } - - if (var9.onTimer != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onTimer; - Client.field633.addFirst(var27); - } - - ScriptEvent var30; - int var35; - int var36; - if (var9.onVarTransmit != null && Client.field800 > var9.field2680) { - if (var9.varTransmitTriggers != null && Client.field800 - var9.field2680 <= 32) { - label899: - for (var35 = var9.field2680; var35 < Client.field800; ++var35) { - var23 = Client.field809[var35 & 31]; - - for (var36 = 0; var36 < var9.varTransmitTriggers.length; ++var36) { - if (var23 == var9.varTransmitTriggers[var36]) { - var30 = new ScriptEvent(); - var30.widget = var9; - var30.args = var9.onVarTransmit; - Client.scriptEvents.addFirst(var30); - break label899; - } - } - } - } else { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onVarTransmit; - Client.scriptEvents.addFirst(var27); - } - - var9.field2680 = Client.field800; - } - - if (var9.onInvTransmit != null && Client.field812 > var9.field2681) { - if (var9.invTransmitTriggers != null && Client.field812 - var9.field2681 <= 32) { - label875: - for (var35 = var9.field2681; var35 < Client.field812; ++var35) { - var23 = Client.field811[var35 & 31]; - - for (var36 = 0; var36 < var9.invTransmitTriggers.length; ++var36) { - if (var23 == var9.invTransmitTriggers[var36]) { - var30 = new ScriptEvent(); - var30.widget = var9; - var30.args = var9.onInvTransmit; - Client.scriptEvents.addFirst(var30); - break label875; - } - } - } - } else { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onInvTransmit; - Client.scriptEvents.addFirst(var27); - } - - var9.field2681 = Client.field812; - } - - if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field2591) { - if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field2591 <= 32) { - label851: - for (var35 = var9.field2591; var35 < Client.changedSkillsCount; ++var35) { - var23 = Client.changedSkills[var35 & 31]; - - for (var36 = 0; var36 < var9.statTransmitTriggers.length; ++var36) { - if (var23 == var9.statTransmitTriggers[var36]) { - var30 = new ScriptEvent(); - var30.widget = var9; - var30.args = var9.onStatTransmit; - Client.scriptEvents.addFirst(var30); - break label851; - } - } - } - } else { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onStatTransmit; - Client.scriptEvents.addFirst(var27); - } - - var9.field2591 = Client.changedSkillsCount; - } - - if (Client.chatCycle > var9.field2679 && var9.onChatTransmit != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onChatTransmit; - Client.scriptEvents.addFirst(var27); - } - - if (Client.field629 > var9.field2679 && var9.onFriendTransmit != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onFriendTransmit; - Client.scriptEvents.addFirst(var27); - } - - if (Client.field817 > var9.field2679 && var9.onClanTransmit != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onClanTransmit; - Client.scriptEvents.addFirst(var27); - } - - if (Client.field818 > var9.field2679 && var9.onStockTransmit != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onStockTransmit; - Client.scriptEvents.addFirst(var27); - } - - if (Client.field819 > var9.field2679 && var9.field2663 != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.field2663; - Client.scriptEvents.addFirst(var27); - } - - if (Client.field820 > var9.field2679 && var9.onMiscTransmit != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onMiscTransmit; - Client.scriptEvents.addFirst(var27); - } - - var9.field2679 = Client.cycleCntr; - if (var9.onKey != null) { - for (var35 = 0; var35 < Client.field677; ++var35) { - ScriptEvent var31 = new ScriptEvent(); - var31.widget = var9; - var31.keyTyped = Client.field815[var35]; - var31.keyPressed = Client.field845[var35]; - var31.args = var9.onKey; - Client.scriptEvents.addFirst(var31); - } - } - } - } - - if (!var9.isIf3) { - if (Client.clickedWidget != null || class188.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) { - class65.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; - } else { - class65.mousedOverWidgetIf1 = var9; - } - } - - if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - WorldMapDecoration.field198 = var9; - } - - if (var9.scrollHeight > var9.height) { - WorldMapData_1.method682(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 (class60.widgetDragDuration == 0) { - Client.clickedWidget = null; - Client.clickedWidgetParent = null; - } - - if (!Client.isMenuOpen) { - LoginScreenAnimation.addCancelMenuEntry(); - } - } - - MouseRecorder.updateRootInterface(var28.group, var12, var13, var14, var15, var10, var11); - } - } - } - } - } + if (Client.field735 == 1 && var0 >= 3139 && var0 <= 3199 && var1 >= 3008 && var1 <= 3062) { + Client.field735 = 0; } } + + @ObfuscatedName("ix") + @ObfuscatedSignature( + signature = "(IIIZB)V", + garbageValue = "48" + ) + @Export("resizeComponents") + static final void resizeComponents(int var0, int var1, int var2, boolean var3) { + if (TaskHandler.loadInterface(var0)) { + class80.resizeInterface(class289.Widget_interfaceComponents[var0], -1, var1, var2, var3); + } + } } diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java index b433c2065e..b99bd340c6 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("kx") +@ObfuscatedName("kt") @Implements("PacketBuffer") public class PacketBuffer extends Buffer { - @ObfuscatedName("j") - static final int[] field3697; - @ObfuscatedName("s") + @ObfuscatedName("x") + static final int[] field3690; + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lle;" + signature = "Lld;" ) @Export("isaacCipher") IsaacCipher isaacCipher; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 298264099 + intValue = -2134590215 ) @Export("bitIndex") int bitIndex; static { - field3697 = 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}; + field3690 = 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("c") @ObfuscatedSignature( signature = "([II)V", - garbageValue = "742513625" + garbageValue = "-39144257" ) @Export("newIsaacCipher") public void newIsaacCipher(int[] var1) { this.isaacCipher = new IsaacCipher(var1); } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lle;B)V", - garbageValue = "-61" + signature = "(Lld;I)V", + garbageValue = "-1534737114" ) @Export("setIsaacCipher") public void setIsaacCipher(IsaacCipher var1) { this.isaacCipher = var1; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(IB)V", - garbageValue = "-88" + garbageValue = "-52" ) @Export("writeByteIsaac") public void writeByteIsaac(int var1) { super.array[++super.offset - 1] = (byte)(var1 + this.isaacCipher.nextInt()); } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "109" + garbageValue = "2" ) @Export("readByteIsaac") public int readByteIsaac() { return super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(S)Z", - garbageValue = "-2758" + signature = "(I)Z", + garbageValue = "-618198962" ) - public boolean method5353() { - int var1 = super.array[super.offset] - this.isaacCipher.method6134() & 255; + public boolean method5417() { + int var1 = super.array[super.offset] - this.isaacCipher.method6210() & 255; return var1 >= 128; } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-129464228" + signature = "(B)I", + garbageValue = "0" ) @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("t") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "-1827240393" + garbageValue = "-758328547" ) - public void method5384(byte[] var1, int var2, int var3) { + public void method5419(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("q") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-340073235" + garbageValue = "2137116524" ) @Export("importIndex") public void importIndex() { this.bitIndex = super.offset * 8; } - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "912146837" + signature = "(IS)I", + garbageValue = "20518" ) @Export("readBits") public int readBits(int var1) { @@ -125,33 +125,33 @@ public class PacketBuffer extends Buffer { int var4 = 0; for (this.bitIndex += var1; var1 > var3; var3 = 8) { - var4 += (super.array[var2++] & field3697[var3]) << var1 - var3; + var4 += (super.array[var2++] & field3690[var3]) << var1 - var3; var1 -= var3; } if (var3 == var1) { - var4 += super.array[var2] & field3697[var3]; + var4 += super.array[var2] & field3690[var3]; } else { - var4 += super.array[var2] >> var3 - var1 & field3697[var1]; + var4 += super.array[var2] >> var3 - var1 & field3690[var1]; } return var4; } - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1798172664" + garbageValue = "-1696608265" ) @Export("exportIndex") public void exportIndex() { super.offset = (this.bitIndex + 7) / 8; } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(IS)I", - garbageValue = "21689" + signature = "(II)I", + garbageValue = "163494637" ) @Export("bitsRemaining") public int bitsRemaining(int var1) { diff --git a/runescape-client/src/main/java/PacketBufferNode.java b/runescape-client/src/main/java/PacketBufferNode.java index aa3c155b10..10fa400410 100644 --- a/runescape-client/src/main/java/PacketBufferNode.java +++ b/runescape-client/src/main/java/PacketBufferNode.java @@ -4,48 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gq") +@ObfuscatedName("gj") @Implements("PacketBufferNode") public class PacketBufferNode extends Node { - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "[Lgq;" + signature = "[Lgj;" ) @Export("PacketBufferNode_packetBufferNodes") static PacketBufferNode[] PacketBufferNode_packetBufferNodes; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -999589245 + intValue = 1509343701 ) @Export("PacketBufferNode_packetBufferNodeCount") static int PacketBufferNode_packetBufferNodeCount; - @ObfuscatedName("d") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lda;" - ) - @Export("soundSystem") - static SoundSystem soundSystem; - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgw;" ) @Export("clientPacket") - ClientPacket clientPacket; - @ObfuscatedName("j") + public ClientPacket clientPacket; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 190922569 + intValue = 1279904825 ) @Export("clientPacketLength") - int clientPacketLength; - @ObfuscatedName("i") + public int clientPacketLength; + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lkx;" + signature = "Lkt;" ) @Export("packetBuffer") public PacketBuffer packetBuffer; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -2083817253 + intValue = 1995143083 ) @Export("index") public int index; @@ -58,10 +52,10 @@ public class PacketBufferNode extends Node { PacketBufferNode() { } - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "0" + garbageValue = "1" ) @Export("release") public void release() { @@ -70,18 +64,41 @@ public class PacketBufferNode extends Node { } } - @ObfuscatedName("j") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Lhz;IIIZI)V", - garbageValue = "-1570089808" + signature = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "-1275149709" ) - public static void method3574(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { - class197.field2378 = 1; - WorldMapDecoration.musicTrackArchive = var0; - class197.musicTrackGroupId = var1; - class197.musicTrackFileId = var2; - WorldMapSprite.field222 = var3; - Varcs.musicTrackBoolean = var4; - class16.field98 = 10000; + public static String method3616(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 = WorldMapDecoration.method302(var5); + } + + if (Character.isLetter(var5)) { + var3 = 0; + } else if (var5 != '.' && var5 != '?' && var5 != '!') { + if (Character.isSpaceChar(var5)) { + if (var3 != 2) { + var3 = 1; + } + } else { + var3 = 1; + } + } else { + var3 = 2; + } + + var2[var4] = var5; + } + + return new String(var2); } } diff --git a/runescape-client/src/main/java/PacketWriter.java b/runescape-client/src/main/java/PacketWriter.java index f09b9c030c..e0f91e8d56 100644 --- a/runescape-client/src/main/java/PacketWriter.java +++ b/runescape-client/src/main/java/PacketWriter.java @@ -1,95 +1,98 @@ import java.io.IOException; +import java.util.LinkedHashMap; +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("cy") +@ObfuscatedName("cx") @Implements("PacketWriter") public class PacketWriter { - @ObfuscatedName("fe") - @ObfuscatedGetter( - intValue = 1606787637 - ) - @Export("baseX") - static int baseX; - @ObfuscatedName("s") + @ObfuscatedName("sh") @ObfuscatedSignature( - signature = "Lkg;" + signature = "Lj;" + ) + @Export("grandExchangeEvents") + static GrandExchangeEvents grandExchangeEvents; + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "Lks;" ) @Export("socket") AbstractSocket socket; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Ljp;" + signature = "Ljd;" ) @Export("packetBufferNodes") IterableNodeDeque packetBufferNodes; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1205819381 + intValue = -1063535483 ) @Export("bufferSize") int bufferSize; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lky;" + signature = "Lkz;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Lle;" + signature = "Lld;" ) @Export("isaacCipher") public IsaacCipher isaacCipher; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lkx;" + signature = "Lkt;" ) @Export("packetBuffer") PacketBuffer packetBuffer; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lga;" ) @Export("serverPacket") ServerPacket serverPacket; - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1032703307 + intValue = -1384639011 ) @Export("serverPacketLength") int serverPacketLength; - @ObfuscatedName("x") - boolean field1284; @ObfuscatedName("d") + boolean field1281; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1284201635 + intValue = 1450743325 ) - int field1293; - @ObfuscatedName("f") + int field1283; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 421998979 + intValue = 135236915 ) @Export("pendingWrites") int pendingWrites; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lga;" ) - ServerPacket field1295; - @ObfuscatedName("r") + ServerPacket field1274; + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lga;" ) - ServerPacket field1296; - @ObfuscatedName("y") + ServerPacket field1286; + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lga;" ) - ServerPacket field1291; + ServerPacket field1287; PacketWriter() { this.packetBufferNodes = new IterableNodeDeque(); @@ -98,15 +101,15 @@ public class PacketWriter { this.packetBuffer = new PacketBuffer(40000); this.serverPacket = null; this.serverPacketLength = 0; - this.field1284 = true; - this.field1293 = 0; + this.field1281 = true; + this.field1283 = 0; this.pendingWrites = 0; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-194505357" + garbageValue = "1888658982" ) @Export("clearBuffer") final void clearBuffer() { @@ -114,10 +117,10 @@ public class PacketWriter { this.bufferSize = 0; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "10298" + signature = "(B)V", + garbageValue = "0" ) @Export("flush") final void flush() throws IOException { @@ -142,10 +145,10 @@ public class PacketWriter { } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lgq;I)V", - garbageValue = "520216141" + signature = "(Lgj;S)V", + garbageValue = "5307" ) @Export("addNode") public final void addNode(PacketBufferNode var1) { @@ -155,20 +158,20 @@ public class PacketWriter { this.bufferSize += var1.index; } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lkg;I)V", - garbageValue = "-2033102393" + signature = "(Lks;B)V", + garbageValue = "1" ) @Export("setSocket") void setSocket(AbstractSocket var1) { this.socket = var1; } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "-104" + garbageValue = "111" ) @Export("close") void close() { @@ -179,23 +182,93 @@ public class PacketWriter { } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-200145232" + garbageValue = "1660773387" ) @Export("removeSocket") void removeSocket() { this.socket = null; } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(S)Lkg;", - garbageValue = "140" + signature = "(I)Lks;", + garbageValue = "-1816909725" ) @Export("getSocket") AbstractSocket getSocket() { return this.socket; } + + @ObfuscatedName("at") + @ObfuscatedSignature( + signature = "(Lfq;IIB)Ldh;", + garbageValue = "25" + ) + public static final PcmPlayer method2246(TaskHandler var0, int var1, int var2) { + if (GrandExchangeOfferWorldComparator.PcmPlayer_sampleRate == 0) { + throw new IllegalStateException(); + } else if (var1 >= 0 && var1 < 2) { + if (var2 < 256) { + var2 = 256; + } + + try { + PcmPlayer var3 = HealthBar.pcmPlayerProvider.player(); + var3.samples = new int[256 * (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; + var3.field1377 = var2; + var3.init(); + var3.capacity = (var2 & -1024) + 1024; + if (var3.capacity > 16384) { + var3.capacity = 16384; + } + + var3.open(var3.capacity); + if (GrandExchangeEvents.PcmPlayer_count > 0 && FontName.soundSystem == null) { + FontName.soundSystem = new SoundSystem(); + SoundCache.soundSystemExecutor = Executors.newScheduledThreadPool(1); + SoundCache.soundSystemExecutor.scheduleAtFixedRate(FontName.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); + } + + if (FontName.soundSystem != null) { + if (FontName.soundSystem.players[var1] != null) { + throw new IllegalArgumentException(); + } + + FontName.soundSystem.players[var1] = var3; + } + + return var3; + } catch (Throwable var4) { + return new PcmPlayer(); + } + } else { + throw new IllegalArgumentException(); + } + } + + @ObfuscatedName("ft") + @ObfuscatedSignature( + signature = "(ZB)V", + garbageValue = "62" + ) + static final void method2238(boolean var0) { + if (var0) { + Client.field659 = Login.field1183 ? class160.field1972 : class160.field1974; + } else { + LinkedHashMap var1 = Actor.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.field659 = var1.containsKey(var5) ? class160.field1975 : class160.field1973; + } + + } } diff --git a/runescape-client/src/main/java/ParamDefinition.java b/runescape-client/src/main/java/ParamDefinition.java index 1b619af600..025208d79c 100644 --- a/runescape-client/src/main/java/ParamDefinition.java +++ b/runescape-client/src/main/java/ParamDefinition.java @@ -1,38 +1,43 @@ -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("is") +@ObfuscatedName("ij") @Implements("ParamDefinition") public class ParamDefinition extends DualNode { - @ObfuscatedName("pk") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lls;" + signature = "Lhz;" ) - @Export("sceneMinimapSprite") - static Sprite sceneMinimapSprite; - @ObfuscatedName("j") + @Export("ParamDefinition_archive") + static AbstractArchive ParamDefinition_archive; + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("ParamDefinition_cached") - static EvictingDualNodeHashTable ParamDefinition_cached; - @ObfuscatedName("i") + public static EvictingDualNodeHashTable ParamDefinition_cached; + @ObfuscatedName("cm") + @ObfuscatedSignature( + signature = "Lbt;" + ) + @Export("mouseRecorder") + static MouseRecorder mouseRecorder; + @ObfuscatedName("t") @Export("type") char type; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1184264069 + intValue = -1004083119 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("autoDisable") boolean autoDisable; @@ -44,19 +49,19 @@ public class ParamDefinition extends DualNode { this.autoDisable = true; } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-549748029" + signature = "(B)V", + garbageValue = "64" ) @Export("postDecode") void postDecode() { } - @ObfuscatedName("i") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lky;I)V", - garbageValue = "207270503" + signature = "(Lkz;B)V", + garbageValue = "119" ) @Export("decode") void decode(Buffer var1) { @@ -70,10 +75,10 @@ public class ParamDefinition extends DualNode { } } - @ObfuscatedName("k") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(Lky;II)V", - garbageValue = "1082151718" + signature = "(Lkz;IB)V", + garbageValue = "-73" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -107,55 +112,11 @@ public class ParamDefinition extends DualNode { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "38" + signature = "(I)Z", + garbageValue = "-654498367" ) @Export("isString") public boolean isString() { return this.type == 's'; } - - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "(Ljava/awt/Component;S)V", - garbageValue = "-10016" - ) - static void method4420(Component var0) { - var0.removeKeyListener(KeyHandler.KeyHandler_instance); - var0.removeFocusListener(KeyHandler.KeyHandler_instance); - KeyHandler.field378 = -1; - } - - @ObfuscatedName("ja") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1970542013" - ) - static final void method4424() { - PacketBufferNode var0 = MenuAction.getPacketBufferNode(ClientPacket.field2205, 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) { - VarpDefinition.closeInterface(var1, true); - } - } - - if (Client.meslayerContinueWidget != null) { - FriendSystem.invalidateWidget(Client.meslayerContinueWidget); - Client.meslayerContinueWidget = null; - } - - } - - @ObfuscatedName("kx") - @ObfuscatedSignature( - signature = "(Lhp;B)I", - garbageValue = "-97" - ) - @Export("getWidgetClickMask") - static int getWidgetClickMask(Widget var0) { - IntegerNode var1 = (IntegerNode)Client.widgetClickMasks.get(((long)var0.id << 32) + (long)var0.childIndex); - return var1 != null ? var1.integer : var0.clickMask; - } } diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java index 4f76816096..a55e788d74 100644 --- a/runescape-client/src/main/java/PcmPlayer.java +++ b/runescape-client/src/main/java/PcmPlayer.java @@ -4,199 +4,193 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dd") +@ObfuscatedName("dh") @Implements("PcmPlayer") public class PcmPlayer { @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -2109466943 - ) - @Export("PcmPlayer_sampleRate") - public static int PcmPlayer_sampleRate; - @ObfuscatedName("n") @Export("PcmPlayer_stereo") protected static boolean PcmPlayer_stereo; - @ObfuscatedName("y") + @ObfuscatedName("s") @Export("samples") protected int[] samples; @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Ldz;" + signature = "Ldg;" ) @Export("stream") PcmStream stream; - @ObfuscatedName("b") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 2121528369 + intValue = -435360499 ) - int field1384; - @ObfuscatedName("g") + int field1375; + @ObfuscatedName("i") @ObfuscatedGetter( - longValue = 7651317449639431647L + longValue = 7049401177374305975L ) @Export("timeMs") long timeMs; - @ObfuscatedName("e") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1742403687 + intValue = 1222696699 ) @Export("capacity") int capacity; - @ObfuscatedName("z") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -2082148367 + intValue = -1397135465 ) - int field1399; - @ObfuscatedName("a") + int field1377; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1595984821 + intValue = 1389632987 ) - int field1388; + int field1380; + @ObfuscatedName("k") + @ObfuscatedGetter( + longValue = -845340094878598137L + ) + long field1379; @ObfuscatedName("w") @ObfuscatedGetter( - longValue = -7364227675697791643L + intValue = 1393634127 ) - long field1389; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -772636771 - ) - int field1379; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = -1968577703 - ) - int field1391; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -289661183 - ) - int field1393; + int field1374; @ObfuscatedName("m") @ObfuscatedGetter( - longValue = 1958141991499651821L + intValue = 1399548221 ) - long field1386; + int field1381; @ObfuscatedName("o") - boolean field1394; - @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 168489489 + intValue = -485630085 ) - int field1395; - @ObfuscatedName("an") + int field1382; + @ObfuscatedName("a") + @ObfuscatedGetter( + longValue = 8930241059901906729L + ) + long field1383; + @ObfuscatedName("b") + boolean field1390; + @ObfuscatedName("al") + @ObfuscatedGetter( + intValue = 207614275 + ) + int field1387; + @ObfuscatedName("as") @ObfuscatedSignature( - signature = "[Ldz;" + signature = "[Ldg;" ) - PcmStream[] field1396; - @ObfuscatedName("at") + PcmStream[] field1388; + @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "[Ldz;" + signature = "[Ldg;" ) - PcmStream[] field1397; + PcmStream[] field1373; protected PcmPlayer() { - this.field1384 = 32; - this.timeMs = SequenceDefinition.method4686(); - this.field1389 = 0L; - this.field1379 = 0; - this.field1391 = 0; - this.field1393 = 0; - this.field1386 = 0L; - this.field1394 = true; - this.field1395 = 0; - this.field1396 = new PcmStream[8]; - this.field1397 = new PcmStream[8]; + this.field1375 = 32; + this.timeMs = SoundCache.method2480(); + this.field1379 = 0L; + this.field1374 = 0; + this.field1381 = 0; + this.field1382 = 0; + this.field1383 = 0L; + this.field1390 = true; + this.field1387 = 0; + this.field1388 = new PcmStream[8]; + this.field1373 = new PcmStream[8]; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "1" + signature = "(I)V", + garbageValue = "1989780823" ) @Export("init") protected void init() throws Exception { } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1939802329" + signature = "(IB)V", + garbageValue = "91" ) @Export("open") protected void open(int var1) throws Exception { } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "428413683" + garbageValue = "-1120986508" ) @Export("position") protected int position() throws Exception { return this.capacity; } - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("write") protected void write() throws Exception { } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "37766209" + garbageValue = "-1450874669" ) @Export("close") protected void close() { } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "645078569" + garbageValue = "-93486639" ) @Export("discard") protected void discard() throws Exception { } - @ObfuscatedName("m") + @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "(Ldz;I)V", - garbageValue = "-414582995" + signature = "(Ldg;B)V", + garbageValue = "10" ) @Export("setStream") public final synchronized void setStream(PcmStream var1) { this.stream = var1; } - @ObfuscatedName("o") + @ObfuscatedName("av") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-862737237" + garbageValue = "-1445657271" ) @Export("run") public final synchronized void run() { if (this.samples != null) { - long var1 = SequenceDefinition.method4686(); + long var1 = SoundCache.method2480(); try { - if (this.field1389 != 0L) { - if (var1 < this.field1389) { + if (this.field1379 != 0L) { + if (var1 < this.field1379) { return; } this.open(this.capacity); - this.field1389 = 0L; - this.field1394 = true; + this.field1379 = 0L; + this.field1390 = true; } int var3 = this.position(); - if (this.field1393 - var3 > this.field1379) { - this.field1379 = this.field1393 - var3; + if (this.field1382 - var3 > this.field1374) { + this.field1374 = this.field1382 - var3; } - int var4 = this.field1388 + this.field1399; + int var4 = this.field1377 + this.field1380; if (var4 + 256 > 16384) { var4 = 16128; } @@ -210,10 +204,10 @@ public class PcmPlayer { this.close(); this.open(this.capacity); var3 = 0; - this.field1394 = true; + this.field1390 = true; if (var4 + 256 > this.capacity) { var4 = this.capacity - 256; - this.field1388 = var4 - this.field1399; + this.field1380 = var4 - this.field1377; } } @@ -223,38 +217,38 @@ public class PcmPlayer { var3 += 256; } - if (var1 > this.field1386) { - if (!this.field1394) { - if (this.field1379 == 0 && this.field1391 == 0) { + if (var1 > this.field1383) { + if (!this.field1390) { + if (this.field1374 == 0 && this.field1381 == 0) { this.close(); - this.field1389 = 2000L + var1; + this.field1379 = 2000L + var1; return; } - this.field1388 = Math.min(this.field1391, this.field1379); - this.field1391 = this.field1379; + this.field1380 = Math.min(this.field1381, this.field1374); + this.field1381 = this.field1374; } else { - this.field1394 = false; + this.field1390 = false; } - this.field1379 = 0; - this.field1386 = var1 + 2000L; + this.field1374 = 0; + this.field1383 = 2000L + var1; } - this.field1393 = var3; + this.field1382 = var3; } catch (Exception var7) { this.close(); - this.field1389 = var1 + 2000L; + this.field1379 = var1 + 2000L; } try { - if (var1 > this.timeMs + 500000L) { + if (var1 > 500000L + this.timeMs) { var1 = this.timeMs; } while (var1 > this.timeMs + 5000L) { this.skip(256); - this.timeMs += (long)(256000 / PcmPlayer_sampleRate); + this.timeMs += (long)(256000 / GrandExchangeOfferWorldComparator.PcmPlayer_sampleRate); } } catch (Exception var6) { this.timeMs = var1; @@ -263,57 +257,57 @@ public class PcmPlayer { } } - @ObfuscatedName("av") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1124222572" - ) - public final void method2397() { - this.field1394 = true; - } - - @ObfuscatedName("am") + @ObfuscatedName("an") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "-38" + garbageValue = "-50" + ) + public final void method2389() { + this.field1390 = true; + } + + @ObfuscatedName("al") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "-1" ) @Export("tryDiscard") public final synchronized void tryDiscard() { - this.field1394 = true; + this.field1390 = true; try { this.discard(); } catch (Exception var2) { this.close(); - this.field1389 = SequenceDefinition.method4686() + 2000L; + this.field1379 = SoundCache.method2480() + 2000L; } } - @ObfuscatedName("ai") + @ObfuscatedName("as") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "58159891" + signature = "(B)V", + garbageValue = "114" ) @Export("shutdown") public final synchronized void shutdown() { - if (PacketBufferNode.soundSystem != null) { + if (FontName.soundSystem != null) { boolean var1 = true; for (int var2 = 0; var2 < 2; ++var2) { - if (this == PacketBufferNode.soundSystem.players[var2]) { - PacketBufferNode.soundSystem.players[var2] = null; + if (this == FontName.soundSystem.players[var2]) { + FontName.soundSystem.players[var2] = null; } - if (PacketBufferNode.soundSystem.players[var2] != null) { + if (FontName.soundSystem.players[var2] != null) { var1 = false; } } if (var1) { - GrandExchangeOfferWorldComparator.soundSystemExecutor.shutdownNow(); - GrandExchangeOfferWorldComparator.soundSystemExecutor = null; - PacketBufferNode.soundSystem = null; + SoundCache.soundSystemExecutor.shutdownNow(); + SoundCache.soundSystemExecutor = null; + FontName.soundSystem = null; } } @@ -321,16 +315,16 @@ public class PcmPlayer { this.samples = null; } - @ObfuscatedName("af") + @ObfuscatedName("ad") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-1085561099" + garbageValue = "1891020754" ) @Export("skip") final void skip(int var1) { - this.field1395 -= var1; - if (this.field1395 < 0) { - this.field1395 = 0; + this.field1387 -= var1; + if (this.field1387 < 0) { + this.field1387 = 0; } if (this.stream != null) { @@ -339,7 +333,7 @@ public class PcmPlayer { } - @ObfuscatedName("az") + @ObfuscatedName("ap") @Export("fill") final void fill(int[] var1, int var2) { int var3 = var2; @@ -348,11 +342,11 @@ public class PcmPlayer { } class300.clearIntArray(var1, 0, var3); - this.field1395 -= var2; - if (this.stream != null && this.field1395 <= 0) { - this.field1395 += PcmPlayer_sampleRate >> 4; - WorldMapArea.PcmStream_disable(this.stream); - this.method2347(this.stream, this.stream.vmethod2644()); + this.field1387 -= var2; + if (this.stream != null && this.field1387 <= 0) { + this.field1387 += GrandExchangeOfferWorldComparator.PcmPlayer_sampleRate >> 4; + class227.PcmStream_disable(this.stream); + this.method2394(this.stream, this.stream.vmethod2673()); int var4 = 0; int var5 = 255; @@ -374,7 +368,7 @@ public class PcmPlayer { if ((var9 & 1) != 0) { var5 &= ~(1 << var7); var10 = null; - PcmStream var11 = this.field1396[var7]; + PcmStream var11 = this.field1388[var7]; label98: while (true) { @@ -390,33 +384,33 @@ public class PcmPlayer { var11 = var11.after; } else { var11.active = true; - int var13 = var11.vmethod3834(); + int var13 = var11.vmethod3881(); var4 += var13; if (var12 != null) { var12.position += var13; } - if (var4 >= this.field1384) { + if (var4 >= this.field1375) { break label104; } PcmStream var14 = var11.firstSubStream(); if (var14 != null) { - for (int var15 = var11.field1478; var14 != null; var14 = var11.nextSubStream()) { - this.method2347(var14, var15 * var14.vmethod2644() >> 8); + for (int var15 = var11.field1459; var14 != null; var14 = var11.nextSubStream()) { + this.method2394(var14, var15 * var14.vmethod2673() >> 8); } } PcmStream var18 = var11.after; var11.after = null; if (var10 == null) { - this.field1396[var7] = var18; + this.field1388[var7] = var18; } else { var10.after = var18; } if (var18 == null) { - this.field1397[var7] = var10; + this.field1373[var7] = var10; } var11 = var18; @@ -431,9 +425,9 @@ public class PcmPlayer { } for (var6 = 0; var6 < 8; ++var6) { - PcmStream var16 = this.field1396[var6]; - PcmStream[] var17 = this.field1396; - this.field1397[var6] = null; + PcmStream var16 = this.field1388[var6]; + PcmStream[] var17 = this.field1388; + this.field1373[var6] = null; for (var17[var6] = null; var16 != null; var16 = var10) { var10 = var16.after; @@ -442,53 +436,42 @@ public class PcmPlayer { } } - if (this.field1395 < 0) { - this.field1395 = 0; + if (this.field1387 < 0) { + this.field1387 = 0; } if (this.stream != null) { this.stream.fill(var1, 0, var2); } - this.timeMs = SequenceDefinition.method4686(); + this.timeMs = SoundCache.method2480(); } - @ObfuscatedName("an") + @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "(Ldz;II)V", - garbageValue = "-2059733660" + signature = "(Ldg;IB)V", + garbageValue = "11" ) - final void method2347(PcmStream var1, int var2) { + final void method2394(PcmStream var1, int var2) { int var3 = var2 >> 5; - PcmStream var4 = this.field1397[var3]; + PcmStream var4 = this.field1373[var3]; if (var4 == null) { - this.field1396[var3] = var1; + this.field1388[var3] = var1; } else { var4.after = var1; } - this.field1397[var3] = var1; - var1.field1478 = var2; + this.field1373[var3] = var1; + var1.field1459 = var2; } - @ObfuscatedName("i") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "0" + signature = "(Lhz;B)V", + garbageValue = "46" ) - public static boolean method2396(int var0) { - return (var0 >> 21 & 1) != 0; - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(Lhz;Lhz;Ljava/lang/String;Ljava/lang/String;B)Lkb;", - garbageValue = "0" - ) - @Export("SpriteBuffer_getFontByName") - public static Font SpriteBuffer_getFontByName(AbstractArchive var0, AbstractArchive var1, String var2, String var3) { - int var4 = var0.getGroupId(var2); - int var5 = var0.getFileId(var4, var3); - return FileSystem.SpriteBuffer_getFont(var0, var1, var4, var5); + @Export("InvDefinition_setArchives") + public static void InvDefinition_setArchives(AbstractArchive var0) { + InvDefinition.InvDefinition_archive = var0; } } diff --git a/runescape-client/src/main/java/PcmPlayerProvider.java b/runescape-client/src/main/java/PcmPlayerProvider.java index 133e44e263..ae58aeccb8 100644 --- a/runescape-client/src/main/java/PcmPlayerProvider.java +++ b/runescape-client/src/main/java/PcmPlayerProvider.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ct") +@ObfuscatedName("co") @Implements("PcmPlayerProvider") public interface PcmPlayerProvider { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(S)Ldd;", - garbageValue = "-22145" + signature = "(I)Ldh;", + garbageValue = "-131796443" ) @Export("player") PcmPlayer player(); diff --git a/runescape-client/src/main/java/PcmStream.java b/runescape-client/src/main/java/PcmStream.java index 5da9f33eac..ee138f69c9 100644 --- a/runescape-client/src/main/java/PcmStream.java +++ b/runescape-client/src/main/java/PcmStream.java @@ -3,24 +3,24 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dz") +@ObfuscatedName("dg") @Implements("PcmStream") public abstract class PcmStream extends Node { - @ObfuscatedName("b") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Ldz;" + signature = "Ldg;" ) @Export("after") PcmStream after; - @ObfuscatedName("g") - int field1478; - @ObfuscatedName("e") + @ObfuscatedName("i") + int field1459; + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lds;" + signature = "Ldi;" ) @Export("sound") AbstractSound sound; - @ObfuscatedName("z") + @ObfuscatedName("y") @Export("active") volatile boolean active; @@ -28,37 +28,37 @@ public abstract class PcmStream extends Node { this.active = true; } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "()Ldz;" + signature = "()Ldg;" ) @Export("firstSubStream") protected abstract PcmStream firstSubStream(); - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "()Ldz;" + signature = "()Ldg;" ) @Export("nextSubStream") protected abstract PcmStream nextSubStream(); - @ObfuscatedName("q") - protected abstract int vmethod3834(); + @ObfuscatedName("v") + protected abstract int vmethod3881(); - @ObfuscatedName("x") + @ObfuscatedName("d") @Export("fill") protected abstract void fill(int[] var1, int var2, int var3); - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("skip") protected abstract void skip(int var1); - @ObfuscatedName("ak") - int vmethod2644() { + @ObfuscatedName("ah") + int vmethod2673() { return 255; } - @ObfuscatedName("fo") + @ObfuscatedName("eh") @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 6f50c36481..62abbb7be6 100644 --- a/runescape-client/src/main/java/PcmStreamMixer.java +++ b/runescape-client/src/main/java/PcmStreamMixer.java @@ -6,149 +6,149 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("cq") @Implements("PcmStreamMixer") public class PcmStreamMixer extends PcmStream { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Ljc;" + signature = "Ljv;" ) @Export("subStreams") NodeDeque subStreams; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Ljc;" + signature = "Ljv;" ) - NodeDeque field1317; - @ObfuscatedName("i") - int field1315; - @ObfuscatedName("k") - int field1314; + NodeDeque field1307; + @ObfuscatedName("t") + int field1308; + @ObfuscatedName("g") + int field1309; public PcmStreamMixer() { this.subStreams = new NodeDeque(); - this.field1317 = new NodeDeque(); - this.field1315 = 0; - this.field1314 = -1; + this.field1307 = new NodeDeque(); + this.field1308 = 0; + this.field1309 = -1; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ldz;)V" + signature = "(Ldg;)V" ) @Export("addSubStream") public final synchronized void addSubStream(PcmStream var1) { this.subStreams.addLast(var1); } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ldz;)V" + signature = "(Ldg;)V" ) @Export("removeSubStream") public final synchronized void removeSubStream(PcmStream var1) { var1.remove(); } - @ObfuscatedName("i") - void method2218() { - if (this.field1315 > 0) { - for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field1317.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field1317.previous()) { - var1.field1429 -= this.field1315; + @ObfuscatedName("t") + void method2292() { + if (this.field1308 > 0) { + for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field1307.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field1307.previous()) { + var1.field1418 -= this.field1308; } - this.field1314 -= this.field1315; - this.field1315 = 0; + this.field1309 -= this.field1308; + this.field1308 = 0; } } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lfb;Ldj;)V" + signature = "(Lfn;Ldp;)V" ) - void method2226(Node var1, PcmStreamMixerListener var2) { - while (this.field1317.sentinel != var1 && ((PcmStreamMixerListener)var1).field1429 <= var2.field1429) { + void method2267(Node var1, PcmStreamMixerListener var2) { + while (this.field1307.sentinel != var1 && ((PcmStreamMixerListener)var1).field1418 <= var2.field1418) { var1 = var1.previous; } NodeDeque.NodeDeque_addBefore(var2, var1); - this.field1314 = ((PcmStreamMixerListener)this.field1317.sentinel.previous).field1429; + this.field1309 = ((PcmStreamMixerListener)this.field1307.sentinel.previous).field1418; } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(Ldj;)V" + signature = "(Ldp;)V" ) - void method2230(PcmStreamMixerListener var1) { + void method2296(PcmStreamMixerListener var1) { var1.remove(); var1.remove2(); - Node var2 = this.field1317.sentinel.previous; - if (var2 == this.field1317.sentinel) { - this.field1314 = -1; + Node var2 = this.field1307.sentinel.previous; + if (var2 == this.field1307.sentinel) { + this.field1309 = -1; } else { - this.field1314 = ((PcmStreamMixerListener)var2).field1429; + this.field1309 = ((PcmStreamMixerListener)var2).field1418; } } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "()Ldz;" + signature = "()Ldg;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { return (PcmStream)this.subStreams.last(); } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "()Ldz;" + signature = "()Ldg;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { return (PcmStream)this.subStreams.previous(); } - @ObfuscatedName("q") - protected int vmethod3834() { + @ObfuscatedName("v") + protected int vmethod3881() { return 0; } - @ObfuscatedName("x") + @ObfuscatedName("d") @Export("fill") public final synchronized void fill(int[] var1, int var2, int var3) { do { - if (this.field1314 < 0) { + if (this.field1309 < 0) { this.updateSubStreams(var1, var2, var3); return; } - if (var3 + this.field1315 < this.field1314) { - this.field1315 += var3; + if (var3 + this.field1308 < this.field1309) { + this.field1308 += var3; this.updateSubStreams(var1, var2, var3); return; } - int var4 = this.field1314 - this.field1315; + int var4 = this.field1309 - this.field1308; this.updateSubStreams(var1, var2, var4); var2 += var4; var3 -= var4; - this.field1315 += var4; - this.method2218(); - PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field1317.last(); + this.field1308 += var4; + this.method2292(); + PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field1307.last(); synchronized(var5) { int var7 = var5.update(); if (var7 < 0) { - var5.field1429 = 0; - this.method2230(var5); + var5.field1418 = 0; + this.method2296(var5); } else { - var5.field1429 = var7; - this.method2226(var5.previous, var5); + var5.field1418 = var7; + this.method2267(var5.previous, var5); } } } while(var3 != 0); } - @ObfuscatedName("d") + @ObfuscatedName("z") @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("f") + @ObfuscatedName("s") @Export("skip") public final synchronized void skip(int var1) { do { - if (this.field1314 < 0) { + if (this.field1309 < 0) { this.skipSubStreams(var1); return; } - if (this.field1315 + var1 < this.field1314) { - this.field1315 += var1; + if (this.field1308 + var1 < this.field1309) { + this.field1308 += var1; this.skipSubStreams(var1); return; } - int var2 = this.field1314 - this.field1315; + int var2 = this.field1309 - this.field1308; this.skipSubStreams(var2); var1 -= var2; - this.field1315 += var2; - this.method2218(); - PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field1317.last(); + this.field1308 += var2; + this.method2292(); + PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field1307.last(); synchronized(var3) { int var5 = var3.update(); if (var5 < 0) { - var3.field1429 = 0; - this.method2230(var3); + var3.field1418 = 0; + this.method2296(var3); } else { - var3.field1429 = var5; - this.method2226(var3.previous, var3); + var3.field1418 = var5; + this.method2267(var3.previous, var3); } } } while(var1 != 0); } - @ObfuscatedName("c") + @ObfuscatedName("p") @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 f1a4ac3045..b253270a90 100644 --- a/runescape-client/src/main/java/PcmStreamMixerListener.java +++ b/runescape-client/src/main/java/PcmStreamMixerListener.java @@ -3,17 +3,17 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dj") +@ObfuscatedName("dp") @Implements("PcmStreamMixerListener") public abstract class PcmStreamMixerListener extends Node { - @ObfuscatedName("s") - int field1429; + @ObfuscatedName("c") + int field1418; - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("remove2") abstract void remove2(); - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(Lcq;)I" ) diff --git a/runescape-client/src/main/java/PendingSpawn.java b/runescape-client/src/main/java/PendingSpawn.java index 9191671d38..c08b6caa30 100644 --- a/runescape-client/src/main/java/PendingSpawn.java +++ b/runescape-client/src/main/java/PendingSpawn.java @@ -3,77 +3,79 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bm") +@ObfuscatedName("bo") @Implements("PendingSpawn") public final class PendingSpawn extends Node { - @ObfuscatedName("s") + @ObfuscatedName("ar") + @Export("hasFocus") + protected static boolean hasFocus; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 520550313 + intValue = 912800159 ) @Export("plane") int plane; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1382168131 - ) - @Export("type") - int type; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -1841764773 - ) - @Export("x") - int x; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -677953367 + intValue = -639221859 ) @Export("y") int y; - @ObfuscatedName("u") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1218871691 + intValue = 458809523 + ) + @Export("type") + int type; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 87359327 + ) + @Export("x") + int x; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1751315985 ) @Export("objectId") int objectId; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1853437901 + intValue = -470640353 ) - int field907; - @ObfuscatedName("t") + int field900; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1490063309 + intValue = -402504459 ) int field903; - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1310509737 + intValue = -1760011819 ) @Export("id") int id; - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1509033293 + intValue = -316029459 ) @Export("orientation") int orientation; - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1964885807 + intValue = 2139915221 ) int field911; - @ObfuscatedName("f") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 679658845 + intValue = -1581206037 ) @Export("delay") int delay; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 2126284793 + intValue = -1067091679 ) @Export("hitpoints") int hitpoints; @@ -83,286 +85,73 @@ public final class PendingSpawn extends Node { this.hitpoints = -1; } - @ObfuscatedName("p") + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(Lhz;III)[Lli;", + garbageValue = "1975064075" + ) + @Export("SpriteBuffer_getSpriteArray") + public static Sprite[] SpriteBuffer_getSpriteArray(AbstractArchive var0, int var1, int var2) { + byte[] var4 = var0.takeFile(var1, var2); + boolean var3; + if (var4 == null) { + var3 = false; + } else { + GrandExchangeOfferWorldComparator.SpriteBuffer_decode(var4); + var3 = true; + } + + return !var3 ? null : RouteStrategy.method3578(); + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(III)I", + garbageValue = "-1406470873" + ) + static int method1683(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("u") + @ObfuscatedSignature( + signature = "(ILhz;Ljava/lang/String;Ljava/lang/String;IZI)V", + garbageValue = "-2128555897" + ) + public static void method1681(int var0, AbstractArchive var1, String var2, String var3, int var4, boolean var5) { + int var6 = var1.getGroupId(var2); + int var7 = var1.getFileId(var6, var3); + class197.field2376 = 1; + class197.musicTrackArchive = var1; + class197.musicTrackGroupId = var6; + class197.musicTrackFileId = var7; + Canvas.field395 = var4; + MouseRecorder.musicTrackBoolean = var5; + ModelData0.field1833 = var0; + } + + @ObfuscatedName("v") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1879382681" + garbageValue = "-789098612" ) - static void method1661() { - Login.loginIndex = 24; - GrandExchangeOfferOwnWorldComparator.setLoginResponseString("", "You were disconnected from the server.", ""); - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "(ILcr;ZI)I", - garbageValue = "1685357339" - ) - static int method1660(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] = Language.method3605(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] = Decimator.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] = class43.method761(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INV_SIZE) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Actor.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 = ItemContainer.plane; - var4 = PacketWriter.baseX * 64 + (WorldMapIcon_1.localPlayer.x >> 7); - var5 = RouteStrategy.baseY * 64 + (WorldMapIcon_1.localPlayer.y >> 7); - 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] = Language.method3605(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] = Decimator.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] = class43.method761(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 { - return 2; - } - } - } - } - - @ObfuscatedName("gy") - @ObfuscatedSignature( - signature = "(ZLkx;B)V", - garbageValue = "4" - ) - @Export("loadRegions") - static final void loadRegions(boolean var0, PacketBuffer var1) { - Client.isInInstance = var0; - int var2; - int var3; - int var5; - int var6; - int var7; - int var8; - if (!Client.isInInstance) { - var2 = var1.method5447(); - var3 = var1.method5446(); - int var4 = var1.readUnsignedShort(); - ModelData0.xteaKeys = new int[var4][4]; - - for (var5 = 0; var5 < var4; ++var5) { - for (var6 = 0; var6 < 4; ++var6) { - ModelData0.xteaKeys[var5][var6] = var1.readInt(); - } - } - - class186.regions = new int[var4]; - MouseHandler.regionMapArchiveIds = new int[var4]; - ClanChat.regionLandArchiveIds = new int[var4]; - GraphicsObject.regionLandArchives = new byte[var4][]; - Messages.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)) { - class186.regions[var4] = var8; - MouseHandler.regionMapArchiveIds[var4] = WorldMapDecoration.archive5.getGroupId("m" + var6 + "_" + var7); - ClanChat.regionLandArchiveIds[var4] = WorldMapDecoration.archive5.getGroupId("l" + var6 + "_" + var7); - ++var4; - } - } - } - - ModelData0.method3198(var3, var2, true); - } else { - var2 = var1.method5446(); - var3 = var1.method5447(); - boolean var15 = var1.readUnsignedByte() == 1; - 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(); - ModelData0.xteaKeys = new int[var5][4]; - - for (var6 = 0; var6 < var5; ++var6) { - for (var7 = 0; var7 < 4; ++var7) { - ModelData0.xteaKeys[var6][var7] = var1.readInt(); - } - } - - class186.regions = new int[var5]; - MouseHandler.regionMapArchiveIds = new int[var5]; - ClanChat.regionLandArchiveIds = new int[var5]; - GraphicsObject.regionLandArchives = new byte[var5][]; - Messages.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 (class186.regions[var13] == var12) { - var12 = -1; - break; - } - } - - if (var12 != -1) { - class186.regions[var5] = var12; - var13 = var12 >> 8 & 255; - int var14 = var12 & 255; - MouseHandler.regionMapArchiveIds[var5] = WorldMapDecoration.archive5.getGroupId("m" + var13 + "_" + var14); - ClanChat.regionLandArchiveIds[var5] = WorldMapDecoration.archive5.getGroupId("l" + var13 + "_" + var14); - ++var5; - } - } - } - } - } - - ModelData0.method3198(var3, var2, !var15); - } - - } - - @ObfuscatedName("iq") - @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "215444906" - ) - @Export("isWidgetMenuOpcode") - static boolean isWidgetMenuOpcode(int var0) { - return var0 == 57 || var0 == 58 || var0 == 1007 || var0 == 25 || var0 == 30; + public static final void method1682() { + ViewportMouse.ViewportMouse_isInViewport = false; + ViewportMouse.ViewportMouse_entityCount = 0; } } diff --git a/runescape-client/src/main/java/PlatformInfo.java b/runescape-client/src/main/java/PlatformInfo.java index ae4336686c..ec6d03d9df 100644 --- a/runescape-client/src/main/java/PlatformInfo.java +++ b/runescape-client/src/main/java/PlatformInfo.java @@ -4,190 +4,194 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lx") +@ObfuscatedName("la") @Implements("PlatformInfo") public class PlatformInfo extends Node { - @ObfuscatedName("an") - @ObfuscatedGetter( - intValue = 37588435 + @ObfuscatedName("gp") + @ObfuscatedSignature( + signature = "[Lli;" ) - int field3915; - @ObfuscatedName("at") - boolean field3930; + @Export("headIconPkSprites") + static Sprite[] headIconPkSprites; @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 1883484511 + intValue = 1262166811 ) - int field3917; - @ObfuscatedName("ak") - @ObfuscatedGetter( - intValue = -2081208413 - ) - int field3918; - @ObfuscatedName("ao") - @ObfuscatedGetter( - intValue = 999773569 - ) - int field3913; - @ObfuscatedName("ac") - @ObfuscatedGetter( - intValue = 516607859 - ) - int field3919; - @ObfuscatedName("ar") - @ObfuscatedGetter( - intValue = -1900568439 - ) - int field3921; - @ObfuscatedName("au") - boolean field3922; - @ObfuscatedName("ax") - @ObfuscatedGetter( - intValue = -1778909967 - ) - int field3923; - @ObfuscatedName("ag") - @ObfuscatedGetter( - intValue = 1710231033 - ) - int field3924; + int field3910; + @ObfuscatedName("ad") + boolean field3918; @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -468207561 + intValue = -233370459 ) - int field3925; - @ObfuscatedName("aq") + int field3912; + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -1974137013 + intValue = -643959755 ) - int field3926; - @ObfuscatedName("ay") - String field3927; - @ObfuscatedName("ad") - String field3928; - @ObfuscatedName("al") - String field3938; - @ObfuscatedName("ah") - String field3932; + int field3913; + @ObfuscatedName("aj") + @ObfuscatedGetter( + intValue = 368561611 + ) + int field3914; @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -144799921 + intValue = -1553931981 ) - int field3931; - @ObfuscatedName("aw") + int field3915; + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 363262683 + intValue = 401263417 ) - int field3936; + int field3903; + @ObfuscatedName("ak") + boolean field3917; + @ObfuscatedName("ay") + @ObfuscatedGetter( + intValue = -569350389 + ) + int field3908; @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 529470443 + intValue = 337511837 ) - int field3933; - @ObfuscatedName("bk") + int field3925; + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -1264069707 + intValue = 1464874395 + ) + int field3916; + @ObfuscatedName("aq") + @ObfuscatedGetter( + intValue = 1301497237 + ) + int field3922; + @ObfuscatedName("ar") + String field3923; + @ObfuscatedName("ac") + String field3921; + @ObfuscatedName("az") + String field3904; + @ObfuscatedName("ai") + String field3926; + @ObfuscatedName("am") + @ObfuscatedGetter( + intValue = -1840491471 + ) + int field3927; + @ObfuscatedName("aw") + @ObfuscatedGetter( + intValue = 1377986557 + ) + int field3928; + @ObfuscatedName("au") + @ObfuscatedGetter( + intValue = -1434416475 + ) + int field3929; + @ObfuscatedName("bg") + @ObfuscatedGetter( + intValue = 549391923 + ) + int field3931; + @ObfuscatedName("bn") + String field3911; + @ObfuscatedName("bk") + String field3932; + @ObfuscatedName("bp") + int[] field3933; + @ObfuscatedName("bu") + @ObfuscatedGetter( + intValue = -419981447 ) int field3934; - @ObfuscatedName("bw") + @ObfuscatedName("bi") String field3935; - @ObfuscatedName("bo") - String field3907; - @ObfuscatedName("bn") - int[] field3937; - @ObfuscatedName("bp") - @ObfuscatedGetter( - intValue = -1729489163 - ) - int field3905; - @ObfuscatedName("bz") - String field3939; 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.field3937 = new int[3]; - this.field3915 = var1; - this.field3930 = var2; - this.field3917 = var3; - this.field3918 = var4; - this.field3913 = var5; - this.field3919 = var6; - this.field3921 = var7; - this.field3922 = var8; - this.field3923 = var9; - this.field3924 = var10; - this.field3925 = var11; - this.field3926 = var12; - this.field3927 = var13; - this.field3928 = var14; - this.field3938 = var15; - this.field3932 = var16; - this.field3931 = var17; - this.field3936 = var18; - this.field3933 = var19; - this.field3934 = var20; - this.field3935 = var21; - this.field3907 = var22; - this.field3937 = var23; - this.field3905 = var24; - this.field3939 = var25; + this.field3933 = new int[3]; + this.field3910 = var1; + this.field3918 = var2; + this.field3912 = var3; + this.field3913 = var4; + this.field3914 = var5; + this.field3915 = var6; + this.field3903 = var7; + this.field3917 = var8; + this.field3908 = var9; + this.field3925 = var10; + this.field3916 = var11; + this.field3922 = var12; + this.field3923 = var13; + this.field3921 = var14; + this.field3904 = var15; + this.field3926 = var16; + this.field3927 = var17; + this.field3928 = var18; + this.field3929 = var19; + this.field3931 = var20; + this.field3911 = var21; + this.field3932 = var22; + this.field3933 = var23; + this.field3934 = var24; + this.field3935 = var25; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lky;I)V", - garbageValue = "-766634357" + signature = "(Lkz;I)V", + garbageValue = "-712263030" ) @Export("write") public void write(Buffer var1) { var1.writeByte(8); - var1.writeByte(this.field3915); - var1.writeByte(this.field3930 ? 1 : 0); - var1.writeShort(this.field3917); - var1.writeByte(this.field3918); + var1.writeByte(this.field3910); + var1.writeByte(this.field3918 ? 1 : 0); + var1.writeShort(this.field3912); var1.writeByte(this.field3913); - var1.writeByte(this.field3919); - var1.writeByte(this.field3921); - var1.writeByte(this.field3922 ? 1 : 0); - var1.writeShort(this.field3923); - var1.writeByte(this.field3924); - var1.writeMedium(this.field3925); - var1.writeShort(this.field3926); - var1.writeStringCp1252NullCircumfixed(this.field3927); - var1.writeStringCp1252NullCircumfixed(this.field3928); - var1.writeStringCp1252NullCircumfixed(this.field3938); + var1.writeByte(this.field3914); + var1.writeByte(this.field3915); + var1.writeByte(this.field3903); + var1.writeByte(this.field3917 ? 1 : 0); + var1.writeShort(this.field3908); + var1.writeByte(this.field3925); + var1.writeMedium(this.field3916); + var1.writeShort(this.field3922); + var1.writeStringCp1252NullCircumfixed(this.field3923); + var1.writeStringCp1252NullCircumfixed(this.field3921); + var1.writeStringCp1252NullCircumfixed(this.field3904); + var1.writeStringCp1252NullCircumfixed(this.field3926); + var1.writeByte(this.field3928); + var1.writeShort(this.field3927); + var1.writeStringCp1252NullCircumfixed(this.field3911); var1.writeStringCp1252NullCircumfixed(this.field3932); - var1.writeByte(this.field3936); - var1.writeShort(this.field3931); - var1.writeStringCp1252NullCircumfixed(this.field3935); - var1.writeStringCp1252NullCircumfixed(this.field3907); - var1.writeByte(this.field3933); - var1.writeByte(this.field3934); + var1.writeByte(this.field3929); + var1.writeByte(this.field3931); - for (int var2 = 0; var2 < this.field3937.length; ++var2) { - var1.writeInt(this.field3937[var2]); + for (int var2 = 0; var2 < this.field3933.length; ++var2) { + var1.writeInt(this.field3933[var2]); } - var1.writeInt(this.field3905); - var1.writeStringCp1252NullCircumfixed(this.field3939); + var1.writeInt(this.field3934); + var1.writeStringCp1252NullCircumfixed(this.field3935); } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1869130367" + signature = "(S)I", + garbageValue = "-16149" ) @Export("size") public int size() { byte var1 = 39; - int var5 = var1 + GrandExchangeOfferWorldComparator.method80(this.field3927); - var5 += GrandExchangeOfferWorldComparator.method80(this.field3928); - var5 += GrandExchangeOfferWorldComparator.method80(this.field3938); - var5 += GrandExchangeOfferWorldComparator.method80(this.field3932); - var5 += GrandExchangeOfferWorldComparator.method80(this.field3935); - String var4 = this.field3907; - int var3 = var4.length() + 2; - var5 += var3; - var5 += GrandExchangeOfferWorldComparator.method80(this.field3939); - return var5; + int var2 = var1 + GrandExchangeOfferOwnWorldComparator.method1245(this.field3923); + var2 += GrandExchangeOfferOwnWorldComparator.method1245(this.field3921); + var2 += GrandExchangeOfferOwnWorldComparator.method1245(this.field3904); + var2 += GrandExchangeOfferOwnWorldComparator.method1245(this.field3926); + var2 += GrandExchangeOfferOwnWorldComparator.method1245(this.field3911); + var2 += GrandExchangeOfferOwnWorldComparator.method1245(this.field3932); + var2 += GrandExchangeOfferOwnWorldComparator.method1245(this.field3935); + return var2; } } diff --git a/runescape-client/src/main/java/PlatformInfoProvider.java b/runescape-client/src/main/java/PlatformInfoProvider.java index 09a2861152..260eff5969 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("lw") +@ObfuscatedName("lb") @Implements("PlatformInfoProvider") public interface PlatformInfoProvider { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)Llx;", - garbageValue = "-1719381077" + signature = "(I)Lla;", + garbageValue = "-2012824793" ) @Export("get") PlatformInfo get(); diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index f2a5c1aa9f..f8b779ad36 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -1,171 +1,158 @@ -import java.applet.Applet; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bd") +@ObfuscatedName("by") @Implements("Player") public final class Player extends Actor { - @ObfuscatedName("rm") - @ObfuscatedGetter( - intValue = -1071324325 - ) - static int field605; - @ObfuscatedName("gk") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lea;" - ) - @Export("scene") - static Scene scene; - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "Ljx;" + signature = "Ljt;" ) @Export("username") Username username; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lhy;" + signature = "Lhl;" ) @Export("appearance") PlayerAppearance appearance; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1192279175 + intValue = 864337607 ) @Export("headIconPk") int headIconPk; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 467804137 + intValue = -643204403 ) @Export("headIconPrayer") int headIconPrayer; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("actions") String[] actions; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1678004971 + intValue = -2062997853 ) @Export("combatLevel") int combatLevel; - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -111404567 + intValue = -948355921 ) @Export("skillLevel") int skillLevel; - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 339695519 + intValue = 327287567 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1030156263 + intValue = 1224273453 ) @Export("animationCycleStart") int animationCycleStart; - @ObfuscatedName("f") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1574000409 + intValue = 1646595601 ) @Export("animationCycleEnd") int animationCycleEnd; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1214691187 + intValue = 775651165 ) - int field599; - @ObfuscatedName("r") + int field597; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -880216621 + intValue = 1969492201 ) @Export("tileHeight2") int tileHeight2; - @ObfuscatedName("y") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1144569719 + intValue = 986726149 ) - int field601; + int field599; @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Ldo;" + signature = "Ldr;" ) @Export("model0") Model model0; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 368063167 - ) - int field603; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 163934537 - ) - int field604; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -548421503 + intValue = -1689358093 ) - int field616; - @ObfuscatedName("z") + int field601; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1361539533 + intValue = -245110959 ) - int field606; - @ObfuscatedName("a") + int field602; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -1431482225 + ) + int field609; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = 1697291055 + ) + int field604; + @ObfuscatedName("r") @Export("isUnanimated") boolean isUnanimated; - @ObfuscatedName("w") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -670761469 + intValue = 1073558355 ) @Export("team") int team; - @ObfuscatedName("l") + @ObfuscatedName("w") @Export("isHidden") boolean isHidden; - @ObfuscatedName("h") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -58712163 + intValue = 1849078909 ) @Export("plane") int plane; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 722380261 + intValue = -385215651 ) @Export("index") int index; - @ObfuscatedName("m") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Ljj;" + signature = "Ljb;" ) @Export("isFriendTriBool") TriBool isFriendTriBool; - @ObfuscatedName("o") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "Ljj;" + signature = "Ljb;" ) @Export("isInClanChat") TriBool isInClanChat; - @ObfuscatedName("av") - boolean field614; - @ObfuscatedName("am") + @ObfuscatedName("ag") + boolean field607; + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 147350869 + intValue = -327661855 ) @Export("tileX") int tileX; - @ObfuscatedName("ai") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 1655455797 + intValue = 1356455245 ) @Export("tileY") int tileY; @@ -188,13 +175,13 @@ public final class Player extends Actor { this.isHidden = false; this.isFriendTriBool = TriBool.TriBool_unknown; this.isInClanChat = TriBool.TriBool_unknown; - this.field614 = false; + this.field607 = false; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lky;B)V", - garbageValue = "15" + signature = "(Lkz;I)V", + garbageValue = "-2019720231" ) @Export("read") final void read(Buffer var1) { @@ -221,7 +208,7 @@ public final class Player extends Actor { } if (var4[var5] >= 512) { - int var8 = WorldMapData_0.ItemDefinition_get(var4[var5] - 512).team; + int var8 = ItemDefinition_get(var4[var5] - 512).team; if (var8 != 0) { this.team = var8; } @@ -233,7 +220,7 @@ public final class Player extends Actor { for (var6 = 0; var6 < 5; ++var6) { var7 = var1.readUnsignedByte(); - if (var7 < 0 || var7 >= FontName.field3651[var6].length) { + if (var7 < 0 || var7 >= PlayerAppearance.field2508[var6].length) { var7 = 0; } @@ -276,10 +263,10 @@ public final class Player extends Actor { super.runSequence = -1; } - this.username = new Username(var1.readStringCp1252NullTerminated(), FontName.loginType); + this.username = new Username(var1.readStringCp1252NullTerminated(), class4.loginType); this.clearIsFriend(); this.clearIsInClanChat(); - if (this == WorldMapIcon_1.localPlayer) { + if (this == Varps.localPlayer) { RunException.localPlayerName = this.username.getName(); } @@ -297,10 +284,10 @@ public final class Player extends Actor { this.appearance.update(var4, var9, var2 == 1, var3); } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "-83" + signature = "(I)Z", + garbageValue = "-992327182" ) @Export("isFriend") boolean isFriend() { @@ -311,30 +298,30 @@ public final class Player extends Actor { return this.isFriendTriBool == TriBool.TriBool_true; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1921612164" + garbageValue = "-93486639" ) @Export("clearIsFriend") void clearIsFriend() { this.isFriendTriBool = TriBool.TriBool_unknown; } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1245343177" + garbageValue = "-1481363625" ) @Export("checkIsFriend") void checkIsFriend() { - this.isFriendTriBool = class32.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isFriendTriBool = class218.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "91374353" + garbageValue = "-1549480529" ) @Export("isClanMember") boolean isClanMember() { @@ -345,48 +332,48 @@ public final class Player extends Actor { return this.isInClanChat == TriBool.TriBool_true; } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1756216558" + garbageValue = "-1297005928" ) @Export("clearIsInClanChat") void clearIsInClanChat() { this.isInClanChat = TriBool.TriBool_unknown; } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "923060512" + garbageValue = "1288266652" ) @Export("updateIsInClanChat") void updateIsInClanChat() { - this.isInClanChat = Client.clanChat != null && Client.clanChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isInClanChat = GrandExchangeOfferUnitPriceComparator.clanChat != null && GrandExchangeOfferUnitPriceComparator.clanChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "910894704" + garbageValue = "2132604057" ) @Export("transformedSize") int transformedSize() { - return this.appearance != null && this.appearance.npcTransformId != -1 ? ViewportMouse.getNpcDefinition(this.appearance.npcTransformId).size : 1; + return this.appearance != null && this.appearance.npcTransformId != -1 ? FontName.getNpcDefinition(this.appearance.npcTransformId).size : 1; } - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)Ldo;", - garbageValue = "-419920513" + signature = "(B)Ldr;", + garbageValue = "-35" ) @Export("getModel") protected final Model getModel() { if (this.appearance == null) { return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? Widget.SequenceDefinition_get(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence != -1 && !this.isUnanimated && (super.readySequence != super.movementSequence || var1 == null) ? Widget.SequenceDefinition_get(super.movementSequence) : null; + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? class83.SequenceDefinition_get(super.sequence) : null; + SequenceDefinition var2 = super.movementSequence != -1 && !this.isUnanimated && (super.readySequence != super.movementSequence || var1 == null) ? class83.SequenceDefinition_get(super.movementSequence) : null; Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); if (var3 == null) { return null; @@ -396,7 +383,7 @@ public final class Player extends Actor { Model var4; Model[] var5; if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { - var4 = HealthBarUpdate.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); + var4 = NetCache.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); if (var4 != null) { var4.offsetBy(0, -super.heightOffset, 0); var5 = new Model[]{var3, var4}; @@ -411,7 +398,7 @@ public final class Player extends Actor { if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { var4 = this.model0; - var4.offsetBy(this.field599 * 4096 - super.x, this.tileHeight2 - this.tileHeight, this.field601 * 4096 - super.y); + var4.offsetBy(this.field597 * 4096 - super.x * -78439701, this.tileHeight2 - this.tileHeight, this.field599 * 4096 - super.y); if (super.orientation == 512) { var4.rotateY90Ccw(); var4.rotateY90Ccw(); @@ -436,7 +423,7 @@ public final class Player extends Actor { var4.rotateY90Ccw(); } - var4.offsetBy(super.x - this.field599 * 4096, this.tileHeight - this.tileHeight2, super.y - this.field601 * 4096); + var4.offsetBy(super.x * -78439701 - this.field597 * 4096, this.tileHeight - this.tileHeight2, super.y - this.field599 * 4096); } } @@ -446,17 +433,17 @@ public final class Player extends Actor { } } - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(IIBI)V", - garbageValue = "-77453000" + garbageValue = "170644869" ) - final void method1190(int var1, int var2, byte var3) { - if (super.sequence != -1 && Widget.SequenceDefinition_get(super.sequence).field3505 == 1) { + final void method1189(int var1, int var2, byte var3) { + if (super.sequence != -1 && class83.SequenceDefinition_get(super.sequence).field3501 == 1) { super.sequence = -1; } - super.field946 = -1; + super.field945 = -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) { @@ -465,574 +452,22 @@ public final class Player extends Actor { int var6 = super.pathY[0]; int var7 = this.transformedSize(); if (var5 >= var7 && var5 < 104 - var7 && var6 >= var7 && var6 < 104 - var7 && var1 >= var7 && var1 < 104 - var7 && var2 >= var7 && var2 < 104 - var7) { - int var9 = this.transformedSize(); - RouteStrategy var10 = class30.method536(var1, var2); - CollisionMap var11 = Client.collisionMaps[this.plane]; - int[] var12 = Client.field697; - int[] var13 = Client.field898; - int var14 = 0; - - label970: - while (true) { - int var15; - if (var14 >= 128) { - int var16; - int var17; - byte var18; - byte var19; - int var20; - int var21; - byte var22; - int var23; - int[][] var24; - int var25; - int var26; - int var27; - int var28; - boolean var34; - boolean var35; - int var36; - int var37; - int var39; - if (var9 == 1) { - var16 = var5; - var17 = var6; - var18 = 64; - var19 = 64; - var20 = var5 - var18; - var21 = var6 - var19; - class173.directions[var18][var19] = 99; - class173.distances[var18][var19] = 0; - var22 = 0; - var23 = 0; - class173.bufferX[var22] = var5; - var39 = var22 + 1; - class173.bufferY[var22] = var6; - var24 = var11.flags; - - while (true) { - if (var39 == var23) { - class173.field2073 = var16; - class173.field2070 = var17; - var35 = false; - break; - } - - var16 = class173.bufferX[var23]; - var17 = class173.bufferY[var23]; - var23 = var23 + 1 & 4095; - var36 = var16 - var20; - var37 = var17 - var21; - var25 = var16 - var11.xInset; - var26 = var17 - var11.yInset; - if (var10.hasArrived(1, var16, var17, var11)) { - class173.field2073 = var16; - class173.field2070 = var17; - var35 = true; - break; - } - - var27 = class173.distances[var36][var37] + 1; - if (var36 > 0 && class173.directions[var36 - 1][var37] == 0 && (var24[var25 - 1][var26] & 19136776) == 0) { - class173.bufferX[var39] = var16 - 1; - class173.bufferY[var39] = var17; - var39 = var39 + 1 & 4095; - class173.directions[var36 - 1][var37] = 2; - class173.distances[var36 - 1][var37] = var27; - } - - if (var36 < 127 && class173.directions[var36 + 1][var37] == 0 && (var24[var25 + 1][var26] & 19136896) == 0) { - class173.bufferX[var39] = var16 + 1; - class173.bufferY[var39] = var17; - var39 = var39 + 1 & 4095; - class173.directions[var36 + 1][var37] = 8; - class173.distances[var36 + 1][var37] = var27; - } - - if (var37 > 0 && class173.directions[var36][var37 - 1] == 0 && (var24[var25][var26 - 1] & 19136770) == 0) { - class173.bufferX[var39] = var16; - class173.bufferY[var39] = var17 - 1; - var39 = var39 + 1 & 4095; - class173.directions[var36][var37 - 1] = 1; - class173.distances[var36][var37 - 1] = var27; - } - - if (var37 < 127 && class173.directions[var36][var37 + 1] == 0 && (var24[var25][var26 + 1] & 19136800) == 0) { - class173.bufferX[var39] = var16; - class173.bufferY[var39] = var17 + 1; - var39 = var39 + 1 & 4095; - class173.directions[var36][var37 + 1] = 4; - class173.distances[var36][var37 + 1] = var27; - } - - if (var36 > 0 && var37 > 0 && class173.directions[var36 - 1][var37 - 1] == 0 && (var24[var25 - 1][var26 - 1] & 19136782) == 0 && (var24[var25 - 1][var26] & 19136776) == 0 && (var24[var25][var26 - 1] & 19136770) == 0) { - class173.bufferX[var39] = var16 - 1; - class173.bufferY[var39] = var17 - 1; - var39 = var39 + 1 & 4095; - class173.directions[var36 - 1][var37 - 1] = 3; - class173.distances[var36 - 1][var37 - 1] = var27; - } - - if (var36 < 127 && var37 > 0 && class173.directions[var36 + 1][var37 - 1] == 0 && (var24[var25 + 1][var26 - 1] & 19136899) == 0 && (var24[var25 + 1][var26] & 19136896) == 0 && (var24[var25][var26 - 1] & 19136770) == 0) { - class173.bufferX[var39] = var16 + 1; - class173.bufferY[var39] = var17 - 1; - var39 = var39 + 1 & 4095; - class173.directions[var36 + 1][var37 - 1] = 9; - class173.distances[var36 + 1][var37 - 1] = var27; - } - - if (var36 > 0 && var37 < 127 && class173.directions[var36 - 1][var37 + 1] == 0 && (var24[var25 - 1][var26 + 1] & 19136824) == 0 && (var24[var25 - 1][var26] & 19136776) == 0 && (var24[var25][var26 + 1] & 19136800) == 0) { - class173.bufferX[var39] = var16 - 1; - class173.bufferY[var39] = var17 + 1; - var39 = var39 + 1 & 4095; - class173.directions[var36 - 1][var37 + 1] = 6; - class173.distances[var36 - 1][var37 + 1] = var27; - } - - if (var36 < 127 && var37 < 127 && class173.directions[var36 + 1][var37 + 1] == 0 && (var24[var25 + 1][var26 + 1] & 19136992) == 0 && (var24[var25 + 1][var26] & 19136896) == 0 && (var24[var25][var26 + 1] & 19136800) == 0) { - class173.bufferX[var39] = var16 + 1; - class173.bufferY[var39] = var17 + 1; - var39 = var39 + 1 & 4095; - class173.directions[var36 + 1][var37 + 1] = 12; - class173.distances[var36 + 1][var37 + 1] = var27; - } - } - - var34 = var35; - } else if (var9 == 2) { - var16 = var5; - var17 = var6; - var18 = 64; - var19 = 64; - var20 = var5 - var18; - var21 = var6 - var19; - class173.directions[var18][var19] = 99; - class173.distances[var18][var19] = 0; - var22 = 0; - var23 = 0; - class173.bufferX[var22] = var5; - var39 = var22 + 1; - class173.bufferY[var22] = var6; - var24 = var11.flags; - - while (true) { - if (var39 == var23) { - class173.field2073 = var16; - class173.field2070 = var17; - var35 = false; - break; - } - - var16 = class173.bufferX[var23]; - var17 = class173.bufferY[var23]; - var23 = var23 + 1 & 4095; - var36 = var16 - var20; - var37 = var17 - var21; - var25 = var16 - var11.xInset; - var26 = var17 - var11.yInset; - if (var10.hasArrived(2, var16, var17, var11)) { - class173.field2073 = var16; - class173.field2070 = var17; - var35 = true; - break; - } - - var27 = class173.distances[var36][var37] + 1; - if (var36 > 0 && class173.directions[var36 - 1][var37] == 0 && (var24[var25 - 1][var26] & 19136782) == 0 && (var24[var25 - 1][var26 + 1] & 19136824) == 0) { - class173.bufferX[var39] = var16 - 1; - class173.bufferY[var39] = var17; - var39 = var39 + 1 & 4095; - class173.directions[var36 - 1][var37] = 2; - class173.distances[var36 - 1][var37] = var27; - } - - if (var36 < 126 && class173.directions[var36 + 1][var37] == 0 && (var24[var25 + 2][var26] & 19136899) == 0 && (var24[var25 + 2][var26 + 1] & 19136992) == 0) { - class173.bufferX[var39] = var16 + 1; - class173.bufferY[var39] = var17; - var39 = var39 + 1 & 4095; - class173.directions[var36 + 1][var37] = 8; - class173.distances[var36 + 1][var37] = var27; - } - - if (var37 > 0 && class173.directions[var36][var37 - 1] == 0 && (var24[var25][var26 - 1] & 19136782) == 0 && (var24[var25 + 1][var26 - 1] & 19136899) == 0) { - class173.bufferX[var39] = var16; - class173.bufferY[var39] = var17 - 1; - var39 = var39 + 1 & 4095; - class173.directions[var36][var37 - 1] = 1; - class173.distances[var36][var37 - 1] = var27; - } - - if (var37 < 126 && class173.directions[var36][var37 + 1] == 0 && (var24[var25][var26 + 2] & 19136824) == 0 && (var24[var25 + 1][var26 + 2] & 19136992) == 0) { - class173.bufferX[var39] = var16; - class173.bufferY[var39] = var17 + 1; - var39 = var39 + 1 & 4095; - class173.directions[var36][var37 + 1] = 4; - class173.distances[var36][var37 + 1] = var27; - } - - if (var36 > 0 && var37 > 0 && class173.directions[var36 - 1][var37 - 1] == 0 && (var24[var25 - 1][var26] & 19136830) == 0 && (var24[var25 - 1][var26 - 1] & 19136782) == 0 && (var24[var25][var26 - 1] & 19136911) == 0) { - class173.bufferX[var39] = var16 - 1; - class173.bufferY[var39] = var17 - 1; - var39 = var39 + 1 & 4095; - class173.directions[var36 - 1][var37 - 1] = 3; - class173.distances[var36 - 1][var37 - 1] = var27; - } - - if (var36 < 126 && var37 > 0 && class173.directions[var36 + 1][var37 - 1] == 0 && (var24[var25 + 1][var26 - 1] & 19136911) == 0 && (var24[var25 + 2][var26 - 1] & 19136899) == 0 && (var24[var25 + 2][var26] & 19136995) == 0) { - class173.bufferX[var39] = var16 + 1; - class173.bufferY[var39] = var17 - 1; - var39 = var39 + 1 & 4095; - class173.directions[var36 + 1][var37 - 1] = 9; - class173.distances[var36 + 1][var37 - 1] = var27; - } - - if (var36 > 0 && var37 < 126 && class173.directions[var36 - 1][var37 + 1] == 0 && (var24[var25 - 1][var26 + 1] & 19136830) == 0 && (var24[var25 - 1][var26 + 2] & 19136824) == 0 && (var24[var25][var26 + 2] & 19137016) == 0) { - class173.bufferX[var39] = var16 - 1; - class173.bufferY[var39] = var17 + 1; - var39 = var39 + 1 & 4095; - class173.directions[var36 - 1][var37 + 1] = 6; - class173.distances[var36 - 1][var37 + 1] = var27; - } - - if (var36 < 126 && var37 < 126 && class173.directions[var36 + 1][var37 + 1] == 0 && (var24[var25 + 1][var26 + 2] & 19137016) == 0 && (var24[var25 + 2][var26 + 2] & 19136992) == 0 && (var24[var25 + 2][var26 + 1] & 19136995) == 0) { - class173.bufferX[var39] = var16 + 1; - class173.bufferY[var39] = var17 + 1; - var39 = var39 + 1 & 4095; - class173.directions[var36 + 1][var37 + 1] = 12; - class173.distances[var36 + 1][var37 + 1] = var27; - } - } - - var34 = var35; - } else { - var16 = var5; - var17 = var6; - var18 = 64; - var19 = 64; - var20 = var5 - var18; - var21 = var6 - var19; - class173.directions[var18][var19] = 99; - class173.distances[var18][var19] = 0; - var22 = 0; - var23 = 0; - class173.bufferX[var22] = var5; - var39 = var22 + 1; - class173.bufferY[var22] = var6; - var24 = var11.flags; - - label940: - while (true) { - label938: - while (true) { - do { - do { - do { - label915: - do { - if (var39 == var23) { - class173.field2073 = var16; - class173.field2070 = var17; - var35 = false; - break label940; - } - - var16 = class173.bufferX[var23]; - var17 = class173.bufferY[var23]; - var23 = var23 + 1 & 4095; - var36 = var16 - var20; - var37 = var17 - var21; - var25 = var16 - var11.xInset; - var26 = var17 - var11.yInset; - if (var10.hasArrived(var9, var16, var17, var11)) { - class173.field2073 = var16; - class173.field2070 = var17; - var35 = true; - break label940; - } - - var27 = class173.distances[var36][var37] + 1; - if (var36 > 0 && class173.directions[var36 - 1][var37] == 0 && (var24[var25 - 1][var26] & 19136782) == 0 && (var24[var25 - 1][var9 + var26 - 1] & 19136824) == 0) { - var28 = 1; - - while (true) { - if (var28 >= var9 - 1) { - class173.bufferX[var39] = var16 - 1; - class173.bufferY[var39] = var17; - var39 = var39 + 1 & 4095; - class173.directions[var36 - 1][var37] = 2; - class173.distances[var36 - 1][var37] = var27; - break; - } - - if ((var24[var25 - 1][var26 + var28] & 19136830) != 0) { - break; - } - - ++var28; - } - } - - if (var36 < 128 - var9 && class173.directions[var36 + 1][var37] == 0 && (var24[var9 + var25][var26] & 19136899) == 0 && (var24[var9 + var25][var9 + var26 - 1] & 19136992) == 0) { - var28 = 1; - - while (true) { - if (var28 >= var9 - 1) { - class173.bufferX[var39] = var16 + 1; - class173.bufferY[var39] = var17; - var39 = var39 + 1 & 4095; - class173.directions[var36 + 1][var37] = 8; - class173.distances[var36 + 1][var37] = var27; - break; - } - - if ((var24[var9 + var25][var28 + var26] & 19136995) != 0) { - break; - } - - ++var28; - } - } - - if (var37 > 0 && class173.directions[var36][var37 - 1] == 0 && (var24[var25][var26 - 1] & 19136782) == 0 && (var24[var25 + var9 - 1][var26 - 1] & 19136899) == 0) { - var28 = 1; - - while (true) { - if (var28 >= var9 - 1) { - class173.bufferX[var39] = var16; - class173.bufferY[var39] = var17 - 1; - var39 = var39 + 1 & 4095; - class173.directions[var36][var37 - 1] = 1; - class173.distances[var36][var37 - 1] = var27; - break; - } - - if ((var24[var25 + var28][var26 - 1] & 19136911) != 0) { - break; - } - - ++var28; - } - } - - if (var37 < 128 - var9 && class173.directions[var36][var37 + 1] == 0 && (var24[var25][var9 + var26] & 19136824) == 0 && (var24[var25 + var9 - 1][var9 + var26] & 19136992) == 0) { - var28 = 1; - - while (true) { - if (var28 >= var9 - 1) { - class173.bufferX[var39] = var16; - class173.bufferY[var39] = var17 + 1; - var39 = var39 + 1 & 4095; - class173.directions[var36][var37 + 1] = 4; - class173.distances[var36][var37 + 1] = var27; - break; - } - - if ((var24[var28 + var25][var9 + var26] & 19137016) != 0) { - break; - } - - ++var28; - } - } - - if (var36 > 0 && var37 > 0 && class173.directions[var36 - 1][var37 - 1] == 0 && (var24[var25 - 1][var26 - 1] & 19136782) == 0) { - var28 = 1; - - while (true) { - if (var28 >= var9) { - class173.bufferX[var39] = var16 - 1; - class173.bufferY[var39] = var17 - 1; - var39 = var39 + 1 & 4095; - class173.directions[var36 - 1][var37 - 1] = 3; - class173.distances[var36 - 1][var37 - 1] = var27; - break; - } - - if ((var24[var25 - 1][var28 + (var26 - 1)] & 19136830) != 0 || (var24[var28 + (var25 - 1)][var26 - 1] & 19136911) != 0) { - break; - } - - ++var28; - } - } - - if (var36 < 128 - var9 && var37 > 0 && class173.directions[var36 + 1][var37 - 1] == 0 && (var24[var25 + var9][var26 - 1] & 19136899) == 0) { - var28 = 1; - - while (true) { - if (var28 >= var9) { - class173.bufferX[var39] = var16 + 1; - class173.bufferY[var39] = var17 - 1; - var39 = var39 + 1 & 4095; - class173.directions[var36 + 1][var37 - 1] = 9; - class173.distances[var36 + 1][var37 - 1] = var27; - break; - } - - if ((var24[var9 + var25][var28 + (var26 - 1)] & 19136995) != 0 || (var24[var25 + var28][var26 - 1] & 19136911) != 0) { - break; - } - - ++var28; - } - } - - if (var36 > 0 && var37 < 128 - var9 && class173.directions[var36 - 1][var37 + 1] == 0 && (var24[var25 - 1][var26 + var9] & 19136824) == 0) { - for (var28 = 1; var28 < var9; ++var28) { - if ((var24[var25 - 1][var28 + var26] & 19136830) != 0 || (var24[var28 + (var25 - 1)][var26 + var9] & 19137016) != 0) { - continue label915; - } - } - - class173.bufferX[var39] = var16 - 1; - class173.bufferY[var39] = var17 + 1; - var39 = var39 + 1 & 4095; - class173.directions[var36 - 1][var37 + 1] = 6; - class173.distances[var36 - 1][var37 + 1] = var27; - } - } while(var36 >= 128 - var9); - } while(var37 >= 128 - var9); - } while(class173.directions[var36 + 1][var37 + 1] != 0); - } while((var24[var9 + var25][var9 + var26] & 19136992) != 0); - - for (var28 = 1; var28 < var9; ++var28) { - if ((var24[var25 + var28][var26 + var9] & 19137016) != 0 || (var24[var25 + var9][var26 + var28] & 19136995) != 0) { - continue label938; - } - } - - class173.bufferX[var39] = var16 + 1; - class173.bufferY[var39] = var17 + 1; - var39 = var39 + 1 & 4095; - class173.directions[var36 + 1][var37 + 1] = 12; - class173.distances[var36 + 1][var37 + 1] = var27; - } - } - - var34 = var35; - } - - int var8; - label1013: { - var15 = var5 - 64; - var16 = var6 - 64; - var17 = class173.field2073; - var36 = class173.field2070; - if (!var34) { - var37 = Integer.MAX_VALUE; - var20 = Integer.MAX_VALUE; - byte var38 = 10; - var39 = var10.approxDestinationX; - var23 = var10.approxDestinationY; - int var33 = var10.approxDestinationSizeX; - var25 = var10.approxDestinationSizeY; - - for (var26 = var39 - var38; var26 <= var39 + var38; ++var26) { - for (var27 = var23 - var38; var27 <= var38 + var23; ++var27) { - var28 = var26 - var15; - int var29 = var27 - var16; - if (var28 >= 0 && var29 >= 0 && var28 < 128 && var29 < 128 && class173.distances[var28][var29] < 100) { - int var30 = 0; - if (var26 < var39) { - var30 = var39 - var26; - } else if (var26 > var33 + var39 - 1) { - var30 = var26 - (var39 + var33 - 1); - } - - int var31 = 0; - if (var27 < var23) { - var31 = var23 - var27; - } else if (var27 > var23 + var25 - 1) { - var31 = var27 - (var25 + var23 - 1); - } - - int var32 = var30 * var30 + var31 * var31; - if (var32 < var37 || var32 == var37 && class173.distances[var28][var29] < var20) { - var37 = var32; - var20 = class173.distances[var28][var29]; - var17 = var26; - var36 = var27; - } - } - } - } - - if (var37 == Integer.MAX_VALUE) { - var8 = -1; - break label1013; - } - } - - if (var17 == var5 && var36 == var6) { - var8 = 0; - } else { - var19 = 0; - class173.bufferX[var19] = var17; - var37 = var19 + 1; - class173.bufferY[var19] = var36; - - for (var20 = var21 = class173.directions[var17 - var15][var36 - var16]; var5 != var17 || var6 != var36; var20 = class173.directions[var17 - var15][var36 - var16]) { - if (var21 != var20) { - var21 = var20; - class173.bufferX[var37] = var17; - class173.bufferY[var37++] = var36; - } - - if ((var20 & 2) != 0) { - ++var17; - } else if ((var20 & 8) != 0) { - --var17; - } - - if ((var20 & 1) != 0) { - ++var36; - } else if ((var20 & 4) != 0) { - --var36; - } - } - - var39 = 0; - - while (var37-- > 0) { - var12[var39] = class173.bufferX[var37]; - var13[var39++] = class173.bufferY[var37]; - if (var39 >= var12.length) { - break; - } - } - - var8 = var39; - } - } - - var14 = var8; - if (var8 < 1) { - break; - } - - var15 = 0; - - while (true) { - if (var15 >= var14 - 1) { - break label970; - } - - var4.method1195(Client.field697[var15], Client.field898[var15], (byte)2); - ++var15; - } + int var10 = this.transformedSize(); + Client.field896.approxDestinationX = var1; + Client.field896.approxDestinationY = var2; + Client.field896.approxDestinationSizeX = 1; + Client.field896.approxDestinationSizeY = 1; + class65 var11 = Client.field896; + int var12 = WorldMapIcon_0.method194(var5, var6, var10, var11, Client.collisionMaps[this.plane], true, Client.field897, Client.field622); + if (var12 >= 1) { + for (int var13 = 0; var13 < var12 - 1; ++var13) { + var4.method1191(Client.field897[var13], Client.field622[var13], (byte)2); } - - for (var15 = 0; var15 < 128; ++var15) { - class173.directions[var14][var15] = 0; - class173.distances[var14][var15] = 99999999; - } - - ++var14; } } } - this.method1195(var1, var2, var3); + this.method1191(var1, var2, var3); } else { this.resetPath(var1, var2); } @@ -1042,29 +477,29 @@ public final class Player extends Actor { } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-1849067298" + garbageValue = "317983942" ) @Export("resetPath") void resetPath(int var1, int var2) { super.pathLength = 0; - super.field947 = 0; - super.field976 = 0; + super.field969 = 0; + super.field975 = 0; super.pathX[0] = var1; super.pathY[0] = var2; int var3 = this.transformedSize(); - super.x = super.pathX[0] * 128 + var3 * 64; + super.x = var3 * -294686528 + super.pathX[0] * -589373056; super.y = super.pathY[0] * 128 + var3 * 64; } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(IIBB)V", - garbageValue = "1" + signature = "(IIBI)V", + garbageValue = "-1285551700" ) - final void method1195(int var1, int var2, byte var3) { + final void method1191(int var1, int var2, byte var3) { if (super.pathLength < 9) { ++super.pathLength; } @@ -1080,181 +515,246 @@ public final class Player extends Actor { super.pathTraversed[0] = var3; } - @ObfuscatedName("r") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(B)Z", - garbageValue = "-110" + garbageValue = "93" ) @Export("isVisible") final boolean isVisible() { return this.appearance != null; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/applet/Applet;Ljava/lang/String;I)V", - garbageValue = "-1361577662" + signature = "(Lhz;I)V", + garbageValue = "-1030066810" ) - public static void method1223(Applet var0, String var1) { - class51.applet = var0; - if (var1 != null) { - class51.field404 = var1; - } - + public static void method1228(AbstractArchive var0) { + FloorOverlayDefinition.FloorOverlayDefinition_archive = var0; } - @ObfuscatedName("f") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "([BS)V", - garbageValue = "-23424" + signature = "(IB)Lid;", + garbageValue = "-59" ) - @Export("SpriteBuffer_decode") - static void SpriteBuffer_decode(byte[] var0) { - Buffer var1 = new Buffer(var0); - var1.offset = var0.length - 2; - class325.SpriteBuffer_spriteCount = var1.readUnsignedShort(); - class325.SpriteBuffer_xOffsets = new int[class325.SpriteBuffer_spriteCount]; - class325.SpriteBuffer_yOffsets = new int[class325.SpriteBuffer_spriteCount]; - class325.SpriteBuffer_spriteWidths = new int[class325.SpriteBuffer_spriteCount]; - class225.SpriteBuffer_spriteHeights = new int[class325.SpriteBuffer_spriteCount]; - WorldMapSection1.SpriteBuffer_pixels = new byte[class325.SpriteBuffer_spriteCount][]; - var1.offset = var0.length - 7 - class325.SpriteBuffer_spriteCount * 8; - GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); - class325.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); - int var2 = (var1.readUnsignedByte() & 255) + 1; - - int var3; - for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) { - class325.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) { - class325.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) { - class325.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) { - class225.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); - } - - var1.offset = var0.length - 7 - class325.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; - class325.SpriteBuffer_spritePalette = new int[var2]; - - for (var3 = 1; var3 < var2; ++var3) { - class325.SpriteBuffer_spritePalette[var3] = var1.readMedium(); - if (class325.SpriteBuffer_spritePalette[var3] == 0) { - class325.SpriteBuffer_spritePalette[var3] = 1; + @Export("ItemDefinition_get") + public static ItemDefinition ItemDefinition_get(int var0) { + ItemDefinition var1 = (ItemDefinition)ItemDefinition.ItemDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = class65.ItemDefinition_archive.takeFile(10, var0); + var1 = new ItemDefinition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); } - } - var1.offset = 0; + var1.post(); + if (var1.noteTemplate != -1) { + var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note)); + } - for (var3 = 0; var3 < class325.SpriteBuffer_spriteCount; ++var3) { - int var4 = class325.SpriteBuffer_spriteWidths[var3]; - int var5 = class225.SpriteBuffer_spriteHeights[var3]; - int var6 = var5 * var4; - byte[] var7 = new byte[var6]; - WorldMapSection1.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 + var10 * var4] = var1.readByte(); + 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 (!ItemDefinition.ItemDefinition_inMembersWorld && var1.isMembersOnly) { + var1.name = "Members object"; + var1.isTradable = false; + var1.groundActions = null; + var1.inventoryActions = null; + var1.shiftClickIndex = -1; + var1.team = 0; + if (var1.params != null) { + boolean var3 = false; + + for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { + ParamDefinition var5 = GrandExchangeOfferTotalQuantityComparator.getParamDefinition((int)var4.key); + if (var5.autoDisable) { + var4.remove(); + } else { + var3 = true; + } + } + + if (!var3) { + var1.params = null; } } } - } + ItemDefinition.ItemDefinition_cached.put(var1, (long)var0); + return var1; + } } - @ObfuscatedName("az") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "([BB)[B", - garbageValue = "-68" + signature = "(II)Lhy;", + garbageValue = "-43524032" ) - @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.field3120 != 0 && var3 > AbstractArchive.field3120) { - throw new RuntimeException(); - } else if (var2 == 0) { - byte[] var4 = new byte[var3]; - var1.readBytes(var4, 0, var3); - return var4; - } else { - int var6 = var1.readInt(); - if (var6 >= 0 && (AbstractArchive.field3120 == 0 || var6 <= AbstractArchive.field3120)) { - byte[] var5 = new byte[var6]; - if (var2 == 1) { - BZip2Decompressor.BZip2Decompressor_decompress(var5, var6, var0, var3, 9); - } else { - AbstractArchive.gzipDecompressor.decompress(var1, var5); - } - - return var5; - } else { - throw new RuntimeException(); + @Export("getWidget") + public static Widget getWidget(int var0) { + int var1 = var0 >> 16; + int var2 = var0 & 65535; + if (class289.Widget_interfaceComponents[var1] == null || class289.Widget_interfaceComponents[var1][var2] == null) { + boolean var3 = TaskHandler.loadInterface(var1); + if (!var3) { + return null; } } + + return class289.Widget_interfaceComponents[var1][var2]; } - @ObfuscatedName("at") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(ILcr;ZI)I", - garbageValue = "-1511089704" + signature = "(IIIIIZI)Lli;", + garbageValue = "1247065479" ) - static int method1224(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.GETWINDOWMODE) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = UserComparator7.getWindowedMode(); - return 1; - } else { - int var3; - if (var0 == ScriptOpcodes.SETWINDOWMODE) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var3 == 1 || var3 == 2) { - StudioGame.setWindowedMode(var3); - } + @Export("getItemSprite") + public static final Sprite 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; + } - return 1; - } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOffer.clientPreferences.windowMode; - return 1; - } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { - if (var0 == 5310) { - --Interpreter.Interpreter_intStackSize; - return 1; - } else { - return 2; - } - } else { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var3 == 1 || var3 == 2) { - GrandExchangeOffer.clientPreferences.windowMode = var3; - GrandExchangeOfferAgeComparator.savePreferences(); - } - - return 1; + long var6 = (long)var0 + ((long)var1 << 16) + ((long)var2 << 38) + ((long)var4 << 40) + ((long)var3 << 42); + Sprite var8; + if (!var5) { + var8 = (Sprite)ItemDefinition.ItemDefinition_cachedSprites.get(var6); + if (var8 != null) { + return var8; } } + + ItemDefinition var9 = 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 = ItemDefinition_get(var10); + } + } + + Model var19 = var9.getModel(1); + if (var19 == null) { + return null; + } else { + Sprite 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 Sprite(36, 32); + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); + Rasterizer2D.Rasterizer2D_clear(); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); + Rasterizer3D.method3033(16, 16); + Rasterizer3D.field1729 = 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.method2854(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) { + class215.ItemDefinition_fontPlain11.draw(BoundaryObject.method3230(var1), 0, 9, 16776960, 1); + } + + if (!var5) { + ItemDefinition.ItemDefinition_cachedSprites.put(var8, var6); + } + + Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); + Rasterizer2D.Rasterizer2D_setClipArray(var15); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); + Rasterizer3D.field1729 = true; + return var8; + } } - @ObfuscatedName("in") + @ObfuscatedName("hn") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "43" + signature = "(IIIII)V", + garbageValue = "16777215" ) - @Export("getNewestMenuIdx") - static final int getNewestMenuIdx() { - return Client.menuOptionsCount - 1; + static void method1196(int var0, int var1, int var2, int var3) { + Widget var4 = class49.getWidgetChild(var0, var1); + if (var4 != null && var4.onTargetEnter != null) { + ScriptEvent var5 = new ScriptEvent(); + var5.widget = var4; + var5.args = var4.onTargetEnter; + SecureRandomFuture.runScriptEvent(var5); + } + + Client.field648 = var3; + Client.isSpellSelected = true; + class83.field1138 = var0; + Client.field687 = var1; + BuddyRankComparator.selectedSpellFlags = var2; + WorldMapID.invalidateWidget(var4); } } diff --git a/runescape-client/src/main/java/PlayerAppearance.java b/runescape-client/src/main/java/PlayerAppearance.java index 685eca3b7a..46fdced300 100644 --- a/runescape-client/src/main/java/PlayerAppearance.java +++ b/runescape-client/src/main/java/PlayerAppearance.java @@ -3,56 +3,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("hy") +@ObfuscatedName("hl") @Implements("PlayerAppearance") public class PlayerAppearance { - @ObfuscatedName("x") - public static short[] field2523; - @ObfuscatedName("f") + @ObfuscatedName("v") + public static short[][] field2508; + @ObfuscatedName("d") + public static short[] field2513; + @ObfuscatedName("z") + public static short[][] field2511; + @ObfuscatedName("n") @Export("equipmentIndices") static final int[] equipmentIndices; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("PlayerAppearance_cachedModels") public static EvictingDualNodeHashTable PlayerAppearance_cachedModels; - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("equipment") int[] equipment; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("bodyColors") int[] bodyColors; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("isFemale") public boolean isFemale; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1853482323 + intValue = 1955539513 ) @Export("npcTransformId") public int npcTransformId; + @ObfuscatedName("l") + @ObfuscatedGetter( + longValue = -768101756987274503L + ) + long field2510; @ObfuscatedName("u") @ObfuscatedGetter( - longValue = -7365242967522799729L + longValue = 270376904250557193L ) - long field2519; - @ObfuscatedName("n") - @ObfuscatedGetter( - longValue = 2050546320493006419L - ) - long field2522; + long field2512; static { equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10}; PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260); } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "([I[IZIB)V", - garbageValue = "-32" + signature = "([I[IZII)V", + garbageValue = "128903597" ) @Export("update") public void update(int[] var1, int[] var2, boolean var3, int var4) { @@ -61,7 +66,7 @@ public class PlayerAppearance { for (int var5 = 0; var5 < 7; ++var5) { for (int var6 = 0; var6 < KitDefinition.KitDefinition_fileCount; ++var6) { - KitDefinition var7 = GameShell.KitDefinition_get(var6); + KitDefinition var7 = class195.KitDefinition_get(var6); if (var7 != null && !var7.nonSelectable && var7.bodypartID == var5 + (var3 ? 7 : 0)) { var1[equipmentIndices[var5]] = var6 + 256; break; @@ -77,10 +82,10 @@ public class PlayerAppearance { this.setHash(); } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IZI)V", - garbageValue = "-420581266" + signature = "(IZB)V", + garbageValue = "0" ) @Export("changeAppearance") public void changeAppearance(int var1, boolean var2) { @@ -103,7 +108,7 @@ public class PlayerAppearance { } } - var4 = GameShell.KitDefinition_get(var3); + var4 = class195.KitDefinition_get(var3); } while(var4 == null || var4.nonSelectable || var1 + (this.isFemale ? 7 : 0) != var4.bodypartID); this.equipment[equipmentIndices[var1]] = var3 + 256; @@ -112,37 +117,50 @@ public class PlayerAppearance { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IZI)V", - garbageValue = "-2145641688" + signature = "(IZS)V", + garbageValue = "32089" ) - public void method3930(int var1, boolean var2) { + public void method3983(int var1, boolean var2) { int var3 = this.bodyColors[var1]; + boolean var4; if (!var2) { do { --var3; if (var3 < 0) { - var3 = FontName.field3651[var1].length - 1; + var3 = field2508[var1].length - 1; } - } while(!DevicePcmPlayerProvider.method794(var1, var3)); + + if (var1 == 4 && var3 >= 8) { + var4 = false; + } else { + var4 = true; + } + } while(!var4); } else { do { ++var3; - if (var3 >= FontName.field3651[var1].length) { + if (var3 >= field2508[var1].length) { var3 = 0; } - } while(!DevicePcmPlayerProvider.method794(var1, var3)); + + if (var1 == 4 && var3 >= 8) { + var4 = false; + } else { + var4 = true; + } + } while(!var4); } this.bodyColors[var1] = var3; this.setHash(); } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "1539673752" + signature = "(ZB)V", + garbageValue = "-80" ) @Export("changeSex") public void changeSex(boolean var1) { @@ -151,10 +169,10 @@ public class PlayerAppearance { } } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(Lky;I)V", - garbageValue = "-1403518523" + signature = "(Lkz;I)V", + garbageValue = "1762621259" ) @Export("write") public void write(Buffer var1) { @@ -176,62 +194,62 @@ public class PlayerAppearance { } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1367510111" + garbageValue = "1290527854" ) @Export("setHash") void setHash() { - long var1 = this.field2519; + long var1 = this.field2510; int var3 = this.equipment[5]; int var4 = this.equipment[9]; this.equipment[5] = var4; this.equipment[9] = var3; - this.field2519 = 0L; + this.field2510 = 0L; int var5; for (var5 = 0; var5 < 12; ++var5) { - this.field2519 <<= 4; + this.field2510 <<= 4; if (this.equipment[var5] >= 256) { - this.field2519 += (long)(this.equipment[var5] - 256); + this.field2510 += (long)(this.equipment[var5] - 256); } } if (this.equipment[0] >= 256) { - this.field2519 += (long)(this.equipment[0] - 256 >> 4); + this.field2510 += (long)(this.equipment[0] - 256 >> 4); } if (this.equipment[1] >= 256) { - this.field2519 += (long)(this.equipment[1] - 256 >> 8); + this.field2510 += (long)(this.equipment[1] - 256 >> 8); } for (var5 = 0; var5 < 5; ++var5) { - this.field2519 <<= 3; - this.field2519 += (long)this.bodyColors[var5]; + this.field2510 <<= 3; + this.field2510 += (long)this.bodyColors[var5]; } - this.field2519 <<= 1; - this.field2519 += (long)(this.isFemale ? 1 : 0); + this.field2510 <<= 1; + this.field2510 += (long)(this.isFemale ? 1 : 0); this.equipment[5] = var3; this.equipment[9] = var4; - if (var1 != 0L && var1 != this.field2519) { + if (0L != var1 && var1 != this.field2510) { PlayerAppearance_cachedModels.remove(var1); } } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lij;ILij;II)Ldo;", - garbageValue = "1074848537" + signature = "(Liw;ILiw;II)Ldr;", + garbageValue = "-1695778045" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { if (this.npcTransformId != -1) { - return ViewportMouse.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); + return FontName.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); } else { - long var5 = this.field2519; + long var5 = this.field2510; int[] var7 = this.equipment; if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) { var7 = new int[12]; @@ -258,18 +276,18 @@ public class PlayerAppearance { int var11; for (int var10 = 0; var10 < 12; ++var10) { var11 = var7[var10]; - if (var11 >= 256 && var11 < 512 && !GameShell.KitDefinition_get(var11 - 256).ready()) { + if (var11 >= 256 && var11 < 512 && !class195.KitDefinition_get(var11 - 256).ready()) { var9 = true; } - if (var11 >= 512 && !WorldMapData_0.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { + if (var11 >= 512 && !Player.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { var9 = true; } } if (var9) { - if (-1L != this.field2522) { - var8 = (Model)PlayerAppearance_cachedModels.get(this.field2522); + if (this.field2512 != -1L) { + var8 = (Model)PlayerAppearance_cachedModels.get(this.field2512); } if (var8 == null) { @@ -286,14 +304,14 @@ public class PlayerAppearance { var13 = var7[var12]; ModelData var14; if (var13 >= 256 && var13 < 512) { - var14 = GameShell.KitDefinition_get(var13 - 256).getModelData(); + var14 = class195.KitDefinition_get(var13 - 256).getModelData(); if (var14 != null) { var16[var11++] = var14; } } if (var13 >= 512) { - var14 = WorldMapData_0.ItemDefinition_get(var13 - 512).method4557(this.isFemale); + var14 = Player.ItemDefinition_get(var13 - 512).method4657(this.isFemale); if (var14 != null) { var16[var11++] = var14; } @@ -303,18 +321,18 @@ public class PlayerAppearance { ModelData var18 = new ModelData(var16, var11); for (var13 = 0; var13 < 5; ++var13) { - if (this.bodyColors[var13] < FontName.field3651[var13].length) { - var18.recolor(KeyHandler.field387[var13], FontName.field3651[var13][this.bodyColors[var13]]); + if (this.bodyColors[var13] < field2508[var13].length) { + var18.recolor(UserComparator8.field1944[var13], field2508[var13][this.bodyColors[var13]]); } - if (this.bodyColors[var13] < SoundCache.field1418[var13].length) { - var18.recolor(field2523[var13], SoundCache.field1418[var13][this.bodyColors[var13]]); + if (this.bodyColors[var13] < field2511[var13].length) { + var18.recolor(field2513[var13], field2511[var13][this.bodyColors[var13]]); } } var8 = var18.toModel(64, 850, -30, -50, -30); PlayerAppearance_cachedModels.put(var8, var5); - this.field2522 = var5; + this.field2512 = var5; } } @@ -335,26 +353,26 @@ public class PlayerAppearance { } } - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(I)Ldq;", - garbageValue = "-337646401" + signature = "(I)Lds;", + garbageValue = "-383729873" ) @Export("getModelData") ModelData getModelData() { if (this.npcTransformId != -1) { - return ViewportMouse.getNpcDefinition(this.npcTransformId).getModelData(); + return FontName.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 && !GameShell.KitDefinition_get(var3 - 256).method4360()) { + if (var3 >= 256 && var3 < 512 && !class195.KitDefinition_get(var3 - 256).method4457()) { var1 = true; } - if (var3 >= 512 && !WorldMapData_0.ItemDefinition_get(var3 - 512).method4558(this.isFemale)) { + if (var3 >= 512 && !Player.ItemDefinition_get(var3 - 512).method4665(this.isFemale)) { var1 = true; } } @@ -370,14 +388,14 @@ public class PlayerAppearance { var5 = this.equipment[var4]; ModelData var6; if (var5 >= 256 && var5 < 512) { - var6 = GameShell.KitDefinition_get(var5 - 256).getKitDefinitionModels(); + var6 = class195.KitDefinition_get(var5 - 256).getKitDefinitionModels(); if (var6 != null) { var7[var3++] = var6; } } if (var5 >= 512) { - var6 = WorldMapData_0.ItemDefinition_get(var5 - 512).method4559(this.isFemale); + var6 = Player.ItemDefinition_get(var5 - 512).method4659(this.isFemale); if (var6 != null) { var7[var3++] = var6; } @@ -387,12 +405,12 @@ public class PlayerAppearance { ModelData var8 = new ModelData(var7, var3); for (var5 = 0; var5 < 5; ++var5) { - if (this.bodyColors[var5] < FontName.field3651[var5].length) { - var8.recolor(KeyHandler.field387[var5], FontName.field3651[var5][this.bodyColors[var5]]); + if (this.bodyColors[var5] < field2508[var5].length) { + var8.recolor(UserComparator8.field1944[var5], field2508[var5][this.bodyColors[var5]]); } - if (this.bodyColors[var5] < SoundCache.field1418[var5].length) { - var8.recolor(field2523[var5], SoundCache.field1418[var5][this.bodyColors[var5]]); + if (this.bodyColors[var5] < field2511[var5].length) { + var8.recolor(field2513[var5], field2511[var5][this.bodyColors[var5]]); } } @@ -401,35 +419,125 @@ public class PlayerAppearance { } } - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1490773548" + garbageValue = "-860762506" ) @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 + ViewportMouse.getNpcDefinition(this.npcTransformId).id; + return this.npcTransformId == -1 ? (this.equipment[0] << 15) + this.equipment[1] + (this.equipment[11] << 5) + (this.equipment[8] << 10) + (this.bodyColors[0] << 25) + (this.bodyColors[4] << 20) : 305419896 + FontName.getNpcDefinition(this.npcTransformId).id; } - @ObfuscatedName("i") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IIIIIII)I", - garbageValue = "-428872333" + signature = "(I)[Lhx;", + garbageValue = "-850307584" ) - public static int method3944(int var0, int var1, int var2, int var3, int var4, int var5) { - if ((var5 & 1) == 1) { - int var6 = var3; - var3 = var4; - var4 = var6; + @Export("PlayerType_values") + public static PlayerType[] PlayerType_values() { + return new PlayerType[]{PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_ironman, PlayerType.PlayerType_ultimateIronman, PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_normal}; + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(IIIS)Lcu;", + garbageValue = "4204" + ) + @Export("getWorldMapScript") + static Script getWorldMapScript(int var0, int var1, int var2) { + int var3 = (var1 << 8) + var0; + Script var6 = (Script)Script.Script_cached.get((long)(var3 << 16)); + Script var5; + if (var6 != null) { + var5 = var6; + } else { + String var7 = String.valueOf(var3); + int var8 = Message.archive12.getGroupId(var7); + if (var8 == -1) { + var5 = null; + } else { + label56: { + byte[] var9 = Message.archive12.takeFileFlat(var8); + if (var9 != null) { + if (var9.length <= 1) { + var5 = null; + break label56; + } + + var6 = AttackOption.newScript(var9); + if (var6 != null) { + Script.Script_cached.put(var6, (long)(var3 << 16)); + var5 = var6; + break label56; + } + } + + var5 = null; + } + } } - var2 &= 3; - if (var2 == 0) { - return var1; - } else if (var2 == 1) { - return 7 - var0 - (var3 - 1); + if (var5 != null) { + return var5; } else { - return var2 == 2 ? 7 - var1 - (var4 - 1) : var0; + int var13 = (var2 + 40000 << 8) + var0; + Script var15 = (Script)Script.Script_cached.get((long)(var13 << 16)); + Script var14; + if (var15 != null) { + var14 = var15; + } else { + String var10 = String.valueOf(var13); + int var11 = Message.archive12.getGroupId(var10); + if (var11 == -1) { + var14 = null; + } else { + byte[] var12 = Message.archive12.takeFileFlat(var11); + if (var12 != null) { + if (var12.length <= 1) { + var14 = null; + return var14 != null ? var14 : null; + } + + var15 = AttackOption.newScript(var12); + if (var15 != null) { + Script.Script_cached.put(var15, (long)(var13 << 16)); + var14 = var15; + return var14 != null ? var14 : null; + } + } + + var14 = null; + } + } + + return var14 != null ? var14 : null; + } + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(ILcu;ZI)I", + garbageValue = "909717024" + ) + static int method3990(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? UserComparator9.field1941 : MidiPcmStream.field2410; + if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.itemId; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { + if (var3.itemId != -1) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_GETID) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.childIndex; + return 1; + } else { + return 2; } } } diff --git a/runescape-client/src/main/java/PlayerType.java b/runescape-client/src/main/java/PlayerType.java index bed346aa54..ccf0e4e43d 100644 --- a/runescape-client/src/main/java/PlayerType.java +++ b/runescape-client/src/main/java/PlayerType.java @@ -3,107 +3,171 @@ 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("hx") @Implements("PlayerType") public enum PlayerType implements Enumerated { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lhh;" + signature = "Lhx;" ) @Export("PlayerType_normal") PlayerType_normal(0, -1, true, false, true), - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lhh;" + signature = "Lhx;" ) @Export("PlayerType_playerModerator") PlayerType_playerModerator(1, 0, true, true, true), - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lhh;" + signature = "Lhx;" ) @Export("PlayerType_jagexModerator") PlayerType_jagexModerator(2, 1, true, true, false), - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lhh;" + signature = "Lhx;" ) @Export("PlayerType_ironman") PlayerType_ironman(3, 2, false, false, true), - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Lhh;" + signature = "Lhx;" ) @Export("PlayerType_ultimateIronman") PlayerType_ultimateIronman(4, 3, false, false, true), - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lhh;" + signature = "Lhx;" ) @Export("PlayerType_hardcoreIronman") PlayerType_hardcoreIronman(5, 10, false, false, true); - @ObfuscatedName("t") + @ObfuscatedName("bm") + @ObfuscatedSignature( + signature = "[Llt;" + ) + @Export("worldSelectFlagSprites") + static IndexedSprite[] worldSelectFlagSprites; + @ObfuscatedName("fr") + @ObfuscatedSignature( + signature = "Lfc;" + ) + @Export("socketTask") + static Task socketTask; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -226803421 + intValue = 981686395 ) @Export("id") final int id; - @ObfuscatedName("q") + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 113800329 + ) @Export("modIcon") public final int modIcon; - @ObfuscatedName("x") + @ObfuscatedName("d") @Export("isPrivileged") public final boolean isPrivileged; - @ObfuscatedName("d") + @ObfuscatedName("z") @Export("isUser") public final boolean isUser; PlayerType(int var3, int var4, boolean var5, boolean var6, boolean var7) { this.id = var3; - this.modIcon = var4 * 840543109; + this.modIcon = var4; this.isPrivileged = var6; this.isUser = var7; } - @ObfuscatedName("j") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-32" + signature = "(I)I", + garbageValue = "-1410702910" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("s") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lhz;Lhz;Lhz;Lgp;I)Z", - garbageValue = "1965364942" + signature = "(ILkx;Lio;I)V", + garbageValue = "1911728475" ) - @Export("setAudioArchives") - public static boolean setAudioArchives(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, MidiPcmStream var3) { - class197.musicPatchesArchive = var0; - class197.musicSamplesArchive = var1; - class197.soundEffectsArchive = var2; - class197.midiPcmStream = var3; - return true; + static void method4120(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; + } + } + } + + if (var3 != null) { + var2.load(var1, var0, var3, true); + } else { + byte[] var4 = var1.read(var0); + var2.load(var1, var0, var4, true); + } } - @ObfuscatedName("h") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(IZII)V", - garbageValue = "912146837" + signature = "(Lhz;II)Z", + garbageValue = "1300216140" ) - @Export("PcmPlayer_configure") - public static final void PcmPlayer_configure(int var0, boolean var1, int var2) { - if (var0 >= 8000 && var0 <= 48000) { - PcmPlayer.PcmPlayer_sampleRate = var0; - PcmPlayer.PcmPlayer_stereo = var1; - FloorDecoration.PcmPlayer_count = var2; + @Export("SpriteBuffer_bufferFileFlat") + public static boolean SpriteBuffer_bufferFileFlat(AbstractArchive var0, int var1) { + byte[] var2 = var0.takeFileFlat(var1); + if (var2 == null) { + return false; } else { - throw new IllegalArgumentException(); + GrandExchangeOfferWorldComparator.SpriteBuffer_decode(var2); + return true; + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(ILcu;ZB)I", + garbageValue = "1" + ) + static int method4121(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { + var3 = Player.getWidget(Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]); + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.itemId; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { + var3 = Player.getWidget(Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]); + if (var3.itemId != -1) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.IF_HASSUB) { + int var5 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var5); + if (var4 != null) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.IF_GETTOP) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.rootInterface; + return 1; + } else { + return 2; } } } diff --git a/runescape-client/src/main/java/Players.java b/runescape-client/src/main/java/Players.java index a7b6603ca8..e09a14c5e5 100644 --- a/runescape-client/src/main/java/Players.java +++ b/runescape-client/src/main/java/Players.java @@ -3,66 +3,65 @@ 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("cb") +@ObfuscatedName("cn") @Implements("Players") public class Players { - @ObfuscatedName("i") - static byte[] field1221; - @ObfuscatedName("k") - static byte[] field1230; - @ObfuscatedName("u") + @ObfuscatedName("t") + static byte[] field1217; + @ObfuscatedName("g") + static byte[] field1220; + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "[Lky;" + signature = "[Lkz;" ) - static Buffer[] field1219; - @ObfuscatedName("n") + static Buffer[] field1221; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1067165743 + intValue = 207480583 ) @Export("Players_count") static int Players_count; - @ObfuscatedName("t") + @ObfuscatedName("j") @Export("Players_indices") static int[] Players_indices; - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -2082496335 + intValue = 205698167 ) @Export("Players_emptyIdxCount") static int Players_emptyIdxCount; - @ObfuscatedName("x") + @ObfuscatedName("d") @Export("Players_emptyIndices") static int[] Players_emptyIndices; - @ObfuscatedName("d") + @ObfuscatedName("z") @Export("Players_regions") static int[] Players_regions; - @ObfuscatedName("f") + @ObfuscatedName("n") @Export("Players_orientations") static int[] Players_orientations; - @ObfuscatedName("c") + @ObfuscatedName("h") @Export("Players_targetIndices") static int[] Players_targetIndices; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 504447411 + intValue = 707214243 ) @Export("Players_pendingUpdateCount") static int Players_pendingUpdateCount; - @ObfuscatedName("y") + @ObfuscatedName("s") @Export("Players_pendingUpdateIndices") static int[] Players_pendingUpdateIndices; @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lky;" + signature = "Lkz;" ) - static Buffer field1233; + static Buffer field1231; static { - field1221 = new byte[2048]; - field1230 = new byte[2048]; - field1219 = new Buffer[2048]; + field1217 = new byte[2048]; + field1220 = new byte[2048]; + field1221 = new Buffer[2048]; Players_count = 0; Players_indices = new int[2048]; Players_emptyIdxCount = 0; @@ -72,36 +71,185 @@ public class Players { Players_targetIndices = new int[2048]; Players_pendingUpdateCount = 0; Players_pendingUpdateIndices = new int[2048]; - field1233 = new Buffer(new byte[5000]); + field1231 = new Buffer(new byte[5000]); } - @ObfuscatedName("r") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(ILcr;ZI)I", - garbageValue = "578310351" + signature = "(II)Lik;", + garbageValue = "-1920916137" ) - static int method2063(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? class286.field3623 : class297.field3693; - 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; + @Export("getInvDefinition") + public static InvDefinition getInvDefinition(int var0) { + InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; } else { - return 2; + 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("jl") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "1427769398" + ) + static final void method2123(int var0) { + WorldMapRectangle.method257(); + WorldMapData_0.method157(); + int var1 = class30.method518(var0).type; + if (var1 != 0) { + int var2 = Varps.Varps_main[var0]; + if (var1 == 1) { + if (var2 == 1) { + Rasterizer3D.Rasterizer3D_setBrightness(0.9D); + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.9D); + } + + if (var2 == 2) { + Rasterizer3D.Rasterizer3D_setBrightness(0.8D); + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.8D); + } + + if (var2 == 3) { + Rasterizer3D.Rasterizer3D_setBrightness(0.7D); + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.7D); + } + + if (var2 == 4) { + Rasterizer3D.Rasterizer3D_setBrightness(0.6D); + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.6D); + } + + ItemDefinition.ItemDefinition_cachedSprites.clear(); + } + + if (var1 == 3) { + short var3 = 0; + if (var2 == 0) { + var3 = 255; + } + + if (var2 == 1) { + var3 = 192; + } + + if (var2 == 2) { + var3 = 128; + } + + if (var2 == 3) { + var3 = 64; + } + + if (var2 == 4) { + var3 = 0; + } + + if (var3 != Client.field638) { + if (Client.field638 == 0 && Client.field857 != -1) { + class49.method826(WorldMapDecoration.archive6, Client.field857, 0, var3, false); + Client.field746 = false; + } else if (var3 == 0) { + class226.method4108(); + Client.field746 = false; + } else { + Decimator.method2499(var3); + } + + Client.field638 = var3; + } + } + + if (var1 == 4) { + if (var2 == 0) { + Client.soundEffectVolume = 127; + } + + if (var2 == 1) { + Client.soundEffectVolume = 96; + } + + if (var2 == 2) { + Client.soundEffectVolume = 64; + } + + if (var2 == 3) { + Client.soundEffectVolume = 32; + } + + if (var2 == 4) { + Client.soundEffectVolume = 0; + } + } + + if (var1 == 5) { + Client.leftClickOpensMenu = var2; + } + + if (var1 == 6) { + Client.chatEffects = var2; + } + + if (var1 == 9) { + Client.field787 = var2; + } + + if (var1 == 10) { + if (var2 == 0) { + Client.field860 = 127; + } + + if (var2 == 1) { + Client.field860 = 96; + } + + if (var2 == 2) { + Client.field860 = 64; + } + + if (var2 == 3) { + Client.field860 = 32; + } + + if (var2 == 4) { + Client.field860 = 0; + } + } + + if (var1 == 17) { + Client.followerIndex = var2 & 65535; + } + + if (var1 == 18) { + Client.playerAttackOption = (AttackOption)ServerPacket.findEnumerated(Coord.method3981(), 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)ServerPacket.findEnumerated(Coord.method3981(), var2); + if (Client.npcAttackOption == null) { + Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + } } } diff --git a/runescape-client/src/main/java/PrivateChatMode.java b/runescape-client/src/main/java/PrivateChatMode.java index 4e0bbadf9d..0f519addf9 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("kk") +@ObfuscatedName("kc") @Implements("PrivateChatMode") public class PrivateChatMode { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lkk;" + signature = "Lkc;" ) - static final PrivateChatMode field3793; - @ObfuscatedName("j") + static final PrivateChatMode field3789; + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lkk;" + signature = "Lkc;" ) - public static final PrivateChatMode field3788; - @ObfuscatedName("i") + public static final PrivateChatMode field3786; + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lkk;" + signature = "Lkc;" ) - static final PrivateChatMode field3790; - @ObfuscatedName("k") + static final PrivateChatMode field3788; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -2070508513 + intValue = -2108036815 ) - public final int field3791; + public final int field3787; static { - field3793 = new PrivateChatMode(0); - field3788 = new PrivateChatMode(1); - field3790 = new PrivateChatMode(2); + field3789 = new PrivateChatMode(0); + field3786 = new PrivateChatMode(1); + field3788 = new PrivateChatMode(2); } PrivateChatMode(int var1) { - this.field3791 = var1; + this.field3787 = var1; } } diff --git a/runescape-client/src/main/java/Projectile.java b/runescape-client/src/main/java/Projectile.java index cb88af0023..e3fade7209 100644 --- a/runescape-client/src/main/java/Projectile.java +++ b/runescape-client/src/main/java/Projectile.java @@ -3,130 +3,131 @@ 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("cp") +@ObfuscatedName("ck") @Implements("Projectile") public final class Projectile extends Entity { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -951459675 + intValue = 1759216915 ) @Export("id") int id; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 240131071 + intValue = -656126641 ) @Export("plane") int plane; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1747500459 + intValue = 229006367 ) @Export("sourceX") int sourceX; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -190757363 + intValue = 1688926415 ) @Export("sourceY") int sourceY; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 120274297 + intValue = -855009313 ) @Export("sourceZ") int sourceZ; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -545031319 + intValue = -199015699 ) @Export("endHeight") int endHeight; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1504161017 + intValue = 977916813 ) @Export("cycleStart") int cycleStart; - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1869679465 + intValue = -1874398309 ) @Export("cycleEnd") int cycleEnd; - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -905404739 + intValue = 603741471 ) @Export("slope") int slope; - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 703869729 + intValue = 1598395117 ) @Export("startHeight") int startHeight; - @ObfuscatedName("f") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1300497163 + intValue = -1654976121 ) @Export("targetIndex") int targetIndex; - @ObfuscatedName("c") + @ObfuscatedName("h") @Export("isMoving") boolean isMoving; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("x") double x; - @ObfuscatedName("y") + @ObfuscatedName("s") @Export("y") double y; @ObfuscatedName("p") @Export("z") double z; - @ObfuscatedName("b") + @ObfuscatedName("e") @Export("speedX") double speedX; - @ObfuscatedName("g") + @ObfuscatedName("i") @Export("speedY") double speedY; - @ObfuscatedName("e") + @ObfuscatedName("q") @Export("speed") double speed; - @ObfuscatedName("z") + @ObfuscatedName("y") @Export("speedZ") double speedZ; - @ObfuscatedName("a") + @ObfuscatedName("r") @Export("accelerationZ") double accelerationZ; - @ObfuscatedName("w") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1352900335 + intValue = -847815087 ) @Export("yaw") int yaw; - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1525474155 + intValue = 1827260865 ) @Export("pitch") int pitch; - @ObfuscatedName("h") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lij;" + signature = "Liw;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 2057925261 + intValue = 165525375 ) @Export("frame") int frame; - @ObfuscatedName("m") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1570641545 + intValue = -1595170679 ) @Export("frameCycle") int frameCycle; @@ -147,19 +148,19 @@ public final class Projectile extends Entity { this.targetIndex = var10; this.endHeight = var11; this.isMoving = false; - int var12 = HealthBarUpdate.SpotAnimationDefinition_get(this.id).sequence; + int var12 = NetCache.SpotAnimationDefinition_get(this.id).sequence; if (var12 != -1) { - this.sequenceDefinition = Widget.SequenceDefinition_get(var12); + this.sequenceDefinition = class83.SequenceDefinition_get(var12); } else { this.sequenceDefinition = null; } } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(IIIII)V", - garbageValue = "-976791033" + garbageValue = "-1630557083" ) @Export("setDestination") final void setDestination(int var1, int var2, int var3, int var4) { @@ -167,34 +168,34 @@ public final class Projectile extends Entity { if (!this.isMoving) { var5 = (double)(var1 - this.sourceX); double var7 = (double)(var2 - this.sourceY); - double var9 = Math.sqrt(var5 * var5 + var7 * var7); + double var9 = Math.sqrt(var7 * var7 + var5 * var5); this.x = (double)this.sourceX + (double)this.startHeight * var5 / var9; - this.y = var7 * (double)this.startHeight / var9 + (double)this.sourceY; + this.y = (double)this.startHeight * var7 / 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.accelerationZ = 2.0D * ((double)var3 - this.z - var5 * this.speedZ) / (var5 * var5); + this.accelerationZ = 2.0D * ((double)var3 - this.z - this.speedZ * var5) / (var5 * var5); } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "172847015" + garbageValue = "-966935805" ) @Export("advance") final void advance(int var1) { this.isMoving = true; this.x += this.speedX * (double)var1; - this.y += (double)var1 * this.speedY; - this.z += (double)var1 * this.speedZ + (double)var1 * (double)var1 * this.accelerationZ * 0.5D; + this.y += this.speedY * (double)var1; + 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; @@ -220,14 +221,14 @@ public final class Projectile extends Entity { } } - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)Ldo;", - garbageValue = "-419920513" + signature = "(B)Ldr;", + garbageValue = "-35" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = HealthBarUpdate.SpotAnimationDefinition_get(this.id); + SpotAnimationDefinition var1 = NetCache.SpotAnimationDefinition_get(this.id); Model var2 = var1.getModel(this.frame); if (var2 == null) { return null; @@ -237,60 +238,57 @@ public final class Projectile extends Entity { } } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "-1666857335" + signature = "(Ljava/lang/String;B)Ljava/lang/Class;", + garbageValue = "27" ) - @Export("loadInterface") - public static boolean loadInterface(int var0) { - if (WorldMapDecoration.Widget_loadedInterfaces[var0]) { - return true; - } else if (!Widget.Widget_archive.tryLoadGroup(var0)) { - return false; + @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 { - int var1 = Widget.Widget_archive.getGroupFileCount(var0); - if (var1 == 0) { - WorldMapDecoration.Widget_loadedInterfaces[var0] = true; - return true; - } else { - if (Widget.Widget_interfaceComponents[var0] == null) { - Widget.Widget_interfaceComponents[var0] = new Widget[var1]; - } - - for (int var2 = 0; var2 < var1; ++var2) { - if (Widget.Widget_interfaceComponents[var0][var2] == null) { - byte[] var3 = Widget.Widget_archive.takeFile(var0, var2); - if (var3 != null) { - Widget.Widget_interfaceComponents[var0][var2] = new Widget(); - Widget.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); - if (var3[0] == -1) { - Widget.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); - } else { - Widget.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); - } - } - } - } - - WorldMapDecoration.Widget_loadedInterfaces[var0] = true; - return true; - } + return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); } } - @ObfuscatedName("k") + @ObfuscatedName("gw") @ObfuscatedSignature( - signature = "(ILhz;IIIZI)V", - garbageValue = "771359751" + signature = "(I)V", + garbageValue = "1195208829" ) - public static void method2040(int var0, AbstractArchive var1, int var2, int var3, int var4, boolean var5) { - class197.field2378 = 1; - WorldMapDecoration.musicTrackArchive = var1; - class197.musicTrackGroupId = var2; - class197.musicTrackFileId = var3; - WorldMapSprite.field222 = var4; - Varcs.musicTrackBoolean = var5; - class16.field98 = var0; + static void method2083() { + 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) { + GameObject.addPlayerToScene(Client.players[var1[var2]], true); + } + } + + } + + @ObfuscatedName("gf") + @ObfuscatedSignature( + signature = "(I)Z", + garbageValue = "1957902455" + ) + static boolean method2087() { + return (Client.drawPlayerNames & 2) != 0; } } diff --git a/runescape-client/src/main/java/RasterProvider.java b/runescape-client/src/main/java/RasterProvider.java index 671667104a..01120b2fd5 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("bk") +@ObfuscatedName("bg") @Implements("RasterProvider") public final class RasterProvider extends AbstractRasterProvider { - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("component") Component component; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("image") Image image; @@ -36,40 +36,40 @@ public final class RasterProvider extends AbstractRasterProvider { this.apply(); } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/awt/Component;B)V", - garbageValue = "-100" + signature = "(Ljava/awt/Component;I)V", + garbageValue = "1531049075" ) @Export("setComponent") final void setComponent(Component var1) { this.component = var1; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "314023161" + garbageValue = "-978411495" ) @Export("drawFull") public final void drawFull(int var1, int var2) { this.drawFull0(this.component.getGraphics(), var1, var2); } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(IIIII)V", - garbageValue = "333545527" + garbageValue = "-2009002566" ) @Export("draw") public final void draw(int var1, int var2, int var3, int var4) { this.draw0(this.component.getGraphics(), var1, var2, var3, var4); } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Ljava/awt/Graphics;III)V", - garbageValue = "-1562101424" + signature = "(Ljava/awt/Graphics;IIB)V", + garbageValue = "-96" ) @Export("drawFull0") final void drawFull0(Graphics var1, int var2, int var3) { @@ -81,10 +81,10 @@ public final class RasterProvider extends AbstractRasterProvider { } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(Ljava/awt/Graphics;IIIII)V", - garbageValue = "399738450" + garbageValue = "-2101060697" ) @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 7219eaa32c..99fb03ce67 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("lj") +@ObfuscatedName("lw") @Implements("Rasterizer2D") public class Rasterizer2D extends DualNode { - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("Rasterizer2D_pixels") public static int[] Rasterizer2D_pixels; - @ObfuscatedName("ai") + @ObfuscatedName("ao") @Export("Rasterizer2D_width") public static int Rasterizer2D_width; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("Rasterizer2D_height") public static int Rasterizer2D_height; - @ObfuscatedName("az") + @ObfuscatedName("an") @Export("Rasterizer2D_yClipStart") public static int Rasterizer2D_yClipStart; - @ObfuscatedName("aj") + @ObfuscatedName("al") @Export("Rasterizer2D_yClipEnd") public static int Rasterizer2D_yClipEnd; - @ObfuscatedName("an") + @ObfuscatedName("as") @Export("Rasterizer2D_xClipStart") public static int Rasterizer2D_xClipStart; - @ObfuscatedName("at") + @ObfuscatedName("ad") @Export("Rasterizer2D_xClipEnd") public static int Rasterizer2D_xClipEnd; @@ -38,7 +38,7 @@ public class Rasterizer2D extends DualNode { protected Rasterizer2D() { } - @ObfuscatedName("cq") + @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("ct") + @ObfuscatedName("dn") @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("cx") + @ObfuscatedName("de") @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("ca") + @ObfuscatedName("da") @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("cs") + @ObfuscatedName("dl") @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("co") + @ObfuscatedName("dg") @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("dr") + @ObfuscatedName("dz") @Export("Rasterizer2D_clear") public static void Rasterizer2D_clear() { int var0 = 0; @@ -141,7 +141,7 @@ public class Rasterizer2D extends DualNode { } - @ObfuscatedName("dd") + @ObfuscatedName("dw") @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("dv") + @ObfuscatedName("di") @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("da") + @ObfuscatedName("dt") @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("dh") + @ObfuscatedName("dc") @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("dm") + @ObfuscatedName("ds") @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("dj") + @ObfuscatedName("dv") @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("dc") + @ObfuscatedName("db") @ObfuscatedSignature( signature = "(IIIIII[BIZ)V", garbageValue = "1" @@ -604,7 +604,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("db") + @ObfuscatedName("du") @Export("Rasterizer2D_drawRectangle") public static void Rasterizer2D_drawRectangle(int var0, int var1, int var2, int var3, int var4) { Rasterizer2D_drawHorizontalLine(var0, var1, var2, var4); @@ -625,7 +625,7 @@ public class Rasterizer2D extends DualNode { } - @ObfuscatedName("dp") + @ObfuscatedName("dq") @Export("Rasterizer2D_drawHorizontalLine") public static void Rasterizer2D_drawHorizontalLine(int var0, int var1, int var2, int var3) { if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { @@ -647,7 +647,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("dz") + @ObfuscatedName("dr") @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("dw") + @ObfuscatedName("dk") @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("dn") + @ObfuscatedName("df") @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("ds") + @ObfuscatedName("ej") @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("dt") + @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("du") + @ObfuscatedName("en") @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 b292b3ae53..bc0aa38817 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("eo") +@ObfuscatedName("ej") @Implements("Rasterizer3D") public class Rasterizer3D extends Rasterizer2D { - @ObfuscatedName("s") - static boolean field1760; - @ObfuscatedName("j") - static boolean field1742; - @ObfuscatedName("i") + @ObfuscatedName("c") + static boolean field1735; + @ObfuscatedName("x") + static boolean field1726; + @ObfuscatedName("t") @Export("Rasterizer3D_isLowDetailTexture") static boolean Rasterizer3D_isLowDetailTexture; - @ObfuscatedName("k") - public static boolean field1744; - @ObfuscatedName("u") + @ObfuscatedName("g") + public static boolean field1729; + @ObfuscatedName("l") @Export("Rasterizer3D_alpha") static int Rasterizer3D_alpha; - @ObfuscatedName("c") + @ObfuscatedName("h") @Export("Rasterizer3D_zoom") public static int Rasterizer3D_zoom; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("Rasterizer3D_clipMidX") static int Rasterizer3D_clipMidX; - @ObfuscatedName("y") + @ObfuscatedName("s") @Export("Rasterizer3D_clipMidY") static int Rasterizer3D_clipMidY; @ObfuscatedName("p") @Export("Rasterizer3D_clipWidth") static int Rasterizer3D_clipWidth; - @ObfuscatedName("b") + @ObfuscatedName("e") @Export("Rasterizer3D_clipHeight") static int Rasterizer3D_clipHeight; - @ObfuscatedName("g") + @ObfuscatedName("i") @Export("Rasterizer3D_clipNegativeMidX") static int Rasterizer3D_clipNegativeMidX; - @ObfuscatedName("e") + @ObfuscatedName("q") @Export("Rasterizer3D_clipMidX2") static int Rasterizer3D_clipMidX2; - @ObfuscatedName("z") + @ObfuscatedName("y") @Export("Rasterizer3D_clipNegativeMidY") static int Rasterizer3D_clipNegativeMidY; - @ObfuscatedName("a") + @ObfuscatedName("r") @Export("Rasterizer3D_clipMidY2") static int Rasterizer3D_clipMidY2; - @ObfuscatedName("w") + @ObfuscatedName("k") @Export("Rasterizer3D_rowOffsets") static int[] Rasterizer3D_rowOffsets; - @ObfuscatedName("l") + @ObfuscatedName("w") @Export("Rasterizer3D_colorPalette") public static int[] Rasterizer3D_colorPalette; - @ObfuscatedName("h") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Leh;" + signature = "Leg;" ) @Export("Rasterizer3D_textureLoader") public static TextureLoader Rasterizer3D_textureLoader; - @ObfuscatedName("v") - static int[] field1764; - @ObfuscatedName("m") - static int[] field1765; @ObfuscatedName("o") + static int[] field1749; + @ObfuscatedName("a") + static int[] field1752; + @ObfuscatedName("b") @Export("Rasterizer3D_sine") public static int[] Rasterizer3D_sine; - @ObfuscatedName("av") + @ObfuscatedName("ag") @Export("Rasterizer3D_cosine") public static int[] Rasterizer3D_cosine; static { - field1760 = false; - field1742 = false; + field1735 = false; + field1726 = false; Rasterizer3D_isLowDetailTexture = false; - field1744 = true; + field1729 = true; Rasterizer3D_alpha = 0; Rasterizer3D_zoom = 512; Rasterizer3D_rowOffsets = new int[1024]; Rasterizer3D_colorPalette = new int[65536]; - field1764 = new int[512]; - field1765 = new int[2048]; + field1749 = new int[512]; + field1752 = new int[2048]; Rasterizer3D_sine = new int[2048]; Rasterizer3D_cosine = new int[2048]; int var0; for (var0 = 1; var0 < 512; ++var0) { - field1764[var0] = 32768 / var0; + field1749[var0] = 32768 / var0; } for (var0 = 1; var0 < 2048; ++var0) { - field1765[var0] = 65536 / var0; + field1752[var0] = 65536 / var0; } for (var0 = 0; var0 < 2048; ++var0) { @@ -98,13 +98,13 @@ public class Rasterizer3D extends Rasterizer2D { } - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("Rasterizer3D_setClipFromRasterizer2D") public static final void Rasterizer3D_setClipFromRasterizer2D() { Rasterizer3D_setClip(Rasterizer2D.Rasterizer2D_xClipStart, Rasterizer2D.Rasterizer2D_yClipStart, Rasterizer2D.Rasterizer2D_xClipEnd, Rasterizer2D.Rasterizer2D_yClipEnd); } - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("Rasterizer3D_setClip") static final void Rasterizer3D_setClip(int var0, int var1, int var2, int var3) { Rasterizer3D_clipWidth = var2 - var0; @@ -133,7 +133,7 @@ public class Rasterizer3D extends Rasterizer2D { } - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("Rasterizer3D_method3") public static final void Rasterizer3D_method3() { Rasterizer3D_clipMidX = Rasterizer3D_clipWidth / 2; @@ -144,8 +144,8 @@ public class Rasterizer3D extends Rasterizer2D { Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; } - @ObfuscatedName("k") - public static final void method2929(int var0, int var1) { + @ObfuscatedName("g") + public static final void method3033(int var0, int var1) { int var2 = Rasterizer3D_rowOffsets[0]; int var3 = var2 / Rasterizer2D.Rasterizer2D_width; int var4 = var2 - var3 * Rasterizer2D.Rasterizer2D_width; @@ -157,22 +157,22 @@ public class Rasterizer3D extends Rasterizer2D { Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(Leh;)V" + signature = "(Leg;)V" ) @Export("Rasterizer3D_setTextureLoader") public static final void Rasterizer3D_setTextureLoader(TextureLoader var0) { Rasterizer3D_textureLoader = var0; } - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("Rasterizer3D_setBrightness") public static final void Rasterizer3D_setBrightness(double var0) { Rasterizer3D_buildPalette(var0, 0, 512); } - @ObfuscatedName("t") + @ObfuscatedName("j") @Export("Rasterizer3D_buildPalette") static final void Rasterizer3D_buildPalette(double var0, int var2, int var3) { int var4 = var2 * 128; @@ -251,7 +251,7 @@ public class Rasterizer3D extends Rasterizer2D { } - @ObfuscatedName("q") + @ObfuscatedName("v") @Export("Rasterizer3D_brighten") static int Rasterizer3D_brighten(int var0, double var1) { double var3 = (double)(var0 >> 16) / 256.0D; @@ -266,13 +266,13 @@ public class Rasterizer3D extends Rasterizer2D { return var11 + (var10 << 8) + (var9 << 16); } - @ObfuscatedName("x") - public static void method2933(int var0, int var1, int var2) { - field1760 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; + @ObfuscatedName("d") + public static void method2970(int var0, int var1, int var2) { + field1735 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; } - @ObfuscatedName("d") - static final void method2934(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + @ObfuscatedName("z") + static final void method2971(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; @@ -330,35 +330,7 @@ public class Rasterizer3D extends Rasterizer2D { var1 = 0; } - if ((var0 == var1 || var17 >= var16) && (var0 != var1 || var17 <= var15)) { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var5 >> 14, var6, var19); - var5 += var17; - var4 += var15; - var6 += var20; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19); - var5 += var17; - var3 += var16; - var6 += var20; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } else { + if (var0 != var1 && var17 < var16 || var0 == var1 && var17 > var15) { var2 -= var1; var1 -= var0; var0 = Rasterizer3D_rowOffsets[var0]; @@ -386,6 +358,34 @@ public class Rasterizer3D extends Rasterizer2D { var6 += var20; var0 += Rasterizer2D.Rasterizer2D_width; } + } else { + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var5 >> 14, var6, var19); + var5 += var17; + var4 += var15; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19); + var5 += var17; + var3 += var16; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; + } } } else { var4 = var3 <<= 14; @@ -487,35 +487,7 @@ public class Rasterizer3D extends Rasterizer2D { var2 = 0; } - if ((var2 == var1 || var16 >= var15) && (var2 != var1 || var16 <= var17)) { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var0; - if (var0 < 0) { - return; - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var3 >> 14, var7, var19); - var3 += var16; - var5 += var17; - var7 += var20; - var1 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); - var3 += var16; - var4 += var15; - var7 += var20; - var1 += Rasterizer2D.Rasterizer2D_width; - } - } else { + if (var2 != var1 && var16 < var15 || var2 == var1 && var16 > var17) { var0 -= var2; var2 -= var1; var1 = Rasterizer3D_rowOffsets[var1]; @@ -543,6 +515,34 @@ public class Rasterizer3D extends Rasterizer2D { var7 += var20; var1 += Rasterizer2D.Rasterizer2D_width; } + } else { + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var3 >> 14, var7, var19); + var3 += var16; + var5 += var17; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); + var3 += var16; + var4 += var15; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; + } } } else { var5 = var4 <<= 14; @@ -777,10 +777,10 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("f") + @ObfuscatedName("s") @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 (field1760) { + if (field1735) { if (var5 > Rasterizer3D_clipWidth) { var5 = Rasterizer3D_clipWidth; } @@ -796,7 +796,7 @@ public class Rasterizer3D extends Rasterizer2D { int var8; int var9; int var10; - if (field1744) { + if (field1729) { var3 = var5 - var4 >> 2; var7 <<= 2; if (Rasterizer3D_alpha == 0) { @@ -880,8 +880,8 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("c") - public static final void method2936(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("p") + public static final void method2990(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); @@ -921,33 +921,7 @@ public class Rasterizer3D extends Rasterizer2D { var1 = 0; } - if (var0 != var1 && var9 < var7 || var0 == var1 && var9 > var8) { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var4 >> 14); - var5 += var9; - var4 += var8; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); - var5 += var9; - var3 += var7; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } else { + if ((var0 == var1 || var9 >= var7) && (var0 != var1 || var9 <= var8)) { var2 -= var1; var1 -= var0; var0 = Rasterizer3D_rowOffsets[var0]; @@ -973,6 +947,32 @@ public class Rasterizer3D extends Rasterizer2D { var3 += var7; var0 += Rasterizer2D.Rasterizer2D_width; } + } else { + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var4 >> 14); + var5 += var9; + var4 += var8; + var0 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); + var5 += var9; + var3 += var7; + var0 += Rasterizer2D.Rasterizer2D_width; + } } } else { var4 = var3 <<= 14; @@ -1067,33 +1067,7 @@ public class Rasterizer3D extends Rasterizer2D { var2 = 0; } - if (var2 != var1 && var7 < var8 || var2 == var1 && var7 > var9) { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var0; - if (var0 < 0) { - return; - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var5 >> 14); - var3 += var7; - var5 += var9; - var1 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); - var3 += var7; - var4 += var8; - var1 += Rasterizer2D.Rasterizer2D_width; - } - } else { + if ((var2 == var1 || var7 >= var8) && (var2 != var1 || var7 <= var9)) { var0 -= var2; var2 -= var1; var1 = Rasterizer3D_rowOffsets[var1]; @@ -1119,6 +1093,32 @@ public class Rasterizer3D extends Rasterizer2D { var4 += var8; var1 += Rasterizer2D.Rasterizer2D_width; } + } else { + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var5 >> 14); + var3 += var7; + var5 += var9; + var1 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); + var3 += var7; + var4 += var8; + var1 += Rasterizer2D.Rasterizer2D_width; + } } } else { var5 = var4 <<= 14; @@ -1336,10 +1336,10 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("r") + @ObfuscatedName("e") @Export("Rasterizer3D_horizAlpha") static final void Rasterizer3D_horizAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5) { - if (field1760) { + if (field1735) { if (var5 > Rasterizer3D_clipWidth) { var5 = Rasterizer3D_clipWidth; } @@ -1431,16 +1431,16 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("y") - static final void method2938(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("i") + static final void method3020(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); - method2934(var0, var1, var2, var3, var4, var5, method2995(var20, var6), method2995(var20, var7), method2995(var20, var8)); + method2971(var0, var1, var2, var3, var4, var5, method3006(var20, var6), method3006(var20, var7), method3006(var20, var8)); } else { Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); - field1742 = Rasterizer3D_textureLoader.vmethod3229(var18); + field1726 = Rasterizer3D_textureLoader.vmethod3240(var18); var20 = var4 - var3; int var21 = var1 - var0; int var22 = var5 - var3; @@ -2052,10 +2052,10 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("p") + @ObfuscatedName("q") @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 (field1760) { + if (field1735) { if (var6 > Rasterizer3D_clipWidth) { var6 = Rasterizer3D_clipWidth; } @@ -2119,7 +2119,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; var8 <<= 3; var15 = var7 >> 8; - if (field1742) { + if (field1726) { if (var17 > 0) { do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; @@ -2314,7 +2314,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; var8 <<= 3; var15 = var7 >> 8; - if (field1742) { + if (field1726) { if (var17 > 0) { do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; @@ -2473,17 +2473,17 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("g") + @ObfuscatedName("r") @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); - method2934(var0, var1, var2, var3, var4, var5, method2995(var20, var6), method2995(var20, var7), method2995(var20, var8)); + method2971(var0, var1, var2, var3, var4, var5, method3006(var20, var6), method3006(var20, var7), method3006(var20, var8)); } else { Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); - field1742 = Rasterizer3D_textureLoader.vmethod3229(var18); + field1726 = Rasterizer3D_textureLoader.vmethod3240(var18); var20 = var4 - var3; int var21 = var1 - var0; int var22 = var5 - var3; @@ -2555,41 +2555,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, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var28; - var4 += var27; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - 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]; @@ -2623,6 +2589,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, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var4 += var27; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } } } else { var4 = var3 <<= 14; @@ -2643,41 +2643,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]; @@ -2711,6 +2677,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; + } } } } @@ -2744,41 +2744,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]; @@ -2812,6 +2778,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; @@ -3095,10 +3095,10 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("e") + @ObfuscatedName("k") @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 (field1760) { + if (field1735) { if (var6 > Rasterizer3D_clipWidth) { var6 = Rasterizer3D_clipWidth; } @@ -3151,7 +3151,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; var8 <<= 3; var15 = var7 >> 8; - if (field1742) { + if (field1726) { if (var17 > 0) { do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; @@ -3294,7 +3294,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; var8 <<= 3; var15 = var7 >> 8; - if (field1742) { + if (field1726) { if (var17 > 0) { do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; @@ -3411,8 +3411,8 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("z") - static final int method2995(int var0, int var1) { + @ObfuscatedName("w") + static final int method3006(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; if (var1 < 2) { var1 = 2; @@ -3423,33 +3423,33 @@ public class Rasterizer3D extends Rasterizer2D { return (var0 & 65408) + var1; } - @ObfuscatedName("w") - static final int method2943(int var0, int var1, int var2, int var3) { - return var0 * var2 + var3 * var1 >> 16; - } - - @ObfuscatedName("l") - static final int method2944(int var0, int var1, int var2, int var3) { - return var2 * var1 - var3 * var0 >> 16; - } - - @ObfuscatedName("h") - static final int method2945(int var0, int var1, int var2, int var3) { - return var0 * var2 - var3 * var1 >> 16; - } - - @ObfuscatedName("v") - static final int method2963(int var0, int var1, int var2, int var3) { - return var3 * var0 + var2 * var1 >> 16; - } - @ObfuscatedName("m") - static final int method2947(int var0, int var1, int var2, int var3) { + static final int method2980(int var0, int var1, int var2, int var3) { return var0 * var2 + var3 * var1 >> 16; } @ObfuscatedName("o") - static final int method2946(int var0, int var1, int var2, int var3) { + static final int method2981(int var0, int var1, int var2, int var3) { + return var2 * var1 - var3 * var0 >> 16; + } + + @ObfuscatedName("a") + static final int method3026(int var0, int var1, int var2, int var3) { + return var0 * var2 - var3 * var1 >> 16; + } + + @ObfuscatedName("b") + static final int method2964(int var0, int var1, int var2, int var3) { + return var3 * var0 + var2 * var1 >> 16; + } + + @ObfuscatedName("ag") + static final int method2983(int var0, int var1, int var2, int var3) { + return var0 * var2 + var3 * var1 >> 16; + } + + @ObfuscatedName("at") + static final int method3000(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 1e510644cd..8021ebaf0e 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("dx") +@ObfuscatedName("da") @Implements("RawPcmStream") public class RawPcmStream extends PcmStream { - @ObfuscatedName("s") - int field1452; - @ObfuscatedName("j") - int field1451; - @ObfuscatedName("i") - int field1454; - @ObfuscatedName("k") - int field1458; - @ObfuscatedName("u") - int field1456; - @ObfuscatedName("n") - int field1455; + @ObfuscatedName("c") + int field1435; + @ObfuscatedName("x") + int field1433; @ObfuscatedName("t") - int field1461; - @ObfuscatedName("q") + int field1434; + @ObfuscatedName("g") + int field1438; + @ObfuscatedName("l") + int field1436; + @ObfuscatedName("u") + int field1437; + @ObfuscatedName("j") + int field1432; + @ObfuscatedName("v") @Export("numLoops") int numLoops; - @ObfuscatedName("x") + @ObfuscatedName("d") @Export("start") int start; - @ObfuscatedName("d") + @ObfuscatedName("z") @Export("end") int end; + @ObfuscatedName("n") + boolean field1442; + @ObfuscatedName("h") + int field1443; @ObfuscatedName("f") - boolean field1460; - @ObfuscatedName("c") - int field1453; - @ObfuscatedName("r") - int field1462; - @ObfuscatedName("y") - int field1463; + int field1444; + @ObfuscatedName("s") + int field1445; @ObfuscatedName("p") - int field1464; + int field1446; @ObfuscatedSignature( - signature = "(Lco;III)V" + signature = "(Lcg;III)V" ) RawPcmStream(RawSound var1, int var2, int var3, int var4) { super.sound = var1; this.start = var1.start; this.end = var1.end; - this.field1460 = var1.field1362; - this.field1451 = var2; - this.field1454 = var3; - this.field1458 = var4; - this.field1452 = 0; - this.method2609(); + this.field1442 = var1.field1358; + this.field1433 = var2; + this.field1434 = var3; + this.field1438 = var4; + this.field1435 = 0; + this.method2512(); } @ObfuscatedSignature( - signature = "(Lco;II)V" + signature = "(Lcg;II)V" ) RawPcmStream(RawSound var1, int var2, int var3) { super.sound = var1; this.start = var1.start; this.end = var1.end; - this.field1460 = var1.field1362; - this.field1451 = var2; - this.field1454 = var3; - this.field1458 = 8192; - this.field1452 = 0; - this.method2609(); + this.field1442 = var1.field1358; + this.field1433 = var2; + this.field1434 = var3; + this.field1438 = 8192; + this.field1435 = 0; + this.method2512(); + } + + @ObfuscatedName("l") + void method2512() { + this.field1436 = this.field1434; + this.field1437 = method2647(this.field1434, this.field1438); + this.field1432 = method2508(this.field1434, this.field1438); } @ObfuscatedName("u") - void method2609() { - this.field1456 = this.field1454; - this.field1455 = method2558(this.field1454, this.field1458); - this.field1461 = method2456(this.field1454, this.field1458); - } - - @ObfuscatedName("n") @ObfuscatedSignature( - signature = "()Ldz;" + signature = "()Ldg;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { return null; } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "()Ldz;" + signature = "()Ldg;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { return null; } - @ObfuscatedName("q") - protected int vmethod3834() { - return this.field1454 == 0 && this.field1453 == 0 ? 0 : 1; + @ObfuscatedName("v") + protected int vmethod3881() { + return this.field1434 == 0 && this.field1443 == 0 ? 0 : 1; } - @ObfuscatedName("x") + @ObfuscatedName("d") @Export("fill") public synchronized void fill(int[] var1, int var2, int var3) { - if (this.field1454 == 0 && this.field1453 == 0) { + if (this.field1434 == 0 && this.field1443 == 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.field1452 < 0) { - if (this.field1451 <= 0) { - this.method2617(); + if (this.field1435 < 0) { + if (this.field1433 <= 0) { + this.method2521(); this.remove(); return; } - this.field1452 = 0; + this.field1435 = 0; } - if (this.field1452 >= var7) { - if (this.field1451 >= 0) { - this.method2617(); + if (this.field1435 >= var7) { + if (this.field1433 >= 0) { + this.method2521(); this.remove(); return; } - this.field1452 = var7 - 1; + this.field1435 = var7 - 1; } if (this.numLoops < 0) { - if (this.field1460) { - if (this.field1451 < 0) { - var9 = this.method2618(var1, var2, var5, var3, var4.samples[this.start]); - if (this.field1452 >= var5) { + if (this.field1442) { + if (this.field1433 < 0) { + var9 = this.method2544(var1, var2, var5, var3, var4.samples[this.start]); + if (this.field1435 >= var5) { return; } - this.field1452 = var5 + var5 - 1 - this.field1452; - this.field1451 = -this.field1451; + this.field1435 = var5 + var5 - 1 - this.field1435; + this.field1433 = -this.field1433; } while (true) { - var9 = this.method2477(var1, var9, var6, var3, var4.samples[this.end - 1]); - if (this.field1452 < var6) { + var9 = this.method2568(var1, var9, var6, var3, var4.samples[this.end - 1]); + if (this.field1435 < var6) { return; } - this.field1452 = var6 + var6 - 1 - this.field1452; - this.field1451 = -this.field1451; - var9 = this.method2618(var1, var9, var5, var3, var4.samples[this.start]); - if (this.field1452 >= var5) { + this.field1435 = var6 + var6 - 1 - this.field1435; + this.field1433 = -this.field1433; + var9 = this.method2544(var1, var9, var5, var3, var4.samples[this.start]); + if (this.field1435 >= var5) { return; } - this.field1452 = var5 + var5 - 1 - this.field1452; - this.field1451 = -this.field1451; + this.field1435 = var5 + var5 - 1 - this.field1435; + this.field1433 = -this.field1433; } - } else if (this.field1451 < 0) { + } else if (this.field1433 < 0) { while (true) { - var9 = this.method2618(var1, var9, var5, var3, var4.samples[this.end - 1]); - if (this.field1452 >= var5) { + var9 = this.method2544(var1, var9, var5, var3, var4.samples[this.end - 1]); + if (this.field1435 >= var5) { return; } - this.field1452 = var6 - 1 - (var6 - 1 - this.field1452) % var8; + this.field1435 = var6 - 1 - (var6 - 1 - this.field1435) % var8; } } else { while (true) { - var9 = this.method2477(var1, var9, var6, var3, var4.samples[this.start]); - if (this.field1452 < var6) { + var9 = this.method2568(var1, var9, var6, var3, var4.samples[this.start]); + if (this.field1435 < var6) { return; } - this.field1452 = var5 + (this.field1452 - var5) % var8; + this.field1435 = var5 + (this.field1435 - var5) % var8; } } } else { if (this.numLoops > 0) { - if (this.field1460) { - label130: { - if (this.field1451 < 0) { - var9 = this.method2618(var1, var2, var5, var3, var4.samples[this.start]); - if (this.field1452 >= var5) { + if (this.field1442) { + label139: { + if (this.field1433 < 0) { + var9 = this.method2544(var1, var2, var5, var3, var4.samples[this.start]); + if (this.field1435 >= var5) { return; } - this.field1452 = var5 + var5 - 1 - this.field1452; - this.field1451 = -this.field1451; + this.field1435 = var5 + var5 - 1 - this.field1435; + this.field1433 = -this.field1433; if (--this.numLoops == 0) { - break label130; + break label139; } } do { - var9 = this.method2477(var1, var9, var6, var3, var4.samples[this.end - 1]); - if (this.field1452 < var6) { + var9 = this.method2568(var1, var9, var6, var3, var4.samples[this.end - 1]); + if (this.field1435 < var6) { return; } - this.field1452 = var6 + var6 - 1 - this.field1452; - this.field1451 = -this.field1451; + this.field1435 = var6 + var6 - 1 - this.field1435; + this.field1433 = -this.field1433; if (--this.numLoops == 0) { break; } - var9 = this.method2618(var1, var9, var5, var3, var4.samples[this.start]); - if (this.field1452 >= var5) { + var9 = this.method2544(var1, var9, var5, var3, var4.samples[this.start]); + if (this.field1435 >= var5) { return; } - this.field1452 = var5 + var5 - 1 - this.field1452; - this.field1451 = -this.field1451; + this.field1435 = var5 + var5 - 1 - this.field1435; + this.field1433 = -this.field1433; } while(--this.numLoops != 0); } } else { int var10; - if (this.field1451 < 0) { + if (this.field1433 < 0) { while (true) { - var9 = this.method2618(var1, var9, var5, var3, var4.samples[this.end - 1]); - if (this.field1452 >= var5) { + var9 = this.method2544(var1, var9, var5, var3, var4.samples[this.end - 1]); + if (this.field1435 >= var5) { return; } - var10 = (var6 - 1 - this.field1452) / var8; + var10 = (var6 - 1 - this.field1435) / var8; if (var10 >= this.numLoops) { - this.field1452 += var8 * this.numLoops; + this.field1435 += var8 * this.numLoops; this.numLoops = 0; break; } - this.field1452 += var8 * var10; + this.field1435 += var8 * var10; this.numLoops -= var10; } } else { while (true) { - var9 = this.method2477(var1, var9, var6, var3, var4.samples[this.start]); - if (this.field1452 < var6) { + var9 = this.method2568(var1, var9, var6, var3, var4.samples[this.start]); + if (this.field1435 < var6) { return; } - var10 = (this.field1452 - var5) / var8; + var10 = (this.field1435 - var5) / var8; if (var10 >= this.numLoops) { - this.field1452 -= var8 * this.numLoops; + this.field1435 -= var8 * this.numLoops; this.numLoops = 0; break; } - this.field1452 -= var8 * var10; + this.field1435 -= var8 * var10; this.numLoops -= var10; } } } } - if (this.field1451 < 0) { - this.method2618(var1, var9, 0, var3, 0); - if (this.field1452 < 0) { - this.field1452 = -1; - this.method2617(); + if (this.field1433 < 0) { + this.method2544(var1, var9, 0, var3, 0); + if (this.field1435 < 0) { + this.field1435 = -1; + this.method2521(); this.remove(); } } else { - this.method2477(var1, var9, var7, var3, 0); - if (this.field1452 >= var7) { - this.field1452 = var7; - this.method2617(); + this.method2568(var1, var9, var7, var3, 0); + if (this.field1435 >= var7) { + this.field1435 = var7; + this.method2521(); this.remove(); } } @@ -282,33 +282,33 @@ public class RawPcmStream extends PcmStream { } } - @ObfuscatedName("d") + @ObfuscatedName("z") @Export("setNumLoops") public synchronized void setNumLoops(int var1) { this.numLoops = var1; } - @ObfuscatedName("f") + @ObfuscatedName("s") @Export("skip") public synchronized void skip(int var1) { - if (this.field1453 > 0) { - if (var1 >= this.field1453) { - if (this.field1454 == Integer.MIN_VALUE) { - this.field1454 = 0; - this.field1461 = 0; - this.field1455 = 0; - this.field1456 = 0; + if (this.field1443 > 0) { + if (var1 >= this.field1443) { + if (this.field1434 == Integer.MIN_VALUE) { + this.field1434 = 0; + this.field1432 = 0; + this.field1437 = 0; + this.field1436 = 0; this.remove(); - var1 = this.field1453; + var1 = this.field1443; } - this.field1453 = 0; - this.method2609(); + this.field1443 = 0; + this.method2512(); } else { - this.field1456 += this.field1462 * var1; - this.field1455 += this.field1463 * var1; - this.field1461 += this.field1464 * var1; - this.field1453 -= var1; + this.field1436 += this.field1444 * var1; + this.field1437 += this.field1445 * var1; + this.field1432 += this.field1446 * var1; + this.field1443 -= var1; } } @@ -321,183 +321,179 @@ public class RawPcmStream extends PcmStream { this.numLoops = 0; } - if (this.field1452 < 0) { - if (this.field1451 <= 0) { - this.method2617(); + if (this.field1435 < 0) { + if (this.field1433 <= 0) { + this.method2521(); this.remove(); return; } - this.field1452 = 0; + this.field1435 = 0; } - if (this.field1452 >= var5) { - if (this.field1451 >= 0) { - this.method2617(); + if (this.field1435 >= var5) { + if (this.field1433 >= 0) { + this.method2521(); this.remove(); return; } - this.field1452 = var5 - 1; + this.field1435 = var5 - 1; } - this.field1452 += this.field1451 * var1; + this.field1435 += this.field1433 * var1; if (this.numLoops < 0) { - if (!this.field1460) { - if (this.field1451 < 0) { - if (this.field1452 >= var3) { + if (!this.field1442) { + if (this.field1433 < 0) { + if (this.field1435 >= var3) { return; } - this.field1452 = var4 - 1 - (var4 - 1 - this.field1452) % var6; + this.field1435 = var4 - 1 - (var4 - 1 - this.field1435) % var6; } else { - if (this.field1452 < var4) { + if (this.field1435 < var4) { return; } - this.field1452 = var3 + (this.field1452 - var3) % var6; + this.field1435 = var3 + (this.field1435 - var3) % var6; } } else { - if (this.field1451 < 0) { - if (this.field1452 >= var3) { + if (this.field1433 < 0) { + if (this.field1435 >= var3) { return; } - this.field1452 = var3 + var3 - 1 - this.field1452; - this.field1451 = -this.field1451; + this.field1435 = var3 + var3 - 1 - this.field1435; + this.field1433 = -this.field1433; } - while (this.field1452 >= var4) { - this.field1452 = var4 + var4 - 1 - this.field1452; - this.field1451 = -this.field1451; - if (this.field1452 >= var3) { + while (this.field1435 >= var4) { + this.field1435 = var4 + var4 - 1 - this.field1435; + this.field1433 = -this.field1433; + if (this.field1435 >= var3) { return; } - this.field1452 = var3 + var3 - 1 - this.field1452; - this.field1451 = -this.field1451; + this.field1435 = var3 + var3 - 1 - this.field1435; + this.field1433 = -this.field1433; } } } else { if (this.numLoops > 0) { - if (this.field1460) { - label120: { - if (this.field1451 < 0) { - if (this.field1452 >= var3) { + if (this.field1442) { + label126: { + if (this.field1433 < 0) { + if (this.field1435 >= var3) { return; } - this.field1452 = var3 + var3 - 1 - this.field1452; - this.field1451 = -this.field1451; + this.field1435 = var3 + var3 - 1 - this.field1435; + this.field1433 = -this.field1433; if (--this.numLoops == 0) { - break label120; + break label126; } } do { - if (this.field1452 < var4) { + if (this.field1435 < var4) { return; } - this.field1452 = var4 + var4 - 1 - this.field1452; - this.field1451 = -this.field1451; + this.field1435 = var4 + var4 - 1 - this.field1435; + this.field1433 = -this.field1433; if (--this.numLoops == 0) { break; } - if (this.field1452 >= var3) { + if (this.field1435 >= var3) { return; } - this.field1452 = var3 + var3 - 1 - this.field1452; - this.field1451 = -this.field1451; + this.field1435 = var3 + var3 - 1 - this.field1435; + this.field1433 = -this.field1433; } while(--this.numLoops != 0); } } else { - label152: { - int var7; - if (this.field1451 < 0) { - if (this.field1452 >= var3) { - return; - } - - var7 = (var4 - 1 - this.field1452) / var6; - if (var7 >= this.numLoops) { - this.field1452 += var6 * this.numLoops; - this.numLoops = 0; - break label152; - } - - this.field1452 += var6 * var7; - this.numLoops -= var7; - } else { - if (this.field1452 < var4) { - return; - } - - var7 = (this.field1452 - var3) / var6; - if (var7 >= this.numLoops) { - this.field1452 -= var6 * this.numLoops; - this.numLoops = 0; - break label152; - } - - this.field1452 -= var6 * var7; - this.numLoops -= var7; + int var7; + if (this.field1433 < 0) { + if (this.field1435 >= var3) { + return; } - return; + var7 = (var4 - 1 - this.field1435) / var6; + if (var7 < this.numLoops) { + this.field1435 += var6 * var7; + this.numLoops -= var7; + return; + } + + this.field1435 += var6 * this.numLoops; + this.numLoops = 0; + } else { + if (this.field1435 < var4) { + return; + } + + var7 = (this.field1435 - var3) / var6; + if (var7 < this.numLoops) { + this.field1435 -= var6 * var7; + this.numLoops -= var7; + return; + } + + this.field1435 -= var6 * this.numLoops; + this.numLoops = 0; } } } - if (this.field1451 < 0) { - if (this.field1452 < 0) { - this.field1452 = -1; - this.method2617(); + if (this.field1433 < 0) { + if (this.field1435 < 0) { + this.field1435 = -1; + this.method2521(); this.remove(); } - } else if (this.field1452 >= var5) { - this.field1452 = var5; - this.method2617(); + } else if (this.field1435 >= var5) { + this.field1435 = var5; + this.method2521(); this.remove(); } } } - @ObfuscatedName("c") - public synchronized void method2599(int var1) { - this.method2465(var1 << 6, this.method2467()); - } - - @ObfuscatedName("r") - synchronized void method2554(int var1) { - this.method2465(var1, this.method2467()); - } - - @ObfuscatedName("y") - synchronized void method2465(int var1, int var2) { - this.field1454 = var1; - this.field1458 = var2; - this.field1453 = 0; - this.method2609(); - } - @ObfuscatedName("p") - public synchronized int method2455() { - return this.field1454 == Integer.MIN_VALUE ? 0 : this.field1454; - } - - @ObfuscatedName("g") - public synchronized int method2467() { - return this.field1458 < 0 ? -1 : this.field1458; + public synchronized void method2514(int var1) { + this.method2532(var1 << 6, this.method2518()); } @ObfuscatedName("e") - public synchronized void method2468(int var1) { + synchronized void method2515(int var1) { + this.method2532(var1, this.method2518()); + } + + @ObfuscatedName("i") + synchronized void method2532(int var1, int var2) { + this.field1434 = var1; + this.field1438 = var2; + this.field1443 = 0; + this.method2512(); + } + + @ObfuscatedName("q") + public synchronized int method2517() { + return this.field1434 == Integer.MIN_VALUE ? 0 : this.field1434; + } + + @ObfuscatedName("r") + public synchronized int method2518() { + return this.field1438 < 0 ? -1 : this.field1438; + } + + @ObfuscatedName("k") + public synchronized void method2569(int var1) { int var2 = ((RawSound)super.sound).samples.length << 8; if (var1 < -1) { var1 = -1; @@ -507,267 +503,254 @@ public class RawPcmStream extends PcmStream { var1 = var2; } - this.field1452 = var1; + this.field1435 = var1; } - @ObfuscatedName("z") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(Z)V", garbageValue = "1" ) - public synchronized void method2469() { - this.field1451 = (this.field1451 ^ this.field1451 >> 31) + (this.field1451 >>> 31); - this.field1451 = -this.field1451; + public synchronized void method2548() { + this.field1433 = (this.field1433 ^ this.field1433 >> 31) + (this.field1433 >>> 31); + this.field1433 = -this.field1433; } - @ObfuscatedName("w") - void method2617() { - if (this.field1453 != 0) { - if (this.field1454 == Integer.MIN_VALUE) { - this.field1454 = 0; + @ObfuscatedName("m") + void method2521() { + if (this.field1443 != 0) { + if (this.field1434 == Integer.MIN_VALUE) { + this.field1434 = 0; } - this.field1453 = 0; - this.method2609(); + this.field1443 = 0; + this.method2512(); } } - @ObfuscatedName("l") - public synchronized void method2470(int var1, int var2) { - this.method2472(var1, var2, this.method2467()); + @ObfuscatedName("o") + public synchronized void method2522(int var1, int var2) { + this.method2523(var1, var2, this.method2518()); } - @ObfuscatedName("az") - public synchronized void method2472(int var1, int var2, int var3) { + @ObfuscatedName("a") + public synchronized void method2523(int var1, int var2, int var3) { if (var1 == 0) { - this.method2465(var2, var3); + this.method2532(var2, var3); } else { - int var4 = method2558(var2, var3); - int var5 = method2456(var2, var3); - if (var4 == this.field1455 && var5 == this.field1461) { - this.field1453 = 0; + int var4 = method2647(var2, var3); + int var5 = method2508(var2, var3); + if (var4 == this.field1437 && var5 == this.field1432) { + this.field1443 = 0; } else { - int var6 = var2 - this.field1456; - if (this.field1456 - var2 > var6) { - var6 = this.field1456 - var2; + int var6 = var2 - this.field1436; + if (this.field1436 - var2 > var6) { + var6 = this.field1436 - var2; } - if (var4 - this.field1455 > var6) { - var6 = var4 - this.field1455; + if (var4 - this.field1437 > var6) { + var6 = var4 - this.field1437; } - if (this.field1455 - var4 > var6) { - var6 = this.field1455 - var4; + if (this.field1437 - var4 > var6) { + var6 = this.field1437 - var4; } - if (var5 - this.field1461 > var6) { - var6 = var5 - this.field1461; + if (var5 - this.field1432 > var6) { + var6 = var5 - this.field1432; } - if (this.field1461 - var5 > var6) { - var6 = this.field1461 - var5; + if (this.field1432 - var5 > var6) { + var6 = this.field1432 - var5; } if (var1 > var6) { var1 = var6; } - this.field1453 = var1; - this.field1454 = var2; - this.field1458 = var3; - this.field1462 = (var2 - this.field1456) / var1; - this.field1463 = (var4 - this.field1455) / var1; - this.field1464 = (var5 - this.field1461) / var1; + this.field1443 = var1; + this.field1434 = var2; + this.field1438 = var3; + this.field1444 = (var2 - this.field1436) / var1; + this.field1445 = (var4 - this.field1437) / var1; + this.field1446 = (var5 - this.field1432) / var1; } } } - @ObfuscatedName("at") - public synchronized void method2473(int var1) { + @ObfuscatedName("b") + public synchronized void method2541(int var1) { if (var1 == 0) { - this.method2554(0); + this.method2515(0); this.remove(); - } else if (this.field1455 == 0 && this.field1461 == 0) { - this.field1453 = 0; - this.field1454 = 0; - this.field1456 = 0; + } else if (this.field1437 == 0 && this.field1432 == 0) { + this.field1443 = 0; + this.field1434 = 0; + this.field1436 = 0; this.remove(); } else { - int var2 = -this.field1456; - if (this.field1456 > var2) { - var2 = this.field1456; + int var2 = -this.field1436; + if (this.field1436 > var2) { + var2 = this.field1436; } - if (-this.field1455 > var2) { - var2 = -this.field1455; + if (-this.field1437 > var2) { + var2 = -this.field1437; } - if (this.field1455 > var2) { - var2 = this.field1455; + if (this.field1437 > var2) { + var2 = this.field1437; } - if (-this.field1461 > var2) { - var2 = -this.field1461; + if (-this.field1432 > var2) { + var2 = -this.field1432; } - if (this.field1461 > var2) { - var2 = this.field1461; + if (this.field1432 > var2) { + var2 = this.field1432; } if (var1 > var2) { var1 = var2; } - this.field1453 = var1; - this.field1454 = Integer.MIN_VALUE; - this.field1462 = -this.field1456 / var1; - this.field1463 = -this.field1455 / var1; - this.field1464 = -this.field1461 / var1; - } - } - - @ObfuscatedName("as") - public synchronized void method2474(int var1) { - if (this.field1451 < 0) { - this.field1451 = -var1; - } else { - this.field1451 = var1; - } - - } - - @ObfuscatedName("ak") - int vmethod2644() { - int var1 = this.field1456 * 3 >> 6; - var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); - if (this.numLoops == 0) { - var1 -= var1 * this.field1452 / (((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("ao") - public synchronized int method2603() { - return this.field1451 < 0 ? -this.field1451 : this.field1451; - } - - @ObfuscatedName("ac") - public boolean method2476() { - return this.field1452 < 0 || this.field1452 >= ((RawSound)super.sound).samples.length << 8; - } - - @ObfuscatedName("ar") - public boolean method2457() { - return this.field1453 != 0; - } - - @ObfuscatedName("au") - int method2477(int[] var1, int var2, int var3, int var4, int var5) { - while (true) { - if (this.field1453 > 0) { - int var6 = var2 + this.field1453; - if (var6 > var4) { - var6 = var4; - } - - this.field1453 += var2; - if (this.field1451 == 256 && (this.field1452 & 255) == 0) { - if (PcmPlayer.PcmPlayer_stereo) { - var2 = method2495(0, ((RawSound)super.sound).samples, var1, this.field1452, var2, this.field1455, this.field1461, this.field1463, this.field1464, 0, var6, var3, this); - } else { - var2 = method2494(((RawSound)super.sound).samples, var1, this.field1452, var2, this.field1456, this.field1462, 0, var6, var3, this); - } - } else if (PcmPlayer.PcmPlayer_stereo) { - var2 = method2499(0, 0, ((RawSound)super.sound).samples, var1, this.field1452, var2, this.field1455, this.field1461, this.field1463, this.field1464, 0, var6, var3, this, this.field1451, var5); - } else { - var2 = method2498(0, 0, ((RawSound)super.sound).samples, var1, this.field1452, var2, this.field1456, this.field1462, 0, var6, var3, this, this.field1451, var5); - } - - this.field1453 -= var2; - if (this.field1453 != 0) { - return var2; - } - - if (!this.method2514()) { - continue; - } - - return var4; - } - - if (this.field1451 == 256 && (this.field1452 & 255) == 0) { - if (PcmPlayer.PcmPlayer_stereo) { - return method2551(0, ((RawSound)super.sound).samples, var1, this.field1452, var2, this.field1455, this.field1461, 0, var4, var3, this); - } - - return method2546(((RawSound)super.sound).samples, var1, this.field1452, var2, this.field1456, 0, var4, var3, this); - } - - if (PcmPlayer.PcmPlayer_stereo) { - return method2491(0, 0, ((RawSound)super.sound).samples, var1, this.field1452, var2, this.field1455, this.field1461, 0, var4, var3, this, this.field1451, var5); - } - - return method2490(0, 0, ((RawSound)super.sound).samples, var1, this.field1452, var2, this.field1456, 0, var4, var3, this, this.field1451, var5); - } - } - - @ObfuscatedName("ax") - int method2618(int[] var1, int var2, int var3, int var4, int var5) { - while (true) { - if (this.field1453 > 0) { - int var6 = var2 + this.field1453; - if (var6 > var4) { - var6 = var4; - } - - this.field1453 += var2; - if (this.field1451 == -256 && (this.field1452 & 255) == 0) { - if (PcmPlayer.PcmPlayer_stereo) { - var2 = method2590(0, ((RawSound)super.sound).samples, var1, this.field1452, var2, this.field1455, this.field1461, this.field1463, this.field1464, 0, var6, var3, this); - } else { - var2 = method2496(((RawSound)super.sound).samples, var1, this.field1452, var2, this.field1456, this.field1462, 0, var6, var3, this); - } - } else if (PcmPlayer.PcmPlayer_stereo) { - var2 = method2458(0, 0, ((RawSound)super.sound).samples, var1, this.field1452, var2, this.field1455, this.field1461, this.field1463, this.field1464, 0, var6, var3, this, this.field1451, var5); - } else { - var2 = method2500(0, 0, ((RawSound)super.sound).samples, var1, this.field1452, var2, this.field1456, this.field1462, 0, var6, var3, this, this.field1451, var5); - } - - this.field1453 -= var2; - if (this.field1453 != 0) { - return var2; - } - - if (!this.method2514()) { - continue; - } - - return var4; - } - - if (this.field1451 == -256 && (this.field1452 & 255) == 0) { - if (PcmPlayer.PcmPlayer_stereo) { - return method2489(0, ((RawSound)super.sound).samples, var1, this.field1452, var2, this.field1455, this.field1461, 0, var4, var3, this); - } - - return method2488(((RawSound)super.sound).samples, var1, this.field1452, var2, this.field1456, 0, var4, var3, this); - } - - if (PcmPlayer.PcmPlayer_stereo) { - return method2545(0, 0, ((RawSound)super.sound).samples, var1, this.field1452, var2, this.field1455, this.field1461, 0, var4, var3, this, this.field1451, var5); - } - - return method2492(0, 0, ((RawSound)super.sound).samples, var1, this.field1452, var2, this.field1456, 0, var4, var3, this, this.field1451, var5); + this.field1443 = var1; + this.field1434 = Integer.MIN_VALUE; + this.field1444 = -this.field1436 / var1; + this.field1445 = -this.field1437 / var1; + this.field1446 = -this.field1432 / var1; } } @ObfuscatedName("ag") - boolean method2514() { - int var1 = this.field1454; + public synchronized void method2525(int var1) { + if (this.field1433 < 0) { + this.field1433 = -var1; + } else { + this.field1433 = var1; + } + + } + + @ObfuscatedName("at") + public synchronized int method2604() { + return this.field1433 < 0 ? -this.field1433 : this.field1433; + } + + @ObfuscatedName("ax") + public boolean method2583() { + return this.field1435 < 0 || this.field1435 >= ((RawSound)super.sound).samples.length << 8; + } + + @ObfuscatedName("aj") + public boolean method2606() { + return this.field1443 != 0; + } + + @ObfuscatedName("ab") + int method2568(int[] var1, int var2, int var3, int var4, int var5) { + while (true) { + if (this.field1443 > 0) { + int var6 = var2 + this.field1443; + if (var6 > var4) { + var6 = var4; + } + + this.field1443 += var2; + if (this.field1433 == 256 && (this.field1435 & 255) == 0) { + if (PcmPlayer.PcmPlayer_stereo) { + var2 = method2546(0, ((RawSound)super.sound).samples, var1, this.field1435, var2, this.field1437, this.field1432, this.field1445, this.field1446, 0, var6, var3, this); + } else { + var2 = method2545(((RawSound)super.sound).samples, var1, this.field1435, var2, this.field1436, this.field1444, 0, var6, var3, this); + } + } else if (PcmPlayer.PcmPlayer_stereo) { + var2 = method2550(0, 0, ((RawSound)super.sound).samples, var1, this.field1435, var2, this.field1437, this.field1432, this.field1445, this.field1446, 0, var6, var3, this, this.field1433, var5); + } else { + var2 = method2645(0, 0, ((RawSound)super.sound).samples, var1, this.field1435, var2, this.field1436, this.field1444, 0, var6, var3, this, this.field1433, var5); + } + + this.field1443 -= var2; + if (this.field1443 != 0) { + return var2; + } + + if (!this.method2526()) { + continue; + } + + return var4; + } + + if (this.field1433 == 256 && (this.field1435 & 255) == 0) { + if (PcmPlayer.PcmPlayer_stereo) { + return method2538(0, ((RawSound)super.sound).samples, var1, this.field1435, var2, this.field1437, this.field1432, 0, var4, var3, this); + } + + return method2537(((RawSound)super.sound).samples, var1, this.field1435, var2, this.field1436, 0, var4, var3, this); + } + + if (PcmPlayer.PcmPlayer_stereo) { + return method2623(0, 0, ((RawSound)super.sound).samples, var1, this.field1435, var2, this.field1437, this.field1432, 0, var4, var3, this, this.field1433, var5); + } + + return method2631(0, 0, ((RawSound)super.sound).samples, var1, this.field1435, var2, this.field1436, 0, var4, var3, this, this.field1433, var5); + } + } + + @ObfuscatedName("ak") + int method2544(int[] var1, int var2, int var3, int var4, int var5) { + while (true) { + if (this.field1443 > 0) { + int var6 = var2 + this.field1443; + if (var6 > var4) { + var6 = var4; + } + + this.field1443 += var2; + if (this.field1433 == -256 && (this.field1435 & 255) == 0) { + if (PcmPlayer.PcmPlayer_stereo) { + var2 = method2535(0, ((RawSound)super.sound).samples, var1, this.field1435, var2, this.field1437, this.field1432, this.field1445, this.field1446, 0, var6, var3, this); + } else { + var2 = method2547(((RawSound)super.sound).samples, var1, this.field1435, var2, this.field1436, this.field1444, 0, var6, var3, this); + } + } else if (PcmPlayer.PcmPlayer_stereo) { + var2 = method2552(0, 0, ((RawSound)super.sound).samples, var1, this.field1435, var2, this.field1437, this.field1432, this.field1445, this.field1446, 0, var6, var3, this, this.field1433, var5); + } else { + var2 = method2551(0, 0, ((RawSound)super.sound).samples, var1, this.field1435, var2, this.field1436, this.field1444, 0, var6, var3, this, this.field1433, var5); + } + + this.field1443 -= var2; + if (this.field1443 != 0) { + return var2; + } + + if (!this.method2526()) { + continue; + } + + return var4; + } + + if (this.field1433 == -256 && (this.field1435 & 255) == 0) { + if (PcmPlayer.PcmPlayer_stereo) { + return method2540(0, ((RawSound)super.sound).samples, var1, this.field1435, var2, this.field1437, this.field1432, 0, var4, var3, this); + } + + return method2539(((RawSound)super.sound).samples, var1, this.field1435, var2, this.field1436, 0, var4, var3, this); + } + + if (PcmPlayer.PcmPlayer_stereo) { + return method2564(0, 0, ((RawSound)super.sound).samples, var1, this.field1435, var2, this.field1437, this.field1432, 0, var4, var3, this, this.field1433, var5); + } + + return method2543(0, 0, ((RawSound)super.sound).samples, var1, this.field1435, var2, this.field1436, 0, var4, var3, this, this.field1433, var5); + } + } + + @ObfuscatedName("ay") + boolean method2526() { + int var1 = this.field1434; int var2; int var3; if (var1 == Integer.MIN_VALUE) { @@ -775,97 +758,110 @@ public class RawPcmStream extends PcmStream { var2 = 0; var1 = 0; } else { - var2 = method2558(var1, this.field1458); - var3 = method2456(var1, this.field1458); + var2 = method2647(var1, this.field1438); + var3 = method2508(var1, this.field1438); } - if (var1 == this.field1456 && var2 == this.field1455 && var3 == this.field1461) { - if (this.field1454 == Integer.MIN_VALUE) { - this.field1454 = 0; - this.field1461 = 0; - this.field1455 = 0; - this.field1456 = 0; + if (var1 == this.field1436 && var2 == this.field1437 && var3 == this.field1432) { + if (this.field1434 == Integer.MIN_VALUE) { + this.field1434 = 0; + this.field1432 = 0; + this.field1437 = 0; + this.field1436 = 0; this.remove(); return true; } else { - this.method2609(); + this.method2512(); return false; } } else { - if (this.field1456 < var1) { - this.field1462 = 1; - this.field1453 = var1 - this.field1456; - } else if (this.field1456 > var1) { - this.field1462 = -1; - this.field1453 = this.field1456 - var1; + if (this.field1436 < var1) { + this.field1444 = 1; + this.field1443 = var1 - this.field1436; + } else if (this.field1436 > var1) { + this.field1444 = -1; + this.field1443 = this.field1436 - var1; } else { - this.field1462 = 0; + this.field1444 = 0; } - if (this.field1455 < var2) { - this.field1463 = 1; - if (this.field1453 == 0 || this.field1453 > var2 - this.field1455) { - this.field1453 = var2 - this.field1455; + if (this.field1437 < var2) { + this.field1445 = 1; + if (this.field1443 == 0 || this.field1443 > var2 - this.field1437) { + this.field1443 = var2 - this.field1437; } - } else if (this.field1455 > var2) { - this.field1463 = -1; - if (this.field1453 == 0 || this.field1453 > this.field1455 - var2) { - this.field1453 = this.field1455 - var2; + } else if (this.field1437 > var2) { + this.field1445 = -1; + if (this.field1443 == 0 || this.field1443 > this.field1437 - var2) { + this.field1443 = this.field1437 - var2; } } else { - this.field1463 = 0; + this.field1445 = 0; } - if (this.field1461 < var3) { - this.field1464 = 1; - if (this.field1453 == 0 || this.field1453 > var3 - this.field1461) { - this.field1453 = var3 - this.field1461; + if (this.field1432 < var3) { + this.field1446 = 1; + if (this.field1443 == 0 || this.field1443 > var3 - this.field1432) { + this.field1443 = var3 - this.field1432; } - } else if (this.field1461 > var3) { - this.field1464 = -1; - if (this.field1453 == 0 || this.field1453 > this.field1461 - var3) { - this.field1453 = this.field1461 - var3; + } else if (this.field1432 > var3) { + this.field1446 = -1; + if (this.field1443 == 0 || this.field1443 > this.field1432 - var3) { + this.field1443 = this.field1432 - var3; } } else { - this.field1464 = 0; + this.field1446 = 0; } return false; } } - @ObfuscatedName("s") - static int method2558(int var0, int var1) { + @ObfuscatedName("ah") + int vmethod2673() { + int var1 = this.field1436 * 3 >> 6; + var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); + if (this.numLoops == 0) { + var1 -= var1 * this.field1435 / (((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("c") + static int method2647(int var0, int var1) { return var1 < 0 ? var0 : (int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D); } - @ObfuscatedName("j") - static int method2456(int var0, int var1) { + @ObfuscatedName("x") + static int method2508(int var0, int var1) { return var1 < 0 ? -var0 : (int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D); } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lco;II)Ldx;" + signature = "(Lcg;II)Lda;" ) @Export("createRawPcmStream") public static RawPcmStream createRawPcmStream(RawSound var0, int var1, int var2) { - return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(PcmPlayer.PcmPlayer_sampleRate * 100)), var2 << 6) : null; + return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(GrandExchangeOfferWorldComparator.PcmPlayer_sampleRate * 100)), var2 << 6) : null; } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lco;III)Ldx;" + signature = "(Lcg;III)Lda;" ) - public static RawPcmStream method2460(RawSound var0, int var1, int var2, int var3) { + public static RawPcmStream method2511(RawSound var0, int var1, int var2, int var3) { return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, var1, var2, var3) : null; } - @ObfuscatedName("aa") + @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "([B[IIIIIIILdx;)I" + signature = "([B[IIIIIIILda;)I" ) - static int method2546(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method2537(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 +884,15 @@ public class RawPcmStream extends PcmStream { var10001 = var3++; } - var8.field1452 = var2 << 8; + var8.field1435 = var2 << 8; return var3; } - @ObfuscatedName("ap") + @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "(I[B[IIIIIIIILdx;)I" + signature = "(I[B[IIIIIIIILda;)I" ) - static int method2551(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + static int method2538(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 +935,15 @@ public class RawPcmStream extends PcmStream { var10001 = var4++; } - var10.field1452 = var3 << 8; + var10.field1435 = var3 << 8; return var4 >> 1; } @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "([B[IIIIIIILdx;)I" + signature = "([B[IIIIIIILda;)I" ) - static int method2488(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method2539(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 +966,15 @@ public class RawPcmStream extends PcmStream { var10001 = var3++; } - var8.field1452 = var2 << 8; + var8.field1435 = var2 << 8; return var3; } - @ObfuscatedName("ay") + @ObfuscatedName("ar") @ObfuscatedSignature( - signature = "(I[B[IIIIIIIILdx;)I" + signature = "(I[B[IIIIIIIILda;)I" ) - static int method2489(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + static int method2540(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 +1017,15 @@ public class RawPcmStream extends PcmStream { var10001 = var4++; } - var10.field1452 = var3 << 8; + var10.field1435 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("ad") + @ObfuscatedName("ac") @ObfuscatedSignature( - signature = "(II[B[IIIIIIILdx;II)I" + signature = "(II[B[IIIIIIILda;II)I" ) - static int method2490(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 method2631(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 +1050,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6; } - var10.field1452 = var4; + var10.field1435 = var4; return var5; } - @ObfuscatedName("al") + @ObfuscatedName("az") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIILdx;II)I" + signature = "(II[B[IIIIIIIILda;II)I" ) - static int method2491(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 method2623(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 +1092,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += var0 * var7 >> 6; } - var11.field1452 = var4; + var11.field1435 = var4; return var5 >> 1; } - @ObfuscatedName("ah") + @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(II[B[IIIIIIILdx;II)I" + signature = "(II[B[IIIIIIILda;II)I" ) - static int method2492(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 method2543(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 +1125,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; } - var10.field1452 = var4; + var10.field1435 = var4; return var5; } - @ObfuscatedName("ab") + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIILdx;II)I" + signature = "(II[B[IIIIIIIILda;II)I" ) - static int method2545(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 method2564(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 +1165,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += var0 * var7 >> 6; } - var11.field1452 = var4; + var11.field1435 = var4; return var5 >> 1; } @ObfuscatedName("aw") @ObfuscatedSignature( - signature = "([B[IIIIIIIILdx;)I" + signature = "([B[IIIIIIIILda;)I" ) - static int method2494(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method2545(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 +1182,8 @@ public class RawPcmStream extends PcmStream { var6 = var7; } - var9.field1455 += var9.field1463 * (var6 - var3); - var9.field1461 += var9.field1464 * (var6 - var3); + var9.field1437 += var9.field1445 * (var6 - var3); + var9.field1432 += var9.field1446 * (var6 - var3); int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { @@ -1209,16 +1205,16 @@ public class RawPcmStream extends PcmStream { var1[var10001] += var0[var2++] * var4; } - var9.field1456 = var4 >> 2; - var9.field1452 = var2 << 8; + var9.field1436 = var4 >> 2; + var9.field1435 = var2 << 8; return var3; } - @ObfuscatedName("ae") + @ObfuscatedName("au") @ObfuscatedSignature( - signature = "(I[B[IIIIIIIIIILdx;)I" + signature = "(I[B[IIIIIIIIIILda;)I" ) - static int method2495(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 method2546(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 +1225,7 @@ public class RawPcmStream extends PcmStream { var9 = var10; } - var12.field1456 += var12.field1462 * (var9 - var4); + var12.field1436 += var12.field1444 * (var9 - var4); var4 <<= 1; var9 <<= 1; @@ -1274,17 +1270,17 @@ public class RawPcmStream extends PcmStream { var2[var10001] += var13 * var6; } - var12.field1455 = var5 >> 2; - var12.field1461 = var6 >> 2; - var12.field1452 = var3 << 8; + var12.field1437 = var5 >> 2; + var12.field1432 = var6 >> 2; + var12.field1435 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("bk") + @ObfuscatedName("bg") @ObfuscatedSignature( - signature = "([B[IIIIIIIILdx;)I" + signature = "([B[IIIIIIIILda;)I" ) - static int method2496(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method2547(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 +1289,8 @@ public class RawPcmStream extends PcmStream { var6 = var7; } - var9.field1455 += var9.field1463 * (var6 - var3); - var9.field1461 += var9.field1464 * (var6 - var3); + var9.field1437 += var9.field1445 * (var6 - var3); + var9.field1432 += var9.field1446 * (var6 - var3); int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { @@ -1316,16 +1312,16 @@ public class RawPcmStream extends PcmStream { var1[var10001] += var0[var2--] * var4; } - var9.field1456 = var4 >> 2; - var9.field1452 = var2 << 8; + var9.field1436 = var4 >> 2; + var9.field1435 = var2 << 8; return var3; } - @ObfuscatedName("bw") + @ObfuscatedName("bn") @ObfuscatedSignature( - signature = "(I[B[IIIIIIIIIILdx;)I" + signature = "(I[B[IIIIIIIIIILda;)I" ) - static int method2590(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 method2535(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 +1332,7 @@ public class RawPcmStream extends PcmStream { var9 = var10; } - var12.field1456 += var12.field1462 * (var9 - var4); + var12.field1436 += var12.field1444 * (var9 - var4); var4 <<= 1; var9 <<= 1; @@ -1381,19 +1377,19 @@ public class RawPcmStream extends PcmStream { var2[var10001] += var13 * var6; } - var12.field1455 = var5 >> 2; - var12.field1461 = var6 >> 2; - var12.field1452 = var3 << 8; + var12.field1437 = var5 >> 2; + var12.field1432 = var6 >> 2; + var12.field1435 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("bo") + @ObfuscatedName("bk") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIILdx;II)I" + signature = "(II[B[IIIIIIIILda;II)I" ) - static int method2498(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.field1455 -= var11.field1463 * var5; - var11.field1461 -= var11.field1464 * var5; + static int method2645(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.field1437 -= var11.field1445 * var5; + var11.field1432 -= var11.field1446 * var5; if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { var8 = var9; } @@ -1420,19 +1416,19 @@ public class RawPcmStream extends PcmStream { var6 += var7; } - var11.field1455 += var11.field1463 * var5; - var11.field1461 += var11.field1464 * var5; - var11.field1456 = var6; - var11.field1452 = var4; + var11.field1437 += var11.field1445 * var5; + var11.field1432 += var11.field1446 * var5; + var11.field1436 = var6; + var11.field1435 = var4; return var5; } - @ObfuscatedName("bn") + @ObfuscatedName("bp") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIIIILdx;II)I" + signature = "(II[B[IIIIIIIIIILda;II)I" ) - static int method2499(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.field1456 -= var5 * var13.field1462; + static int method2550(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.field1436 -= var5 * var13.field1444; if (var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) { var10 = var11; } @@ -1471,20 +1467,20 @@ public class RawPcmStream extends PcmStream { } var5 >>= 1; - var13.field1456 += var13.field1462 * var5; - var13.field1455 = var6; - var13.field1461 = var7; - var13.field1452 = var4; + var13.field1436 += var13.field1444 * var5; + var13.field1437 = var6; + var13.field1432 = var7; + var13.field1435 = var4; return var5; } - @ObfuscatedName("bp") + @ObfuscatedName("bu") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIILdx;II)I" + signature = "(II[B[IIIIIIIILda;II)I" ) - static int method2500(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.field1455 -= var11.field1463 * var5; - var11.field1461 -= var11.field1464 * var5; + static int method2551(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.field1437 -= var11.field1445 * var5; + var11.field1432 -= var11.field1446 * var5; if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { var8 = var9; } @@ -1511,19 +1507,19 @@ public class RawPcmStream extends PcmStream { var6 += var7; } - var11.field1455 += var11.field1463 * var5; - var11.field1461 += var11.field1464 * var5; - var11.field1456 = var6; - var11.field1452 = var4; + var11.field1437 += var11.field1445 * var5; + var11.field1432 += var11.field1446 * var5; + var11.field1436 = var6; + var11.field1435 = var4; return var5; } - @ObfuscatedName("bz") + @ObfuscatedName("bi") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIIIILdx;II)I" + signature = "(II[B[IIIIIIIIIILda;II)I" ) - static int method2458(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.field1456 -= var5 * var13.field1462; + static int method2552(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.field1436 -= var5 * var13.field1444; if (var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) { var10 = var11; } @@ -1560,10 +1556,10 @@ public class RawPcmStream extends PcmStream { } var5 >>= 1; - var13.field1456 += var13.field1462 * var5; - var13.field1455 = var6; - var13.field1461 = var7; - var13.field1452 = var4; + var13.field1436 += var13.field1444 * var5; + var13.field1437 = var6; + var13.field1432 = var7; + var13.field1435 = var4; return var5; } } diff --git a/runescape-client/src/main/java/RawSound.java b/runescape-client/src/main/java/RawSound.java index 8038dff76c..661e43049f 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("co") +@ObfuscatedName("cg") @Implements("RawSound") public class RawSound extends AbstractSound { - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("sampleRate") public int sampleRate; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("samples") public byte[] samples; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("start") public int start; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("end") int end; - @ObfuscatedName("u") - public boolean field1362; + @ObfuscatedName("l") + public boolean field1358; 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.field1362 = var5; + this.field1358 = var5; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ldb;)Lco;" + signature = "(Lde;)Lcg;" ) @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 6bac54c47e..72fe06ac75 100644 --- a/runescape-client/src/main/java/ReflectionCheck.java +++ b/runescape-client/src/main/java/ReflectionCheck.java @@ -1,92 +1,157 @@ +import java.applet.Applet; import java.lang.reflect.Field; import java.lang.reflect.Method; +import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import netscape.javascript.JSObject; -@ObfuscatedName("cv") +@ObfuscatedName("cf") @Implements("ReflectionCheck") public class ReflectionCheck extends Node { - @ObfuscatedName("cm") - @ObfuscatedGetter( - intValue = -391486769 + @ObfuscatedName("h") + @ObfuscatedSignature( + signature = "Lgy;" ) - public static int field1307; - @ObfuscatedName("s") + @Export("musicTrack") + public static MusicTrack musicTrack; + @ObfuscatedName("fx") @ObfuscatedGetter( - intValue = 1136310453 + intValue = 1741628195 + ) + static int field1303; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -698721725 ) @Export("id") int id; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 563211099 + intValue = -414565063 ) @Export("size") int size; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("operations") int[] operations; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("creationErrors") int[] creationErrors; - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("fields") Field[] fields; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("intReplaceValues") int[] intReplaceValues; - @ObfuscatedName("t") + @ObfuscatedName("j") @Export("methods") Method[] methods; - @ObfuscatedName("q") + @ObfuscatedName("v") @Export("arguments") byte[][][] arguments; ReflectionCheck() { } - @ObfuscatedName("s") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(IIIB)I", - garbageValue = "4" + signature = "(Ljava/lang/String;ILjava/lang/String;B)Z", + garbageValue = "122" ) - public static int method2213(int var0, int var1, int var2) { - var2 &= 3; - if (var2 == 0) { - return var0; - } else if (var2 == 1) { - return var1; + static boolean method2261(String var0, int var1, String var2) { + if (var1 == 0) { + try { + if (!class51.field406.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 = class51.applet; + Object[] var5 = new Object[]{(new URL(class51.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 { + class51.applet.getAppletContext().showDocument(new URL(class51.applet.getCodeBase(), var0), "_blank"); + return true; + } catch (Exception var10) { + return false; + } + } else if (var1 == 3) { + try { + class47.method812(class51.applet, "loggedout"); + } catch (Throwable var12) { + } + + try { + class51.applet.getAppletContext().showDocument(new URL(class51.applet.getCodeBase(), var0), "_top"); + return true; + } catch (Exception var11) { + return false; + } } else { - return var2 == 2 ? 7 - var0 : 7 - var1; + throw new IllegalArgumentException(); } } + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "(Lbb;I)V", + garbageValue = "1777731201" + ) + @Export("changeWorld") + static void changeWorld(World var0) { + if (var0.isMembersOnly() != Client.isMembersWorld) { + Client.isMembersWorld = var0.isMembersOnly(); + VertexNormal.method2960(var0.isMembersOnly()); + } + + ArchiveLoader.worldHost = var0.host; + Client.worldId = var0.id; + Client.worldProperties = var0.properties; + WorldMapSection1.port1 = Client.gameBuild == 0 ? 43594 : var0.id + 40000; + IsaacCipher.port2 = Client.gameBuild == 0 ? 443 : var0.id + 50000; + LoginPacket.port3 = WorldMapSection1.port1; + } + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "-125143607" + signature = "(Lhy;IB)V", + garbageValue = "0" ) - public static int method2212(int var0, int var1) { - return (var0 << 8) + var1; - } + @Export("Widget_setKeyIgnoreHeld") + static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { + if (var0.field2671 == null) { + throw new RuntimeException(); + } else { + if (var0.field2656 == null) { + var0.field2656 = new int[var0.field2671.length]; + } - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)I", - garbageValue = "482373296" - ) - @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 + class14.charToByteCp1252(var0.charAt(var3)); + var0.field2656[var1] = Integer.MAX_VALUE; } - - return var2; } } diff --git a/runescape-client/src/main/java/RouteStrategy.java b/runescape-client/src/main/java/RouteStrategy.java index f26c6c491d..365b87419b 100644 --- a/runescape-client/src/main/java/RouteStrategy.java +++ b/runescape-client/src/main/java/RouteStrategy.java @@ -4,42 +4,54 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fq") +@ObfuscatedName("fw") @Implements("RouteStrategy") public abstract class RouteStrategy { - @ObfuscatedName("da") + @ObfuscatedName("sk") @ObfuscatedSignature( - signature = "Lft;" + signature = "Lkx;" ) - @Export("js5SocketTask") - static Task js5SocketTask; - @ObfuscatedName("fa") - @ObfuscatedGetter( - intValue = 207475119 + @Export("masterDisk") + static ArchiveDisk masterDisk; + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "Leq;" ) - @Export("baseY") - static int baseY; - @ObfuscatedName("s") + @Export("World_request") + static UrlRequest World_request; + @ObfuscatedName("fy") + @ObfuscatedSignature( + signature = "Led;" + ) + @Export("urlRequester") + static UrlRequester urlRequester; + @ObfuscatedName("gc") + @ObfuscatedSignature( + signature = "[Lli;" + ) + @Export("headIconPrayerSprites") + static Sprite[] headIconPrayerSprites; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 663574439 + intValue = -2040361911 ) @Export("approxDestinationX") public int approxDestinationX; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -148289361 + intValue = 1007393083 ) @Export("approxDestinationY") public int approxDestinationY; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 2029951319 + intValue = -462526133 ) @Export("approxDestinationSizeX") public int approxDestinationSizeX; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 2116488485 + intValue = -1078511921 ) @Export("approxDestinationSizeY") public int approxDestinationSizeY; @@ -47,77 +59,40 @@ public abstract class RouteStrategy { protected RouteStrategy() { } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IIILfm;I)Z", - garbageValue = "1325675955" + signature = "(IIILfj;I)Z", + garbageValue = "2030512647" ) @Export("hasArrived") - public abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4); + protected abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4); - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(CB)Z", - garbageValue = "-117" + signature = "(S)[Lli;", + garbageValue = "-22640" ) - @Export("isAlphaNumeric") - public static boolean isAlphaNumeric(char var0) { - return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; - } + static Sprite[] method3578() { + Sprite[] var0 = new Sprite[class325.SpriteBuffer_spriteCount]; - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "-1827304570" - ) - static final int method3533(int var0, int var1) { - if (var0 == -2) { - return 12345678; - } else if (var0 == -1) { - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; + for (int var1 = 0; var1 < class325.SpriteBuffer_spriteCount; ++var1) { + Sprite var2 = var0[var1] = new Sprite(); + var2.width = class325.SpriteBuffer_spriteWidth; + var2.height = class325.SpriteBuffer_spriteHeight; + var2.xOffset = class325.SpriteBuffer_xOffsets[var1]; + var2.yOffset = SecureRandomCallable.SpriteBuffer_yOffsets[var1]; + var2.subWidth = class325.SpriteBuffer_spriteWidths[var1]; + var2.subHeight = SoundSystem.SpriteBuffer_spriteHeights[var1]; + int var3 = var2.subHeight * var2.subWidth; + byte[] var4 = InvDefinition.SpriteBuffer_pixels[var1]; + var2.pixels = new int[var3]; + + for (int var5 = 0; var5 < var3; ++var5) { + var2.pixels[var5] = class325.SpriteBuffer_spritePalette[var4[var5] & 255]; } - - return var1; - } else { - var1 = (var0 & 127) * var1 / 128; - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } - - return (var0 & 65408) + var1; - } - } - - @ObfuscatedName("ku") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZI)Ljava/lang/String;", - garbageValue = "1938958003" - ) - static String method3534(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 (Clock.field2037 != null) { - var3 = "/p=" + Clock.field2037; - } - - String var4 = "runescape.com"; - return var2 + var0 + "." + var4 + "/l=" + class60.clientLanguage + "/a=" + SoundSystem.field1414 + var3 + "/"; + class192.SpriteBuffer_clear(); + return var0; } } diff --git a/runescape-client/src/main/java/RunException.java b/runescape-client/src/main/java/RunException.java index b1503e45f2..294a6140f1 100644 --- a/runescape-client/src/main/java/RunException.java +++ b/runescape-client/src/main/java/RunException.java @@ -1,21 +1,28 @@ import java.applet.Applet; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("mv") +@ObfuscatedName("ma") @Implements("RunException") public class RunException extends RuntimeException { - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("RunException_applet") public static Applet RunException_applet; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("localPlayerName") public static String localPlayerName; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -242879535 + ) + @Export("RunException_revision") + public static int RunException_revision; @ObfuscatedName("u") @Export("message") String message; - @ObfuscatedName("n") + @ObfuscatedName("j") @Export("throwable") Throwable throwable; diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java index c87eb6743b..59de00a926 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("ea") +@ObfuscatedName("ep") @Implements("Scene") public class Scene { - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("Scene_isLowDetail") public static boolean Scene_isLowDetail; @ObfuscatedName("p") @Export("tileUpdateCount") static int tileUpdateCount; - @ObfuscatedName("b") + @ObfuscatedName("e") @Export("Scene_plane") static int Scene_plane; - @ObfuscatedName("g") + @ObfuscatedName("i") @Export("Scene_drawnCount") static int Scene_drawnCount; - @ObfuscatedName("e") + @ObfuscatedName("q") @Export("Scene_cameraXTileMin") static int Scene_cameraXTileMin; - @ObfuscatedName("z") + @ObfuscatedName("y") @Export("Scene_cameraXTileMax") static int Scene_cameraXTileMax; - @ObfuscatedName("a") + @ObfuscatedName("r") @Export("Scene_cameraYTileMin") static int Scene_cameraYTileMin; - @ObfuscatedName("w") + @ObfuscatedName("k") @Export("Scene_cameraYTileMax") static int Scene_cameraYTileMax; - @ObfuscatedName("l") + @ObfuscatedName("w") @Export("Scene_cameraXTile") static int Scene_cameraXTile; - @ObfuscatedName("h") + @ObfuscatedName("m") @Export("Scene_cameraYTile") static int Scene_cameraYTile; - @ObfuscatedName("v") + @ObfuscatedName("o") @Export("Scene_cameraX") static int Scene_cameraX; - @ObfuscatedName("m") + @ObfuscatedName("a") @Export("Scene_cameraY") static int Scene_cameraY; - @ObfuscatedName("o") + @ObfuscatedName("b") @Export("Scene_cameraZ") static int Scene_cameraZ; - @ObfuscatedName("av") + @ObfuscatedName("ag") @Export("Scene_cameraPitchSine") static int Scene_cameraPitchSine; - @ObfuscatedName("am") + @ObfuscatedName("at") @Export("Scene_cameraPitchCosine") static int Scene_cameraPitchCosine; - @ObfuscatedName("ai") + @ObfuscatedName("ao") @Export("Scene_cameraYawSine") static int Scene_cameraYawSine; - @ObfuscatedName("af") + @ObfuscatedName("av") @Export("Scene_cameraYawCosine") static int Scene_cameraYawCosine; - @ObfuscatedName("az") + @ObfuscatedName("an") @ObfuscatedSignature( - signature = "[Lej;" + signature = "[Lef;" ) @Export("gameObjects") static GameObject[] gameObjects; - @ObfuscatedName("aj") + @ObfuscatedName("al") @Export("checkClick") static boolean checkClick; - @ObfuscatedName("an") + @ObfuscatedName("as") @Export("Scene_selectedPlane") static int Scene_selectedPlane; - @ObfuscatedName("at") + @ObfuscatedName("ad") @Export("Scene_selectedScreenX") static int Scene_selectedScreenX; - @ObfuscatedName("as") + @ObfuscatedName("ap") @Export("Scene_selectedScreenY") static int Scene_selectedScreenY; - @ObfuscatedName("ak") + @ObfuscatedName("ax") @Export("Scene_selectedX") public static int Scene_selectedX; - @ObfuscatedName("ao") + @ObfuscatedName("aj") @Export("Scene_selectedY") public static int Scene_selectedY; - @ObfuscatedName("ac") + @ObfuscatedName("ab") @Export("viewportWalking") static boolean viewportWalking; - @ObfuscatedName("ax") + @ObfuscatedName("ay") @Export("Scene_planesCount") static int Scene_planesCount; - @ObfuscatedName("ag") + @ObfuscatedName("ae") @Export("Scene_planeOccluderCounts") static int[] Scene_planeOccluderCounts; - @ObfuscatedName("aa") + @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "[[Leq;" + signature = "[[Lek;" ) @Export("Scene_planeOccluders") static Occluder[][] Scene_planeOccluders; - @ObfuscatedName("ap") + @ObfuscatedName("aa") @Export("Scene_currentOccludersCount") static int Scene_currentOccludersCount; @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "[Leq;" + signature = "[Lek;" ) @Export("Scene_currentOccluders") static Occluder[] Scene_currentOccluders; - @ObfuscatedName("ay") + @ObfuscatedName("ar") @ObfuscatedSignature( - signature = "Ljc;" + signature = "Ljv;" ) @Export("Scene_tilesDeque") static NodeDeque Scene_tilesDeque; - @ObfuscatedName("ad") - static final int[] field1826; - @ObfuscatedName("al") - static final int[] field1796; - @ObfuscatedName("ah") - static final int[] field1799; - @ObfuscatedName("ab") - static final int[] field1844; + @ObfuscatedName("ac") + static final int[] field1818; + @ObfuscatedName("az") + static final int[] field1781; + @ObfuscatedName("ai") + static final int[] field1813; + @ObfuscatedName("am") + static final int[] field1814; @ObfuscatedName("aw") - static final int[] field1830; - @ObfuscatedName("ae") - static final int[] field1831; - @ObfuscatedName("bk") - static final int[] field1832; - @ObfuscatedName("bv") + static final int[] field1779; + @ObfuscatedName("au") + static final int[] field1801; + @ObfuscatedName("bg") + static final int[] field1817; + @ObfuscatedName("bf") @Export("visibilityMap") static boolean[][][][] visibilityMap; - @ObfuscatedName("bj") + @ObfuscatedName("bm") @Export("visibleTiles") static boolean[][] visibleTiles; - @ObfuscatedName("bq") + @ObfuscatedName("bw") @Export("Scene_viewportXCenter") static int Scene_viewportXCenter; - @ObfuscatedName("by") + @ObfuscatedName("bs") @Export("Scene_viewportYCenter") static int Scene_viewportYCenter; - @ObfuscatedName("bs") + @ObfuscatedName("bt") @Export("Scene_viewportXMin") static int Scene_viewportXMin; - @ObfuscatedName("bi") + @ObfuscatedName("bj") @Export("Scene_viewportYMin") static int Scene_viewportYMin; - @ObfuscatedName("bf") + @ObfuscatedName("bd") @Export("Scene_viewportXMax") static int Scene_viewportXMax; - @ObfuscatedName("bd") + @ObfuscatedName("by") @Export("Scene_viewportYMax") static int Scene_viewportYMax; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("planes") int planes; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("xSize") int xSize; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("ySize") int ySize; - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("tileHeights") int[][][] tileHeights; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "[[[Lde;" + signature = "[[[Ldq;" ) @Export("tiles") Tile[][][] tiles; - @ObfuscatedName("t") + @ObfuscatedName("j") @Export("minPlane") int minPlane; - @ObfuscatedName("q") + @ObfuscatedName("v") @Export("tempGameObjectsCount") int tempGameObjectsCount; - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "[Lej;" + signature = "[Lef;" ) @Export("tempGameObjects") GameObject[] tempGameObjects; - @ObfuscatedName("d") - int[][][] field1789; - @ObfuscatedName("bz") + @ObfuscatedName("z") + int[][][] field1815; + @ObfuscatedName("bi") @Export("tileShape2D") int[][] tileShape2D; - @ObfuscatedName("bh") + @ObfuscatedName("bv") @Export("tileRotation2D") int[][] tileRotation2D; @@ -206,13 +206,13 @@ public class Scene { Scene_currentOccludersCount = 0; Scene_currentOccluders = new Occluder[500]; Scene_tilesDeque = new NodeDeque(); - field1826 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; - field1796 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; - field1799 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; - field1844 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; - field1830 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; - field1831 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; - field1832 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; + field1818 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; + field1781 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; + field1813 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; + field1814 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; + field1779 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; + field1801 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; + field1817 = 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.field1789 = new int[var1][var2 + 1][var3 + 1]; + this.field1815 = new int[var1][var2 + 1][var3 + 1]; this.tileHeights = var4; this.clear(); } - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("clear") public void clear() { int var1; @@ -264,7 +264,7 @@ public class Scene { } - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("init") public void init(int var1) { this.minPlane = var1; @@ -279,7 +279,7 @@ public class Scene { } - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("setLinkBelow") public void setLinkBelow(int var1, int var2) { Tile var3 = this.tiles[0][var1][var2]; @@ -291,7 +291,9 @@ public class Scene { for (int var6 = 0; var6 < var5.gameObjectsCount; ++var6) { GameObject var7 = var5.gameObjects[var6]; - if (WorldMapEvent.method730(var7.tag) && var7.startX == var1 && var2 == var7.startY) { + long var9 = var7.tag; + boolean var8 = UserComparator2.ViewportMouse_unpackY(var9) == 2; + if (var8 && var7.startX == var1 && var2 == var7.startY) { --var7.plane; } } @@ -306,7 +308,7 @@ public class Scene { this.tiles[3][var1][var2] = null; } - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("setTileMinPlane") public void setTileMinPlane(int var1, int var2, int var3, int var4) { Tile var5 = this.tiles[var1][var2][var3]; @@ -315,7 +317,7 @@ public class Scene { } } - @ObfuscatedName("n") + @ObfuscatedName("u") @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) { TilePaint var21; @@ -353,9 +355,9 @@ public class Scene { } } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IIIILen;JI)V" + signature = "(IIIILel;JI)V" ) @Export("newFloorDecoration") public void newFloorDecoration(int var1, int var2, int var3, int var4, Entity var5, long var6, int var8) { @@ -375,15 +377,15 @@ public class Scene { } } - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(IIIILen;JLen;Len;)V" + signature = "(IIIILel;JLel;Lel;)V" ) @Export("newGroundItemPile") public void newGroundItemPile(int var1, int var2, int var3, int var4, Entity var5, long var6, Entity var8, Entity var9) { TileItemPile var10 = new TileItemPile(); var10.first = var5; - var10.x = var2 * 128 + 64; + var10.x = var2 * 134217728 + 67108864; var10.y = var3 * 128 + 64; var10.tileHeight = var4; var10.tag = var6; @@ -411,9 +413,9 @@ public class Scene { this.tiles[var1][var2][var3].tileItemPile = var10; } - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(IIIILen;Len;IIJI)V" + signature = "(IIIILel;Lel;IIJI)V" ) @Export("newBoundaryObject") public void newBoundaryObject(int var1, int var2, int var3, int var4, Entity var5, Entity var6, int var7, int var8, long var9, int var11) { @@ -439,9 +441,9 @@ public class Scene { } } - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(IIIILen;Len;IIIIJI)V" + signature = "(IIIILel;Lel;IIIIJI)V" ) @Export("newWallDecoration") public void newWallDecoration(int var1, int var2, int var3, int var4, Entity var5, Entity var6, int var7, int var8, int var9, int var10, long var11, int var13) { @@ -469,11 +471,11 @@ public class Scene { } } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(IIIIIILen;IJI)Z" + signature = "(IIIIIILel;IJI)Z" ) - public boolean method3013(int var1, int var2, int var3, int var4, int var5, int var6, Entity var7, int var8, long var9, int var11) { + public boolean method3051(int var1, int var2, int var3, int var4, int var5, int var6, Entity var7, int var8, long var9, int var11) { if (var7 == null) { return true; } else { @@ -483,9 +485,9 @@ public class Scene { } } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(IIIIILen;IJZ)Z" + signature = "(IIIIILel;IJZ)Z" ) @Export("drawEntity") public boolean drawEntity(int var1, int var2, int var3, int var4, int var5, Entity var6, int var7, long var8, boolean var10) { @@ -522,18 +524,18 @@ public class Scene { } } - @ObfuscatedName("r") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(IIIIILen;IJIIII)Z" + signature = "(IIIIILel;IJIIII)Z" ) @Export("addNullableObject") public boolean addNullableObject(int var1, int var2, int var3, int var4, int var5, Entity 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("y") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(IIIIIIIILen;IZJI)Z" + signature = "(IIIIIIIILel;IZJI)Z" ) @Export("newGameObject") boolean newGameObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, Entity var9, int var10, boolean var11, long var12, int var14) { @@ -544,8 +546,8 @@ public class Scene { return false; } - Tile var23 = this.tiles[var1][var15][var16]; - if (var23 != null && var23.gameObjectsCount >= 5) { + Tile var17 = this.tiles[var1][var15][var16]; + if (var17 != null && var17.gameObjectsCount >= 5) { return false; } } @@ -566,7 +568,7 @@ public class Scene { var21.endY = var3 + var5 - 1; for (var16 = var2; var16 < var2 + var4; ++var16) { - for (int var17 = var3; var17 < var3 + var5; ++var17) { + for (int var22 = var3; var22 < var3 + var5; ++var22) { int var18 = 0; if (var16 > var2) { ++var18; @@ -576,25 +578,25 @@ public class Scene { var18 += 4; } - if (var17 > var3) { + if (var22 > var3) { var18 += 8; } - if (var17 < var3 + var5 - 1) { + if (var22 < var3 + var5 - 1) { var18 += 2; } for (int var19 = var1; var19 >= 0; --var19) { - if (this.tiles[var19][var16][var17] == null) { - this.tiles[var19][var16][var17] = new Tile(var19, var16, var17); + if (this.tiles[var19][var16][var22] == null) { + this.tiles[var19][var16][var22] = new Tile(var19, var16, var22); } } - Tile var22 = this.tiles[var1][var16][var17]; - var22.gameObjects[var22.gameObjectsCount] = var21; - var22.gameObjectEdgeMasks[var22.gameObjectsCount] = var18; - var22.gameObjectsEdgeMask |= var18; - ++var22.gameObjectsCount; + Tile var23 = this.tiles[var1][var16][var22]; + var23.gameObjects[var23.gameObjectsCount] = var21; + var23.gameObjectEdgeMasks[var23.gameObjectsCount] = var18; + var23.gameObjectsEdgeMask |= var18; + ++var23.gameObjectsCount; } } @@ -605,7 +607,7 @@ public class Scene { return true; } - @ObfuscatedName("p") + @ObfuscatedName("q") @Export("clearTempGameObjects") public void clearTempGameObjects() { for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { @@ -617,9 +619,9 @@ public class Scene { this.tempGameObjectsCount = 0; } - @ObfuscatedName("g") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(Lej;)V" + signature = "(Lef;)V" ) @Export("removeGameObject") void removeGameObject(GameObject var1) { @@ -653,8 +655,8 @@ public class Scene { } - @ObfuscatedName("e") - public void method3026(int var1, int var2, int var3, int var4) { + @ObfuscatedName("k") + public void method3057(int var1, int var2, int var3, int var4) { Tile var5 = this.tiles[var1][var2][var3]; if (var5 != null) { WallDecoration var6 = var5.wallDecoration; @@ -665,7 +667,7 @@ public class Scene { } } - @ObfuscatedName("z") + @ObfuscatedName("w") @Export("removeBoundaryObject") public void removeBoundaryObject(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -674,7 +676,7 @@ public class Scene { } } - @ObfuscatedName("w") + @ObfuscatedName("m") @Export("removeWallDecoration") public void removeWallDecoration(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -683,14 +685,16 @@ public class Scene { } } - @ObfuscatedName("l") + @ObfuscatedName("o") @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 (WorldMapEvent.method730(var6.tag) && var2 == var6.startX && var3 == var6.startY) { + long var8 = var6.tag; + boolean var7 = UserComparator2.ViewportMouse_unpackY(var8) == 2; + if (var7 && var2 == var6.startX && var3 == var6.startY) { this.removeGameObject(var6); return; } @@ -699,7 +703,7 @@ public class Scene { } } - @ObfuscatedName("h") + @ObfuscatedName("a") @Export("removeFloorDecoration") public void removeFloorDecoration(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -708,7 +712,7 @@ public class Scene { } } - @ObfuscatedName("v") + @ObfuscatedName("b") @Export("removeGroundItemPile") public void removeGroundItemPile(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -717,36 +721,38 @@ public class Scene { } } - @ObfuscatedName("m") + @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "(III)Ley;" + signature = "(III)Lea;" ) - public BoundaryObject method3032(int var1, int var2, int var3) { + public BoundaryObject method3063(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 == null ? null : var4.boundaryObject; } - @ObfuscatedName("o") + @ObfuscatedName("at") @ObfuscatedSignature( - signature = "(III)Lec;" + signature = "(III)Les;" ) - public WallDecoration method3033(int var1, int var2, int var3) { + public WallDecoration method3189(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 == null ? null : var4.wallDecoration; } - @ObfuscatedName("av") + @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "(III)Lej;" + signature = "(III)Lef;" ) - public GameObject method3034(int var1, int var2, int var3) { + public GameObject method3065(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 (WorldMapEvent.method730(var6.tag) && var2 == var6.startX && var3 == var6.startY) { + long var8 = var6.tag; + boolean var7 = UserComparator2.ViewportMouse_unpackY(var8) == 2; + if (var7 && var2 == var6.startX && var3 == var6.startY) { return var6; } } @@ -755,9 +761,9 @@ public class Scene { } } - @ObfuscatedName("am") + @ObfuscatedName("av") @ObfuscatedSignature( - signature = "(III)Ldy;" + signature = "(III)Ldb;" ) @Export("getFloorDecoration") public FloorDecoration getFloorDecoration(int var1, int var2, int var3) { @@ -765,21 +771,21 @@ public class Scene { return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; } - @ObfuscatedName("ai") + @ObfuscatedName("an") @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("af") + @ObfuscatedName("al") @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("az") + @ObfuscatedName("as") @Export("getGameObjectTag") public long getGameObjectTag(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -788,7 +794,9 @@ public class Scene { } else { for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { GameObject var6 = var4.gameObjects[var5]; - if (WorldMapEvent.method730(var6.tag) && var2 == var6.startX && var3 == var6.startY) { + long var8 = var6.tag; + boolean var7 = UserComparator2.ViewportMouse_unpackY(var8) == 2; + if (var7 && var2 == var6.startX && var3 == var6.startY) { return var6.tag; } } @@ -797,14 +805,14 @@ public class Scene { } } - @ObfuscatedName("aj") + @ObfuscatedName("ad") @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("an") + @ObfuscatedName("ap") @Export("getObjectFlags") public int getObjectFlags(int var1, int var2, int var3, long var4) { Tile var6 = this.tiles[var1][var2][var3]; @@ -827,8 +835,8 @@ public class Scene { } } - @ObfuscatedName("at") - public void method3100(int var1, int var2, int var3) { + @ObfuscatedName("ax") + public void method3072(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 +846,11 @@ public class Scene { ModelData var10; if (var8 != null && var8.entity1 instanceof ModelData) { ModelData var9 = (ModelData)var8.entity1; - this.method3043(var9, var4, var5, var6, 1, 1); + this.method3060(var9, var4, var5, var6, 1, 1); if (var8.entity2 instanceof ModelData) { var10 = (ModelData)var8.entity2; - this.method3043(var10, var4, var5, var6, 1, 1); - ModelData.method2745(var9, var10, 0, 0, 0, false); + this.method3060(var10, var4, var5, var6, 1, 1); + ModelData.method2807(var9, var10, 0, 0, 0, false); var8.entity2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); } @@ -853,7 +861,7 @@ public class Scene { GameObject var14 = var7.gameObjects[var12]; if (var14 != null && var14.entity instanceof ModelData) { ModelData var11 = (ModelData)var14.entity; - this.method3043(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); + this.method3060(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); var14.entity = var11.toModel(var11.ambient, var11.contrast, var1, var2, var3); } } @@ -861,7 +869,7 @@ public class Scene { FloorDecoration var13 = var7.floorDecoration; if (var13 != null && var13.entity instanceof ModelData) { var10 = (ModelData)var13.entity; - this.method3042(var10, var4, var5, var6); + this.method3073(var10, var4, var5, var6); var13.entity = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); } } @@ -871,18 +879,18 @@ public class Scene { } - @ObfuscatedName("as") + @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "(Ldq;III)V" + signature = "(Lds;III)V" ) - void method3042(ModelData var1, int var2, int var3, int var4) { + void method3073(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.entity instanceof ModelData) { var6 = (ModelData)var5.floorDecoration.entity; - ModelData.method2745(var1, var6, 128, 0, 0, true); + ModelData.method2807(var1, var6, 128, 0, 0, true); } } @@ -890,7 +898,7 @@ public class Scene { var5 = this.tiles[var2][var3][var4 + 1]; if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { var6 = (ModelData)var5.floorDecoration.entity; - ModelData.method2745(var1, var6, 0, 0, 128, true); + ModelData.method2807(var1, var6, 0, 0, 128, true); } } @@ -898,7 +906,7 @@ public class Scene { var5 = this.tiles[var2][var3 + 1][var4 + 1]; if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { var6 = (ModelData)var5.floorDecoration.entity; - ModelData.method2745(var1, var6, 128, 0, 128, true); + ModelData.method2807(var1, var6, 128, 0, 128, true); } } @@ -906,17 +914,17 @@ public class Scene { var5 = this.tiles[var2][var3 + 1][var4 - 1]; if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { var6 = (ModelData)var5.floorDecoration.entity; - ModelData.method2745(var1, var6, 128, 0, -128, true); + ModelData.method2807(var1, var6, 128, 0, -128, true); } } } - @ObfuscatedName("ak") + @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "(Ldq;IIIII)V" + signature = "(Lds;IIIII)V" ) - void method3043(ModelData var1, int var2, int var3, int var4, int var5, int var6) { + void method3060(ModelData var1, int var2, int var3, int var4, int var5, int var6) { boolean var7 = true; int var8 = var3; int var9 = var3 + var5; @@ -937,12 +945,12 @@ public class Scene { ModelData var18; if (var17.entity1 instanceof ModelData) { var18 = (ModelData)var17.entity1; - ModelData.method2745(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); + ModelData.method2807(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); } if (var17.entity2 instanceof ModelData) { var18 = (ModelData)var17.entity2; - ModelData.method2745(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); + ModelData.method2807(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); } } @@ -952,7 +960,7 @@ public class Scene { ModelData var20 = (ModelData)var19.entity; int var21 = var19.endX - var19.startX + 1; int var22 = var19.endY - var19.startY + 1; - ModelData.method2745(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); + ModelData.method2807(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); } } } @@ -968,7 +976,7 @@ public class Scene { } - @ObfuscatedName("ao") + @ObfuscatedName("af") @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,10 +1041,10 @@ public class Scene { } } - @ObfuscatedName("au") + @ObfuscatedName("ae") @Export("menuOpen") public void menuOpen(int var1, int var2, int var3, boolean var4) { - if (!method3049() || var4) { + if (!method3080() || var4) { checkClick = true; viewportWalking = var4; Scene_selectedPlane = var1; @@ -1047,13 +1055,13 @@ public class Scene { } } - @ObfuscatedName("ax") + @ObfuscatedName("ah") @Export("setViewportWalking") public void setViewportWalking() { viewportWalking = true; } - @ObfuscatedName("ap") + @ObfuscatedName("ar") @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { if (var1 < 0) { @@ -1250,9 +1258,9 @@ public class Scene { checkClick = false; } - @ObfuscatedName("aq") + @ObfuscatedName("ac") @ObfuscatedSignature( - signature = "(Lde;Z)V" + signature = "(Ldq;Z)V" ) @Export("drawTile") void drawTile(Tile var1, boolean var2) { @@ -1396,43 +1404,43 @@ public class Scene { var21 += 6; } - var11 = field1826[var21]; - var3.field1636 = field1799[var21]; + var11 = field1818[var21]; + var3.field1613 = field1813[var21]; } if (var31 != null) { - if ((var31.orientationA & field1796[var21]) != 0) { + if ((var31.orientationA & field1781[var21]) != 0) { if (var31.orientationA == 16) { var3.drawGameObjectEdges = 3; - var3.field1637 = field1844[var21]; - var3.field1645 = 3 - var3.field1637; + var3.field1632 = field1814[var21]; + var3.field1622 = 3 - var3.field1632; } else if (var31.orientationA == 32) { var3.drawGameObjectEdges = 6; - var3.field1637 = field1830[var21]; - var3.field1645 = 6 - var3.field1637; + var3.field1632 = field1779[var21]; + var3.field1622 = 6 - var3.field1632; } else if (var31.orientationA == 64) { var3.drawGameObjectEdges = 12; - var3.field1637 = field1831[var21]; - var3.field1645 = 12 - var3.field1637; + var3.field1632 = field1801[var21]; + var3.field1622 = 12 - var3.field1632; } else { var3.drawGameObjectEdges = 9; - var3.field1637 = field1832[var21]; - var3.field1645 = 9 - var3.field1637; + var3.field1632 = field1817[var21]; + var3.field1622 = 9 - var3.field1632; } } else { var3.drawGameObjectEdges = 0; } - if ((var31.orientationA & var11) != 0 && !this.method3070(var7, var4, var5, var31.orientationA)) { + if ((var31.orientationA & var11) != 0 && !this.method3090(var7, var4, var5, var31.orientationA)) { var31.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x * 4096 - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y * 4096 - Scene_cameraZ, var31.tag); } - if ((var31.orientationB & var11) != 0 && !this.method3070(var7, var4, var5, var31.orientationB)) { + if ((var31.orientationB & var11) != 0 && !this.method3090(var7, var4, var5, var31.orientationB)) { var31.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x * 4096 - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y * 4096 - Scene_cameraZ, var31.tag); } } - if (var13 != null && !this.method3185(var7, var4, var5, var13.entity1.height)) { + if (var13 != null && !this.method3138(var7, var4, var5, var13.entity1.height)) { if ((var13.orientation & var11) != 0) { var13.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.xOffset + (var13.x * 4096 - Scene_cameraX), var13.tileHeight - Scene_cameraY, var13.yOffset + (var13.y * 4096 - Scene_cameraZ), var13.tag); } else if (var13.orientation == 256) { @@ -1470,15 +1478,15 @@ public class Scene { TileItemPile var23 = var3.tileItemPile; if (var23 != null && var23.height == 0) { if (var23.second != null) { - var23.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x * 4096 - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y * 4096 - Scene_cameraZ, var23.tag); + var23.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x * 64 - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y * 4096 - Scene_cameraZ, var23.tag); } if (var23.third != null) { - var23.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x * 4096 - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y * 4096 - Scene_cameraZ, var23.tag); + var23.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x * 64 - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y * 4096 - Scene_cameraZ, var23.tag); } if (var23.first != null) { - var23.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x * 4096 - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y * 4096 - Scene_cameraZ, var23.tag); + var23.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x * 64 - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y * 4096 - Scene_cameraZ, var23.tag); } } } @@ -1520,7 +1528,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.field1637) { + if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field1632) { var20 = false; break; } @@ -1528,7 +1536,7 @@ public class Scene { if (var20) { var10 = var3.boundaryObject; - if (!this.method3070(var7, var4, var5, var10.orientationA)) { + if (!this.method3090(var7, var4, var5, var10.orientationA)) { var10.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x * 4096 - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y * 4096 - Scene_cameraZ, var10.tag); } @@ -1575,7 +1583,7 @@ public class Scene { var16 += 2; } - if ((var16 & var36.drawGameObjectEdges) == var3.field1645) { + if ((var16 & var36.drawGameObjectEdges) == var3.field1622) { var3.drawGameObjects = true; continue label563; } @@ -1593,9 +1601,9 @@ public class Scene { var15 = Scene_cameraYTile - var12.startY; var16 = var12.endY - Scene_cameraYTile; if (var16 > var15) { - var12.field1916 = var24 + var16; + var12.field1904 = var24 + var16; } else { - var12.field1916 = var24 + var15; + var12.field1904 = var24 + var15; } } } @@ -1607,10 +1615,10 @@ public class Scene { for (var24 = 0; var24 < var21; ++var24) { GameObject var35 = gameObjects[var24]; if (var35.lastDrawn != Scene_drawnCount) { - if (var35.field1916 > var11) { - var11 = var35.field1916; + if (var35.field1904 > var11) { + var11 = var35.field1904; var25 = var24; - } else if (var11 == var35.field1916) { + } else if (var11 == var35.field1904) { var15 = var35.centerX - Scene_cameraX; var16 = var35.centerY - Scene_cameraZ; var17 = gameObjects[var25].centerX - Scene_cameraX; @@ -1628,7 +1636,7 @@ public class Scene { GameObject var33 = gameObjects[var25]; var33.lastDrawn = Scene_drawnCount; - if (!this.method3061(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.entity.height)) { + if (!this.method3092(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.entity.height)) { var33.entity.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); } @@ -1688,22 +1696,22 @@ public class Scene { TileItemPile var32 = var3.tileItemPile; if (var32 != null && var32.height != 0) { if (var32.second != null) { - var32.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x * 4096 - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y * 4096 - Scene_cameraZ, var32.tag); + var32.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x * 64 - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y * 4096 - Scene_cameraZ, var32.tag); } if (var32.third != null) { - var32.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x * 4096 - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y * 4096 - Scene_cameraZ, var32.tag); + var32.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x * 64 - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y * 4096 - Scene_cameraZ, var32.tag); } if (var32.first != null) { - var32.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x * 4096 - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y * 4096 - Scene_cameraZ, var32.tag); + var32.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x * 64 - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y * 4096 - Scene_cameraZ, var32.tag); } } - if (var3.field1636 != 0) { + if (var3.field1613 != 0) { WallDecoration var29 = var3.wallDecoration; - if (var29 != null && !this.method3185(var7, var4, var5, var29.entity1.height)) { - if ((var29.orientation & var3.field1636) != 0) { + if (var29 != null && !this.method3138(var7, var4, var5, var29.entity1.height)) { + if ((var29.orientation & var3.field1613) != 0) { var29.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.xOffset + (var29.x * 4096 - Scene_cameraX), var29.tileHeight - Scene_cameraY, var29.yOffset + (var29.y * 4096 - Scene_cameraZ), var29.tag); } else if (var29.orientation == 256) { var11 = var29.x * 4096 - Scene_cameraX; @@ -1732,11 +1740,11 @@ public class Scene { BoundaryObject var27 = var3.boundaryObject; if (var27 != null) { - if ((var27.orientationB & var3.field1636) != 0 && !this.method3070(var7, var4, var5, var27.orientationB)) { + if ((var27.orientationB & var3.field1613) != 0 && !this.method3090(var7, var4, var5, var27.orientationB)) { var27.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x * 4096 - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y * 4096 - Scene_cameraZ, var27.tag); } - if ((var27.orientationA & var3.field1636) != 0 && !this.method3070(var7, var4, var5, var27.orientationA)) { + if ((var27.orientationA & var3.field1613) != 0 && !this.method3090(var7, var4, var5, var27.orientationA)) { var27.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x * 4096 - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y * 4096 - Scene_cameraZ, var27.tag); } } @@ -1780,9 +1788,9 @@ public class Scene { } } - @ObfuscatedName("ay") + @ObfuscatedName("az") @ObfuscatedSignature( - signature = "(Lef;IIIIIII)V" + signature = "(Lec;IIIIIII)V" ) @Export("drawTileUnderlay") void drawTileUnderlay(TilePaint var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { @@ -1836,9 +1844,9 @@ public class Scene { Rasterizer3D.Rasterizer3D_alpha = 0; int var30; if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { - Rasterizer3D.field1760 = false; + Rasterizer3D.field1735 = false; if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field1760 = true; + Rasterizer3D.field1735 = true; } if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { @@ -1848,7 +1856,7 @@ public class Scene { if (var1.texture == -1) { if (var1.neColor != 12345678) { - Rasterizer3D.method2934(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); + Rasterizer3D.method2971(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); } } else if (!Scene_isLowDetail) { if (var1.isFlat) { @@ -1858,14 +1866,14 @@ public class Scene { } } else { var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); - Rasterizer3D.method2934(var27, var29, var25, var26, var28, var24, method3055(var30, var1.neColor), method3055(var30, var1.nwColor), method3055(var30, var1.seColor)); + Rasterizer3D.method2971(var27, var29, var25, var26, var28, var24, method3086(var30, var1.neColor), method3086(var30, var1.nwColor), method3086(var30, var1.seColor)); } } if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { - Rasterizer3D.field1760 = false; + Rasterizer3D.field1735 = false; if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field1760 = true; + Rasterizer3D.field1735 = true; } if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { @@ -1875,13 +1883,13 @@ public class Scene { if (var1.texture == -1) { if (var1.swColor != 12345678) { - Rasterizer3D.method2934(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor); + Rasterizer3D.method2971(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.method2934(var23, var25, var29, var22, var24, var28, method3055(var30, var1.swColor), method3055(var30, var1.seColor), method3055(var30, var1.nwColor)); + Rasterizer3D.method2971(var23, var25, var29, var22, var24, var28, method3086(var30, var1.swColor), method3086(var30, var1.seColor), method3086(var30, var1.nwColor)); } } @@ -1891,9 +1899,9 @@ public class Scene { } } - @ObfuscatedName("ad") + @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(Ldg;IIIIII)V" + signature = "(Ldv;IIIIII)V" ) @Export("drawTileOverlay") void drawTileOverlay(TileModel var1, int var2, int var3, int var4, int var5, int var6, int var7) { @@ -1918,13 +1926,13 @@ public class Scene { } if (var1.triangleTextureId != null) { - TileModel.field1585[var9] = var10; - TileModel.field1583[var9] = var13; - TileModel.field1587[var9] = var12; + TileModel.field1573[var9] = var10; + TileModel.field1576[var9] = var13; + TileModel.field1574[var9] = var12; } - TileModel.field1569[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; - TileModel.field1584[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; + TileModel.field1560[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; + TileModel.field1572[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; } Rasterizer3D.Rasterizer3D_alpha = 0; @@ -1934,16 +1942,16 @@ public class Scene { var10 = var1.faceX[var9]; var11 = var1.faceY[var9]; var12 = var1.faceZ[var9]; - var13 = TileModel.field1569[var10]; - int var14 = TileModel.field1569[var11]; - int var15 = TileModel.field1569[var12]; - int var16 = TileModel.field1584[var10]; - int var17 = TileModel.field1584[var11]; - int var18 = TileModel.field1584[var12]; + var13 = TileModel.field1560[var10]; + int var14 = TileModel.field1560[var11]; + int var15 = TileModel.field1560[var12]; + int var16 = TileModel.field1572[var10]; + int var17 = TileModel.field1572[var11]; + int var18 = TileModel.field1572[var12]; if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { - Rasterizer3D.field1760 = false; + Rasterizer3D.field1735 = false; if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field1760 = true; + Rasterizer3D.field1735 = true; } if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { @@ -1954,23 +1962,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], TileModel.field1585[0], TileModel.field1585[1], TileModel.field1585[3], TileModel.field1583[0], TileModel.field1583[1], TileModel.field1583[3], TileModel.field1587[0], TileModel.field1587[1], TileModel.field1587[3], var1.triangleTextureId[var9]); + Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1573[0], TileModel.field1573[1], TileModel.field1573[3], TileModel.field1576[0], TileModel.field1576[1], TileModel.field1576[3], TileModel.field1574[0], TileModel.field1574[1], TileModel.field1574[3], var1.triangleTextureId[var9]); } else { - Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1585[var10], TileModel.field1585[var11], TileModel.field1585[var12], TileModel.field1583[var10], TileModel.field1583[var11], TileModel.field1583[var12], TileModel.field1587[var10], TileModel.field1587[var11], TileModel.field1587[var12], var1.triangleTextureId[var9]); + Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1573[var10], TileModel.field1573[var11], TileModel.field1573[var12], TileModel.field1576[var10], TileModel.field1576[var11], TileModel.field1576[var12], TileModel.field1574[var10], TileModel.field1574[var11], TileModel.field1574[var12], var1.triangleTextureId[var9]); } } else { int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); - Rasterizer3D.method2934(var16, var17, var18, var13, var14, var15, method3055(var19, var1.triangleColorA[var9]), method3055(var19, var1.triangleColorB[var9]), method3055(var19, var1.triangleColorC[var9])); + Rasterizer3D.method2971(var16, var17, var18, var13, var14, var15, method3086(var19, var1.triangleColorA[var9]), method3086(var19, var1.triangleColorB[var9]), method3086(var19, var1.triangleColorC[var9])); } } else if (var1.triangleColorA[var9] != 12345678) { - Rasterizer3D.method2934(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); + Rasterizer3D.method2971(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); } } } } - @ObfuscatedName("ab") + @ObfuscatedName("au") @Export("occlude") void occlude() { int var1 = Scene_planeOccluderCounts[Scene_plane]; @@ -2009,20 +2017,20 @@ public class Scene { if (var13) { var9 = Scene_cameraX - var4.minX; if (var9 > 32) { - var4.field1883 = 1; + var4.field1872 = 1; } else { if (var9 >= -32) { continue; } - var4.field1883 = 2; + var4.field1872 = 2; var9 = -var9; } - var4.field1886 = (var4.minZ - Scene_cameraZ << 8) / var9; - var4.field1887 = (var4.maxZ - Scene_cameraZ << 8) / var9; - var4.field1872 = (var4.minY - Scene_cameraY << 8) / var9; - var4.field1888 = (var4.maxY - Scene_cameraY << 8) / var9; + var4.field1879 = (var4.minZ - Scene_cameraZ << 8) / var9; + var4.field1876 = (var4.maxZ - Scene_cameraZ << 8) / var9; + var4.field1871 = (var4.minY - Scene_cameraY << 8) / var9; + var4.field1878 = (var4.maxY - Scene_cameraY << 8) / var9; Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } @@ -2051,20 +2059,20 @@ public class Scene { if (var13) { var9 = Scene_cameraZ - var4.minZ; if (var9 > 32) { - var4.field1883 = 3; + var4.field1872 = 3; } else { if (var9 >= -32) { continue; } - var4.field1883 = 4; + var4.field1872 = 4; var9 = -var9; } - var4.field1882 = (var4.minX - Scene_cameraX << 8) / var9; - var4.field1885 = (var4.maxX - Scene_cameraX << 8) / var9; - var4.field1872 = (var4.minY - Scene_cameraY << 8) / var9; - var4.field1888 = (var4.maxY - Scene_cameraY << 8) / var9; + var4.field1873 = (var4.minX - Scene_cameraX << 8) / var9; + var4.field1861 = (var4.maxX - Scene_cameraX << 8) / var9; + var4.field1871 = (var4.minY - Scene_cameraY << 8) / var9; + var4.field1878 = (var4.maxY - Scene_cameraY << 8) / var9; Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } @@ -2105,11 +2113,11 @@ public class Scene { } if (var10) { - var4.field1883 = 5; - var4.field1882 = (var4.minX - Scene_cameraX << 8) / var5; - var4.field1885 = (var4.maxX - Scene_cameraX << 8) / var5; - var4.field1886 = (var4.minZ - Scene_cameraZ << 8) / var5; - var4.field1887 = (var4.maxZ - Scene_cameraZ << 8) / var5; + var4.field1872 = 5; + var4.field1873 = (var4.minX - Scene_cameraX << 8) / var5; + var4.field1861 = (var4.maxX - Scene_cameraX << 8) / var5; + var4.field1879 = (var4.minZ - Scene_cameraZ << 8) / var5; + var4.field1876 = (var4.maxZ - Scene_cameraZ << 8) / var5; Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } @@ -2119,9 +2127,9 @@ public class Scene { } - @ObfuscatedName("aw") + @ObfuscatedName("bg") boolean method3089(int var1, int var2, int var3) { - int var4 = this.field1789[var1][var2][var3]; + int var4 = this.field1815[var1][var2][var3]; if (var4 == -Scene_drawnCount) { return false; } else if (var4 == Scene_drawnCount) { @@ -2129,18 +2137,18 @@ public class Scene { } else { int var5 = var2 << 7; int var6 = var3 << 7; - if (this.method3188(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method3188(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method3188(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method3188(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { - this.field1789[var1][var2][var3] = Scene_drawnCount; + if (this.method3093(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method3093(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method3093(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method3093(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { + this.field1815[var1][var2][var3] = Scene_drawnCount; return true; } else { - this.field1789[var1][var2][var3] = -Scene_drawnCount; + this.field1815[var1][var2][var3] = -Scene_drawnCount; return false; } } } - @ObfuscatedName("ae") - boolean method3070(int var1, int var2, int var3, int var4) { + @ObfuscatedName("bn") + boolean method3090(int var1, int var2, int var3, int var4) { if (!this.method3089(var1, var2, var3)) { return false; } else { @@ -2153,30 +2161,30 @@ public class Scene { if (var4 < 16) { if (var4 == 1) { if (var5 > Scene_cameraX) { - if (!this.method3188(var5, var7, var6)) { + if (!this.method3093(var5, var7, var6)) { return false; } - if (!this.method3188(var5, var7, var6 + 128)) { + if (!this.method3093(var5, var7, var6 + 128)) { return false; } } if (var1 > 0) { - if (!this.method3188(var5, var8, var6)) { + if (!this.method3093(var5, var8, var6)) { return false; } - if (!this.method3188(var5, var8, var6 + 128)) { + if (!this.method3093(var5, var8, var6 + 128)) { return false; } } - if (!this.method3188(var5, var9, var6)) { + if (!this.method3093(var5, var9, var6)) { return false; } - if (!this.method3188(var5, var9, var6 + 128)) { + if (!this.method3093(var5, var9, var6 + 128)) { return false; } @@ -2185,30 +2193,30 @@ public class Scene { if (var4 == 2) { if (var6 < Scene_cameraZ) { - if (!this.method3188(var5, var7, var6 + 128)) { + if (!this.method3093(var5, var7, var6 + 128)) { return false; } - if (!this.method3188(var5 + 128, var7, var6 + 128)) { + if (!this.method3093(var5 + 128, var7, var6 + 128)) { return false; } } if (var1 > 0) { - if (!this.method3188(var5, var8, var6 + 128)) { + if (!this.method3093(var5, var8, var6 + 128)) { return false; } - if (!this.method3188(var5 + 128, var8, var6 + 128)) { + if (!this.method3093(var5 + 128, var8, var6 + 128)) { return false; } } - if (!this.method3188(var5, var9, var6 + 128)) { + if (!this.method3093(var5, var9, var6 + 128)) { return false; } - if (!this.method3188(var5 + 128, var9, var6 + 128)) { + if (!this.method3093(var5 + 128, var9, var6 + 128)) { return false; } @@ -2217,30 +2225,30 @@ public class Scene { if (var4 == 4) { if (var5 < Scene_cameraX) { - if (!this.method3188(var5 + 128, var7, var6)) { + if (!this.method3093(var5 + 128, var7, var6)) { return false; } - if (!this.method3188(var5 + 128, var7, var6 + 128)) { + if (!this.method3093(var5 + 128, var7, var6 + 128)) { return false; } } if (var1 > 0) { - if (!this.method3188(var5 + 128, var8, var6)) { + if (!this.method3093(var5 + 128, var8, var6)) { return false; } - if (!this.method3188(var5 + 128, var8, var6 + 128)) { + if (!this.method3093(var5 + 128, var8, var6 + 128)) { return false; } } - if (!this.method3188(var5 + 128, var9, var6)) { + if (!this.method3093(var5 + 128, var9, var6)) { return false; } - if (!this.method3188(var5 + 128, var9, var6 + 128)) { + if (!this.method3093(var5 + 128, var9, var6 + 128)) { return false; } @@ -2249,30 +2257,30 @@ public class Scene { if (var4 == 8) { if (var6 > Scene_cameraZ) { - if (!this.method3188(var5, var7, var6)) { + if (!this.method3093(var5, var7, var6)) { return false; } - if (!this.method3188(var5 + 128, var7, var6)) { + if (!this.method3093(var5 + 128, var7, var6)) { return false; } } if (var1 > 0) { - if (!this.method3188(var5, var8, var6)) { + if (!this.method3093(var5, var8, var6)) { return false; } - if (!this.method3188(var5 + 128, var8, var6)) { + if (!this.method3093(var5 + 128, var8, var6)) { return false; } } - if (!this.method3188(var5, var9, var6)) { + if (!this.method3093(var5, var9, var6)) { return false; } - if (!this.method3188(var5 + 128, var9, var6)) { + if (!this.method3093(var5 + 128, var9, var6)) { return false; } @@ -2280,16 +2288,16 @@ public class Scene { } } - if (!this.method3188(var5 + 64, var10, var6 + 64)) { + if (!this.method3093(var5 + 64, var10, var6 + 64)) { return false; } else if (var4 == 16) { - return this.method3188(var5, var9, var6 + 128); + return this.method3093(var5, var9, var6 + 128); } else if (var4 == 32) { - return this.method3188(var5 + 128, var9, var6 + 128); + return this.method3093(var5 + 128, var9, var6 + 128); } else if (var4 == 64) { - return this.method3188(var5 + 128, var9, var6); + return this.method3093(var5 + 128, var9, var6); } else if (var4 == 128) { - return this.method3188(var5, var9, var6); + return this.method3093(var5, var9, var6); } else { return true; } @@ -2297,18 +2305,18 @@ public class Scene { } @ObfuscatedName("bk") - boolean method3185(int var1, int var2, int var3, int var4) { + boolean method3138(int var1, int var2, int var3, int var4) { if (!this.method3089(var1, var2, var3)) { return false; } else { int var5 = var2 << 7; int var6 = var3 << 7; - return this.method3188(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method3188(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method3188(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method3188(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); + return this.method3093(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method3093(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method3093(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method3093(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); } } - @ObfuscatedName("bw") - boolean method3061(int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("bp") + boolean method3092(int var1, int var2, int var3, int var4, int var5, int var6) { int var7; int var8; if (var3 == var2 && var5 == var4) { @@ -2317,12 +2325,12 @@ public class Scene { } else { var7 = var2 << 7; var8 = var4 << 7; - return this.method3188(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method3188(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method3188(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method3188(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); + return this.method3093(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method3093(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method3093(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method3093(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.field1789[var1][var7][var8] == -Scene_drawnCount) { + if (this.field1815[var1][var7][var8] == -Scene_drawnCount) { return false; } } @@ -2331,17 +2339,17 @@ public class Scene { var7 = (var2 << 7) + 1; var8 = (var4 << 7) + 2; int var9 = this.tileHeights[var1][var2][var4] - var6; - if (!this.method3188(var7, var9, var8)) { + if (!this.method3093(var7, var9, var8)) { return false; } else { int var10 = (var3 << 7) - 1; - if (!this.method3188(var10, var9, var8)) { + if (!this.method3093(var10, var9, var8)) { return false; } else { int var11 = (var5 << 7) - 1; - if (!this.method3188(var7, var9, var11)) { + if (!this.method3093(var7, var9, var11)) { return false; - } else if (!this.method3188(var10, var9, var11)) { + } else if (!this.method3093(var10, var9, var11)) { return false; } else { return true; @@ -2351,8 +2359,8 @@ public class Scene { } } - @ObfuscatedName("bo") - boolean method3188(int var1, int var2, int var3) { + @ObfuscatedName("bu") + boolean method3093(int var1, int var2, int var3) { for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { Occluder var5 = Scene_currentOccluders[var4]; int var6; @@ -2360,57 +2368,57 @@ public class Scene { int var8; int var9; int var10; - if (var5.field1883 == 1) { + if (var5.field1872 == 1) { var6 = var5.minX - var1; if (var6 > 0) { - var7 = (var6 * var5.field1886 >> 8) + var5.minZ; - var8 = (var6 * var5.field1887 >> 8) + var5.maxZ; - var9 = (var6 * var5.field1872 >> 8) + var5.minY; - var10 = (var6 * var5.field1888 >> 8) + var5.maxY; + var7 = (var6 * var5.field1879 >> 8) + var5.minZ; + var8 = (var6 * var5.field1876 >> 8) + var5.maxZ; + var9 = (var6 * var5.field1871 >> 8) + var5.minY; + var10 = (var6 * var5.field1878 >> 8) + var5.maxY; if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field1883 == 2) { + } else if (var5.field1872 == 2) { var6 = var1 - var5.minX; if (var6 > 0) { - var7 = (var6 * var5.field1886 >> 8) + var5.minZ; - var8 = (var6 * var5.field1887 >> 8) + var5.maxZ; - var9 = (var6 * var5.field1872 >> 8) + var5.minY; - var10 = (var6 * var5.field1888 >> 8) + var5.maxY; + var7 = (var6 * var5.field1879 >> 8) + var5.minZ; + var8 = (var6 * var5.field1876 >> 8) + var5.maxZ; + var9 = (var6 * var5.field1871 >> 8) + var5.minY; + var10 = (var6 * var5.field1878 >> 8) + var5.maxY; if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field1883 == 3) { + } else if (var5.field1872 == 3) { var6 = var5.minZ - var3; if (var6 > 0) { - var7 = (var6 * var5.field1882 >> 8) + var5.minX; - var8 = (var6 * var5.field1885 >> 8) + var5.maxX; - var9 = (var6 * var5.field1872 >> 8) + var5.minY; - var10 = (var6 * var5.field1888 >> 8) + var5.maxY; + var7 = (var6 * var5.field1873 >> 8) + var5.minX; + var8 = (var6 * var5.field1861 >> 8) + var5.maxX; + var9 = (var6 * var5.field1871 >> 8) + var5.minY; + var10 = (var6 * var5.field1878 >> 8) + var5.maxY; if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field1883 == 4) { + } else if (var5.field1872 == 4) { var6 = var3 - var5.minZ; if (var6 > 0) { - var7 = (var6 * var5.field1882 >> 8) + var5.minX; - var8 = (var6 * var5.field1885 >> 8) + var5.maxX; - var9 = (var6 * var5.field1872 >> 8) + var5.minY; - var10 = (var6 * var5.field1888 >> 8) + var5.maxY; + var7 = (var6 * var5.field1873 >> 8) + var5.minX; + var8 = (var6 * var5.field1861 >> 8) + var5.maxX; + var9 = (var6 * var5.field1871 >> 8) + var5.minY; + var10 = (var6 * var5.field1878 >> 8) + var5.maxY; if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field1883 == 5) { + } else if (var5.field1872 == 5) { var6 = var2 - var5.minY; if (var6 > 0) { - var7 = (var6 * var5.field1882 >> 8) + var5.minX; - var8 = (var6 * var5.field1885 >> 8) + var5.maxX; - var9 = (var6 * var5.field1886 >> 8) + var5.minZ; - var10 = (var6 * var5.field1887 >> 8) + var5.maxZ; + var7 = (var6 * var5.field1873 >> 8) + var5.minX; + var8 = (var6 * var5.field1861 >> 8) + var5.maxX; + var9 = (var6 * var5.field1879 >> 8) + var5.minZ; + var10 = (var6 * var5.field1876 >> 8) + var5.maxZ; if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { return true; } @@ -2421,7 +2429,7 @@ public class Scene { return false; } - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("Scene_addOccluder") public static void Scene_addOccluder(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { Occluder var8 = new Occluder(); @@ -2439,7 +2447,7 @@ public class Scene { Scene_planeOccluders[var0][Scene_planeOccluderCounts[var0]++] = var8; } - @ObfuscatedName("ac") + @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 +2480,7 @@ public class Scene { boolean var14 = false; for (int var15 = -var1; var15 <= var2; var15 += 128) { - if (method3037(var12, var0[var8] + var15, var13)) { + if (method3095(var12, var0[var8] + var15, var13)) { var14 = true; break; } @@ -2523,8 +2531,8 @@ public class Scene { } - @ObfuscatedName("ar") - static boolean method3037(int var0, int var1, int var2) { + @ObfuscatedName("ay") + static boolean method3095(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,19 +2546,19 @@ public class Scene { } } - @ObfuscatedName("ag") - public static boolean method3049() { + @ObfuscatedName("aa") + public static boolean method3080() { return viewportWalking && Scene_selectedX != -1; } - @ObfuscatedName("aa") - public static void method3050() { + @ObfuscatedName("aq") + public static void method3117() { Scene_selectedX = -1; viewportWalking = false; } - @ObfuscatedName("al") - static final int method3055(int var0, int var1) { + @ObfuscatedName("am") + static final int method3086(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; if (var1 < 2) { var1 = 2; @@ -2561,7 +2569,7 @@ public class Scene { return (var0 & 65408) + var1; } - @ObfuscatedName("ah") + @ObfuscatedName("aw") @Export("containsBounds") static boolean containsBounds(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (var1 < var2 && var1 < var3 && var1 < var4) { diff --git a/runescape-client/src/main/java/Script.java b/runescape-client/src/main/java/Script.java index 4a6f01cd92..37ab857059 100644 --- a/runescape-client/src/main/java/Script.java +++ b/runescape-client/src/main/java/Script.java @@ -4,57 +4,51 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cr") +@ObfuscatedName("cu") @Implements("Script") public class Script extends DualNode { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("Script_cached") static EvictingDualNodeHashTable Script_cached; - @ObfuscatedName("eo") - @ObfuscatedSignature( - signature = "Lid;" - ) - @Export("archive20") - static Archive archive20; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("opcodes") int[] opcodes; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("intOperands") int[] intOperands; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("stringOperands") String[] stringOperands; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 733828633 + intValue = 1662651269 ) @Export("localIntCount") int localIntCount; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 433175323 + intValue = 925895493 ) @Export("localStringCount") int localStringCount; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1193864261 + intValue = -1615704029 ) @Export("intArgumentCount") int intArgumentCount; - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1480737507 + intValue = -1886789561 ) @Export("stringArgumentCount") int stringArgumentCount; - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "[Lln;" + signature = "[Llj;" ) @Export("switches") IterableNodeHashTable[] switches; @@ -66,95 +60,34 @@ public class Script extends DualNode { Script() { } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(II)[Lln;", - garbageValue = "-825369330" + signature = "(IB)[Llj;", + garbageValue = "58" ) @Export("newIterableNodeHashTable") IterableNodeHashTable[] newIterableNodeHashTable(int var1) { return new IterableNodeHashTable[var1]; } - @ObfuscatedName("hy") + @ObfuscatedName("gu") @ObfuscatedSignature( - signature = "(IIIIIIIB)V", - garbageValue = "1" + signature = "(B)V", + garbageValue = "-4" ) - @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 != ItemContainer.plane) { - return; - } - - long var7 = 0L; - boolean var9 = true; - boolean var10 = false; - boolean var11 = false; - if (var1 == 0) { - var7 = Player.scene.getBoundaryObjectTag(var0, var2, var3); - } - - if (var1 == 1) { - var7 = Player.scene.getWallDecorationTag(var0, var2, var3); - } - - if (var1 == 2) { - var7 = Player.scene.getGameObjectTag(var0, var2, var3); - } - - if (var1 == 3) { - var7 = Player.scene.getFloorDecorationTag(var0, var2, var3); - } - - int var12; - if (0L != var7) { - var12 = Player.scene.getObjectFlags(var0, var2, var3, var7); - int var14 = BoundaryObject.Entity_unpackID(var7); - int var15 = var12 & 31; - int var16 = var12 >> 6 & 3; - ObjectDefinition var13; - if (var1 == 0) { - Player.scene.removeBoundaryObject(var0, var2, var3); - var13 = class215.getObjectDefinition(var14); - if (var13.interactType != 0) { - Client.collisionMaps[var0].method3497(var2, var3, var15, var16, var13.boolean1); + static final void method2201() { + for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { + if (var0.plane == MouseRecorder.plane && !var0.isFinished) { + if (Client.cycle >= var0.cycleStart) { + var0.advance(Client.field683); + if (var0.isFinished) { + var0.remove(); + } else { + WorldMapIcon_1.scene.drawEntity(var0.plane, var0.x, var0.y, var0.height, 60, var0, 0, -1L, false); } } - - if (var1 == 1) { - Player.scene.removeWallDecoration(var0, var2, var3); - } - - if (var1 == 2) { - Player.scene.removeGameObject(var0, var2, var3); - var13 = class215.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) { - Player.scene.removeFloorDecoration(var0, var2, var3); - var13 = class215.getObjectDefinition(var14); - if (var13.interactType == 1) { - Client.collisionMaps[var0].method3527(var2, var3); - } - } - } - - if (var4 >= 0) { - var12 = var0; - if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { - var12 = var0 + 1; - } - - Client.addPendingGameObject(var0, var12, var2, var3, var4, var5, var6, Player.scene, Client.collisionMaps[var0]); + } else { + var0.remove(); } } diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java index 25edbea89f..6a59d47a2b 100644 --- a/runescape-client/src/main/java/ScriptEvent.java +++ b/runescape-client/src/main/java/ScriptEvent.java @@ -4,79 +4,80 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("by") +@ObfuscatedName("bs") @Implements("ScriptEvent") public class ScriptEvent extends Node { - @ObfuscatedName("fh") + @ObfuscatedName("de") @ObfuscatedSignature( - signature = "Leg;" + signature = "Lio;" ) - @Export("urlRequester") - static UrlRequester urlRequester; - @ObfuscatedName("hv") + @Export("archive0") + static Archive archive0; + @ObfuscatedName("fl") @ObfuscatedGetter( - intValue = 966526807 + intValue = 1594394289 ) - static int field559; - @ObfuscatedName("s") + @Export("baseY") + static int baseY; + @ObfuscatedName("c") @Export("args") Object[] args; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("isMouseInputEvent") boolean isMouseInputEvent; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhy;" ) @Export("widget") Widget widget; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1722758415 + intValue = 268953475 ) @Export("mouseX") int mouseX; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1522847743 + intValue = -2080678737 ) @Export("mouseY") int mouseY; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 494348445 + intValue = -2067393571 ) @Export("opIndex") int opIndex; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhy;" ) @Export("dragTarget") Widget dragTarget; - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 329318747 + intValue = 459538491 ) @Export("keyTyped") int keyTyped; - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1953283421 + intValue = 464546499 ) @Export("keyPressed") int keyPressed; - @ObfuscatedName("d") + @ObfuscatedName("z") @Export("targetName") String targetName; - @ObfuscatedName("f") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1233738225 + intValue = 1112328999 ) - int field555; - @ObfuscatedName("c") + int field550; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -998343503 + intValue = -1497234369 ) @Export("type") int type; @@ -85,23 +86,441 @@ public class ScriptEvent extends Node { this.type = 76; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "([Ljava/lang/Object;I)V", - garbageValue = "136665190" + garbageValue = "1827430499" ) @Export("setArgs") public void setArgs(Object[] var1) { this.args = var1; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(IB)V", - garbageValue = "0" + garbageValue = "-8" ) @Export("setType") public void setType(int var1) { this.type = var1; } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(CLgf;I)C", + garbageValue = "-1157356777" + ) + @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("fn") + @ObfuscatedSignature( + signature = "(IIIII)V", + garbageValue = "-1198922162" + ) + @Export("drawEntities") + static final void drawEntities(int var0, int var1, int var2, int var3) { + ++Client.viewportDrawCount; + if (Varps.localPlayer.x * -78439701 >> 7 == Client.destinationX && Varps.localPlayer.y >> 7 == Client.destinationY) { + Client.destinationX = 0; + } + + HealthBarUpdate.method1708(); + if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { + GameObject.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); + } + + class2.addNpcsToScene(true); + Projectile.method2083(); + class2.addNpcsToScene(false); + + int var6; + for (Projectile var4 = (Projectile)Client.projectiles.last(); var4 != null; var4 = (Projectile)Client.projectiles.previous()) { + if (var4.plane == MouseRecorder.plane && Client.cycle <= var4.cycleEnd) { + if (Client.cycle >= var4.cycleStart) { + if (var4.targetIndex > 0) { + NPC var22 = Client.npcs[var4.targetIndex - 1]; + if (var22 != null && var22.x * -78439701 >= 0 && var22.x * -78439701 < 13312 && var22.y >= 0 && var22.y < 13312) { + var4.setDestination(var22.x * -78439701, var22.y, WorldMapAreaData.getTileHeight(var22.x * -78439701, var22.y, var4.plane) - var4.endHeight, Client.cycle); + } + } + + if (var4.targetIndex < 0) { + var6 = -var4.targetIndex - 1; + Player var24; + if (var6 == Client.localPlayerIndex) { + var24 = Varps.localPlayer; + } else { + var24 = Client.players[var6]; + } + + if (var24 != null && var24.x * -78439701 >= 0 && var24.x * -78439701 < 13312 && var24.y >= 0 && var24.y < 13312) { + var4.setDestination(var24.x * -78439701, var24.y, WorldMapAreaData.getTileHeight(var24.x * -78439701, var24.y, var4.plane) - var4.endHeight, Client.cycle); + } + } + + var4.advance(Client.field683); + WorldMapIcon_1.scene.drawEntity(MouseRecorder.plane, (int)var4.x, (int)var4.y, (int)var4.z, 60, var4, var4.yaw, -1L, false); + } + } else { + var4.remove(); + } + } + + Script.method2201(); + DesktopPlatformInfoProvider.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 var7; + int var8; + int var9; + int var11; + int var12; + int var14; + int var21; + if (!Client.isCameraLocked) { + var21 = Client.camAngleX; + if (Client.field707 / 256 > var21) { + var21 = Client.field707 / 256; + } + + if (Client.field749[4] && Client.field887[4] + 128 > var21) { + var21 = Client.field887[4] + 128; + } + + var5 = Client.camAngleY & 2047; + var6 = SecureRandomFuture.oculusOrbFocalPointX; + var7 = class65.field580 * 1615694975; + var8 = AbstractByteArrayCopier.oculusOrbFocalPointY; + var9 = var21 * 3 + 600; + var12 = var3 - 334; + if (var12 < 0) { + var12 = 0; + } else if (var12 > 100) { + var12 = 100; + } + + int var13 = (Client.zoomWidth - Client.zoomHeight) * var12 / 100 + Client.zoomHeight; + var11 = var13 * var9 / 256; + var12 = 2048 - var21 & 2047; + var13 = 2048 - var5 & 2047; + var14 = 0; + int var15 = 0; + int var16 = var11; + int var17; + int var18; + int var19; + if (var12 != 0) { + var17 = Rasterizer3D.Rasterizer3D_sine[var12]; + var18 = Rasterizer3D.Rasterizer3D_cosine[var12]; + var19 = var18 * var15 - var11 * var17 >> 16; + var16 = var17 * var15 + var18 * var11 >> 16; + var15 = var19; + } + + if (var13 != 0) { + var17 = Rasterizer3D.Rasterizer3D_sine[var13]; + var18 = Rasterizer3D.Rasterizer3D_cosine[var13]; + var19 = var18 * var14 + var17 * var16 >> 16; + var16 = var18 * var16 - var17 * var14 >> 16; + var14 = var19; + } + + ScriptFrame.cameraX = var6 - var14; + GrandExchangeOfferTotalQuantityComparator.cameraY = var7 - var15; + class14.cameraZ = var8 - var16; + class319.cameraPitch = var21; + Tile.cameraYaw = var5; + if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (Varps.localPlayer.x * -78439701 >> 7 != SecureRandomFuture.oculusOrbFocalPointX >> 7 || AbstractByteArrayCopier.oculusOrbFocalPointY >> 7 != Varps.localPlayer.y >> 7)) { + var17 = Varps.localPlayer.plane; + var18 = class4.baseX * 64 + (SecureRandomFuture.oculusOrbFocalPointX >> 7); + var19 = (AbstractByteArrayCopier.oculusOrbFocalPointY >> 7) + baseY; + PacketBufferNode var20 = MenuAction.getPacketBufferNode(ClientPacket.field2187, Client.packetWriter.isaacCipher); + var20.packetBuffer.method5500(var18); + var20.packetBuffer.writeShort(var19); + var20.packetBuffer.method5491(var17); + var20.packetBuffer.writeIntLE16(Client.field688); + Client.packetWriter.addNode(var20); + } + } + + if (!Client.isCameraLocked) { + var21 = Client.method1679(); + } else { + var21 = SecureRandomCallable.getHighestVisiblePlane(); + } + + var5 = ScriptFrame.cameraX; + var6 = GrandExchangeOfferTotalQuantityComparator.cameraY; + var7 = class14.cameraZ; + var8 = class319.cameraPitch; + var9 = Tile.cameraYaw; + + int var10; + for (var10 = 0; var10 < 5; ++var10) { + if (Client.field749[var10]) { + var11 = (int)(Math.random() * (double)(Client.field779[var10] * 2 + 1) - (double)Client.field779[var10] + Math.sin((double)Client.field871[var10] / 100.0D * (double)Client.field799[var10]) * (double)Client.field887[var10]); + if (var10 == 0) { + ScriptFrame.cameraX += var11; + } + + if (var10 == 1) { + GrandExchangeOfferTotalQuantityComparator.cameraY += var11; + } + + if (var10 == 2) { + class14.cameraZ += var11; + } + + if (var10 == 3) { + Tile.cameraYaw = var11 + Tile.cameraYaw & 2047; + } + + if (var10 == 4) { + class319.cameraPitch += var11; + if (class319.cameraPitch < 128) { + class319.cameraPitch = 128; + } + + if (class319.cameraPitch > 383) { + class319.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) { + WorldMapIcon_0.method174(var10 - var0, var11 - var1); + } else { + PendingSpawn.method1682(); + } + + ModelData0.playPcmPlayers(); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); + ModelData0.playPcmPlayers(); + var12 = Rasterizer3D.Rasterizer3D_zoom; + Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; + WorldMapIcon_1.scene.draw(ScriptFrame.cameraX, GrandExchangeOfferTotalQuantityComparator.cameraY, class14.cameraZ, class319.cameraPitch, Tile.cameraYaw, var21); + Rasterizer3D.Rasterizer3D_zoom = var12; + ModelData0.playPcmPlayers(); + WorldMapIcon_1.scene.clearTempGameObjects(); + Actor.method1704(var0, var1, var2, var3); + if (Client.hintArrowType == 2) { + NPC.worldToScreen(Client.hintArrowSubX * 64 + (Client.hintArrowX - class4.baseX * 64 << 7), Client.hintArrowSubY * 64 + (Client.hintArrowY - baseY << 7), Client.hintArrowHeight * 2); + if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { + GrandExchangeEvents.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); + } + } + + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field683); + Occluder.method3253(); + ScriptFrame.cameraX = var5; + GrandExchangeOfferTotalQuantityComparator.cameraY = var6; + class14.cameraZ = var7; + class319.cameraPitch = var8; + Tile.cameraYaw = var9; + if (Client.isLoading) { + byte var23 = 0; + var14 = var23 + NetCache.NetCache_pendingPriorityResponsesCount + NetCache.NetCache_pendingPriorityWritesCount; + if (var14 == 0) { + Client.isLoading = false; + } + } + + if (Client.isLoading) { + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); + GZipDecompressor.drawLoadingMessage("Loading - please wait.", false); + } + + } + + @ObfuscatedName("hr") + @ObfuscatedSignature( + signature = "(IIS)V", + garbageValue = "128" + ) + @Export("calculateMenuBounds") + static void calculateMenuBounds(int var0, int var1) { + int var2 = HealthBar.fontBold12.stringWidth("Choose Option"); + + int var3; + int var4; + for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { + var4 = HealthBar.fontBold12.stringWidth(class188.method3620(var3)); + if (var4 > var2) { + var2 = var4; + } + } + + var2 += 8; + var3 = Client.menuOptionsCount * 15 + 22; + var4 = var0 - var2 / 2; + if (var2 + var4 > GraphicsDefaults.canvasWidth) { + var4 = GraphicsDefaults.canvasWidth - var2; + } + + if (var4 < 0) { + var4 = 0; + } + + int var5 = var1; + if (var3 + var1 > GameShell.canvasHeight) { + var5 = GameShell.canvasHeight - var3; + } + + if (var5 < 0) { + var5 = 0; + } + + FileSystem.menuX = var4; + class83.menuY = var5; + class173.menuWidth = var2; + FaceNormal.menuHeight = Client.menuOptionsCount * 15 + 22; + } + + @ObfuscatedName("ie") + @ObfuscatedSignature( + signature = "(Lhy;Lid;IIZI)V", + garbageValue = "-2103292132" + ) + @Export("addWidgetItemMenuItem") + static final void addWidgetItemMenuItem(Widget var0, ItemDefinition 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) { + Decimator.insertMenuItem(var7, UserComparator7.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); + } + + } + + @ObfuscatedName("jj") + @ObfuscatedSignature( + signature = "(Lhy;IIII)V", + garbageValue = "458533569" + ) + @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) { + UrlRequest.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/ScriptFrame.java b/runescape-client/src/main/java/ScriptFrame.java index a10374bf5c..56c5dfdf02 100644 --- a/runescape-client/src/main/java/ScriptFrame.java +++ b/runescape-client/src/main/java/ScriptFrame.java @@ -4,25 +4,31 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bp") +@ObfuscatedName("bu") @Implements("ScriptFrame") public class ScriptFrame { - @ObfuscatedName("s") + @ObfuscatedName("hp") @ObfuscatedGetter( - intValue = 1672525423 + intValue = 583805703 ) - @Export("pc") - int pc; - @ObfuscatedName("j") + @Export("cameraX") + static int cameraX; + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lcr;" + signature = "Lcu;" ) @Export("script") Script script; - @ObfuscatedName("i") + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 669580895 + ) + @Export("pc") + int pc; + @ObfuscatedName("t") @Export("intLocals") int[] intLocals; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("stringLocals") String[] stringLocals; @@ -30,60 +36,33 @@ public class ScriptFrame { this.pc = -1; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lkx;I)V", - garbageValue = "923319519" + signature = "(IIII)Lli;", + garbageValue = "-283029695" ) - @Export("updatePlayer") - static final void updatePlayer(PacketBuffer var0) { - var0.importIndex(); - int var1 = Client.localPlayerIndex; - Player var2 = WorldMapIcon_1.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 - PacketWriter.baseX * 64; - var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); - var2.pathY[0] = var6 - RouteStrategy.baseY * 64; - var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); - ItemContainer.plane = var2.plane = var4; - if (Players.field1219[var1] != null) { - var2.read(Players.field1219[var1]); - } - - Players.Players_count = 0; - Players.Players_indices[++Players.Players_count - 1] = var1; - Players.field1221[var1] = 0; - Players.Players_emptyIdxCount = 0; - - for (int var7 = 1; var7 < 2048; ++var7) { - if (var1 != var7) { - int var8 = var0.readBits(18); - int var9 = var8 >> 16; - int var10 = var8 >> 8 & 597; - int var11 = var8 & 597; - Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28); - Players.Players_orientations[var7] = 0; - Players.Players_targetIndices[var7] = -1; - Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7; - Players.field1221[var7] = 0; - } - } - - var0.exportIndex(); + static Sprite method1085(int var0, int var1, int var2) { + DemotingHashTable var3 = WorldMapRegion.WorldMapRegion_cachedSprites; + long var4 = (long)(var2 << 16 | var0 << 8 | var1); + return (Sprite)var3.get(var4); } - @ObfuscatedName("je") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "53" + signature = "(B)V", + garbageValue = "46" ) - static void method1092(int var0, int var1) { - MenuAction var2 = class1.tempMenuAction; - SecureRandomFuture.menuAction(var2.argument1, var2.argument2, var2.opcode, var2.argument0, var2.action, var2.action, var0, var1); - class1.tempMenuAction = null; + @Export("WorldMapRegion_clearCachedSprites") + static void WorldMapRegion_clearCachedSprites() { + WorldMapRegion.WorldMapRegion_cachedSprites.clear(); + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(II)I", + garbageValue = "1564175728" + ) + public static int method1086(int var0) { + return var0 >> 17 & 7; } } diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java index 598384a008..7381df4a21 100644 --- a/runescape-client/src/main/java/SecureRandomCallable.java +++ b/runescape-client/src/main/java/SecureRandomCallable.java @@ -6,29 +6,23 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bz") +@ObfuscatedName("bi") @Implements("SecureRandomCallable") public class SecureRandomCallable implements Callable { - @ObfuscatedName("su") - @Export("foundItemIds") - static short[] foundItemIds; - @ObfuscatedName("r") + @ObfuscatedName("rc") + @ObfuscatedGetter( + intValue = 52067712 + ) + static int field499; + @ObfuscatedName("l") + @Export("SpriteBuffer_yOffsets") + public static int[] SpriteBuffer_yOffsets; + @ObfuscatedName("gm") @ObfuscatedSignature( - signature = "Lct;" + signature = "[Llt;" ) - @Export("pcmPlayerProvider") - static PcmPlayerProvider pcmPlayerProvider; - @ObfuscatedName("ae") - @ObfuscatedGetter( - intValue = 1643871529 - ) - static int field500; - @ObfuscatedName("ej") - @ObfuscatedGetter( - intValue = 1838360693 - ) - @Export("port3") - static int port3; + @Export("modIconSprites") + static IndexedSprite[] modIconSprites; SecureRandomCallable() { } @@ -38,4 +32,42 @@ public class SecureRandomCallable implements Callable { var2.nextInt(); return var2; } + + @ObfuscatedName("fz") + @ObfuscatedSignature( + signature = "(III)V", + garbageValue = "373014156" + ) + @Export("playSoundJingle") + static void playSoundJingle(int var0, int var1) { + if (Client.field638 != 0 && var0 != -1) { + class49.method826(ArchiveDisk.archive11, var0, 0, Client.field638, false); + Client.field746 = true; + } + + } + + @ObfuscatedName("gl") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "-1333341579" + ) + @Export("getHighestVisiblePlane") + static final int getHighestVisiblePlane() { + if (Actor.clientPreferences.roofsHidden) { + return MouseRecorder.plane; + } else { + int var0 = WorldMapAreaData.getTileHeight(ScriptFrame.cameraX, class14.cameraZ, MouseRecorder.plane); + return var0 - GrandExchangeOfferTotalQuantityComparator.cameraY < 800 && (Tiles.Tiles_renderFlags[MouseRecorder.plane][ScriptFrame.cameraX >> 7][class14.cameraZ >> 7] & 4) != 0 ? MouseRecorder.plane : 3; + } + } + + @ObfuscatedName("ky") + @ObfuscatedSignature( + signature = "(I)Z", + garbageValue = "18257266" + ) + public static boolean method1092() { + return Client.staffModLevel >= 2; + } } diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java index db2dcc11e1..700a2201a3 100644 --- a/runescape-client/src/main/java/SecureRandomFuture.java +++ b/runescape-client/src/main/java/SecureRandomFuture.java @@ -1,21 +1,26 @@ -import java.awt.Component; import java.security.SecureRandom; import java.util.concurrent.ExecutorService; 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; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("cm") +@ObfuscatedName("ce") @Implements("SecureRandomFuture") public class SecureRandomFuture { - @ObfuscatedName("s") + @ObfuscatedName("ho") + @ObfuscatedGetter( + intValue = -209939989 + ) + @Export("oculusOrbFocalPointX") + static int oculusOrbFocalPointX; + @ObfuscatedName("c") @Export("executor") ExecutorService executor; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("future") Future future; @@ -24,10 +29,10 @@ public class SecureRandomFuture { this.future = this.executor.submit(new SecureRandomCallable()); } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1323034679" + signature = "(B)V", + garbageValue = "17" ) @Export("shutdown") void shutdown() { @@ -35,20 +40,20 @@ public class SecureRandomFuture { this.executor = null; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-2137893013" + garbageValue = "-1733947901" ) @Export("isDone") boolean isDone() { return this.future.isDone(); } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)Ljava/security/SecureRandom;", - garbageValue = "1958597886" + garbageValue = "1840325785" ) @Export("get") SecureRandom get() { @@ -61,929 +66,28 @@ public class SecureRandomFuture { } } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/awt/Component;B)V", - garbageValue = "4" + signature = "(Lbs;I)V", + garbageValue = "-1751721951" ) - static void method2061(Component var0) { - var0.addMouseListener(MouseHandler.MouseHandler_instance); - var0.addMouseMotionListener(MouseHandler.MouseHandler_instance); - var0.addFocusListener(MouseHandler.MouseHandler_instance); + @Export("runScriptEvent") + public static void runScriptEvent(ScriptEvent var0) { + GameShell.runScript(var0, 500000); } - @ObfuscatedName("q") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(ILcr;ZS)I", - garbageValue = "-27974" + signature = "(II)I", + garbageValue = "1744475740" ) - static int method2060(int var0, Script var1, boolean var2) { - boolean var3 = true; - Widget var4; - if (var0 >= 2000) { - var0 -= 1000; - var4 = WorldMapElement.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - var3 = false; - } else { - var4 = var2 ? class286.field3623 : class297.field3693; - } - - 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[--Interpreter.Interpreter_stringStackSize]); - return 1; - } else { - --Interpreter.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 = ModelData0.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[--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.field2688 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else { - int var7; - byte[] var9; - if (var0 != ScriptOpcodes.CC_SETOPKEY) { - byte var5; - if (var0 == ScriptOpcodes.CC_SETOPTKEY) { - Interpreter.Interpreter_intStackSize -= 2; - var5 = 10; - var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]}; - byte[] var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]}; - class80.Widget_setKey(var4, var5, var9, var10); - 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) { - FontName.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]; - FontName.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) { - class30.Widget_setKeyIgnoreHeld(var4, var11); - return 1; - } else { - throw new RuntimeException(); - } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { - var5 = 10; - class30.Widget_setKeyIgnoreHeld(var4, var5); - return 1; - } else { - return 2; - } - } else { - byte[] var8 = null; - var9 = 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) { - var8 = new byte[var7 / 2]; - var9 = new byte[var7 / 2]; - - for (var7 -= 2; var7 >= 0; var7 -= 2) { - var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize]; - var9[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize + 1]; - } - } - } else { - Interpreter.Interpreter_intStackSize -= 2; - var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]}; - var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]}; - } - - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] - 1; - if (var7 >= 0 && var7 <= 9) { - class80.Widget_setKey(var4, var7, var8, var9); - return 1; - } else { - throw new RuntimeException(); - } - } - } - } + public static int method2101(int var0) { + return Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var0]); } - @ObfuscatedName("hn") - @ObfuscatedSignature( - signature = "(IIIILjava/lang/String;Ljava/lang/String;III)V", - garbageValue = "1546769014" - ) - @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 = MenuAction.getPacketBufferNode(ClientPacket.field2270, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5432(RouteStrategy.baseY * 64 + var1); - var8.packetBuffer.writeShortLE(class185.selectedItemSlot); - var8.packetBuffer.method5433(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeIntLE(FontName.selectedItemWidget); - var8.packetBuffer.method5432(PacketWriter.baseX * 64 + var0); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.writeShortLE(class1.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 = MenuAction.getPacketBufferNode(ClientPacket.field2277, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShort(PacketWriter.baseX * 64 + var0); - var8.packetBuffer.method5443(var3); - var8.packetBuffer.writeIntLE16(NetCache.field3162); - var8.packetBuffer.writeShort(Client.field816); - var8.packetBuffer.writeShortLE(RouteStrategy.baseY * 64 + var1); - Client.packetWriter.addNode(var8); - } else if (var2 == 3) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = MenuAction.getPacketBufferNode(ClientPacket.field2212, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(RouteStrategy.baseY * 64 + var1); - var8.packetBuffer.method5435(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5443(var3); - var8.packetBuffer.method5432(PacketWriter.baseX * 64 + var0); - 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 = MenuAction.getPacketBufferNode(ClientPacket.field2264, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5433(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.writeShort(RouteStrategy.baseY * 64 + var1); - var8.packetBuffer.writeShort(PacketWriter.baseX * 64 + var0); - 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 = MenuAction.getPacketBufferNode(ClientPacket.field2274, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5432(PacketWriter.baseX * 64 + var0); - var8.packetBuffer.method5443(var3); - var8.packetBuffer.method5432(RouteStrategy.baseY * 64 + var1); - var8.packetBuffer.method5433(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 = MenuAction.getPacketBufferNode(ClientPacket.field2248, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5433(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5443(RouteStrategy.baseY * 64 + var1); - var8.packetBuffer.method5443(PacketWriter.baseX * 64 + var0); - var8.packetBuffer.writeShortLE(var3); - 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 = MenuAction.getPacketBufferNode(ClientPacket.field2208, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5432(class1.selectedItemId); - var9.packetBuffer.writeShort(class185.selectedItemSlot); - var9.packetBuffer.method5432(var3); - var9.packetBuffer.method5545(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeInt(FontName.selectedItemWidget); - 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 = MenuAction.getPacketBufferNode(ClientPacket.field2271, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5432(var3); - var9.packetBuffer.method5545(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeIntLE(NetCache.field3162); - var9.packetBuffer.method5443(Client.field816); - 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 = MenuAction.getPacketBufferNode(ClientPacket.field2256, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5545(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeShortLE(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 = MenuAction.getPacketBufferNode(ClientPacket.field2186, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5443(var3); - var9.packetBuffer.writeByte(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 = MenuAction.getPacketBufferNode(ClientPacket.field2218, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5432(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 = MenuAction.getPacketBufferNode(ClientPacket.field2196, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(var3); - var9.packetBuffer.method5433(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 13) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = MenuAction.getPacketBufferNode(ClientPacket.field2216, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5443(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 = MenuAction.getPacketBufferNode(ClientPacket.field2242, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5432(class185.selectedItemSlot); - var9.packetBuffer.method5435(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeIntME(FontName.selectedItemWidget); - var9.packetBuffer.writeShort(var3); - var9.packetBuffer.writeShort(class1.selectedItemId); - 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 = MenuAction.getPacketBufferNode(ClientPacket.field2240, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeIntLE16(NetCache.field3162); - var9.packetBuffer.method5435(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5443(Client.field816); - 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 = MenuAction.getPacketBufferNode(ClientPacket.field2251, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(FontName.selectedItemWidget); - var8.packetBuffer.method5432(class1.selectedItemId); - var8.packetBuffer.method5433(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShortLE(class185.selectedItemSlot); - var8.packetBuffer.method5432(var3); - var8.packetBuffer.method5432(PacketWriter.baseX * 64 + var0); - var8.packetBuffer.writeShortLE(RouteStrategy.baseY * 64 + var1); - 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 = MenuAction.getPacketBufferNode(ClientPacket.field2217, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(NetCache.field3162); - var8.packetBuffer.writeShort(Client.field816); - var8.packetBuffer.method5443(RouteStrategy.baseY * 64 + var1); - var8.packetBuffer.method5443(PacketWriter.baseX * 64 + var0); - var8.packetBuffer.method5433(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShortLE(var3); - 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 = MenuAction.getPacketBufferNode(ClientPacket.field2190, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5432(RouteStrategy.baseY * 64 + var1); - var8.packetBuffer.writeShortLE(var3); - var8.packetBuffer.writeShortLE(PacketWriter.baseX * 64 + var0); - 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 = MenuAction.getPacketBufferNode(ClientPacket.field2259, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5432(var3); - var8.packetBuffer.method5443(PacketWriter.baseX * 64 + var0); - var8.packetBuffer.writeShort(RouteStrategy.baseY * 64 + var1); - var8.packetBuffer.writeByte(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 = MenuAction.getPacketBufferNode(ClientPacket.field2191, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(RouteStrategy.baseY * 64 + var1); - var8.packetBuffer.method5435(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShortLE(PacketWriter.baseX * 64 + var0); - var8.packetBuffer.writeShortLE(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 = MenuAction.getPacketBufferNode(ClientPacket.field2214, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5443(RouteStrategy.baseY * 64 + var1); - var8.packetBuffer.writeShortLE(var3); - var8.packetBuffer.writeShort(PacketWriter.baseX * 64 + var0); - var8.packetBuffer.method5435(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 = MenuAction.getPacketBufferNode(ClientPacket.field2236, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5432(var3); - var8.packetBuffer.method5443(RouteStrategy.baseY * 64 + var1); - var8.packetBuffer.writeShort(PacketWriter.baseX * 64 + var0); - Client.packetWriter.addNode(var8); - } else if (var2 == 23) { - if (Client.isMenuOpen) { - Player.scene.setViewportWalking(); - } else { - Player.scene.menuOpen(ItemContainer.plane, var0, var1, true); - } - } else { - PacketBufferNode var10; - Widget var16; - if (var2 == 24) { - var16 = WorldMapElement.getWidget(var1); - boolean var12 = true; - if (var16.contentType > 0) { - var12 = WorldMapSection1.method563(var16); - } - - if (var12) { - var10 = MenuAction.getPacketBufferNode(ClientPacket.field2254, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var10); - } - } else { - if (var2 == 25) { - var16 = ModelData0.getWidgetChild(var1, var0); - if (var16 != null) { - WorldMapRegion.Widget_runOnTargetLeave(); - class223.method4036(var1, var0, WorldMapRegion.method530(ParamDefinition.getWidgetClickMask(var16)), var16.itemId); - Client.isItemSelected = 0; - Client.selectedSpellActionName = class173.method3529(var16); - if (Client.selectedSpellActionName == null) { - Client.selectedSpellActionName = "null"; - } - - if (var16.isIf3) { - Client.selectedSpellName = var16.dataText + class16.colorStartTag(16777215); - } else { - Client.selectedSpellName = class16.colorStartTag(65280) + var16.spellName + class16.colorStartTag(16777215); - } - } - - return; - } - - if (var2 == 26) { - ParamDefinition.method4424(); - } else { - int var11; - Widget var14; - if (var2 == 28) { - var8 = MenuAction.getPacketBufferNode(ClientPacket.field2254, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var8); - var14 = WorldMapElement.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]; - ObjectSound.method1837(var11); - } - } else if (var2 == 29) { - var8 = MenuAction.getPacketBufferNode(ClientPacket.field2254, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var8); - var14 = WorldMapElement.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]; - ObjectSound.method1837(var11); - } - } - } else if (var2 == 30) { - if (Client.meslayerContinueWidget == null) { - GameShell.resumePauseWidget(var1, var0); - Client.meslayerContinueWidget = ModelData0.getWidgetChild(var1, var0); - FriendSystem.invalidateWidget(Client.meslayerContinueWidget); - } - } else if (var2 == 31) { - var8 = MenuAction.getPacketBufferNode(ClientPacket.field2229, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(var1); - var8.packetBuffer.writeIntLE16(FontName.selectedItemWidget); - var8.packetBuffer.method5432(class185.selectedItemSlot); - var8.packetBuffer.writeShortLE(class1.selectedItemId); - var8.packetBuffer.writeShortLE(var0); - var8.packetBuffer.method5432(var3); - Client.packetWriter.addNode(var8); - Client.field729 = 0; - Actor.field978 = WorldMapElement.getWidget(var1); - Client.field730 = var0; - } else if (var2 == 32) { - var8 = MenuAction.getPacketBufferNode(ClientPacket.field2187, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(NetCache.field3162); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.writeShort(var0); - var8.packetBuffer.writeShortLE(var3); - var8.packetBuffer.writeShortLE(Client.field816); - Client.packetWriter.addNode(var8); - Client.field729 = 0; - Actor.field978 = WorldMapElement.getWidget(var1); - Client.field730 = var0; - } else if (var2 == 33) { - var8 = MenuAction.getPacketBufferNode(ClientPacket.field2235, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(var3); - var8.packetBuffer.writeIntME(var1); - var8.packetBuffer.writeShort(var0); - Client.packetWriter.addNode(var8); - Client.field729 = 0; - Actor.field978 = WorldMapElement.getWidget(var1); - Client.field730 = var0; - } else if (var2 == 34) { - var8 = MenuAction.getPacketBufferNode(ClientPacket.field2283, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5443(var3); - var8.packetBuffer.writeIntLE16(var1); - var8.packetBuffer.method5432(var0); - Client.packetWriter.addNode(var8); - Client.field729 = 0; - Actor.field978 = WorldMapElement.getWidget(var1); - Client.field730 = var0; - } else if (var2 == 35) { - var8 = MenuAction.getPacketBufferNode(ClientPacket.field2257, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntLE(var1); - var8.packetBuffer.method5432(var0); - var8.packetBuffer.method5432(var3); - Client.packetWriter.addNode(var8); - Client.field729 = 0; - Actor.field978 = WorldMapElement.getWidget(var1); - Client.field730 = var0; - } else if (var2 == 36) { - var8 = MenuAction.getPacketBufferNode(ClientPacket.field2188, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5432(var3); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.method5432(var0); - Client.packetWriter.addNode(var8); - Client.field729 = 0; - Actor.field978 = WorldMapElement.getWidget(var1); - Client.field730 = var0; - } else if (var2 == 37) { - var8 = MenuAction.getPacketBufferNode(ClientPacket.field2243, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.writeShort(var0); - var8.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var8); - Client.field729 = 0; - Actor.field978 = WorldMapElement.getWidget(var1); - Client.field730 = var0; - } else { - if (var2 == 38) { - WorldMapRegion.Widget_runOnTargetLeave(); - var16 = WorldMapElement.getWidget(var1); - Client.isItemSelected = 1; - class185.selectedItemSlot = var0; - FontName.selectedItemWidget = var1; - class1.selectedItemId = var3; - FriendSystem.invalidateWidget(var16); - Client.selectedItemName = class16.colorStartTag(16748608) + WorldMapData_0.ItemDefinition_get(var3).name + class16.colorStartTag(16777215); - if (Client.selectedItemName == null) { - Client.selectedItemName = "null"; - } - - return; - } - - if (var2 == 39) { - var8 = MenuAction.getPacketBufferNode(ClientPacket.field2231, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5432(var3); - var8.packetBuffer.writeIntLE16(var1); - var8.packetBuffer.writeShortLE(var0); - Client.packetWriter.addNode(var8); - Client.field729 = 0; - Actor.field978 = WorldMapElement.getWidget(var1); - Client.field730 = var0; - } else if (var2 == 40) { - var8 = MenuAction.getPacketBufferNode(ClientPacket.field2211, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntLE16(var1); - var8.packetBuffer.writeShortLE(var0); - var8.packetBuffer.method5443(var3); - Client.packetWriter.addNode(var8); - Client.field729 = 0; - Actor.field978 = WorldMapElement.getWidget(var1); - Client.field730 = var0; - } else if (var2 == 41) { - var8 = MenuAction.getPacketBufferNode(ClientPacket.field2250, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntLE(var1); - var8.packetBuffer.method5443(var0); - var8.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var8); - Client.field729 = 0; - Actor.field978 = WorldMapElement.getWidget(var1); - Client.field730 = var0; - } else if (var2 == 42) { - var8 = MenuAction.getPacketBufferNode(ClientPacket.field2193, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.method5443(var0); - var8.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var8); - Client.field729 = 0; - Actor.field978 = WorldMapElement.getWidget(var1); - Client.field730 = var0; - } else if (var2 == 43) { - var8 = MenuAction.getPacketBufferNode(ClientPacket.field2268, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.writeIntME(var1); - var8.packetBuffer.writeShort(var0); - Client.packetWriter.addNode(var8); - Client.field729 = 0; - Actor.field978 = WorldMapElement.getWidget(var1); - Client.field730 = 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 = MenuAction.getPacketBufferNode(ClientPacket.field2272, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(var3); - var9.packetBuffer.method5545(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - 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 = MenuAction.getPacketBufferNode(ClientPacket.field2241, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5433(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5443(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 = MenuAction.getPacketBufferNode(ClientPacket.field2247, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5443(var3); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 47) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = MenuAction.getPacketBufferNode(ClientPacket.field2279, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5432(var3); - var9.packetBuffer.method5545(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 = MenuAction.getPacketBufferNode(ClientPacket.field2262, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5433(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5443(var3); - 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 = MenuAction.getPacketBufferNode(ClientPacket.field2249, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5443(var3); - var9.packetBuffer.method5435(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 = MenuAction.getPacketBufferNode(ClientPacket.field2260, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5435(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeShortLE(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 = MenuAction.getPacketBufferNode(ClientPacket.field2273, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5545(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5432(var3); - Client.packetWriter.addNode(var9); - } - } else { - label758: { - if (var2 != 57) { - if (var2 == 58) { - var16 = ModelData0.getWidgetChild(var1, var0); - if (var16 != null) { - var9 = MenuAction.getPacketBufferNode(ClientPacket.field2246, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShortLE(Client.field816); - var9.packetBuffer.writeIntLE16(var1); - var9.packetBuffer.writeShortLE(Client.field736); - var9.packetBuffer.method5432(var0); - var9.packetBuffer.writeInt(NetCache.field3162); - var9.packetBuffer.method5432(var16.itemId); - Client.packetWriter.addNode(var9); - } - break label758; - } - - if (var2 == 1001) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = MenuAction.getPacketBufferNode(ClientPacket.field2287, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.method5433(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5443(PacketWriter.baseX * 64 + var0); - var8.packetBuffer.method5432(RouteStrategy.baseY * 64 + var1); - Client.packetWriter.addNode(var8); - break label758; - } - - if (var2 == 1002) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var8 = MenuAction.getPacketBufferNode(ClientPacket.field2239, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5443(var3); - Client.packetWriter.addNode(var8); - break label758; - } - - if (var2 == 1003) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var13 = Client.npcs[var3]; - if (var13 != null) { - NPCDefinition var17 = var13.definition; - if (var17.transforms != null) { - var17 = var17.transform(); - } - - if (var17 != null) { - var10 = MenuAction.getPacketBufferNode(ClientPacket.field2215, Client.packetWriter.isaacCipher); - var10.packetBuffer.method5443(var17.id); - Client.packetWriter.addNode(var10); - } - } - break label758; - } - - if (var2 == 1004) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var8 = MenuAction.getPacketBufferNode(ClientPacket.field2209, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(var3); - Client.packetWriter.addNode(var8); - break label758; - } - - if (var2 == 1005) { - var16 = WorldMapElement.getWidget(var1); - if (var16 != null && var16.itemQuantities[var0] >= 100000) { - DirectByteArrayCopier.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + WorldMapData_0.ItemDefinition_get(var3).name); - } else { - var9 = MenuAction.getPacketBufferNode(ClientPacket.field2209, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShortLE(var3); - Client.packetWriter.addNode(var9); - } - - Client.field729 = 0; - Actor.field978 = WorldMapElement.getWidget(var1); - Client.field730 = var0; - break label758; - } - - if (var2 != 1007) { - if (var2 == 1010 || var2 == 1011 || var2 == 1008 || var2 == 1009 || var2 == 1012) { - WorldMapCacheName.worldMap.menuAction(var2, var3, new Coord(var0), new Coord(var1)); - } - break label758; - } - } - - var16 = ModelData0.getWidgetChild(var1, var0); - if (var16 != null) { - InterfaceParent.method1127(var3, var1, var0, var16.itemId, var5); - } - } - } - } - } - } - } - } - } - - if (Client.isItemSelected != 0) { - Client.isItemSelected = 0; - FriendSystem.invalidateWidget(WorldMapElement.getWidget(FontName.selectedItemWidget)); - } - - if (Client.isSpellSelected) { - WorldMapRegion.Widget_runOnTargetLeave(); - } - - if (Actor.field978 != null && Client.field729 == 0) { - FriendSystem.invalidateWidget(Actor.field978); - } - + @ObfuscatedName("l") + @Export("Entity_unpackID") + public static int Entity_unpackID(long var0) { + return (int)(var0 >>> 17 & 4294967295L); } } diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java index 604b7eb55e..afa40d9178 100644 --- a/runescape-client/src/main/java/SequenceDefinition.java +++ b/runescape-client/src/main/java/SequenceDefinition.java @@ -1,106 +1,106 @@ +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("ij") +@ObfuscatedName("iw") @Implements("SequenceDefinition") public class SequenceDefinition extends DualNode { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "Lhz;" ) @Export("SequenceDefinition_archive") - static AbstractArchive SequenceDefinition_archive; - @ObfuscatedName("j") + public static AbstractArchive SequenceDefinition_archive; + @ObfuscatedName("x") @ObfuscatedSignature( signature = "Lhz;" ) @Export("SequenceDefinition_animationsArchive") - static AbstractArchive SequenceDefinition_animationsArchive; - @ObfuscatedName("i") + public static AbstractArchive SequenceDefinition_animationsArchive; + @ObfuscatedName("t") @ObfuscatedSignature( signature = "Lhz;" ) @Export("SequenceDefinition_skeletonsArchive") - static AbstractArchive SequenceDefinition_skeletonsArchive; - @ObfuscatedName("k") + public static AbstractArchive SequenceDefinition_skeletonsArchive; + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("SequenceDefinition_cached") public static EvictingDualNodeHashTable SequenceDefinition_cached; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("SequenceDefinition_cachedFrames") public static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; - @ObfuscatedName("bo") - @ObfuscatedSignature( - signature = "Lha;" - ) - static ServerBuild field3507; - @ObfuscatedName("n") + @ObfuscatedName("gu") + @Export("regionLandArchiveIds") + static int[] regionLandArchiveIds; + @ObfuscatedName("u") @Export("frameIds") public int[] frameIds; - @ObfuscatedName("t") + @ObfuscatedName("j") @Export("chatFrameIds") int[] chatFrameIds; - @ObfuscatedName("q") + @ObfuscatedName("v") @Export("frameLengths") public int[] frameLengths; - @ObfuscatedName("x") + @ObfuscatedName("d") @Export("soundEffects") public int[] soundEffects; - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -522121775 + intValue = -993478563 ) @Export("frameCount") public int frameCount; + @ObfuscatedName("n") + int[] field3494; + @ObfuscatedName("h") + public boolean field3495; @ObfuscatedName("f") - int[] field3500; - @ObfuscatedName("c") - public boolean field3501; - @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1194078823 + intValue = 287380897 ) - public int field3508; - @ObfuscatedName("y") + public int field3504; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1255780887 + intValue = 520762813 ) @Export("shield") public int shield; @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1291874465 + intValue = -561463937 ) @Export("weapon") public int weapon; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -1987515665 - ) - public int field3502; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -327317387 - ) - public int field3506; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1253996227 - ) - public int field3505; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -41123277 + intValue = -916538321 ) public int field3492; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -594984365 + ) + public int field3496; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 20396127 + ) + public int field3501; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = 881200293 + ) + public int field3502; static { SequenceDefinition_cached = new EvictingDualNodeHashTable(64); @@ -109,20 +109,20 @@ public class SequenceDefinition extends DualNode { SequenceDefinition() { this.frameCount = -1; - this.field3501 = false; - this.field3508 = 5; + this.field3495 = false; + this.field3504 = 5; this.shield = -1; this.weapon = -1; - this.field3502 = 99; - this.field3506 = -1; - this.field3505 = -1; - this.field3492 = 2; + this.field3492 = 99; + this.field3496 = -1; + this.field3501 = -1; + this.field3502 = 2; } - @ObfuscatedName("i") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lky;B)V", - garbageValue = "1" + signature = "(Lkz;I)V", + garbageValue = "430086086" ) @Export("decode") void decode(Buffer var1) { @@ -136,10 +136,10 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lky;II)V", - garbageValue = "20396859" + signature = "(Lkz;II)V", + garbageValue = "1868272717" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -166,29 +166,29 @@ public class SequenceDefinition extends DualNode { this.frameCount = var1.readUnsignedShort(); } else if (var2 == 3) { var3 = var1.readUnsignedByte(); - this.field3500 = new int[var3 + 1]; + this.field3494 = new int[var3 + 1]; for (var4 = 0; var4 < var3; ++var4) { - this.field3500[var4] = var1.readUnsignedByte(); + this.field3494[var4] = var1.readUnsignedByte(); } - this.field3500[var3] = 9999999; + this.field3494[var3] = 9999999; } else if (var2 == 4) { - this.field3501 = true; + this.field3495 = true; } else if (var2 == 5) { - this.field3508 = var1.readUnsignedByte(); + this.field3504 = var1.readUnsignedByte(); } else if (var2 == 6) { this.shield = var1.readUnsignedShort(); } else if (var2 == 7) { this.weapon = var1.readUnsignedShort(); } else if (var2 == 8) { - this.field3502 = var1.readUnsignedByte(); - } else if (var2 == 9) { - this.field3506 = var1.readUnsignedByte(); - } else if (var2 == 10) { - this.field3505 = var1.readUnsignedByte(); - } else if (var2 == 11) { this.field3492 = var1.readUnsignedByte(); + } else if (var2 == 9) { + this.field3496 = var1.readUnsignedByte(); + } else if (var2 == 10) { + this.field3501 = var1.readUnsignedByte(); + } else if (var2 == 11) { + this.field3502 = var1.readUnsignedByte(); } else if (var2 == 12) { var3 = var1.readUnsignedByte(); this.chatFrameIds = new int[var3]; @@ -211,40 +211,40 @@ public class SequenceDefinition extends DualNode { } - @ObfuscatedName("u") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1147971481" + garbageValue = "1343556698" ) @Export("postDecode") void postDecode() { - if (this.field3506 == -1) { - if (this.field3500 != null) { - this.field3506 = 2; + if (this.field3496 == -1) { + if (this.field3494 != null) { + this.field3496 = 2; } else { - this.field3506 = 0; + this.field3496 = 0; } } - if (this.field3505 == -1) { - if (this.field3500 != null) { - this.field3505 = 2; + if (this.field3501 == -1) { + if (this.field3494 != null) { + this.field3501 = 2; } else { - this.field3505 = 0; + this.field3501 = 0; } } } - @ObfuscatedName("n") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(Ldo;II)Ldo;", - garbageValue = "1625064611" + signature = "(Ldr;II)Ldr;", + garbageValue = "-213562589" ) @Export("transformActorModel") public Model transformActorModel(Model var1, int var2) { var2 = this.frameIds[var2]; - Frames var3 = WorldMapSprite.getFrames(var2 >> 16); + Frames var3 = class173.getFrames(var2 >> 16); var2 &= 65535; if (var3 == null) { return var1.toSharedSequenceModel(true); @@ -255,15 +255,15 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("t") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Ldo;III)Ldo;", - garbageValue = "1397099935" + signature = "(Ldr;III)Ldr;", + garbageValue = "1650845543" ) @Export("transformObjectModel") Model transformObjectModel(Model var1, int var2, int var3) { var2 = this.frameIds[var2]; - Frames var4 = WorldMapSprite.getFrames(var2 >> 16); + Frames var4 = class173.getFrames(var2 >> 16); var2 &= 65535; if (var4 == null) { return var1.toSharedSequenceModel(true); @@ -291,15 +291,15 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("q") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Ldo;IB)Ldo;", - garbageValue = "-37" + signature = "(Ldr;II)Ldr;", + garbageValue = "-703390998" ) @Export("transformSpotAnimationModel") Model transformSpotAnimationModel(Model var1, int var2) { var2 = this.frameIds[var2]; - Frames var3 = WorldMapSprite.getFrames(var2 >> 16); + Frames var3 = class173.getFrames(var2 >> 16); var2 &= 65535; if (var3 == null) { return var1.toSharedSpotAnimationModel(true); @@ -310,21 +310,21 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("x") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(Ldo;ILij;II)Ldo;", - garbageValue = "-111207649" + signature = "(Ldr;ILiw;II)Ldr;", + garbageValue = "1097000562" ) @Export("applyTransformations") public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, int var4) { var2 = this.frameIds[var2]; - Frames var5 = WorldMapSprite.getFrames(var2 >> 16); + Frames var5 = class173.getFrames(var2 >> 16); var2 &= 65535; if (var5 == null) { return var3.transformActorModel(var1, var4); } else { var4 = var3.frameIds[var4]; - Frames var6 = WorldMapSprite.getFrames(var4 >> 16); + Frames var6 = class173.getFrames(var4 >> 16); var4 &= 65535; Model var7; if (var6 == null) { @@ -333,7 +333,7 @@ public class SequenceDefinition extends DualNode { return var7; } else { var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); - var7.animate2(var5, var2, var6, var4, this.field3500); + var7.animate2(var5, var2, var6, var4, this.field3494); return var7; } } @@ -341,13 +341,13 @@ public class SequenceDefinition extends DualNode { @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Ldo;II)Ldo;", - garbageValue = "793015931" + signature = "(Ldr;II)Ldr;", + garbageValue = "-358919947" ) @Export("transformWidgetModel") public Model transformWidgetModel(Model var1, int var2) { int var3 = this.frameIds[var2]; - Frames var4 = WorldMapSprite.getFrames(var3 >> 16); + Frames var4 = class173.getFrames(var3 >> 16); var3 &= 65535; if (var4 == null) { return var1.toSharedSequenceModel(true); @@ -356,7 +356,7 @@ public class SequenceDefinition extends DualNode { int var6 = 0; if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { var6 = this.chatFrameIds[var2]; - var5 = WorldMapSprite.getFrames(var6 >> 16); + var5 = class173.getFrames(var6 >> 16); var6 &= 65535; } @@ -374,28 +374,74 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("s") + @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "(I)J", - garbageValue = "1864654090" + signature = "(ILcu;ZB)I", + garbageValue = "4" ) - public static final synchronized long method4686() { - long var0 = System.currentTimeMillis(); - if (var0 < class296.field3688) { - class296.field3689 += class296.field3688 - var0; - } + static int method4799(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { + class160.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + int var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + if (!Client.isCameraLocked) { + Client.camAngleX = var3; + Client.camAngleY = var4; + } - class296.field3688 = var0; - return class296.field3689 + var0; + return 1; + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.camAngleX; + return 1; + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.camAngleY; + return 1; + } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + if (var3 < 0) { + var3 = 0; + } + + Client.camFollowHeight = var3 * 1593328887; + return 1; + } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.camFollowHeight * 172735687; + return 1; + } else { + return 2; + } } - @ObfuscatedName("s") + @ObfuscatedName("kz") @ObfuscatedSignature( - signature = "(B)[Llb;", - garbageValue = "43" + signature = "(Lkz;I)V", + garbageValue = "477248942" ) - @Export("FillMode_values") - public static FillMode[] FillMode_values() { - return new FillMode[]{FillMode.field3858, FillMode.field3860, FillMode.SOLID}; + static void method4770(Buffer var0) { + if (Client.randomDatData != null) { + var0.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); + } else { + byte[] var2 = new byte[24]; + + 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); + } } } diff --git a/runescape-client/src/main/java/ServerBuild.java b/runescape-client/src/main/java/ServerBuild.java index 4682f7d29a..4e0fc2161e 100644 --- a/runescape-client/src/main/java/ServerBuild.java +++ b/runescape-client/src/main/java/ServerBuild.java @@ -4,41 +4,46 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ha") +@ObfuscatedName("ho") @Implements("ServerBuild") public class ServerBuild { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lha;" + signature = "Lho;" ) @Export("LIVE") static final ServerBuild LIVE; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lha;" + signature = "Lho;" ) @Export("BUILDLIVE") static final ServerBuild BUILDLIVE; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lha;" + signature = "Lho;" ) @Export("RC") static final ServerBuild RC; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lha;" + signature = "Lho;" ) @Export("WIP") static final ServerBuild WIP; - @ObfuscatedName("u") + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 1377702413 + ) + static int field3079; + @ObfuscatedName("l") @Export("name") public final String name; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1354780061 + intValue = -2004053653 ) - public final int field3080; + public final int field3077; static { LIVE = new ServerBuild("LIVE", 0); @@ -49,6 +54,6 @@ public class ServerBuild { ServerBuild(String var1, int var2) { this.name = var1; - this.field3080 = var2; + this.field3077 = var2; } } diff --git a/runescape-client/src/main/java/ServerPacket.java b/runescape-client/src/main/java/ServerPacket.java index 23207f9c23..139dd871d9 100644 --- a/runescape-client/src/main/java/ServerPacket.java +++ b/runescape-client/src/main/java/ServerPacket.java @@ -4,539 +4,539 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gj") +@ObfuscatedName("ga") @Implements("ServerPacket") public class ServerPacket { - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2102; - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2098; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2099; - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2183; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2101; - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2170; - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2100; - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2158; - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2105; - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2106; - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2107; @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2108; - @ObfuscatedName("r") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2161; - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2184; - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2178; - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2112; - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2137; - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2114; - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2104; - @ObfuscatedName("a") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2116; - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2115; - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2134; - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2119; - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2120; - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2121; - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2122; - @ObfuscatedName("av") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2123; - @ObfuscatedName("am") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2124; - @ObfuscatedName("ai") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2159; - @ObfuscatedName("af") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2126; - @ObfuscatedName("az") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2136; - @ObfuscatedName("aj") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2128; - @ObfuscatedName("an") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2163; - @ObfuscatedName("at") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2117; - @ObfuscatedName("as") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2131; - @ObfuscatedName("ak") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2130; - @ObfuscatedName("ao") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2133; - @ObfuscatedName("ac") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2129; - @ObfuscatedName("ar") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2135; - @ObfuscatedName("au") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2148; - @ObfuscatedName("ax") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2175; - @ObfuscatedName("ag") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2138; - @ObfuscatedName("aa") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2139; - @ObfuscatedName("ap") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2140; - @ObfuscatedName("aq") - @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lga;" ) public static final ServerPacket field2141; - @ObfuscatedName("ay") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lga;" + ) + public static final ServerPacket field2113; + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2122; + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2120; + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2100; + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2101; + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2102; + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2103; + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2104; + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2162; + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2118; + @ObfuscatedName("h") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2107; + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2108; + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2109; + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2110; + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2111; + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2112; + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2098; + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2105; + @ObfuscatedName("r") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2135; + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2134; + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2117; + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2181; + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2119; + @ObfuscatedName("a") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2099; + @ObfuscatedName("b") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2121; + @ObfuscatedName("ag") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2096; + @ObfuscatedName("at") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2123; + @ObfuscatedName("ao") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2116; + @ObfuscatedName("av") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2137; + @ObfuscatedName("an") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2126; + @ObfuscatedName("al") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2127; + @ObfuscatedName("as") + @ObfuscatedSignature( + signature = "Lga;" ) public static final ServerPacket field2142; @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lga;" ) - public static final ServerPacket field2143; - @ObfuscatedName("al") + public static final ServerPacket field2115; + @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lga;" ) - public static final ServerPacket field2144; - @ObfuscatedName("ah") + public static final ServerPacket field2130; + @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2145; - @ObfuscatedName("ab") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2146; - @ObfuscatedName("aw") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2147; - @ObfuscatedName("ae") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2125; - @ObfuscatedName("bk") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2149; - @ObfuscatedName("bw") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2150; - @ObfuscatedName("bo") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2151; - @ObfuscatedName("bn") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2152; - @ObfuscatedName("bp") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2162; - @ObfuscatedName("bz") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2097; - @ObfuscatedName("bh") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2155; - @ObfuscatedName("bv") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2156; - @ObfuscatedName("bj") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2118; - @ObfuscatedName("bq") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2132; - @ObfuscatedName("by") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2110; - @ObfuscatedName("bs") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2160; - @ObfuscatedName("bi") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2103; - @ObfuscatedName("bf") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2127; - @ObfuscatedName("bd") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2154; - @ObfuscatedName("br") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2164; - @ObfuscatedName("bm") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2165; - @ObfuscatedName("bu") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2179; - @ObfuscatedName("bb") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2167; - @ObfuscatedName("bl") - @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lga;" ) public static final ServerPacket field2168; - @ObfuscatedName("bt") + @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lga;" ) - public static final ServerPacket field2169; - @ObfuscatedName("bx") + public static final ServerPacket field2132; + @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lga;" ) - public static final ServerPacket field2166; - @ObfuscatedName("ba") + public static final ServerPacket field2133; + @ObfuscatedName("af") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lga;" ) - public static final ServerPacket field2171; - @ObfuscatedName("bg") + public static final ServerPacket field2131; + @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lga;" ) - public static final ServerPacket field2172; - @ObfuscatedName("be") + public static final ServerPacket field2158; + @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lga;" ) - public static final ServerPacket field2173; - @ObfuscatedName("bc") + public static final ServerPacket field2136; + @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2174; - @ObfuscatedName("ce") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2153; - @ObfuscatedName("ci") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2176; - @ObfuscatedName("ck") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2177; - @ObfuscatedName("cc") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2113; - @ObfuscatedName("cd") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2157; - @ObfuscatedName("cf") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2180; - @ObfuscatedName("cw") - @ObfuscatedSignature( - signature = "Lgj;" - ) - public static final ServerPacket field2181; - @ObfuscatedName("cj") - @ObfuscatedSignature( - signature = "Lgj;" + signature = "Lga;" ) public static final ServerPacket field2182; - @ObfuscatedName("cp") + @ObfuscatedName("ah") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2138; + @ObfuscatedName("aa") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2164; + @ObfuscatedName("aq") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2172; + @ObfuscatedName("ar") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2125; + @ObfuscatedName("ac") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2129; + @ObfuscatedName("az") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2106; + @ObfuscatedName("ai") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2144; + @ObfuscatedName("am") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2145; + @ObfuscatedName("aw") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2146; + @ObfuscatedName("au") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2143; + @ObfuscatedName("bg") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2128; + @ObfuscatedName("bn") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2149; + @ObfuscatedName("bk") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2150; + @ObfuscatedName("bp") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2151; + @ObfuscatedName("bu") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2152; + @ObfuscatedName("bi") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2153; + @ObfuscatedName("bv") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2154; + @ObfuscatedName("bf") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2124; + @ObfuscatedName("bm") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2156; + @ObfuscatedName("bw") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2157; + @ObfuscatedName("bs") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2147; + @ObfuscatedName("bt") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2159; + @ObfuscatedName("bj") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2160; + @ObfuscatedName("bd") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2161; + @ObfuscatedName("by") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2148; + @ObfuscatedName("bh") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2163; + @ObfuscatedName("bo") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2155; + @ObfuscatedName("be") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2165; + @ObfuscatedName("bl") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2166; + @ObfuscatedName("bb") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2167; + @ObfuscatedName("ba") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2139; + @ObfuscatedName("bz") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2169; + @ObfuscatedName("bc") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2170; + @ObfuscatedName("br") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2171; + @ObfuscatedName("bx") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2097; + @ObfuscatedName("bq") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2173; + @ObfuscatedName("cb") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2174; + @ObfuscatedName("ct") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2175; + @ObfuscatedName("ch") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2176; + @ObfuscatedName("cc") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2177; + @ObfuscatedName("cv") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2178; + @ObfuscatedName("cr") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2179; + @ObfuscatedName("cl") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2180; + @ObfuscatedName("ca") + @ObfuscatedSignature( + signature = "Lga;" + ) + public static final ServerPacket field2140; + @ObfuscatedName("ck") @ObfuscatedGetter( - intValue = -69273905 + intValue = -1244788261 ) @Export("id") public final int id; - @ObfuscatedName("cu") + @ObfuscatedName("cm") @ObfuscatedGetter( - intValue = -1621131225 + intValue = -1059640139 ) @Export("length") public final int length; static { - field2102 = new ServerPacket(0, -2); - field2098 = new ServerPacket(1, 0); - field2099 = new ServerPacket(2, 0); - field2183 = new ServerPacket(3, -1); - field2101 = new ServerPacket(4, 6); - field2170 = new ServerPacket(5, 4); - field2100 = new ServerPacket(6, 4); - field2158 = new ServerPacket(7, 4); - field2105 = new ServerPacket(8, 6); - field2106 = new ServerPacket(9, 4); - field2107 = new ServerPacket(10, -2); - field2108 = new ServerPacket(11, 15); - field2161 = new ServerPacket(12, 5); - field2184 = new ServerPacket(13, 2); - field2178 = new ServerPacket(14, 3); - field2112 = new ServerPacket(15, 7); - field2137 = new ServerPacket(16, 1); - field2114 = new ServerPacket(17, -2); - field2104 = new ServerPacket(18, -2); - field2116 = new ServerPacket(19, -2); - field2115 = new ServerPacket(20, 10); - field2134 = new ServerPacket(21, 5); - field2119 = new ServerPacket(22, 6); - field2120 = new ServerPacket(23, 2); - field2121 = new ServerPacket(24, 6); - field2122 = new ServerPacket(25, 2); - field2123 = new ServerPacket(26, 5); - field2124 = new ServerPacket(27, -2); - field2159 = new ServerPacket(28, 0); - field2126 = new ServerPacket(29, 0); - field2136 = new ServerPacket(30, 4); - field2128 = new ServerPacket(31, 6); - field2163 = new ServerPacket(32, -2); - field2117 = new ServerPacket(33, -2); - field2131 = new ServerPacket(34, 1); - field2130 = new ServerPacket(35, 6); - field2133 = new ServerPacket(36, 6); - field2129 = new ServerPacket(37, -1); - field2135 = new ServerPacket(38, -2); - field2148 = new ServerPacket(39, 4); - field2175 = new ServerPacket(40, 5); - field2138 = new ServerPacket(41, 8); - field2139 = new ServerPacket(42, 14); - field2140 = new ServerPacket(43, -2); - field2141 = new ServerPacket(44, -2); - field2142 = new ServerPacket(45, -1); - field2143 = new ServerPacket(46, 2); - field2144 = new ServerPacket(47, -1); - field2145 = new ServerPacket(48, 12); - field2146 = new ServerPacket(49, 4); - field2147 = new ServerPacket(50, 10); - field2125 = new ServerPacket(51, -2); - field2149 = new ServerPacket(52, 0); - field2150 = new ServerPacket(53, -2); - field2151 = new ServerPacket(54, -1); - field2152 = new ServerPacket(55, 20); - field2162 = new ServerPacket(56, -2); - field2097 = new ServerPacket(57, 28); - field2155 = new ServerPacket(58, -2); - field2156 = new ServerPacket(59, 8); - field2118 = new ServerPacket(60, 1); - field2132 = new ServerPacket(61, 6); - field2110 = new ServerPacket(62, -2); - field2160 = new ServerPacket(63, 3); - field2103 = new ServerPacket(64, 2); - field2127 = new ServerPacket(65, 5); - field2154 = new ServerPacket(66, -1); - field2164 = new ServerPacket(67, 2); - field2165 = new ServerPacket(68, 1); - field2179 = new ServerPacket(69, 8); - field2167 = new ServerPacket(70, -2); - field2168 = new ServerPacket(71, 2); - field2169 = new ServerPacket(72, 2); - field2166 = new ServerPacket(73, 0); - field2171 = new ServerPacket(74, 1); - field2172 = new ServerPacket(75, 6); - field2173 = new ServerPacket(76, 6); - field2174 = new ServerPacket(77, 7); - field2153 = new ServerPacket(78, 0); - field2176 = new ServerPacket(79, -2); - field2177 = new ServerPacket(80, 2); - field2113 = new ServerPacket(81, -2); - field2157 = new ServerPacket(82, 8); - field2180 = new ServerPacket(83, 6); - field2181 = new ServerPacket(84, 2); - field2182 = new ServerPacket(85, 1); + field2141 = new ServerPacket(0, -2); + field2113 = new ServerPacket(1, 2); + field2122 = new ServerPacket(2, -2); + field2120 = new ServerPacket(3, 2); + field2100 = new ServerPacket(4, 2); + field2101 = new ServerPacket(5, -2); + field2102 = new ServerPacket(6, 1); + field2103 = new ServerPacket(7, 6); + field2104 = new ServerPacket(8, 14); + field2162 = new ServerPacket(9, 4); + field2118 = new ServerPacket(10, 10); + field2107 = new ServerPacket(11, 5); + field2108 = new ServerPacket(12, -1); + field2109 = new ServerPacket(13, -1); + field2110 = new ServerPacket(14, -1); + field2111 = new ServerPacket(15, -2); + field2112 = new ServerPacket(16, 6); + field2098 = new ServerPacket(17, 2); + field2105 = new ServerPacket(18, -2); + field2135 = new ServerPacket(19, -1); + field2134 = new ServerPacket(20, 4); + field2117 = new ServerPacket(21, -2); + field2181 = new ServerPacket(22, 6); + field2119 = new ServerPacket(23, 8); + field2099 = new ServerPacket(24, -2); + field2121 = new ServerPacket(25, 3); + field2096 = new ServerPacket(26, 6); + field2123 = new ServerPacket(27, -2); + field2116 = new ServerPacket(28, 0); + field2137 = new ServerPacket(29, -2); + field2126 = new ServerPacket(30, 4); + field2127 = new ServerPacket(31, 6); + field2142 = new ServerPacket(32, 3); + field2115 = new ServerPacket(33, 0); + field2130 = new ServerPacket(34, 4); + field2168 = new ServerPacket(35, 2); + field2132 = new ServerPacket(36, -2); + field2133 = new ServerPacket(37, -2); + field2131 = new ServerPacket(38, 8); + field2158 = new ServerPacket(39, 8); + field2136 = new ServerPacket(40, 1); + field2182 = new ServerPacket(41, -2); + field2138 = new ServerPacket(42, 5); + field2164 = new ServerPacket(43, -2); + field2172 = new ServerPacket(44, 1); + field2125 = new ServerPacket(45, -2); + field2129 = new ServerPacket(46, 4); + field2106 = new ServerPacket(47, 7); + field2144 = new ServerPacket(48, 6); + field2145 = new ServerPacket(49, 0); + field2146 = new ServerPacket(50, 0); + field2143 = new ServerPacket(51, 6); + field2128 = new ServerPacket(52, 12); + field2149 = new ServerPacket(53, 15); + field2150 = new ServerPacket(54, 20); + field2151 = new ServerPacket(55, -2); + field2152 = new ServerPacket(56, 5); + field2153 = new ServerPacket(57, -1); + field2154 = new ServerPacket(58, 0); + field2124 = new ServerPacket(59, 0); + field2156 = new ServerPacket(60, -2); + field2157 = new ServerPacket(61, 2); + field2147 = new ServerPacket(62, 4); + field2159 = new ServerPacket(63, -2); + field2160 = new ServerPacket(64, 2); + field2161 = new ServerPacket(65, 28); + field2148 = new ServerPacket(66, 8); + field2163 = new ServerPacket(67, -1); + field2155 = new ServerPacket(68, 2); + field2165 = new ServerPacket(69, 2); + field2166 = new ServerPacket(70, 1); + field2167 = new ServerPacket(71, 4); + field2139 = new ServerPacket(72, 0); + field2169 = new ServerPacket(73, 5); + field2170 = new ServerPacket(74, 10); + field2171 = new ServerPacket(75, 1); + field2097 = new ServerPacket(76, 7); + field2173 = new ServerPacket(77, -2); + field2174 = new ServerPacket(78, 1); + field2175 = new ServerPacket(79, 6); + field2176 = new ServerPacket(80, 6); + field2177 = new ServerPacket(81, -2); + field2178 = new ServerPacket(82, 2); + field2179 = new ServerPacket(83, 5); + field2180 = new ServerPacket(84, 6); + field2140 = new ServerPacket(85, 6); } ServerPacket(int var1, int var2) { @@ -544,40 +544,105 @@ public class ServerPacket { this.length = var2; } - @ObfuscatedName("gm") + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "([Lgk;II)Lgk;", + garbageValue = "-1697869771" + ) + @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; + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(II)Lil;", + garbageValue = "-2017353606" + ) + @Export("FloorUnderlayDefinition_get") + public static FloorUnderlayDefinition FloorUnderlayDefinition_get(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("fc") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "-1" + garbageValue = "-20" ) - static final void method3555() { - for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { - if (var0.plane == ItemContainer.plane && !var0.isFinished) { - if (Client.cycle >= var0.cycleStart) { - var0.advance(Client.field879); - if (var0.isFinished) { - var0.remove(); - } else { - Player.scene.drawEntity(var0.plane, var0.x, var0.y, var0.height, 60, var0, 0, -1L, false); - } + @Export("processOverheadText") + static final void processOverheadText() { + int[] var0 = Players.Players_indices; + + int var1; + for (var1 = 0; var1 < Players.Players_count; ++var1) { + Player var2 = Client.players[var0[var1]]; + if (var2 != null && var2.overheadTextCyclesRemaining > 0) { + --var2.overheadTextCyclesRemaining; + if (var2.overheadTextCyclesRemaining == 0) { + var2.overheadText = null; + } + } + } + + for (var1 = 0; var1 < Client.npcCount; ++var1) { + int var4 = Client.npcIndices[var1]; + NPC var3 = Client.npcs[var4]; + if (var3 != null && var3.overheadTextCyclesRemaining > 0) { + --var3.overheadTextCyclesRemaining; + if (var3.overheadTextCyclesRemaining == 0) { + var3.overheadText = null; } - } else { - var0.remove(); } } } - @ObfuscatedName("jb") + @ObfuscatedName("iz") @ObfuscatedSignature( - signature = "(Lhp;B)Lhp;", - garbageValue = "-118" + signature = "(IIIIIB)V", + garbageValue = "-32" ) - static Widget method3552(Widget var0) { - Widget var1 = AbstractByteArrayCopier.method3871(var0); - if (var1 == null) { - var1 = var0.parent; + @Export("drawScrollBar") + static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { + WorldMapIcon_1.scrollBarSprites[0].drawAt(var0, var1); + WorldMapIcon_1.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field684); + int var5 = var3 * (var3 - 32) / var4; + if (var5 < 8) { + var5 = 8; } - return var1; + int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field745); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field817); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field817); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field817); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field817); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field686); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field686); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field686); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field686); } } diff --git a/runescape-client/src/main/java/Skeleton.java b/runescape-client/src/main/java/Skeleton.java index 2c5f252561..d480e2eecd 100644 --- a/runescape-client/src/main/java/Skeleton.java +++ b/runescape-client/src/main/java/Skeleton.java @@ -4,25 +4,25 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ex") +@ObfuscatedName("en") @Implements("Skeleton") public class Skeleton extends Node { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1796359349 + intValue = 1226731601 ) @Export("id") int id; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -911873839 + intValue = 1996239831 ) @Export("count") int count; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("transformTypes") int[] transformTypes; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("labels") int[][] labels; @@ -50,12 +50,83 @@ public class Skeleton extends Node { } - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "244690440" + signature = "(Lhz;Lhz;Ljava/lang/String;Ljava/lang/String;I)Lkf;", + garbageValue = "1144321855" ) - public static int method3008() { - return KeyHandler.KeyHandler_idleCycles; + @Export("SpriteBuffer_getFontByName") + public static Font SpriteBuffer_getFontByName(AbstractArchive var0, AbstractArchive var1, String var2, String var3) { + int var4 = var0.getGroupId(var2); + int var5 = var0.getFileId(var4, var3); + byte[] var8 = var0.takeFile(var4, var5); + boolean var7; + if (var8 == null) { + var7 = false; + } else { + GrandExchangeOfferWorldComparator.SpriteBuffer_decode(var8); + var7 = true; + } + + Font var6; + if (!var7) { + var6 = null; + } else { + byte[] var9 = var1.takeFile(var4, var5); + Font var11; + if (var9 == null) { + var11 = null; + } else { + Font var10 = new Font(var9, class325.SpriteBuffer_xOffsets, SecureRandomCallable.SpriteBuffer_yOffsets, class325.SpriteBuffer_spriteWidths, SoundSystem.SpriteBuffer_spriteHeights, class325.SpriteBuffer_spritePalette, InvDefinition.SpriteBuffer_pixels); + class192.SpriteBuffer_clear(); + var11 = var10; + } + + var6 = var11; + } + + return var6; + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "(IZI)Ljava/lang/String;", + garbageValue = "-1925003342" + ) + @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); + } } } diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java index ffc3ed2ca8..58dac9e412 100644 --- a/runescape-client/src/main/java/Skills.java +++ b/runescape-client/src/main/java/Skills.java @@ -1,18 +1,23 @@ import 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("hx") +@ObfuscatedName("hu") @Implements("Skills") public class Skills { - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("Skills_enabled") public static final boolean[] Skills_enabled; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("Skills_experienceTable") public static int[] Skills_experienceTable; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 209893551 + ) + public static int field2723; 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}; @@ -28,42 +33,12 @@ public class Skills { } - @ObfuscatedName("as") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(ILcr;ZB)I", - garbageValue = "1" + signature = "(I)Lgj;", + garbageValue = "1350642398" ) - static int method4031(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - int var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - if (!Client.isCameraLocked) { - Client.camAngleX = var3; - Client.camAngleY = var4; - } - - return 1; - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camAngleX; - return 1; - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camAngleY; - return 1; - } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var3 < 0) { - var3 = 0; - } - - Client.camFollowHeight = var3; - return 1; - } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camFollowHeight; - return 1; - } else { - return 2; - } + public static PacketBufferNode method4100() { + return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; } } diff --git a/runescape-client/src/main/java/SoftWrapper.java b/runescape-client/src/main/java/SoftWrapper.java index c0ffaed3e0..0d71a3ba88 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("ez") +@ObfuscatedName("ee") @Implements("SoftWrapper") public class SoftWrapper extends Wrapper { - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("ref") SoftReference ref; @@ -15,13 +15,13 @@ public class SoftWrapper extends Wrapper { this.ref = new SoftReference(var1); } - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("get") Object get() { return this.ref.get(); } - @ObfuscatedName("j") + @ObfuscatedName("x") @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 0dcf95791f..b7f1454cc5 100644 --- a/runescape-client/src/main/java/SoundCache.java +++ b/runescape-client/src/main/java/SoundCache.java @@ -1,56 +1,45 @@ +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("dh") +@ObfuscatedName("dy") @Implements("SoundCache") public class SoundCache { - @ObfuscatedName("qo") + @ObfuscatedName("ni") @ObfuscatedSignature( - signature = "Ldd;" + signature = "[Lhy;" ) - @Export("pcmPlayer1") - static PcmPlayer pcmPlayer1; - @ObfuscatedName("d") - public static short[][] field1418; - @ObfuscatedName("f") - @ObfuscatedGetter( - intValue = -1949899187 - ) - static int field1424; - @ObfuscatedName("bv") + static Widget[] field1410; + @ObfuscatedName("v") + @Export("soundSystemExecutor") + static ScheduledExecutorService soundSystemExecutor; + @ObfuscatedName("lc") @ObfuscatedSignature( - signature = "[Lls;" + signature = "Lcv;" ) - @Export("worldSelectBackSprites") - static Sprite[] worldSelectBackSprites; - @ObfuscatedName("df") - @ObfuscatedSignature( - signature = "Lid;" - ) - @Export("archive19") - static Archive archive19; - @ObfuscatedName("s") + @Export("tempMenuAction") + static MenuAction tempMenuAction; + @ObfuscatedName("c") @ObfuscatedSignature( signature = "Lhz;" ) @Export("soundEffectIndex") AbstractArchive soundEffectIndex; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "Lhz;" ) @Export("musicSampleIndex") AbstractArchive musicSampleIndex; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "Llm;" ) @Export("musicSamples") NodeHashTable musicSamples; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "Llm;" ) @@ -67,10 +56,10 @@ public class SoundCache { this.musicSampleIndex = var2; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(II[II)Lco;", - garbageValue = "2104823387" + signature = "(II[II)Lcg;", + garbageValue = "-1638620781" ) @Export("getSoundEffect0") RawSound getSoundEffect0(int var1, int var2, int[] var3) { @@ -98,10 +87,10 @@ public class SoundCache { } } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(II[II)Lco;", - garbageValue = "-1528849608" + signature = "(II[II)Lcg;", + garbageValue = "-1622135466" ) @Export("getMusicSample0") RawSound getMusicSample0(int var1, int var2, int[] var3) { @@ -135,10 +124,10 @@ public class SoundCache { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I[II)Lco;", - garbageValue = "-743934209" + signature = "(I[II)Lcg;", + garbageValue = "-351115688" ) @Export("getSoundEffect") public RawSound getSoundEffect(int var1, int[] var2) { @@ -151,10 +140,10 @@ public class SoundCache { } } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I[IB)Lco;", - garbageValue = "-113" + signature = "(I[II)Lcg;", + garbageValue = "-1184184439" ) @Export("getMusicSample") public RawSound getMusicSample(int var1, int[] var2) { @@ -167,39 +156,46 @@ public class SoundCache { } } - @ObfuscatedName("ft") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "954967907" + signature = "(B)J", + garbageValue = "18" ) - @Export("playSong") - static void playSong(int var0) { - if (var0 == -1 && !Client.field858) { - class197.midiPcmStream.clear(); - class197.field2378 = 1; - WorldMapDecoration.musicTrackArchive = null; - } else if (var0 != -1 && var0 != Client.field857 && Client.field856 != 0 && !Client.field858) { - Projectile.method2040(2, GrandExchangeEvent.archive6, var0, 0, Client.field856, false); + public static final synchronized long method2480() { + long var0 = System.currentTimeMillis(); + if (var0 < class296.field3680) { + class296.field3681 += class296.field3680 - var0; } - Client.field857 = var0; + class296.field3680 = var0; + return class296.field3681 + var0; } - @ObfuscatedName("kt") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(Lhp;IIII)V", - garbageValue = "-1061413321" + signature = "(I)I", + garbageValue = "-1565845454" ) - @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) { - class32.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); - } + static final int method2479() { + return ViewportMouse.ViewportMouse_x; + } - } + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "(IIII)I", + garbageValue = "118252239" + ) + static final int method2467(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 = DevicePcmPlayerProvider.method811(var3, var5); + int var8 = DevicePcmPlayerProvider.method811(var3 + 1, var5); + int var9 = DevicePcmPlayerProvider.method811(var3, var5 + 1); + int var10 = DevicePcmPlayerProvider.method811(var3 + 1, var5 + 1); + int var11 = class65.method1171(var7, var8, var4, var2); + int var12 = class65.method1171(var9, var10, var4, var2); + return class65.method1171(var11, var12, var6, var2); } } diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java index 8fa202a6a2..556686460f 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("ca") +@ObfuscatedName("cp") @Implements("SoundEffect") public class SoundEffect { - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "[Ldn;" + signature = "[Ldw;" ) @Export("instruments") Instrument[] instruments; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("start") int start; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("end") int end; @ObfuscatedSignature( - signature = "(Lky;)V" + signature = "(Lkz;)V" ) SoundEffect(Buffer var1) { this.instruments = new Instrument[10]; @@ -38,9 +38,9 @@ public class SoundEffect { this.end = var1.readUnsignedShort(); } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "()Lco;" + signature = "()Lcg;" ) @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("i") + @ObfuscatedName("t") @Export("calculateDelay") public final int calculateDelay() { int var1 = 9999999; @@ -83,7 +83,7 @@ public class SoundEffect { } } - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("mix") final byte[] mix() { int var1 = 0; @@ -122,9 +122,9 @@ public class SoundEffect { } } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lhz;II)Lca;" + signature = "(Lhz;II)Lcp;" ) @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 1c42234024..13932468b8 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("dv") +@ObfuscatedName("do") @Implements("SoundEnvelope") public class SoundEnvelope { - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("segments") int segments; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("durations") int[] durations; - @ObfuscatedName("i") + @ObfuscatedName("g") @Export("phases") int[] phases; - @ObfuscatedName("k") + @ObfuscatedName("l") @Export("start") int start; @ObfuscatedName("u") @Export("end") int end; - @ObfuscatedName("n") + @ObfuscatedName("j") @Export("form") int form; - @ObfuscatedName("t") + @ObfuscatedName("v") @Export("ticks") int ticks; - @ObfuscatedName("q") + @ObfuscatedName("d") @Export("phaseIndex") int phaseIndex; - @ObfuscatedName("d") + @ObfuscatedName("z") @Export("step") int step; - @ObfuscatedName("f") + @ObfuscatedName("n") @Export("amplitude") int amplitude; - @ObfuscatedName("c") + @ObfuscatedName("h") @Export("max") int max; @@ -50,9 +50,9 @@ public class SoundEnvelope { this.phases[1] = 65535; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lky;)V" + signature = "(Lkz;)V" ) @Export("decode") final void decode(Buffer var1) { @@ -62,9 +62,9 @@ public class SoundEnvelope { this.decodeSegments(var1); } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lky;)V" + signature = "(Lkz;)V" ) @Export("decodeSegments") final void decodeSegments(Buffer var1) { @@ -79,7 +79,7 @@ public class SoundEnvelope { } - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("reset") final void reset() { this.ticks = 0; @@ -89,7 +89,7 @@ public class SoundEnvelope { this.max = 0; } - @ObfuscatedName("k") + @ObfuscatedName("g") @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 d47e59c034..2fa0b7e385 100644 --- a/runescape-client/src/main/java/SoundSystem.java +++ b/runescape-client/src/main/java/SoundSystem.java @@ -1,26 +1,17 @@ -import java.io.File; -import java.io.IOException; -import java.io.RandomAccessFile; -import java.lang.reflect.Field; -import java.lang.reflect.Method; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; -@ObfuscatedName("da") +@ObfuscatedName("dm") @Implements("SoundSystem") public class SoundSystem implements Runnable { - @ObfuscatedName("bs") - @ObfuscatedGetter( - intValue = -73516399 - ) - static int field1414; - @ObfuscatedName("s") + @ObfuscatedName("j") + @Export("SpriteBuffer_spriteHeights") + public static int[] SpriteBuffer_spriteHeights; + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "[Ldd;" + signature = "[Ldh;" ) @Export("players") volatile PcmPlayer[] players; @@ -38,209 +29,8 @@ public class SoundSystem implements Runnable { } } } catch (Exception var4) { - class3.RunException_sendStackTrace((String)null, var4); + class188.RunException_sendStackTrace((String)null, var4); } } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(Lky;II)V", - garbageValue = "-1145796075" - ) - @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] = UserComparator4.loadClassFromDescriptor(var8[var12]); - } - - Class var22 = UserComparator4.loadClassFromDescriptor(var20); - if (UserComparator4.loadClassFromDescriptor(var5).getClassLoader() == null) { - throw new SecurityException(); - } - - Method[] var13 = UserComparator4.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 (var17.length == var21.length) { - boolean var18 = true; - - for (int var19 = 0; var19 < var21.length; ++var19) { - if (var17[var19] != var21[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 (UserComparator4.loadClassFromDescriptor(var5).getClassLoader() == null) { - throw new SecurityException(); - } - - var2.fields[var3] = Reflection.findField(UserComparator4.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; - } - } - - class96.reflectionChecks.addFirst(var2); - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-27" - ) - public static void method2417() { - try { - File var0 = new File(FontName.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 < Login.field1181.length; ++var1) { - for (var2 = 0; var2 < GrandExchangeEvent.field47.length; ++var2) { - File var3 = new File(GrandExchangeEvent.field47[var2] + Login.field1181[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) { - } - - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "(Lbl;Lbl;IZI)I", - garbageValue = "-295284349" - ) - @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.method1689() ? (var1.method1689() ? 0 : 1) : (var1.method1689() ? -1 : 0); - } else if (var2 == 5) { - return var0.method1687() ? (var1.method1687() ? 0 : 1) : (var1.method1687() ? -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/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java index c71ec78603..7a5b5ec817 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -4,96 +4,90 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("il") +@ObfuscatedName("im") @Implements("SpotAnimationDefinition") public class SpotAnimationDefinition extends DualNode { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "Lhz;" ) @Export("SpotAnimationDefinition_archive") public static AbstractArchive SpotAnimationDefinition_archive; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "Lhz;" ) @Export("SpotAnimationDefinition_modelArchive") public static AbstractArchive SpotAnimationDefinition_modelArchive; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("SpotAnimationDefinition_cached") - static EvictingDualNodeHashTable SpotAnimationDefinition_cached; - @ObfuscatedName("k") + public static EvictingDualNodeHashTable SpotAnimationDefinition_cached; + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("SpotAnimationDefinition_cachedModels") - static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; - @ObfuscatedName("ax") - @ObfuscatedSignature( - signature = "Llg;" - ) - @Export("rasterProvider") - public static AbstractRasterProvider rasterProvider; - @ObfuscatedName("u") + public static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 320838719 + intValue = -1511616539 ) @Export("id") int id; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1719895913 + intValue = 1772514951 ) @Export("archive") int archive; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -17026775 + intValue = -1013743627 ) @Export("sequence") public int sequence; - @ObfuscatedName("q") + @ObfuscatedName("v") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("x") + @ObfuscatedName("d") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("d") + @ObfuscatedName("z") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("f") + @ObfuscatedName("n") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 197223751 + intValue = -193898345 ) @Export("widthScale") int widthScale; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 651694427 + intValue = 1030509965 ) @Export("heightScale") int heightScale; - @ObfuscatedName("y") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1190331459 + intValue = -967824705 ) @Export("orientation") int orientation; @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -963659109 + intValue = 150676553 ) @Export("ambient") int ambient; - @ObfuscatedName("b") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 140228823 + intValue = -844670327 ) @Export("contrast") int contrast; @@ -112,10 +106,10 @@ public class SpotAnimationDefinition extends DualNode { this.contrast = 0; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lky;I)V", - garbageValue = "-2093778900" + signature = "(Lkz;I)V", + garbageValue = "-122623445" ) @Export("decode") void decode(Buffer var1) { @@ -129,10 +123,10 @@ public class SpotAnimationDefinition extends DualNode { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lky;II)V", - garbageValue = "-565062969" + signature = "(Lkz;IB)V", + garbageValue = "6" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -176,10 +170,10 @@ public class SpotAnimationDefinition extends DualNode { } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(II)Ldo;", - garbageValue = "-1744649720" + signature = "(II)Ldr;", + garbageValue = "-669692165" ) @Export("getModel") public final Model getModel(int var1) { @@ -209,7 +203,7 @@ public class SpotAnimationDefinition extends DualNode { Model var5; if (this.sequence != -1 && var1 != -1) { - var5 = Widget.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); + var5 = class83.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); } else { var5 = var2.toSharedSpotAnimationModel(true); } @@ -237,89 +231,4 @@ public class SpotAnimationDefinition extends DualNode { return var5; } - - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "(Lky;Ljava/lang/String;S)I", - garbageValue = "313" - ) - public static int method4334(Buffer var0, String var1) { - int var2 = var0.offset; - int var4 = var1.length(); - byte[] var5 = new byte[var4]; - - for (int var6 = 0; var6 < var4; ++var6) { - char var7 = var1.charAt(var6); - if ((var7 <= 0 || var7 >= 128) && (var7 < 160 || var7 > 255)) { - if (var7 == 8364) { - var5[var6] = -128; - } else if (var7 == 8218) { - var5[var6] = -126; - } else if (var7 == 402) { - var5[var6] = -125; - } else if (var7 == 8222) { - var5[var6] = -124; - } else if (var7 == 8230) { - var5[var6] = -123; - } else if (var7 == 8224) { - var5[var6] = -122; - } else if (var7 == 8225) { - var5[var6] = -121; - } else if (var7 == 710) { - var5[var6] = -120; - } else if (var7 == 8240) { - var5[var6] = -119; - } else if (var7 == 352) { - var5[var6] = -118; - } else if (var7 == 8249) { - var5[var6] = -117; - } else if (var7 == 338) { - var5[var6] = -116; - } else if (var7 == 381) { - var5[var6] = -114; - } else if (var7 == 8216) { - var5[var6] = -111; - } else if (var7 == 8217) { - var5[var6] = -110; - } else if (var7 == 8220) { - var5[var6] = -109; - } else if (var7 == 8221) { - var5[var6] = -108; - } else if (var7 == 8226) { - var5[var6] = -107; - } else if (var7 == 8211) { - var5[var6] = -106; - } else if (var7 == 8212) { - var5[var6] = -105; - } else if (var7 == 732) { - var5[var6] = -104; - } else if (var7 == 8482) { - var5[var6] = -103; - } else if (var7 == 353) { - var5[var6] = -102; - } else if (var7 == 8250) { - var5[var6] = -101; - } else if (var7 == 339) { - var5[var6] = -100; - } else if (var7 == 382) { - var5[var6] = -98; - } else if (var7 == 376) { - var5[var6] = -97; - } else { - var5[var6] = 63; - } - } else { - var5[var6] = (byte)var7; - } - } - - var0.writeSmartByteShort(var5.length); - var0.offset += class210.huffman.compress(var5, 0, var5.length, var0.array, var0.offset); - return var0.offset - var2; - } - - @ObfuscatedName("j") - public static boolean method4333(long var0) { - return 0L != var0 && !WorldMapLabelSize.method186(var0); - } } diff --git a/runescape-client/src/main/java/Sprite.java b/runescape-client/src/main/java/Sprite.java index 39182613aa..5feb3317ae 100644 --- a/runescape-client/src/main/java/Sprite.java +++ b/runescape-client/src/main/java/Sprite.java @@ -3,28 +3,28 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ls") +@ObfuscatedName("li") @Implements("Sprite") public final class Sprite extends Rasterizer2D { - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("pixels") public int[] pixels; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("subWidth") public int subWidth; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("subHeight") public int subHeight; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("xOffset") public int xOffset; - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("yOffset") int yOffset; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("width") public int width; - @ObfuscatedName("t") + @ObfuscatedName("j") @Export("height") public int height; @@ -43,9 +43,9 @@ public final class Sprite extends Rasterizer2D { Sprite() { } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "()Lls;" + signature = "()Lli;" ) @Export("mirrorHorizontally") public Sprite mirrorHorizontally() { @@ -64,9 +64,9 @@ public final class Sprite extends Rasterizer2D { return var1; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "()Lls;" + signature = "()Lli;" ) @Export("copyNormalized") public Sprite copyNormalized() { @@ -81,13 +81,13 @@ public final class Sprite extends Rasterizer2D { return var1; } - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("setRaster") public void setRaster() { Rasterizer2D.Rasterizer2D_replace(this.pixels, this.subWidth, this.subHeight); } - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("normalize") public void normalize() { if (this.subWidth != this.width || this.subHeight != this.height) { @@ -107,7 +107,7 @@ public final class Sprite extends Rasterizer2D { } } - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("pad") public void pad(int var1) { if (this.subWidth != this.width || this.subHeight != this.height) { @@ -149,7 +149,7 @@ public final class Sprite extends Rasterizer2D { } } - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("flipHorizontally") public void flipHorizontally() { int[] var1 = new int[this.subWidth * this.subHeight]; @@ -165,7 +165,7 @@ public final class Sprite extends Rasterizer2D { this.xOffset = this.width - this.subWidth - this.xOffset; } - @ObfuscatedName("t") + @ObfuscatedName("j") @Export("flipVertically") public void flipVertically() { int[] var1 = new int[this.subWidth * this.subHeight]; @@ -181,7 +181,7 @@ public final class Sprite extends Rasterizer2D { this.yOffset = this.height - this.subHeight - this.yOffset; } - @ObfuscatedName("q") + @ObfuscatedName("v") @Export("outline") public void outline(int var1) { int[] var2 = new int[this.subWidth * this.subHeight]; @@ -209,7 +209,7 @@ public final class Sprite extends Rasterizer2D { this.pixels = var2; } - @ObfuscatedName("x") + @ObfuscatedName("d") @Export("shadow") public void shadow(int var1) { for (int var2 = this.subHeight - 1; var2 > 0; --var2) { @@ -224,7 +224,7 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("d") + @ObfuscatedName("z") @Export("drawAt") public void drawAt(int var1, int var2) { var1 += this.xOffset; @@ -270,7 +270,7 @@ public final class Sprite extends Rasterizer2D { } } - @ObfuscatedName("c") + @ObfuscatedName("p") @Export("drawTransBgAt") public void drawTransBgAt(int var1, int var2) { var1 += this.xOffset; @@ -316,7 +316,7 @@ public final class Sprite extends Rasterizer2D { } } - @ObfuscatedName("y") + @ObfuscatedName("i") @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 Sprite extends Rasterizer2D { } } - @ObfuscatedName("g") + @ObfuscatedName("r") @Export("drawTransOverlayAt") public void drawTransOverlayAt(int var1, int var2, int var3, int var4) { if (var3 == 256) { @@ -431,7 +431,7 @@ public final class Sprite extends Rasterizer2D { } } - @ObfuscatedName("z") + @ObfuscatedName("w") @Export("drawTransAt") public void drawTransAt(int var1, int var2, int var3) { var1 += this.xOffset; @@ -477,7 +477,7 @@ public final class Sprite extends Rasterizer2D { } } - @ObfuscatedName("l") + @ObfuscatedName("o") @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 Sprite extends Rasterizer2D { } } - @ObfuscatedName("v") - public void method6014(int var1, int var2, int var3) { + @ObfuscatedName("b") + public void method6096(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 Sprite extends Rasterizer2D { if (var7 > 0 && var6 > 0) { if (var3 == 256) { - method6067(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); + method6097(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); } else { - method6016(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); + method6098(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); } } } - @ObfuscatedName("av") - public void method6017(int var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("ao") + public void method6099(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 Sprite extends Rasterizer2D { } if (var5 == 256) { - method6088(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); + method6100(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); } else { - method6019(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); + method6162(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); } } } - @ObfuscatedName("af") - public void method6020(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { + @ObfuscatedName("al") + public void method6102(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 Sprite extends Rasterizer2D { } - @ObfuscatedName("az") + @ObfuscatedName("as") @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 Sprite extends Rasterizer2D { } - @ObfuscatedName("aj") - public void method6022(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { + @ObfuscatedName("ad") + public void method6104(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 Sprite extends Rasterizer2D { } - @ObfuscatedName("an") - public void method6023(int var1, int var2, int var3, int var4) { - this.method6024(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); + @ObfuscatedName("ap") + public void method6105(int var1, int var2, int var3, int var4) { + this.method6114(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); } - @ObfuscatedName("at") - void method6024(int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("ax") + void method6114(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 Sprite extends Rasterizer2D { } } - @ObfuscatedName("as") + @ObfuscatedName("aj") @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 Sprite extends Rasterizer2D { } } - @ObfuscatedName("f") + @ObfuscatedName("s") @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 Sprite extends Rasterizer2D { } - @ObfuscatedName("r") + @ObfuscatedName("e") @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 Sprite extends Rasterizer2D { } - @ObfuscatedName("p") + @ObfuscatedName("q") @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 Sprite extends Rasterizer2D { } - @ObfuscatedName("e") + @ObfuscatedName("k") @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 Sprite extends Rasterizer2D { } - @ObfuscatedName("w") + @ObfuscatedName("m") @Export("Sprite_drawTransparent") static void Sprite_drawTransparent(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { int var10 = 256 - var9; @@ -1527,7 +1527,7 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("h") + @ObfuscatedName("a") @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 Sprite extends Rasterizer2D { } - @ObfuscatedName("m") - static void method6067(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("ag") + static void method6097(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 Sprite extends Rasterizer2D { } - @ObfuscatedName("o") - static void method6016(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("at") + static void method6098(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 Sprite extends Rasterizer2D { } - @ObfuscatedName("am") - static void method6088(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("av") + static void method6100(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 Sprite extends Rasterizer2D { } - @ObfuscatedName("ai") - static void method6019(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("an") + static void method6162(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/SpriteMask.java b/runescape-client/src/main/java/SpriteMask.java index 91e089396d..60139a76ab 100644 --- a/runescape-client/src/main/java/SpriteMask.java +++ b/runescape-client/src/main/java/SpriteMask.java @@ -4,27 +4,25 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hg") +@ObfuscatedName("hi") @Implements("SpriteMask") public class SpriteMask extends DualNode { - @ObfuscatedName("cu") - public static char field2499; - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1889581331 + intValue = 1779870231 ) @Export("width") public final int width; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -300799133 + intValue = 368220397 ) @Export("height") public final int height; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("xWidths") public final int[] xWidths; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("xStarts") public final int[] xStarts; @@ -35,10 +33,10 @@ public class SpriteMask extends DualNode { this.xStarts = var4; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(III)Z", - garbageValue = "-1169016407" + garbageValue = "1440865418" ) @Export("contains") public boolean contains(int var1, int var2) { @@ -51,14 +49,4 @@ public class SpriteMask extends DualNode { return false; } - - @ObfuscatedName("jm") - @ObfuscatedSignature( - signature = "(ZB)V", - garbageValue = "57" - ) - @Export("setTapToDrop") - static void setTapToDrop(boolean var0) { - Client.tapToDrop = var0; - } } diff --git a/runescape-client/src/main/java/Strings.java b/runescape-client/src/main/java/Strings.java index 3d646397cb..bdb27419ef 100644 --- a/runescape-client/src/main/java/Strings.java +++ b/runescape-client/src/main/java/Strings.java @@ -1,25 +1,240 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ht") +@ObfuscatedName("he") @Implements("Strings") public class Strings { - @ObfuscatedName("bn") - public static String field2992; - @ObfuscatedName("cg") - public static String field2831; - @ObfuscatedName("ji") - public static String field3007; - @ObfuscatedName("jd") + @ObfuscatedName("bp") + public static String field2863; + @ObfuscatedName("cs") + public static String field3016; + @ObfuscatedName("jc") public static String field3008; - @ObfuscatedName("jr") - public static String field3009; + @ObfuscatedName("jg") + public static String field2966; + @ObfuscatedName("jl") + public static String field2844; static { - field2992 = "Please visit the support page for assistance."; - field2831 = "Please visit the support page for assistance."; - field3007 = ""; - field3008 = "Page has opened in a new window."; - field3009 = "(Please check your popup blocker.)"; + field2863 = "Please visit the support page for assistance."; + field3016 = "Please visit the support page for assistance."; + field3008 = ""; + field2966 = "Page has opened in a new window."; + field2844 = "(Please check your popup blocker.)"; + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(IIILfw;Lfj;I)Z", + garbageValue = "2096775897" + ) + static final boolean method4103(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; + class173.directions[var7][var8] = 99; + class173.distances[var7][var8] = 0; + byte var11 = 0; + int var12 = 0; + class173.bufferX[var11] = var0; + int var20 = var11 + 1; + class173.bufferY[var11] = var1; + int[][] var13 = var4.flags; + + while (true) { + label303: + while (true) { + int var14; + int var15; + int var16; + int var17; + int var18; + int var19; + do { + do { + do { + label280: + do { + if (var20 == var12) { + class173.field2063 = var5; + class173.field2068 = var6; + return false; + } + + var5 = class173.bufferX[var12]; + var6 = class173.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)) { + class173.field2063 = var5; + class173.field2068 = var6; + return true; + } + + var16 = class173.distances[var18][var19] + 1; + if (var18 > 0 && class173.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) { + class173.bufferX[var20] = var5 - 1; + class173.bufferY[var20] = var6; + var20 = var20 + 1 & 4095; + class173.directions[var18 - 1][var19] = 2; + class173.distances[var18 - 1][var19] = var16; + break; + } + + if ((var13[var14 - 1][var17 + var15] & 19136830) != 0) { + break; + } + + ++var17; + } + } + + if (var18 < 128 - var2 && class173.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) { + class173.bufferX[var20] = var5 + 1; + class173.bufferY[var20] = var6; + var20 = var20 + 1 & 4095; + class173.directions[var18 + 1][var19] = 8; + class173.distances[var18 + 1][var19] = var16; + break; + } + + if ((var13[var14 + var2][var17 + var15] & 19136995) != 0) { + break; + } + + ++var17; + } + } + + if (var19 > 0 && class173.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) { + class173.bufferX[var20] = var5; + class173.bufferY[var20] = var6 - 1; + var20 = var20 + 1 & 4095; + class173.directions[var18][var19 - 1] = 1; + class173.distances[var18][var19 - 1] = var16; + break; + } + + if ((var13[var17 + var14][var15 - 1] & 19136911) != 0) { + break; + } + + ++var17; + } + } + + if (var19 < 128 - var2 && class173.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) { + class173.bufferX[var20] = var5; + class173.bufferY[var20] = var6 + 1; + var20 = var20 + 1 & 4095; + class173.directions[var18][var19 + 1] = 4; + class173.distances[var18][var19 + 1] = var16; + break; + } + + if ((var13[var17 + var14][var15 + var2] & 19137016) != 0) { + break; + } + + ++var17; + } + } + + if (var18 > 0 && var19 > 0 && class173.directions[var18 - 1][var19 - 1] == 0 && (var13[var14 - 1][var15 - 1] & 19136782) == 0) { + var17 = 1; + + while (true) { + if (var17 >= var2) { + class173.bufferX[var20] = var5 - 1; + class173.bufferY[var20] = var6 - 1; + var20 = var20 + 1 & 4095; + class173.directions[var18 - 1][var19 - 1] = 3; + class173.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 && class173.directions[var18 + 1][var19 - 1] == 0 && (var13[var14 + var2][var15 - 1] & 19136899) == 0) { + var17 = 1; + + while (true) { + if (var17 >= var2) { + class173.bufferX[var20] = var5 + 1; + class173.bufferY[var20] = var6 - 1; + var20 = var20 + 1 & 4095; + class173.directions[var18 + 1][var19 - 1] = 9; + class173.distances[var18 + 1][var19 - 1] = var16; + break; + } + + if ((var13[var14 + var2][var17 + (var15 - 1)] & 19136995) != 0 || (var13[var14 + var17][var15 - 1] & 19136911) != 0) { + break; + } + + ++var17; + } + } + + if (var18 > 0 && var19 < 128 - var2 && class173.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 label280; + } + } + + class173.bufferX[var20] = var5 - 1; + class173.bufferY[var20] = var6 + 1; + var20 = var20 + 1 & 4095; + class173.directions[var18 - 1][var19 + 1] = 6; + class173.distances[var18 - 1][var19 + 1] = var16; + } + } while(var18 >= 128 - var2); + } while(var19 >= 128 - var2); + } while(class173.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 label303; + } + } + + class173.bufferX[var20] = var5 + 1; + class173.bufferY[var20] = var6 + 1; + var20 = var20 + 1 & 4095; + class173.directions[var18 + 1][var19 + 1] = 12; + class173.distances[var18 + 1][var19 + 1] = var16; + } + } } } diff --git a/runescape-client/src/main/java/StructDefinition.java b/runescape-client/src/main/java/StructDefinition.java index bc853f115d..3ab209295e 100644 --- a/runescape-client/src/main/java/StructDefinition.java +++ b/runescape-client/src/main/java/StructDefinition.java @@ -3,24 +3,24 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ix") +@ObfuscatedName("iv") @Implements("StructDefinition") public class StructDefinition extends DualNode { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "Lhz;" ) @Export("StructDefinition_archive") - public static AbstractArchive StructDefinition_archive; - @ObfuscatedName("j") + static AbstractArchive StructDefinition_archive; + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("StructDefinition_cached") public static EvictingDualNodeHashTable StructDefinition_cached; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lln;" + signature = "Llj;" ) @Export("params") IterableNodeHashTable params; @@ -32,19 +32,19 @@ public class StructDefinition extends DualNode { StructDefinition() { } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "658327081" + signature = "(B)V", + garbageValue = "115" ) @Export("postDecode") void postDecode() { } - @ObfuscatedName("i") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lky;I)V", - garbageValue = "1747756287" + signature = "(Lkz;I)V", + garbageValue = "583710412" ) @Export("decode") void decode(Buffer var1) { @@ -58,15 +58,15 @@ public class StructDefinition extends DualNode { } } - @ObfuscatedName("k") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(Lky;II)V", - garbageValue = "120190923" + signature = "(Lkz;II)V", + garbageValue = "-636119543" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 249) { - this.params = DynamicObject.readStringIntParameters(var1, this.params); + this.params = FloorOverlayDefinition.readStringIntParameters(var1, this.params); } } @@ -74,134 +74,81 @@ public class StructDefinition extends DualNode { @ObfuscatedName("u") @ObfuscatedSignature( signature = "(III)I", - garbageValue = "1830789518" + garbageValue = "-2063775576" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { + return class65.method1177(this.params, var1, var2); + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(ILjava/lang/String;I)Ljava/lang/String;", + garbageValue = "915337596" + ) + @Export("getStringParam") + public String getStringParam(int var1, String var2) { IterableNodeHashTable var4 = this.params; - int var3; + String var3; if (var4 == null) { var3 = var2; } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); + ObjectNode var5 = (ObjectNode)var4.get((long)var1); if (var5 == null) { var3 = var2; } else { - var3 = var5.integer; + var3 = (String)var5.obj; } } return var3; } - @ObfuscatedName("n") + @ObfuscatedName("jm") @ObfuscatedSignature( - signature = "(ILjava/lang/String;B)Ljava/lang/String;", - garbageValue = "50" + signature = "(Lbw;ZI)V", + garbageValue = "1941630609" ) - @Export("getStringParam") - public String getStringParam(int var1, String var2) { - return class227.method4041(this.params, var1, var2); - } + @Export("closeInterface") + static final void closeInterface(InterfaceParent var0, boolean var1) { + int var2 = var0.group; + int var3 = (int)var0.key; + var0.remove(); + if (var1) { + TileItemPile.method2728(var2); + } - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "(II)Lio;", - garbageValue = "-431406721" - ) - @Export("HitSplatDefinition_get") - public static HitSplatDefinition HitSplatDefinition_get(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)); + WorldMapSectionType.method224(var2); + Widget var4 = Player.getWidget(var3); + if (var4 != null) { + WorldMapID.invalidateWidget(var4); + } + + for (int var5 = 0; var5 < Client.menuOptionsCount; ++var5) { + int var7 = Client.menuOpcodes[var5]; + boolean var6 = var7 == 57 || var7 == 58 || var7 == 1007 || var7 == 25 || var7 == 30; + if (var6) { + if (var5 < Client.menuOptionsCount - 1) { + for (int var8 = var5; var8 < Client.menuOptionsCount - 1; ++var8) { + Client.menuActions[var8] = Client.menuActions[var8 + 1]; + Client.menuTargets[var8] = Client.menuTargets[var8 + 1]; + Client.menuOpcodes[var8] = Client.menuOpcodes[var8 + 1]; + Client.menuIdentifiers[var8] = Client.menuIdentifiers[var8 + 1]; + Client.menuArguments1[var8] = Client.menuArguments1[var8 + 1]; + Client.menuArguments2[var8] = Client.menuArguments2[var8 + 1]; + Client.menuShiftClick[var8] = Client.menuShiftClick[var8 + 1]; + } + } + + --var5; + --Client.menuOptionsCount; } - - HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); - return var1; } - } - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(CI)C", - garbageValue = "-2066919022" - ) - static char method4449(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); + WorldMapRegion.calculateMenuBounds(); + if (Client.rootInterface != -1) { + WorldMapRectangle.runIntfCloseListeners(Client.rootInterface, 1); } + } } diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java index 6b1d76fb60..e59a974815 100644 --- a/runescape-client/src/main/java/StudioGame.java +++ b/runescape-client/src/main/java/StudioGame.java @@ -1,58 +1,56 @@ -import java.awt.Desktop; -import java.awt.Desktop.Action; -import java.net.URI; +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("hv") +@ObfuscatedName("ht") @Implements("StudioGame") public enum StudioGame implements Enumerated { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lhv;" + signature = "Lht;" ) @Export("runescape") runescape("runescape", "RuneScape", 0), - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lhv;" + signature = "Lht;" ) @Export("stellardawn") stellardawn("stellardawn", "Stellar Dawn", 1), - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lhv;" + signature = "Lht;" ) @Export("game3") game3("game3", "Game 3", 2), - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lhv;" + signature = "Lht;" ) @Export("game4") game4("game4", "Game 4", 3), - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Lhv;" + signature = "Lht;" ) @Export("game5") game5("game5", "Game 5", 4), - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lhv;" + signature = "Lht;" ) @Export("oldscape") oldscape("oldscape", "RuneScape 2007", 5); - @ObfuscatedName("t") + @ObfuscatedName("j") @Export("name") public final String name; - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1258776417 + intValue = 933814381 ) @Export("id") final int id; @@ -62,338 +60,72 @@ public enum StudioGame implements Enumerated { this.id = var5; } - @ObfuscatedName("j") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-32" + signature = "(I)I", + garbageValue = "-1410702910" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "(II)Lie;", - garbageValue = "1021508128" - ) - @Export("FloorUnderlayDefinition_get") - public static FloorUnderlayDefinition FloorUnderlayDefinition_get(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); - } + @ObfuscatedName("t") + @Export("base37DecodeLong") + public static String base37DecodeLong(long var0) { + if (var0 > 0L && var0 < 6582952005840035281L) { + if (0L == var0 % 37L) { + return null; + } else { + int var2 = 0; - var1.postDecode(); - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); - return var1; + 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 = class288.base37Table[(int)(var6 - var0 * 37L)]; + 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("i") + @ObfuscatedName("gc") @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZLjava/lang/String;ZB)V", - garbageValue = "4" + signature = "(ZI)V", + garbageValue = "-508732522" ) - static void method4056(String var0, boolean var1, String var2, boolean var3) { - if (var1) { - if (!var3 && Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { + static final void method4131(boolean var0) { + ModelData0.playPcmPlayers(); + ++Client.packetWriter.pendingWrites; + if (Client.packetWriter.pendingWrites >= 50 || var0) { + Client.packetWriter.pendingWrites = 0; + if (!Client.field772 && Client.packetWriter.getSocket() != null) { + PacketBufferNode var1 = MenuAction.getPacketBufferNode(ClientPacket.field2185, Client.packetWriter.isaacCipher); + Client.packetWriter.addNode(var1); + try { - Desktop.getDesktop().browse(new URI(var0)); - return; - } catch (Exception var5) { + Client.packetWriter.flush(); + } catch (IOException var3) { + Client.field772 = true; } } - if (class51.field404.startsWith("win") && !var3) { - GrandExchangeOffer.method109(var0, 0); - return; - } - - if (class51.field404.startsWith("mac")) { - WorldMapSection0.method232(var0, 1, var2); - return; - } - - WorldMapSection0.method232(var0, 2, "openjs"); - } else { - GrandExchangeOffer.method109(var0, 3); } - - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(Lkx;II)V", - garbageValue = "-990783681" - ) - @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.field614 = false; - } else if (Client.localPlayerIndex == var1) { - throw new RuntimeException(); - } else { - Players.Players_regions[var1] = (var4.plane << 28) + (PacketWriter.baseX * 64 + var4.pathX[0] >> 13 << 14) + (RouteStrategy.baseY * 64 + var4.pathY[0] >> 13); - if (var4.field946 != -1) { - Players.Players_orientations[var1] = var4.field946; - } else { - Players.Players_orientations[var1] = var4.orientation; - } - - Players.Players_targetIndices[var1] = var4.targetIndex; - Client.players[var1] = null; - if (var0.readBits(1) != 0) { - WorldMapLabelSize.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) { - if (var2) { - var4.field614 = true; - var4.tileX = var6; - var4.tileY = var7; - } else { - var4.field614 = false; - var4.method1190(var6, var7, Players.field1230[var1]); - } - } else { - var4.resetPath(var6, var7); - var4.field614 = false; - } - - } 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.field614 = false; - } else if (var2) { - var4.field614 = true; - var4.tileX = var6; - var4.tileY = var7; - } else { - var4.field614 = false; - var4.method1190(var6, var7, Players.field1230[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) { - if (var2) { - var4.field614 = true; - var4.tileX = var10; - var4.tileY = var11; - } else { - var4.field614 = false; - var4.method1190(var10, var11, Players.field1230[var1]); - } - } else { - var4.resetPath(var10, var11); - var4.field614 = false; - } - - var4.plane = (byte)(var7 + var4.plane & 3); - if (Client.localPlayerIndex == var1) { - ItemContainer.plane = var4.plane; - } - - } else { - var6 = var0.readBits(30); - var7 = var6 >> 28; - var8 = var6 >> 14 & 16383; - var9 = var6 & 16383; - var10 = (PacketWriter.baseX * 64 + var8 + var4.pathX[0] & 16383) - PacketWriter.baseX * 64; - var11 = (RouteStrategy.baseY * 64 + var9 + var4.pathY[0] & 16383) - RouteStrategy.baseY * 64; - if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { - if (var2) { - var4.field614 = true; - var4.tileX = var10; - var4.tileY = var11; - } else { - var4.field614 = false; - var4.method1190(var10, var11, Players.field1230[var1]); - } - } else { - var4.resetPath(var10, var11); - var4.field614 = false; - } - - var4.plane = (byte)(var7 + var4.plane & 3); - if (Client.localPlayerIndex == var1) { - ItemContainer.plane = var4.plane; - } - - } - } - } - } - - @ObfuscatedName("fb") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-674863226" - ) - @Export("setWindowedMode") - static void setWindowedMode(int var0) { - Client.field836 = 0L; - if (var0 >= 2) { - Client.isResizable = true; - } else { - Client.isResizable = false; - } - - if (UserComparator7.getWindowedMode() == 1) { - WorldMapID.client.setMaxCanvasSize(765, 503); - } else { - WorldMapID.client.setMaxCanvasSize(7680, 2160); - } - - if (Client.gameState >= 25) { - WorldMapCacheName.method593(); - } - - } - - @ObfuscatedName("he") - @ObfuscatedSignature( - signature = "(IIIIIIIIIB)V", - garbageValue = "-114" - ) - @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; - WorldMapManager.method607(var9); - Client.pendingSpawns.addFirst(var9); - } - - var9.id = var4; - var9.field911 = var5; - var9.orientation = var6; - var9.delay = var7; - var9.hitpoints = var8; } } diff --git a/runescape-client/src/main/java/Task.java b/runescape-client/src/main/java/Task.java index 3a101d684d..108cb3d1c0 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("ft") +@ObfuscatedName("fc") @Implements("Task") public class Task { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lft;" + signature = "Lfc;" ) @Export("next") Task next; - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("status") public volatile int status; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 693617751 + intValue = -2110229229 ) @Export("type") int type; - @ObfuscatedName("t") + @ObfuscatedName("j") @Export("intArgument") public int intArgument; - @ObfuscatedName("q") + @ObfuscatedName("v") @Export("objectArgument") Object objectArgument; - @ObfuscatedName("x") + @ObfuscatedName("d") @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 f9e72a608b..c2d521f2c7 100644 --- a/runescape-client/src/main/java/TaskHandler.java +++ b/runescape-client/src/main/java/TaskHandler.java @@ -1,6 +1,4 @@ import java.io.DataInputStream; -import java.io.File; -import java.io.IOException; import java.net.InetAddress; import java.net.Socket; import java.net.URL; @@ -9,31 +7,31 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fu") +@ObfuscatedName("fq") @Implements("TaskHandler") public class TaskHandler implements Runnable { - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("javaVendor") public static String javaVendor; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("javaVersion") public static String javaVersion; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lft;" + signature = "Lfc;" ) @Export("current") Task current; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lft;" + signature = "Lfc;" ) @Export("task") Task task; - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("thread") Thread thread; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("isClosed") boolean isClosed; @@ -57,10 +55,10 @@ public class TaskHandler implements Runnable { this.thread.start(); } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1887947364" + signature = "(B)V", + garbageValue = "-72" ) @Export("close") public final void close() { @@ -76,10 +74,10 @@ public class TaskHandler implements Runnable { } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IIILjava/lang/Object;I)Lft;", - garbageValue = "1177256583" + signature = "(IIILjava/lang/Object;I)Lfc;", + garbageValue = "-1315009014" ) @Export("newTask") final Task newTask(int var1, int var2, int var3, Object var4) { @@ -100,20 +98,20 @@ public class TaskHandler implements Runnable { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Ljava/lang/String;IB)Lft;", - garbageValue = "-49" + signature = "(Ljava/lang/String;IS)Lfc;", + garbageValue = "-16284" ) @Export("newSocketTask") public final Task newSocketTask(String var1, int var2) { return this.newTask(1, var2, 0, var1); } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Ljava/lang/Runnable;IB)Lft;", - garbageValue = "1" + signature = "(Ljava/lang/Runnable;II)Lfc;", + garbageValue = "-1670540626" ) @Export("newThreadTask") public final Task newThreadTask(Runnable var1, int var2) { @@ -168,64 +166,96 @@ public class TaskHandler implements Runnable { } } - @ObfuscatedName("j") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)Z", - garbageValue = "-641292083" + signature = "(Lll;I)I", + garbageValue = "-428557907" ) - @Export("isNumber") - public static boolean isNumber(CharSequence var0) { - return class219.method4022(var0, 10, true); + public static final int method3464(LoginType var0) { + if (var0 == null) { + return 12; + } else { + switch(var0.field4033) { + case 7: + return 20; + default: + return 12; + } + } } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;ZI)Lmm;", - garbageValue = "929231118" + signature = "(II)Z", + garbageValue = "-1906197616" ) - @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) { + @Export("loadInterface") + public static boolean loadInterface(int var0) { + if (UserComparator3.Widget_loadedInterfaces[var0]) { + return true; + } else if (!ArchiveDiskActionHandler.Widget_archive.tryLoadGroup(var0)) { + return false; + } else { + int var1 = ArchiveDiskActionHandler.Widget_archive.getGroupFileCount(var0); + if (var1 == 0) { + UserComparator3.Widget_loadedInterfaces[var0] = true; + return true; + } else { + if (class289.Widget_interfaceComponents[var0] == null) { + class289.Widget_interfaceComponents[var0] = new Widget[var1]; + } + + for (int var2 = 0; var2 < var1; ++var2) { + if (class289.Widget_interfaceComponents[var0][var2] == null) { + byte[] var3 = ArchiveDiskActionHandler.Widget_archive.takeFile(var0, var2); + if (var3 != null) { + class289.Widget_interfaceComponents[var0][var2] = new Widget(); + class289.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); + if (var3[0] == -1) { + class289.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); + } else { + class289.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); + } + } + } + } + + UserComparator3.Widget_loadedInterfaces[var0] = true; + return true; } } + } - String var4 = ""; - if (InterfaceParent.cacheGamebuild == 33) { - var4 = "_rc"; - } else if (InterfaceParent.cacheGamebuild == 34) { - var4 = "_wip"; - } - - File var5 = new File(FontName.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) { + @ObfuscatedName("as") + @ObfuscatedSignature( + signature = "([BI)[B", + garbageValue = "1618033265" + ) + @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.field3120 != 0 && var3 > AbstractArchive.field3120) { throw new RuntimeException(); - } - } + } else if (var2 == 0) { + byte[] var4 = new byte[var3]; + var1.readBytes(var4, 0, var3); + return var4; + } else { + int var6 = var1.readInt(); + if (var6 >= 0 && (AbstractArchive.field3120 == 0 || var6 <= AbstractArchive.field3120)) { + byte[] var5 = new byte[var6]; + if (var2 == 1) { + BZip2Decompressor.BZip2Decompressor_decompress(var5, var6, var0, var3, 9); + } else { + AbstractArchive.gzipDecompressor.decompress(var1, var5); + } - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "-6" - ) - public static int method3411(int var0, int var1) { - int var2 = var0 >>> 31; - return (var0 + var2) / var1 - var2; + return var5; + } else { + throw new RuntimeException(); + } + } } } diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java index 95688d138b..62c62260ef 100644 --- a/runescape-client/src/main/java/Texture.java +++ b/runescape-client/src/main/java/Texture.java @@ -3,46 +3,46 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dk") +@ObfuscatedName("du") @Implements("Texture") public class Texture extends Node { @ObfuscatedName("p") @Export("Texture_animatedPixels") static int[] Texture_animatedPixels; - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("averageRGB") int averageRGB; - @ObfuscatedName("n") - boolean field1604; - @ObfuscatedName("t") + @ObfuscatedName("u") + boolean field1590; + @ObfuscatedName("j") @Export("fileIds") int[] fileIds; - @ObfuscatedName("q") - int[] field1607; - @ObfuscatedName("x") - int[] field1610; + @ObfuscatedName("v") + int[] field1594; @ObfuscatedName("d") - int[] field1599; - @ObfuscatedName("f") + int[] field1592; + @ObfuscatedName("z") + int[] field1600; + @ObfuscatedName("n") @Export("animationDirection") int animationDirection; - @ObfuscatedName("c") + @ObfuscatedName("h") @Export("animationSpeed") int animationSpeed; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("pixels") int[] pixels; - @ObfuscatedName("y") + @ObfuscatedName("s") @Export("isLoaded") boolean isLoaded; @ObfuscatedSignature( - signature = "(Lky;)V" + signature = "(Lkz;)V" ) Texture(Buffer var1) { this.isLoaded = false; this.averageRGB = var1.readUnsignedShort(); - this.field1604 = var1.readUnsignedByte() == 1; + this.field1590 = 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.field1607 = new int[var2 - 1]; + this.field1594 = new int[var2 - 1]; for (var3 = 0; var3 < var2 - 1; ++var3) { - this.field1607[var3] = var1.readUnsignedByte(); + this.field1594[var3] = var1.readUnsignedByte(); } } if (var2 > 1) { - this.field1610 = new int[var2 - 1]; + this.field1592 = new int[var2 - 1]; for (var3 = 0; var3 < var2 - 1; ++var3) { - this.field1610[var3] = var1.readUnsignedByte(); + this.field1592[var3] = var1.readUnsignedByte(); } } - this.field1599 = new int[var2]; + this.field1600 = new int[var2]; for (var3 = 0; var3 < var2; ++var3) { - this.field1599[var3] = var1.readInt(); + this.field1600[var3] = var1.readInt(); } this.animationDirection = var1.readUnsignedByte(); @@ -82,7 +82,7 @@ public class Texture extends Node { } } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(DILhz;)Z" ) @@ -101,26 +101,26 @@ public class Texture extends Node { for (int var6 = 0; var6 < this.fileIds.length; ++var6) { int var8 = this.fileIds[var6]; IndexedSprite var7; - if (!class290.SpriteBuffer_bufferFileFlat(var4, var8)) { + if (!PlayerType.SpriteBuffer_bufferFileFlat(var4, var8)) { var7 = null; } else { IndexedSprite var10 = new IndexedSprite(); - var10.width = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth; + var10.width = class325.SpriteBuffer_spriteWidth; var10.height = class325.SpriteBuffer_spriteHeight; var10.xOffset = class325.SpriteBuffer_xOffsets[0]; - var10.yOffset = class325.SpriteBuffer_yOffsets[0]; + var10.yOffset = SecureRandomCallable.SpriteBuffer_yOffsets[0]; var10.subWidth = class325.SpriteBuffer_spriteWidths[0]; - var10.subHeight = class225.SpriteBuffer_spriteHeights[0]; + var10.subHeight = SoundSystem.SpriteBuffer_spriteHeights[0]; var10.palette = class325.SpriteBuffer_spritePalette; - var10.pixels = WorldMapSection1.SpriteBuffer_pixels[0]; - UserComparator7.SpriteBuffer_clear(); + var10.pixels = InvDefinition.SpriteBuffer_pixels[0]; + class192.SpriteBuffer_clear(); var7 = var10; } var7.normalize(); byte[] var17 = var7.pixels; int[] var11 = var7.palette; - int var12 = this.field1599[var6]; + int var12 = this.field1600[var6]; if ((var12 & -16777216) == 16777216) { } @@ -151,7 +151,7 @@ public class Texture extends Node { if (var6 == 0) { var13 = 0; } else { - var13 = this.field1607[var6 - 1]; + var13 = this.field1594[var6 - 1]; } if (var13 == 0) { @@ -195,13 +195,13 @@ public class Texture extends Node { return true; } - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("reset") void reset() { this.pixels = null; } - @ObfuscatedName("i") + @ObfuscatedName("t") @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 90a2593c38..b145435aa4 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("eh") +@ObfuscatedName("eg") @Implements("TextureLoader") public interface TextureLoader { - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(II)[I", - garbageValue = "-414302740" + garbageValue = "-1189972175" ) @Export("getTexturePixels") int[] getTexturePixels(int var1); - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "87" + signature = "(II)I", + garbageValue = "168409140" ) @Export("getAverageTextureRGB") int getAverageTextureRGB(int var1); + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "(II)Z", + garbageValue = "1740870730" + ) + boolean vmethod3240(int var1); + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "-39304153" - ) - boolean vmethod3229(int var1); - - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "(IS)Z", - garbageValue = "17414" + garbageValue = "-1205212261" ) @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 7e0abef495..14e60b4ef7 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -7,40 +7,52 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("dt") @Implements("TextureProvider") public class TextureProvider implements TextureLoader { - @ObfuscatedName("s") + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -1924995775 + ) + @Export("Interpreter_stringStackSize") + static int Interpreter_stringStackSize; + @ObfuscatedName("dx") @ObfuscatedSignature( - signature = "[Ldk;" + signature = "Lio;" + ) + @Export("archive13") + static Archive archive13; + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "[Ldu;" ) @Export("textures") Texture[] textures; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Ljc;" + signature = "Ljv;" ) @Export("deque") NodeDeque deque; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -428424459 + intValue = 1017571935 ) @Export("capacity") int capacity; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 280831487 + intValue = -1253604875 ) @Export("remaining") int remaining; - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("brightness") double brightness; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 97407855 + intValue = -407607489 ) @Export("textureSize") int textureSize; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "Lhz;" ) @@ -71,10 +83,10 @@ public class TextureProvider implements TextureLoader { } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-1619815981" + signature = "(B)I", + garbageValue = "0" ) @Export("getLoadedPercentage") public int getLoadedPercentage() { @@ -90,7 +102,7 @@ public class TextureProvider implements TextureLoader { for (int var7 = 0; var7 < var6.length; ++var7) { int var8 = var6[var7]; - if (this.archive.method4066(var8)) { + if (this.archive.method4142(var8)) { ++var2; } } @@ -104,17 +116,17 @@ public class TextureProvider implements TextureLoader { } } - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("setBrightness") public void setBrightness(double var1) { this.brightness = var1; this.clear(); } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(II)[I", - garbageValue = "-414302740" + garbageValue = "-1189972175" ) @Export("getTexturePixels") public int[] getTexturePixels(int var1) { @@ -144,39 +156,39 @@ public class TextureProvider implements TextureLoader { return null; } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "87" + signature = "(II)I", + garbageValue = "168409140" ) @Export("getAverageTextureRGB") public int getAverageTextureRGB(int var1) { return this.textures[var1] != null ? this.textures[var1].averageRGB : 0; } + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "(II)Z", + garbageValue = "1740870730" + ) + public boolean vmethod3240(int var1) { + return this.textures[var1].field1590; + } + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "-39304153" - ) - public boolean vmethod3229(int var1) { - return this.textures[var1].field1604; - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "(IS)Z", - garbageValue = "17414" + garbageValue = "-1205212261" ) @Export("isLowDetail") public boolean isLowDetail(int var1) { return this.textureSize == 64; } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "222022788" + signature = "(B)V", + garbageValue = "0" ) @Export("clear") public void clear() { @@ -190,10 +202,10 @@ public class TextureProvider implements TextureLoader { this.remaining = this.capacity; } - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "162917811" + signature = "(IS)V", + garbageValue = "-1153" ) @Export("animate") public void animate(int var1) { @@ -206,4 +218,25 @@ public class TextureProvider implements TextureLoader { } } + + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", + garbageValue = "969491526" + ) + public static String method2727(CharSequence var0) { + return HealthBarDefinition.method4481('*', var0.length()); + } + + @ObfuscatedName("ig") + @ObfuscatedSignature( + signature = "(IIIIIIII)V", + garbageValue = "-1345116753" + ) + @Export("updateRootInterface") + static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (TaskHandler.loadInterface(var0)) { + Tiles.updateInterface(class289.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); + } + } } diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java index 280589a51a..a95177d793 100644 --- a/runescape-client/src/main/java/Tile.java +++ b/runescape-client/src/main/java/Tile.java @@ -4,134 +4,135 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("de") +@ObfuscatedName("dq") @Implements("Tile") public final class Tile extends Node { - @ObfuscatedName("nn") + @ObfuscatedName("ha") @ObfuscatedGetter( - intValue = -590587583 + intValue = -1915591411 ) - static int field1648; - @ObfuscatedName("s") + @Export("cameraYaw") + static int cameraYaw; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1576668311 + intValue = 255690453 ) @Export("plane") int plane; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -2142283815 - ) - @Export("x") - int x; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 22720331 + intValue = 1658035031 ) @Export("y") int y; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 322819535 + intValue = 518252243 + ) + @Export("x") + int x; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 2024380867 ) @Export("originalPlane") int originalPlane; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lef;" - ) - @Export("paint") - TilePaint paint; - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "Ldg;" - ) - @Export("model") - TileModel model; - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Ley;" - ) - @Export("boundaryObject") - BoundaryObject boundaryObject; - @ObfuscatedName("q") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "Lec;" ) + @Export("paint") + TilePaint paint; + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Ldv;" + ) + @Export("model") + TileModel model; + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "Lea;" + ) + @Export("boundaryObject") + BoundaryObject boundaryObject; + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "Les;" + ) @Export("wallDecoration") WallDecoration wallDecoration; - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Ldy;" + signature = "Ldb;" ) @Export("floorDecoration") FloorDecoration floorDecoration; - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Ldu;" + signature = "Ldc;" ) @Export("tileItemPile") TileItemPile tileItemPile; - @ObfuscatedName("f") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -76351175 + intValue = 342071413 ) @Export("gameObjectsCount") int gameObjectsCount; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "[Lej;" + signature = "[Lef;" ) @Export("gameObjects") GameObject[] gameObjects; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("gameObjectEdgeMasks") int[] gameObjectEdgeMasks; - @ObfuscatedName("y") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 832836189 + intValue = -247968309 ) @Export("gameObjectsEdgeMask") int gameObjectsEdgeMask; @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1717986561 + intValue = 1983266615 ) @Export("minPlane") int minPlane; - @ObfuscatedName("b") + @ObfuscatedName("e") @Export("drawPrimary") boolean drawPrimary; - @ObfuscatedName("g") + @ObfuscatedName("i") @Export("drawSecondary") boolean drawSecondary; - @ObfuscatedName("e") + @ObfuscatedName("q") @Export("drawGameObjects") boolean drawGameObjects; - @ObfuscatedName("z") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1859538339 + intValue = -1182393573 ) @Export("drawGameObjectEdges") int drawGameObjectEdges; - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -652671997 + intValue = 1178282289 ) - int field1637; + int field1632; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 340120719 + ) + int field1622; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1052800923 + intValue = 248240175 ) - int field1645; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 837010603 - ) - int field1636; - @ObfuscatedName("h") + int field1613; + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lde;" + signature = "Ldq;" ) @Export("linkedBelowTile") Tile linkedBelowTile; @@ -145,182 +146,346 @@ public final class Tile extends Node { this.y = var3; } - @ObfuscatedName("i") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "([Lbl;II[I[IB)V", - garbageValue = "-18" + signature = "(I)[Lho;", + garbageValue = "-1998452195" ) - @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 (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); - } - + public static ServerBuild[] method2830() { + return new ServerBuild[]{ServerBuild.RC, ServerBuild.LIVE, ServerBuild.WIP, ServerBuild.BUILDLIVE}; } - @ObfuscatedName("jj") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "([Lhp;II)V", - garbageValue = "1415111680" + signature = "(I)[Lht;", + garbageValue = "2061214511" ) - @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 || !WorldMapRectangle.isComponentHidden(var3))) { - if (var3.type == 0) { - if (!var3.isIf3 && WorldMapRectangle.isComponentHidden(var3) && var3 != class65.mousedOverWidgetIf1) { - continue; - } + public static StudioGame[] method2831() { + return new StudioGame[]{StudioGame.runescape, StudioGame.oldscape, StudioGame.game4, StudioGame.game3, StudioGame.game5, StudioGame.stellardawn}; + } - drawModelComponents(var0, var3.id); - if (var3.children != null) { - drawModelComponents(var3.children, var3.id); - } + @ObfuscatedName("aa") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "2091898372" + ) + @Export("runWidgetOnLoadListener") + static void runWidgetOnLoadListener(int var0) { + if (var0 != -1) { + if (TaskHandler.loadInterface(var0)) { + Widget[] var1 = class289.Widget_interfaceComponents[var0]; - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); - if (var4 != null) { - CollisionMap.drawInterfaceModelComponents(var4.group); + 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; + GameShell.runScript(var4, 5000000); } } - if (var3.type == 6) { - int var5; - if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { - boolean var7 = UserComparator10.runCs1(var3); - if (var7) { - var5 = var3.sequenceId2; - } else { - var5 = var3.sequenceId; + } + } + } + + @ObfuscatedName("fa") + @ObfuscatedSignature( + signature = "(Lbe;IB)V", + garbageValue = "2" + ) + @Export("calculateActorPosition") + static final void calculateActorPosition(Actor var0, int var1) { + int var3; + int var4; + int var11; + if (var0.field963 > Client.cycle) { + WorldMapSection2.method299(var0); + } else if (var0.field964 >= Client.cycle) { + Login.method2075(var0); + } else { + var0.movementSequence = var0.readySequence; + if (var0.pathLength == 0) { + var0.field975 = 0; + } else { + label396: { + if (var0.sequence != -1 && var0.sequenceDelay == 0) { + SequenceDefinition var2 = class83.SequenceDefinition_get(var0.sequence); + if (var0.field969 > 0 && var2.field3496 == 0) { + ++var0.field975; + break label396; } - if (var5 != -1) { - SequenceDefinition var6 = Widget.SequenceDefinition_get(var5); + if (var0.field969 <= 0 && var2.field3501 == 0) { + ++var0.field975; + break label396; + } + } - for (var3.modelFrameCycle += Client.field879; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; FriendSystem.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; - } + var11 = var0.x * -78439701; + var3 = var0.y; + var4 = var0.pathX[var0.pathLength - 1] * 128 + var0.size * 64; + int var5 = var0.pathY[var0.pathLength - 1] * 128 + var0.size * 64; + if (var11 < var4) { + if (var3 < var5) { + var0.orientation = 1280; + } else if (var3 > var5) { + var0.orientation = 1792; + } else { + var0.orientation = 1536; + } + } else if (var11 > var4) { + if (var3 < var5) { + var0.orientation = 768; + } else if (var3 > var5) { + var0.orientation = 256; + } else { + var0.orientation = 512; + } + } else if (var3 < var5) { + var0.orientation = 1024; + } else if (var3 > var5) { + var0.orientation = 0; + } + + byte var6 = var0.pathTraversed[var0.pathLength - 1]; + if (var4 - var11 <= 256 && var4 - var11 >= -256 && var5 - var3 <= 256 && var5 - var3 >= -256) { + int var7 = var0.orientation - var0.rotation & 2047; + if (var7 > 1024) { + var7 -= 2048; + } + + int var8 = var0.walkBackSequence; + if (var7 >= -256 && var7 <= 256) { + var8 = var0.walkSequence; + } else if (var7 >= 256 && var7 < 768) { + var8 = var0.walkRightSequence; + } else if (var7 >= -768 && var7 <= -256) { + var8 = var0.walkLeftSequence; + } + + if (var8 == -1) { + var8 = var0.walkSequence; + } + + var0.movementSequence = var8; + int var9 = 4; + boolean var10 = true; + if (var0 instanceof NPC) { + var10 = ((NPC)var0).definition.isClickable; + } + + if (var10) { + if (var0.rotation != var0.orientation && var0.targetIndex == -1 && var0.field953 != 0) { + var9 = 2; + } + + if (var0.pathLength > 2) { + var9 = 6; + } + + if (var0.pathLength > 3) { + var9 = 8; + } + + if (var0.field975 > 0 && var0.pathLength > 1) { + var9 = 8; + --var0.field975; + } + } else { + if (var0.pathLength > 1) { + var9 = 6; + } + + if (var0.pathLength > 2) { + var9 = 8; + } + + if (var0.field975 > 0 && var0.pathLength > 1) { + var9 = 8; + --var0.field975; + } + } + + if (var6 == 2) { + var9 <<= 1; + } + + if (var9 >= 8 && var0.movementSequence == var0.walkSequence && var0.runSequence != -1) { + var0.movementSequence = var0.runSequence; + } + + if (var11 != var4 || var5 != var3) { + if (var11 < var4) { + var0.x += var9 * 62504387; + if (var0.x * -78439701 > var4) { + var0.x = var4 * 62504387; + } + } else if (var11 > var4) { + var0.x -= var9 * 62504387; + if (var0.x * -78439701 < var4) { + var0.x = var4 * 62504387; + } + } + + if (var3 < var5) { + var0.y += var9; + if (var0.y > var5) { + var0.y = var5; + } + } else if (var3 > var5) { + var0.y -= var9; + if (var0.y < var5) { + var0.y = var5; } } } - } - if (var3.field2602 != 0 && !var3.isIf3) { - int var8 = var3.field2602 >> 16; - var5 = var3.field2602 << 16 >> 16; - var8 *= Client.field879; - var5 *= Client.field879; - var3.modelAngleX = var8 + var3.modelAngleX & 2047; - var3.modelAngleY = var5 + var3.modelAngleY & 2047; - FriendSystem.invalidateWidget(var3); + if (var0.x * -78439701 == var4 && var5 == var0.y) { + --var0.pathLength; + if (var0.field969 > 0) { + --var0.field969; + } + } + } else { + var0.x = var4 * 62504387; + var0.y = var5; + --var0.pathLength; + if (var0.field969 > 0) { + --var0.field969; + } } } } } + if (var0.x * -78439701 < 128 || var0.y < 128 || var0.x * -78439701 >= 13184 || var0.y >= 13184) { + var0.sequence = -1; + var0.spotAnimation = -1; + var0.field963 = 0; + var0.field964 = 0; + var0.x = var0.pathX[0] * -589373056 + var0.size * -294686528; + var0.y = var0.pathY[0] * 128 + var0.size * 64; + var0.method1699(); + } + + if (Varps.localPlayer == var0 && (var0.x * -78439701 < 1536 || var0.y < 1536 || var0.x * -78439701 >= 11776 || var0.y >= 11776)) { + var0.sequence = -1; + var0.spotAnimation = -1; + var0.field963 = 0; + var0.field964 = 0; + var0.x = var0.size * -294686528 + var0.pathX[0] * -589373056; + var0.y = var0.pathY[0] * 128 + var0.size * 64; + var0.method1699(); + } + + if (var0.field953 != 0) { + if (var0.targetIndex != -1) { + Object var13 = null; + if (var0.targetIndex < 32768) { + var13 = Client.npcs[var0.targetIndex]; + } else if (var0.targetIndex >= 32768) { + var13 = Client.players[var0.targetIndex - 32768]; + } + + if (var13 != null) { + var3 = var0.x * -78439701 - ((Actor)var13).x * -78439701; + var4 = var0.y - ((Actor)var13).y; + if (var3 != 0 || var4 != 0) { + var0.orientation = (int)(Math.atan2((double)var3, (double)var4) * 325.949D) & 2047; + } + } else if (var0.false0) { + var0.targetIndex = -1; + var0.false0 = false; + } + } + + if (var0.field945 != -1 && (var0.pathLength == 0 || var0.field975 > 0)) { + var0.orientation = var0.field945; + var0.field945 = -1; + } + + var11 = var0.orientation - var0.rotation & 2047; + if (var11 == 0 && var0.false0) { + var0.targetIndex = -1; + var0.false0 = false; + } + + if (var11 != 0) { + ++var0.field976; + boolean var14; + if (var11 > 1024) { + var0.rotation -= var0.field953; + var14 = true; + if (var11 < var0.field953 || var11 > 2048 - var0.field953) { + var0.rotation = var0.orientation; + var14 = false; + } + + if (var0.movementSequence == var0.readySequence && (var0.field976 > 25 || var14)) { + if (var0.turnLeftSequence != -1) { + var0.movementSequence = var0.turnLeftSequence; + } else { + var0.movementSequence = var0.walkSequence; + } + } + } else { + var0.rotation += var0.field953; + var14 = true; + if (var11 < var0.field953 || var11 > 2048 - var0.field953) { + var0.rotation = var0.orientation; + var14 = false; + } + + if (var0.readySequence == var0.movementSequence && (var0.field976 > 25 || var14)) { + if (var0.turnRightSequence != -1) { + var0.movementSequence = var0.turnRightSequence; + } else { + var0.movementSequence = var0.walkSequence; + } + } + } + + var0.rotation &= 2047; + } else { + var0.field976 = 0; + } + } + + HitSplatDefinition.method4558(var0); + } + + @ObfuscatedName("iy") + @ObfuscatedSignature( + signature = "(Lhy;I)Z", + garbageValue = "-2046780414" + ) + @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 = class286.method5218(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; + } } } diff --git a/runescape-client/src/main/java/TileItem.java b/runescape-client/src/main/java/TileItem.java index 712ca0a158..935fd1c942 100644 --- a/runescape-client/src/main/java/TileItem.java +++ b/runescape-client/src/main/java/TileItem.java @@ -3,19 +3,23 @@ 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("cu") +@ObfuscatedName("cm") @Implements("TileItem") public final class TileItem extends Entity { - @ObfuscatedName("s") + @ObfuscatedName("n") + @Export("Tiles_saturation") + static int[] Tiles_saturation; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -431370449 + intValue = -1255811811 ) @Export("id") int id; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -143029991 + intValue = -411129151 ) @Export("quantity") int quantity; @@ -23,23 +27,225 @@ public final class TileItem extends Entity { TileItem() { } - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)Ldo;", - garbageValue = "-419920513" + signature = "(B)Ldr;", + garbageValue = "-35" ) @Export("getModel") protected final Model getModel() { - return WorldMapData_0.ItemDefinition_get(this.id).getModel(this.quantity); + return Player.ItemDefinition_get(this.id).getModel(this.quantity); } - @ObfuscatedName("u") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-10" + signature = "(ILcu;ZI)I", + garbageValue = "-475912836" ) - public static void method2048() { - SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); - SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); + static int method2091(int var0, Script var1, boolean var2) { + int var3; + int var4; + if (var0 == ScriptOpcodes.CC_CREATE) { + class160.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + int var5 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 2]; + if (var4 == 0) { + throw new RuntimeException(); + } else { + Widget var6 = Player.getWidget(var3); + if (var6.children == null) { + var6.children = new Widget[var5 + 1]; + } + + if (var6.children.length <= var5) { + Widget[] var7 = new Widget[var5 + 1]; + + for (int var8 = 0; var8 < var6.children.length; ++var8) { + var7[var8] = var6.children[var8]; + } + + var6.children = var7; + } + + if (var5 > 0 && var6.children[var5 - 1] == null) { + throw new RuntimeException("" + (var5 - 1)); + } else { + Widget var12 = new Widget(); + var12.type = var4; + var12.parentId = var12.id = var6.id; + var12.childIndex = var5; + var12.isIf3 = true; + var6.children[var5] = var12; + if (var2) { + UserComparator9.field1941 = var12; + } else { + MidiPcmStream.field2410 = var12; + } + + WorldMapID.invalidateWidget(var6); + return 1; + } + } + } else { + Widget var9; + if (var0 == ScriptOpcodes.CC_DELETE) { + var9 = var2 ? UserComparator9.field1941 : MidiPcmStream.field2410; + Widget var10 = Player.getWidget(var9.id); + var10.children[var9.childIndex] = null; + WorldMapID.invalidateWidget(var10); + return 1; + } else if (var0 == ScriptOpcodes.CC_DELETEALL) { + var9 = Player.getWidget(Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]); + var9.children = null; + WorldMapID.invalidateWidget(var9); + return 1; + } else if (var0 != ScriptOpcodes.CC_FIND) { + if (var0 == ScriptOpcodes.IF_FIND) { + var9 = Player.getWidget(Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]); + if (var9 != null) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 1; + if (var2) { + UserComparator9.field1941 = var9; + } else { + MidiPcmStream.field2410 = var9; + } + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else { + return 2; + } + } else { + class160.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + Widget var11 = class49.getWidgetChild(var3, var4); + if (var11 != null && var4 != -1) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 1; + if (var2) { + UserComparator9.field1941 = var11; + } else { + MidiPcmStream.field2410 = var11; + } + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + } + } + + @ObfuscatedName("ht") + @ObfuscatedSignature( + signature = "(IIIILjava/lang/String;I)V", + garbageValue = "-2119996572" + ) + static void method2093(int var0, int var1, int var2, int var3, String var4) { + Widget var5 = class49.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; + SecureRandomFuture.runScriptEvent(var6); + } + + boolean var8 = true; + if (var5.contentType > 0) { + var8 = class49.method825(var5); + } + + if (var8) { + if (class210.method3951(class60.getWidgetClickMask(var5), var0 - 1)) { + PacketBufferNode var7; + if (var0 == 1) { + var7 = MenuAction.getPacketBufferNode(ClientPacket.field2279, Client.packetWriter.isaacCipher); + var7.packetBuffer.writeInt(var1); + var7.packetBuffer.writeShort(var2); + var7.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var7); + } + + if (var0 == 2) { + var7 = MenuAction.getPacketBufferNode(ClientPacket.field2228, Client.packetWriter.isaacCipher); + var7.packetBuffer.writeInt(var1); + var7.packetBuffer.writeShort(var2); + var7.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var7); + } + + if (var0 == 3) { + var7 = MenuAction.getPacketBufferNode(ClientPacket.field2202, Client.packetWriter.isaacCipher); + var7.packetBuffer.writeInt(var1); + var7.packetBuffer.writeShort(var2); + var7.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var7); + } + + if (var0 == 4) { + var7 = MenuAction.getPacketBufferNode(ClientPacket.field2231, Client.packetWriter.isaacCipher); + var7.packetBuffer.writeInt(var1); + var7.packetBuffer.writeShort(var2); + var7.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var7); + } + + if (var0 == 5) { + var7 = MenuAction.getPacketBufferNode(ClientPacket.field2258, Client.packetWriter.isaacCipher); + var7.packetBuffer.writeInt(var1); + var7.packetBuffer.writeShort(var2); + var7.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var7); + } + + if (var0 == 6) { + var7 = MenuAction.getPacketBufferNode(ClientPacket.field2251, Client.packetWriter.isaacCipher); + var7.packetBuffer.writeInt(var1); + var7.packetBuffer.writeShort(var2); + var7.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var7); + } + + if (var0 == 7) { + var7 = MenuAction.getPacketBufferNode(ClientPacket.field2199, Client.packetWriter.isaacCipher); + var7.packetBuffer.writeInt(var1); + var7.packetBuffer.writeShort(var2); + var7.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var7); + } + + if (var0 == 8) { + var7 = MenuAction.getPacketBufferNode(ClientPacket.field2207, Client.packetWriter.isaacCipher); + var7.packetBuffer.writeInt(var1); + var7.packetBuffer.writeShort(var2); + var7.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var7); + } + + if (var0 == 9) { + var7 = MenuAction.getPacketBufferNode(ClientPacket.field2247, Client.packetWriter.isaacCipher); + var7.packetBuffer.writeInt(var1); + var7.packetBuffer.writeShort(var2); + var7.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var7); + } + + if (var0 == 10) { + var7 = MenuAction.getPacketBufferNode(ClientPacket.field2217, 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/TileItemPile.java b/runescape-client/src/main/java/TileItemPile.java index 33284eb040..910d4ae7ef 100644 --- a/runescape-client/src/main/java/TileItemPile.java +++ b/runescape-client/src/main/java/TileItemPile.java @@ -4,54 +4,54 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("du") +@ObfuscatedName("dc") @Implements("TileItemPile") public final class TileItemPile { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1479767219 + intValue = -2023976075 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1786599841 - ) - @Export("x") - int x; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 2004816783 + intValue = -1848174955 ) @Export("y") int y; - @ObfuscatedName("k") + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -957349888 + ) + @Export("x") + int x; + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Len;" + signature = "Lel;" ) @Export("first") Entity first; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Len;" + signature = "Lel;" ) @Export("second") Entity second; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Len;" + signature = "Lel;" ) @Export("third") Entity third; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedGetter( - longValue = 8397822487422638179L + longValue = 7030774088402658829L ) @Export("tag") long tag; - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 299840789 + intValue = -1955777995 ) @Export("height") int height; @@ -59,220 +59,46 @@ public final class TileItemPile { TileItemPile() { } - @ObfuscatedName("i") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(ILcr;ZI)I", - garbageValue = "-1592164881" + signature = "(IIB)Lbj;", + garbageValue = "126" ) - static int method2701(int var0, Script var1, boolean var2) { - if (var0 < 1000) { - return FriendSystem.method1831(var0, var1, var2); - } else if (var0 < 1100) { - return UserComparator10.method3345(var0, var1, var2); - } else if (var0 < 1200) { - return Canvas.method806(var0, var1, var2); - } else if (var0 < 1300) { - return GrandExchangeOffer.method123(var0, var1, var2); - } else if (var0 < 1400) { - return SecureRandomFuture.method2060(var0, var1, var2); - } else if (var0 < 1500) { - return NPC.method1968(var0, var1, var2); - } else if (var0 < 1600) { - return Players.method2063(var0, var1, var2); - } else if (var0 < 1700) { - return class312.method5788(var0, var1, var2); - } else if (var0 < 1800) { - return GraphicsObject.method1939(var0, var1, var2); - } else if (var0 < 1900) { - return class40.method728(var0, var1, var2); - } else if (var0 < 2000) { - return GrandExchangeOfferWorldComparator.method79(var0, var1, var2); - } else if (var0 < 2100) { - return UserComparator10.method3345(var0, var1, var2); - } else if (var0 < 2200) { - return Canvas.method806(var0, var1, var2); - } else if (var0 < 2300) { - return GrandExchangeOffer.method123(var0, var1, var2); - } else if (var0 < 2400) { - return SecureRandomFuture.method2060(var0, var1, var2); - } else if (var0 < 2500) { - return NPC.method1968(var0, var1, var2); - } else if (var0 < 2600) { - return GameShell.method1003(var0, var1, var2); - } else if (var0 < 2700) { - return class268.method4893(var0, var1, var2); - } else if (var0 < 2800) { - return GrandExchangeEvents.method84(var0, var1, var2); - } else if (var0 < 2900) { - return WorldMapSectionType.method240(var0, var1, var2); - } else if (var0 < 3000) { - return GrandExchangeOfferWorldComparator.method79(var0, var1, var2); - } else if (var0 < 3200) { - return WorldMapRegion.method464(var0, var1, var2); - } else if (var0 < 3300) { - return WorldMapIcon_0.method206(var0, var1, var2); - } else if (var0 < 3400) { - return PendingSpawn.method1660(var0, var1, var2); - } else if (var0 < 3500) { - return class286.method5166(var0, var1, var2); - } else if (var0 < 3700) { - return class192.method3616(var0, var1, var2); - } else if (var0 < 4000) { - return Message.method1172(var0, var1, var2); - } else if (var0 < 4100) { - return GrandExchangeOfferUnitPriceComparator.method136(var0, var1, var2); - } else if (var0 < 4200) { - return Message.method1174(var0, var1, var2); - } else if (var0 < 4300) { - return MouseHandler.method1043(var0, var1, var2); - } else if (var0 < 5100) { - return GrandExchangeOfferNameComparator.method150(var0, var1, var2); - } else if (var0 < 5400) { - return Player.method1224(var0, var1, var2); - } else if (var0 < 5600) { - return Skills.method4031(var0, var1, var2); - } else if (var0 < 5700) { - return Entity.method3210(var0, var1, var2); - } else if (var0 < 6300) { - return class49.method811(var0, var1, var2); - } else if (var0 < 6600) { - return WallDecoration.method3243(var0, var1, var2); - } else { - return var0 < 6700 ? InterfaceParent.method1126(var0, var1, var2) : 2; - } + @Export("Messages_getByChannelAndID") + static Message Messages_getByChannelAndID(int var0, int var1) { + ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); + return var2.getMessage(var1); } - @ObfuscatedName("h") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-508815789" + signature = "(IB)V", + garbageValue = "-75" ) - public static void method2700() { - ItemDefinition.ItemDefinition_cached.clear(); - ItemDefinition.ItemDefinition_cachedModels.clear(); - ItemDefinition.ItemDefinition_cachedSprites.clear(); - } + public static void method2728(int var0) { + if (var0 != -1) { + if (UserComparator3.Widget_loadedInterfaces[var0]) { + ArchiveDiskActionHandler.Widget_archive.clearFilesGroup(var0); + if (class289.Widget_interfaceComponents[var0] != null) { + boolean var1 = true; - @ObfuscatedName("kj") - @ObfuscatedSignature( - signature = "(Lhp;IIII)V", - garbageValue = "912146837" - ) - @Export("drawMinimap") - static final void drawMinimap(Widget var0, int var1, int var2, int var3) { - WorldMapSectionType.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 = WorldMapIcon_1.localPlayer.x / 32 + 48; - int var7 = 464 - WorldMapIcon_1.localPlayer.y / 32; - ParamDefinition.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); - - int var8; - int var9; - int var10; - for (var8 = 0; var8 < Client.mapIconCount; ++var8) { - var9 = Client.mapIconXs[var8] * 4 + 2 - WorldMapIcon_1.localPlayer.x / 32; - var10 = Client.mapIconYs[var8] * 4 + 2 - WorldMapIcon_1.localPlayer.y / 32; - class191.drawSpriteOnMinimap(var1, var2, var9, var10, Client.mapIcons[var8], var4); - } - - int var11; - int var12; - for (var8 = 0; var8 < 104; ++var8) { - for (var9 = 0; var9 < 104; ++var9) { - NodeDeque var15 = Client.groundItems[ItemContainer.plane][var8][var9]; - if (var15 != null) { - var11 = var8 * 4 + 2 - WorldMapIcon_1.localPlayer.x / 32; - var12 = var9 * 4 + 2 - WorldMapIcon_1.localPlayer.y / 32; - class191.drawSpriteOnMinimap(var1, var2, var11, var12, WorldMapLabel.mapDotSprites[0], var4); - } - } - } - - for (var8 = 0; var8 < Client.npcCount; ++var8) { - NPC var16 = Client.npcs[Client.npcIndices[var8]]; - if (var16 != null && var16.isVisible()) { - NPCDefinition var18 = var16.definition; - if (var18 != null && var18.transforms != null) { - var18 = var18.transform(); - } - - if (var18 != null && var18.drawMapDot && var18.isInteractable) { - var11 = var16.x / 32 - WorldMapIcon_1.localPlayer.x / 32; - var12 = var16.y / 32 - WorldMapIcon_1.localPlayer.y / 32; - class191.drawSpriteOnMinimap(var1, var2, var11, var12, WorldMapLabel.mapDotSprites[1], var4); - } - } - } - - var8 = Players.Players_count; - int[] var19 = Players.Players_indices; - - for (var10 = 0; var10 < var8; ++var10) { - Player var17 = Client.players[var19[var10]]; - if (var17 != null && var17.isVisible() && !var17.isHidden && var17 != WorldMapIcon_1.localPlayer) { - var12 = var17.x / 32 - WorldMapIcon_1.localPlayer.x / 32; - int var13 = var17.y / 32 - WorldMapIcon_1.localPlayer.y / 32; - boolean var14 = false; - if (WorldMapIcon_1.localPlayer.team != 0 && var17.team != 0 && var17.team == WorldMapIcon_1.localPlayer.team) { - var14 = true; - } - - if (var17.isFriend()) { - class191.drawSpriteOnMinimap(var1, var2, var12, var13, WorldMapLabel.mapDotSprites[3], var4); - } else if (var14) { - class191.drawSpriteOnMinimap(var1, var2, var12, var13, WorldMapLabel.mapDotSprites[4], var4); - } else if (var17.isClanMember()) { - class191.drawSpriteOnMinimap(var1, var2, var12, var13, WorldMapLabel.mapDotSprites[5], var4); - } else { - class191.drawSpriteOnMinimap(var1, var2, var12, var13, WorldMapLabel.mapDotSprites[2], var4); - } - } - } - - if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { - if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { - NPC var20 = Client.npcs[Client.hintArrowNpcIndex]; - if (var20 != null) { - var11 = var20.x / 32 - WorldMapIcon_1.localPlayer.x / 32; - var12 = var20.y / 32 - WorldMapIcon_1.localPlayer.y / 32; - GrandExchangeOfferNameComparator.worldToMinimap(var1, var2, var11, var12, WorldMapSection1.mapMarkerSprites[1], var4); + for (int var2 = 0; var2 < class289.Widget_interfaceComponents[var0].length; ++var2) { + if (class289.Widget_interfaceComponents[var0][var2] != null) { + if (class289.Widget_interfaceComponents[var0][var2].type != 2) { + class289.Widget_interfaceComponents[var0][var2] = null; + } else { + var1 = false; + } } } - if (Client.hintArrowType == 2) { - var10 = Client.hintArrowX * 4 - PacketWriter.baseX * 256 + 2 - WorldMapIcon_1.localPlayer.x / 32; - var11 = Client.hintArrowY * 4 - RouteStrategy.baseY * 256 + 2 - WorldMapIcon_1.localPlayer.y / 32; - GrandExchangeOfferNameComparator.worldToMinimap(var1, var2, var10, var11, WorldMapSection1.mapMarkerSprites[1], var4); + if (var1) { + class289.Widget_interfaceComponents[var0] = null; } - if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { - Player var21 = Client.players[Client.hintArrowPlayerIndex]; - if (var21 != null) { - var11 = var21.x / 32 - WorldMapIcon_1.localPlayer.x / 32; - var12 = var21.y / 32 - WorldMapIcon_1.localPlayer.y / 32; - GrandExchangeOfferNameComparator.worldToMinimap(var1, var2, var11, var12, WorldMapSection1.mapMarkerSprites[1], var4); - } - } + UserComparator3.Widget_loadedInterfaces[var0] = false; } - - if (Client.destinationX != 0) { - var10 = Client.destinationX * 4 + 2 - WorldMapIcon_1.localPlayer.x / 32; - var11 = Client.destinationY * 4 + 2 - WorldMapIcon_1.localPlayer.y / 32; - class191.drawSpriteOnMinimap(var1, var2, var10, var11, WorldMapSection1.mapMarkerSprites[0], var4); - } - - if (!WorldMapIcon_1.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.field829[var3] = true; } } } diff --git a/runescape-client/src/main/java/TileModel.java b/runescape-client/src/main/java/TileModel.java index 81571764bb..9ce3d7707b 100644 --- a/runescape-client/src/main/java/TileModel.java +++ b/runescape-client/src/main/java/TileModel.java @@ -2,63 +2,63 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("dg") +@ObfuscatedName("dv") @Implements("TileModel") public final class TileModel { - @ObfuscatedName("b") - static int[] field1569; - @ObfuscatedName("g") - static int[] field1584; @ObfuscatedName("e") - static int[] field1585; - @ObfuscatedName("z") - static int[] field1583; - @ObfuscatedName("a") - static int[] field1587; + static int[] field1560; + @ObfuscatedName("i") + static int[] field1572; + @ObfuscatedName("q") + static int[] field1573; + @ObfuscatedName("y") + static int[] field1576; + @ObfuscatedName("r") + static int[] field1574; + @ObfuscatedName("k") + static final int[][] field1556; @ObfuscatedName("w") - static final int[][] field1588; - @ObfuscatedName("l") - static final int[][] field1581; - @ObfuscatedName("s") + static final int[][] field1569; + @ObfuscatedName("c") @Export("vertexX") int[] vertexX; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("vertexY") int[] vertexY; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("vertexZ") int[] vertexZ; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("triangleColorA") int[] triangleColorA; - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("triangleColorB") int[] triangleColorB; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("triangleColorC") int[] triangleColorC; - @ObfuscatedName("t") + @ObfuscatedName("j") @Export("faceX") int[] faceX; - @ObfuscatedName("q") + @ObfuscatedName("v") @Export("faceY") int[] faceY; - @ObfuscatedName("x") + @ObfuscatedName("d") @Export("faceZ") int[] faceZ; - @ObfuscatedName("d") + @ObfuscatedName("z") @Export("triangleTextureId") int[] triangleTextureId; - @ObfuscatedName("f") + @ObfuscatedName("n") @Export("isFlat") boolean isFlat; - @ObfuscatedName("c") + @ObfuscatedName("h") @Export("shape") int shape; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("rotation") int rotation; - @ObfuscatedName("y") + @ObfuscatedName("s") @Export("underlayRgb") int underlayRgb; @ObfuscatedName("p") @@ -66,13 +66,13 @@ public final class TileModel { int overlayRgb; static { - field1569 = new int[6]; - field1584 = new int[6]; - field1585 = new int[6]; - field1583 = new int[6]; - field1587 = new int[6]; - field1588 = 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}}; - field1581 = 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}}; + field1560 = new int[6]; + field1572 = new int[6]; + field1573 = new int[6]; + field1576 = new int[6]; + field1574 = new int[6]; + field1556 = 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}}; + field1569 = 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}}; } TileModel(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 TileModel { int var21 = var20 / 2; int var22 = var20 / 4; int var23 = var20 * 3 / 4; - int[] var24 = field1588[var1]; + int[] var24 = field1556[var1]; int var25 = var24.length; this.vertexX = new int[var25]; this.vertexY = new int[var25]; @@ -224,7 +224,7 @@ public final class TileModel { var27[var30] = var36; } - int[] var38 = field1581[var1]; + int[] var38 = field1569[var1]; var31 = var38.length / 4; this.faceX = new int[var31]; this.faceY = new int[var31]; diff --git a/runescape-client/src/main/java/TilePaint.java b/runescape-client/src/main/java/TilePaint.java index 88120ce330..3965e2171b 100644 --- a/runescape-client/src/main/java/TilePaint.java +++ b/runescape-client/src/main/java/TilePaint.java @@ -1,49 +1,48 @@ -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("ef") +@ObfuscatedName("ec") @Implements("TilePaint") public final class TilePaint { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1005153033 + intValue = 569513587 ) @Export("swColor") int swColor; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -62371409 + intValue = -1458777975 ) @Export("seColor") int seColor; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 732641473 + intValue = 658024941 ) @Export("neColor") int neColor; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1434155121 + intValue = -112567911 ) @Export("nwColor") int nwColor; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 974605461 + intValue = 696861651 ) @Export("texture") int texture; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("isFlat") boolean isFlat; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1074682835 + intValue = -130131907 ) @Export("rgb") int rgb; @@ -59,271 +58,119 @@ public final class TilePaint { this.isFlat = var7; } - @ObfuscatedName("s") + @ObfuscatedName("ee") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-2050253727" + signature = "(B)V", + garbageValue = "-55" ) - public static boolean method3007() { - long var0 = SequenceDefinition.method4686(); - int var2 = (int)(var0 - NetCache.field3145); - NetCache.field3145 = var0; - if (var2 > 200) { - var2 = 200; + static void method3037() { + Client.mouseLastLastPressedTimeMillis = 1L; + ParamDefinition.mouseRecorder.index = 0; + PendingSpawn.hasFocus = true; + Client.hadFocus = true; + Client.field750 = -1L; + class51.method860(); + Client.packetWriter.clearBuffer(); + Client.packetWriter.packetBuffer.offset = 0; + Client.packetWriter.serverPacket = null; + Client.packetWriter.field1274 = null; + Client.packetWriter.field1286 = null; + Client.packetWriter.field1287 = null; + Client.packetWriter.serverPacketLength = 0; + Client.packetWriter.field1283 = 0; + Client.rebootTimer = 0; + Client.logoutTimer = 0; + Client.hintArrowType = 0; + Client.menuOptionsCount = 0; + Client.isMenuOpen = false; + MouseHandler.MouseHandler_idleCycles = 0; + Messages.Messages_channels.clear(); + Messages.Messages_hashTable.clear(); + Messages.Messages_queue.clear(); + Messages.Messages_count = 0; + Client.isItemSelected = 0; + Client.isSpellSelected = false; + Client.soundEffectCount = 0; + Client.camAngleY = 0; + Client.oculusOrbState = 0; + MenuAction.field1133 = null; + Client.minimapState = 0; + Client.field848 = -1; + Client.destinationX = 0; + Client.destinationY = 0; + Client.playerAttackOption = AttackOption.AttackOption_hidden; + Client.npcAttackOption = AttackOption.AttackOption_hidden; + Client.npcCount = 0; + Huffman.method3942(); + + int var0; + for (var0 = 0; var0 < 2048; ++var0) { + Client.players[var0] = null; } - 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; - } + for (var0 = 0; var0 < 32768; ++var0) { + Client.npcs[var0] = null; + } - 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; - } + Client.combatTargetPlayerIndex = -1; + Client.projectiles.clear(); + Client.graphicsObjects.clear(); - 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 (NetCache.NetCache_currentResponse == null) { - var5 = 8; - } else if (NetCache.field3156 == 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.field3159 != 0) { - for (var7 = 0; var7 < var6; ++var7) { - var10000 = NetCache.NetCache_responseHeaderBuffer.array; - var10001 = var7 + NetCache.NetCache_responseHeaderBuffer.offset; - var10000[var10001] ^= NetCache.field3159; - } - } - - var22 = NetCache.NetCache_responseHeaderBuffer; - var22.offset += var6; - if (NetCache.NetCache_responseHeaderBuffer.offset < var5) { - break; - } - - if (NetCache.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); - Huffman.field2486 = true; - if (var13 == null) { - var13 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var11); - Huffman.field2486 = false; - } - - if (var13 == null) { - throw new IOException(); - } - - int var14 = var9 == 0 ? 5 : 9; - NetCache.NetCache_currentResponse = var13; - NetCache.NetCache_responseArchiveBuffer = new Buffer(var14 + var10 + NetCache.NetCache_currentResponse.padding); - NetCache.NetCache_responseArchiveBuffer.writeByte(var9); - NetCache.NetCache_responseArchiveBuffer.writeInt(var10); - NetCache.field3156 = 8; - NetCache.NetCache_responseHeaderBuffer.offset = 0; - } else if (NetCache.field3156 == 0) { - if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { - NetCache.field3156 = 1; - NetCache.NetCache_responseHeaderBuffer.offset = 0; - } else { - NetCache.NetCache_currentResponse = null; - } - } - } else { - var6 = NetCache.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding; - var7 = 512 - NetCache.field3156; - if (var7 > var6 - NetCache.NetCache_responseArchiveBuffer.offset) { - var7 = var6 - NetCache.NetCache_responseArchiveBuffer.offset; - } - - if (var7 > var16) { - var7 = var16; - } - - NetCache.NetCache_socket.read(NetCache.NetCache_responseArchiveBuffer.array, NetCache.NetCache_responseArchiveBuffer.offset, var7); - if (NetCache.field3159 != 0) { - for (var8 = 0; var8 < var7; ++var8) { - var10000 = NetCache.NetCache_responseArchiveBuffer.array; - var10001 = NetCache.NetCache_responseArchiveBuffer.offset + var8; - var10000[var10001] ^= NetCache.field3159; - } - } - - var22 = NetCache.NetCache_responseArchiveBuffer; - var22.offset += var7; - NetCache.field3156 += var7; - if (var6 == NetCache.NetCache_responseArchiveBuffer.offset) { - if (NetCache.NetCache_currentResponse.key == 16711935L) { - Decimator.NetCache_reference = NetCache.NetCache_responseArchiveBuffer; - - for (var8 = 0; var8 < 256; ++var8) { - Archive var17 = NetCache.NetCache_archives[var8]; - if (var17 != null) { - Decimator.NetCache_reference.offset = var8 * 8 + 5; - var10 = Decimator.NetCache_reference.readInt(); - int var18 = Decimator.NetCache_reference.readInt(); - var17.loadIndex(var10, var18); - } - } - } else { - NetCache.NetCache_crc.reset(); - NetCache.NetCache_crc.update(NetCache.NetCache_responseArchiveBuffer.array, 0, var6); - var8 = (int)NetCache.NetCache_crc.getValue(); - if (var8 != NetCache.NetCache_currentResponse.crc) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var20) { - } - - ++NetCache.NetCache_crcMismatches; - NetCache.NetCache_socket = null; - NetCache.field3159 = (byte)((int)(Math.random() * 255.0D + 1.0D)); - return false; - } - - NetCache.NetCache_crcMismatches = 0; - NetCache.NetCache_ioExceptions = 0; - NetCache.NetCache_currentResponse.archive.write((int)(NetCache.NetCache_currentResponse.key & 65535L), NetCache.NetCache_responseArchiveBuffer.array, (NetCache.NetCache_currentResponse.key & 16711680L) == 16711680L, Huffman.field2486); - } - - NetCache.NetCache_currentResponse.remove(); - if (Huffman.field2486) { - --NetCache.NetCache_pendingPriorityResponsesCount; - } else { - --NetCache.NetCache_pendingResponsesCount; - } - - NetCache.field3156 = 0; - NetCache.NetCache_currentResponse = null; - NetCache.NetCache_responseArchiveBuffer = null; - } else { - if (NetCache.field3156 != 512) { - break; - } - - NetCache.field3156 = 0; - } - } - } - - return true; + for (var0 = 0; var0 < 4; ++var0) { + for (int var1 = 0; var1 < 104; ++var1) { + for (int var2 = 0; var2 < 104; ++var2) { + Client.groundItems[var0][var1][var2] = null; } - } catch (IOException var21) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var19) { - } - - ++NetCache.NetCache_ioExceptions; - NetCache.NetCache_socket = null; - return false; } } - } - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(Lhz;III)Lls;", - garbageValue = "869538043" - ) - @Export("SpriteBuffer_getSprite") - public static Sprite SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { - if (!World.SpriteBuffer_bufferFile(var0, var1, var2)) { - return null; - } else { - Sprite var4 = new Sprite(); - var4.width = GrandExchangeOfferUnitPriceComparator.SpriteBuffer_spriteWidth; - var4.height = class325.SpriteBuffer_spriteHeight; - var4.xOffset = class325.SpriteBuffer_xOffsets[0]; - var4.yOffset = class325.SpriteBuffer_yOffsets[0]; - var4.subWidth = class325.SpriteBuffer_spriteWidths[0]; - var4.subHeight = class225.SpriteBuffer_spriteHeights[0]; - int var5 = var4.subHeight * var4.subWidth; - byte[] var6 = WorldMapSection1.SpriteBuffer_pixels[0]; - var4.pixels = new int[var5]; + Client.pendingSpawns = new NodeDeque(); + class218.friendSystem.clear(); - for (int var7 = 0; var7 < var5; ++var7) { - var4.pixels[var7] = class325.SpriteBuffer_spritePalette[var6[var7] & 255]; + for (var0 = 0; var0 < CollisionMap.VarpDefinition_fileCount; ++var0) { + VarpDefinition var3 = class30.method518(var0); + if (var3 != null) { + Varps.Varps_temp[var0] = 0; + Varps.Varps_main[var0] = 0; } - - UserComparator7.SpriteBuffer_clear(); - return var4; - } - } - - @ObfuscatedName("ez") - @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "812603626" - ) - static void method3005(int var0, int var1) { - int[] var2 = new int[9]; - - for (int var3 = 0; var3 < var2.length; ++var3) { - int var4 = var3 * 32 + 15 + 128; - int var5 = var4 * 3 + 600; - int var7 = Rasterizer3D.Rasterizer3D_sine[var4]; - int var6 = ArchiveLoader.method1100(var5, var1); - var2[var3] = var6 * var7 >> 16; } - Scene.Scene_buildVisiblityMap(var2, 500, 800, var0 * 334 / var1, 334); + BoundaryObject.varcs.clearTransient(); + Client.followerIndex = -1; + if (Client.rootInterface != -1) { + TileItemPile.method2728(Client.rootInterface); + } + + for (InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.first(); var4 != null; var4 = (InterfaceParent)Client.interfaceParents.next()) { + StructDefinition.closeInterface(var4, 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; + } + + class286.method5221(); + Client.isLoading = true; + + for (var0 = 0; var0 < 100; ++var0) { + Client.field827[var0] = true; + } + + MouseRecorder.method1145(); + GrandExchangeOfferUnitPriceComparator.clanChat = null; + + for (var0 = 0; var0 < 8; ++var0) { + Client.grandExchangeOffers[var0] = new GrandExchangeOffer(); + } + + PacketWriter.grandExchangeEvents = null; } } diff --git a/runescape-client/src/main/java/Tiles.java b/runescape-client/src/main/java/Tiles.java index 0b3dbf7d66..b1cea69b41 100644 --- a/runescape-client/src/main/java/Tiles.java +++ b/runescape-client/src/main/java/Tiles.java @@ -4,50 +4,49 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bn") +@ObfuscatedName("bp") @Implements("Tiles") public final class Tiles { - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("Tiles_heights") static int[][][] Tiles_heights; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("Tiles_renderFlags") static byte[][][] Tiles_renderFlags; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 210861461 + intValue = -103165029 ) @Export("Tiles_minPlane") static int Tiles_minPlane; - @ObfuscatedName("k") - static byte[][][] field485; - @ObfuscatedName("t") - static byte[][][] field475; - @ObfuscatedName("d") - @Export("Tiles_hue") - static int[] Tiles_hue; - @ObfuscatedName("p") - static int[][][] field483; - @ObfuscatedName("z") - static final int[] field479; - @ObfuscatedName("a") - static final int[] field480; - @ObfuscatedName("w") - static final int[] field481; - @ObfuscatedName("l") - static final int[] field482; - @ObfuscatedName("h") - static final int[] field478; + @ObfuscatedName("g") + static byte[][][] field476; + @ObfuscatedName("u") + static byte[][][] field477; @ObfuscatedName("v") - static final int[] field484; + static byte[][][] field473; + @ObfuscatedName("s") + static int[] field488; + @ObfuscatedName("y") + static final int[] field480; + @ObfuscatedName("r") + static final int[] field481; + @ObfuscatedName("k") + static final int[] field482; + @ObfuscatedName("w") + static final int[] field487; @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 1482528019 - ) - static int field477; + static final int[] field484; @ObfuscatedName("o") + static final int[] field485; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1522928569 + intValue = -1299931197 + ) + static int field483; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 420970565 ) static int field486; @@ -55,153 +54,680 @@ public final class Tiles { Tiles_heights = new int[4][105][105]; Tiles_renderFlags = new byte[4][104][104]; Tiles_minPlane = 99; - field479 = new int[]{1, 2, 4, 8}; - field480 = new int[]{16, 32, 64, 128}; - field481 = new int[]{1, 0, -1, 0}; - field482 = new int[]{0, -1, 0, 1}; - field478 = new int[]{1, -1, -1, 1}; - field484 = new int[]{-1, -1, 1, 1}; - field477 = (int)(Math.random() * 17.0D) - 8; + field480 = new int[]{1, 2, 4, 8}; + field481 = new int[]{16, 32, 64, 128}; + field482 = new int[]{1, 0, -1, 0}; + field487 = new int[]{0, -1, 0, 1}; + field484 = new int[]{1, -1, -1, 1}; + field485 = new int[]{-1, -1, 1, 1}; + field483 = (int)(Math.random() * 17.0D) - 8; field486 = (int)(Math.random() * 33.0D) - 16; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "-739357854" + signature = "(II)Lcu;", + garbageValue = "946612961" ) - static int method1060(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) { + @Export("getScript") + static Script getScript(int var0) { + Script var1 = (Script)Script.Script_cached.get((long)var0); + if (var1 != null) { return var1; - } else if (var2.secondaryRgb >= 0) { - return var2.secondaryRgb | -16777216; } else { - int var5; - byte var6; - int var8; - int var9; - if (var2.texture >= 0) { - var5 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var2.texture); - var6 = 96; - if (var5 == -2) { - var8 = 12345678; - } else if (var5 == -1) { - if (var6 < 0) { - var6 = 0; - } else if (var6 > 127) { - var6 = 127; - } - - var9 = 127 - var6; - var8 = var9; - } else { - var9 = var6 * (var5 & 127) / 128; - if (var9 < 2) { - var9 = 2; - } else if (var9 > 126) { - var9 = 126; - } - - var8 = var9 + (var5 & 65408); - } - - return Rasterizer3D.Rasterizer3D_colorPalette[var8] | -16777216; - } else if (var2.primaryRgb == 16711935) { - return var1; + byte[] var2 = Message.archive12.takeFile(var0, 0); + if (var2 == null) { + return null; } else { - var8 = WorldMapIcon_0.WorldMap_hslToRgb(var2.hue, var2.saturation, var2.lightness); - var6 = 96; - if (var8 == -2) { - var5 = 12345678; - } else if (var8 == -1) { - if (var6 < 0) { - var6 = 0; - } else if (var6 > 127) { - var6 = 127; - } - - var9 = 127 - var6; - var5 = var9; - } else { - var9 = var6 * (var8 & 127) / 128; - if (var9 < 2) { - var9 = 2; - } else if (var9 > 126) { - var9 = 126; - } - - var5 = var9 + (var8 & 65408); - } - - return Rasterizer3D.Rasterizer3D_colorPalette[var5] | -16777216; + var1 = AttackOption.newScript(var2); + Script.Script_cached.put(var1, (long)var0); + return var1; } } } - @ObfuscatedName("s") + @ObfuscatedName("fq") @ObfuscatedSignature( - signature = "(Lhz;B)V", - garbageValue = "-34" + signature = "(Ljava/lang/String;I)V", + garbageValue = "361955202" ) - @Export("VarpDefinition_setArchives") - public static void VarpDefinition_setArchives(AbstractArchive var0) { - VarpDefinition.VarpDefinition_archive = var0; - VarpDefinition.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); - } - - @ObfuscatedName("fe") - @ObfuscatedSignature( - signature = "(Lbu;I)V", - garbageValue = "-1027985377" - ) - static final void method1075(Actor var0) { - int var1 = var0.field941 - Client.cycle; - int var2 = var0.field960 * 128 + var0.size * -178253824; - int var3 = var0.field954 * 128 + var0.size * -178253824; - var0.x += (var2 - var0.x) / var1; - var0.y += (var3 - var0.y) / var1; - var0.field976 = 0; - var0.orientation = var0.field966; - } - - @ObfuscatedName("ke") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-63" - ) - @Export("Clan_leaveChat") - static final void Clan_leaveChat() { - PacketBufferNode var0 = MenuAction.getPacketBufferNode(ClientPacket.field2263, Client.packetWriter.isaacCipher); - var0.packetBuffer.writeByte(0); - Client.packetWriter.addNode(var0); - } - - @ObfuscatedName("ki") - @ObfuscatedSignature( - signature = "([BII)V", - garbageValue = "912146837" - ) - static void method1088(byte[] var0, int var1) { - if (Client.randomDatData == null) { - Client.randomDatData = new byte[24]; + @Export("doCheat") + static final void doCheat(String var0) { + if (var0.equalsIgnoreCase("toggleroof")) { + Actor.clientPreferences.roofsHidden = !Actor.clientPreferences.roofsHidden; + class296.savePreferences(); + if (Actor.clientPreferences.roofsHidden) { + WorldMapCacheName.addGameMessage(99, "", "Roofs are now all hidden"); + } else { + WorldMapCacheName.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")) { + GrandExchangeOfferUnitPriceComparator.worldMap.showCoord = !GrandExchangeOfferUnitPriceComparator.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")) { + class185.method3607(); + } + } + + PacketBufferNode var1 = MenuAction.getPacketBufferNode(ClientPacket.field2255, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(var0.length() + 1); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); + } + + @ObfuscatedName("gx") + @ObfuscatedSignature( + signature = "(IIIIIIIIII)V", + garbageValue = "1821175447" + ) + @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; + class16.method164(var9); + Client.pendingSpawns.addFirst(var9); + } + + var9.id = var4; + var9.field911 = var5; + var9.orientation = var6; + var9.delay = var7; + var9.hitpoints = var8; + } + + @ObfuscatedName("jd") + @ObfuscatedSignature( + signature = "([Lhy;IIIIIIII)V", + garbageValue = "1552145390" + ) + @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 || class60.getWidgetClickMask(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { + if (var9.isIf3) { + if (NetCache.isComponentHidden(var9)) { + continue; + } + } else if (var9.type == 0 && var9 != class32.mousedOverWidgetIf1 && NetCache.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.field803 = true; + Client.field804 = var10; + Client.field699 = var11; + } + + boolean var32 = false; + if (var9.field2612) { + switch(Client.field784) { + case 0: + var32 = true; + case 1: + default: + break; + case 2: + if (Client.field785 == var9.id >>> 16) { + var32 = true; + } + break; + case 3: + if (var9.id == Client.field785) { + var32 = true; + } + } + } + + if (var32 || !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 (ArchiveLoader.widgetDragDuration == 0) { + Client.clickedWidget = null; + Client.clickedWidgetParent = null; + } + + if (!Client.isMenuOpen) { + GraphicsObject.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 var33 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; + if (var9.contentType == 1337) { + if (!Client.isLoading && !Client.isMenuOpen && var33) { + ModelData0.addSceneMenuOptions(var17, var18, var12, var13); + } + } else if (var9.contentType == 1338) { + class223.checkIfMinimapClicked(var9, var10, var11); + } else { + if (var9.contentType == 1400) { + GrandExchangeOfferUnitPriceComparator.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var33, var10, var11, var9.width, var9.height); + } + + if (!Client.isMenuOpen && var33) { + if (var9.contentType == 1400) { + GrandExchangeOfferUnitPriceComparator.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18); + } else { + WorldMapSection0.method217(var9, var17 - var10, var18 - var11); + } + } + + boolean var21; + int var23; + if (var32) { + for (int var20 = 0; var20 < var9.field2671.length; ++var20) { + var21 = false; + boolean var22 = false; + if (!var21 && var9.field2671[var20] != null) { + for (var23 = 0; var23 < var9.field2671[var20].length; ++var23) { + boolean var24 = false; + if (var9.field2656 != null) { + var24 = KeyHandler.KeyHandler_pressedKeys[var9.field2671[var20][var23]]; + } + + if (WorldMapSection0.method216(var9.field2671[var20][var23]) || var24) { + var21 = true; + if (var9.field2656 != null && var9.field2656[var20] > Client.cycle) { + break; + } + + byte var25 = var9.field2614[var20][var23]; + if (var25 == 0 || ((var25 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var25 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var25 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var25 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { + var22 = true; + break; + } + } + } + } + + if (var22) { + if (var20 < 10) { + TileItem.method2093(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); + } else if (var20 == 10) { + FloorDecoration.Widget_runOnTargetLeave(); + Player.method1196(var9.id, var9.childIndex, WorldMapElement.method4390(class60.getWidgetClickMask(var9)), var9.itemId); + Client.selectedSpellActionName = class16.method165(var9); + if (Client.selectedSpellActionName == null) { + Client.selectedSpellActionName = "null"; + } + + Client.selectedSpellName = var9.dataText + UserComparator7.colorStartTag(16777215); + } + + var23 = var9.field2615[var20]; + if (var9.field2656 == null) { + var9.field2656 = new int[var9.field2671.length]; + } + + if (var9.field2616 == null) { + var9.field2616 = new int[var9.field2671.length]; + } + + if (var23 != 0) { + if (var9.field2656[var20] == 0) { + var9.field2656[var20] = var23 + Client.cycle + var9.field2616[var20]; + } else { + var9.field2656[var20] = var23 + Client.cycle; + } + } else { + var9.field2656[var20] = Integer.MAX_VALUE; + } + } + + if (!var21 && var9.field2656 != null) { + var9.field2656[var20] = 0; + } + } + } + + if (var9.isIf3) { + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + var33 = true; + } else { + var33 = false; + } + + boolean var34 = false; + if ((MouseHandler.MouseHandler_currentButton == 1 || !WorldMapSection1.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var33) { + var34 = true; + } + + var21 = false; + if ((MouseHandler.MouseHandler_lastButton == 1 || !WorldMapSection1.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) { + class83.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11); + } + + if (var9.contentType == 1400) { + GrandExchangeOfferUnitPriceComparator.worldMap.method6284(var17, var18, var33 & var34, var33 & var21); + } + + if (Client.clickedWidget != null && var9 != Client.clickedWidget && var33 && class222.method4101(class60.getWidgetClickMask(var9))) { + Client.draggedOnWidget = var9; + } + + if (var9 == Client.clickedWidgetParent) { + Client.field800 = true; + Client.field801 = var10; + Client.field706 = var11; + } + + if (var9.hasListener) { + ScriptEvent var29; + if (var33 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { + var29 = new ScriptEvent(); + var29.isMouseInputEvent = true; + var29.widget = var9; + var29.mouseY = Client.mouseWheelRotation; + var29.args = var9.onScroll; + Client.scriptEvents.addFirst(var29); + } + + if (Client.clickedWidget != null || class4.dragInventoryWidget != null || Client.isMenuOpen) { + var21 = false; + var34 = false; + var33 = false; + } + + if (!var9.isClicked && var21) { + var9.isClicked = true; + if (var9.onClick != null) { + var29 = new ScriptEvent(); + var29.isMouseInputEvent = true; + var29.widget = var9; + var29.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; + var29.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; + var29.args = var9.onClick; + Client.scriptEvents.addFirst(var29); + } + } + + if (var9.isClicked && var34 && var9.onClickRepeat != null) { + var29 = new ScriptEvent(); + var29.isMouseInputEvent = true; + var29.widget = var9; + var29.mouseX = MouseHandler.MouseHandler_x - var10; + var29.mouseY = MouseHandler.MouseHandler_y - var11; + var29.args = var9.onClickRepeat; + Client.scriptEvents.addFirst(var29); + } + + if (var9.isClicked && !var34) { + var9.isClicked = false; + if (var9.onRelease != null) { + var29 = new ScriptEvent(); + var29.isMouseInputEvent = true; + var29.widget = var9; + var29.mouseX = MouseHandler.MouseHandler_x - var10; + var29.mouseY = MouseHandler.MouseHandler_y - var11; + var29.args = var9.onRelease; + Client.field823.addFirst(var29); + } + } + + if (var34 && var9.onHold != null) { + var29 = new ScriptEvent(); + var29.isMouseInputEvent = true; + var29.widget = var9; + var29.mouseX = MouseHandler.MouseHandler_x - var10; + var29.mouseY = MouseHandler.MouseHandler_y - var11; + var29.args = var9.onHold; + Client.scriptEvents.addFirst(var29); + } + + if (!var9.containsMouse && var33) { + var9.containsMouse = true; + if (var9.onMouseOver != null) { + var29 = new ScriptEvent(); + var29.isMouseInputEvent = true; + var29.widget = var9; + var29.mouseX = MouseHandler.MouseHandler_x - var10; + var29.mouseY = MouseHandler.MouseHandler_y - var11; + var29.args = var9.onMouseOver; + Client.scriptEvents.addFirst(var29); + } + } + + if (var9.containsMouse && var33 && var9.onMouseRepeat != null) { + var29 = new ScriptEvent(); + var29.isMouseInputEvent = true; + var29.widget = var9; + var29.mouseX = MouseHandler.MouseHandler_x - var10; + var29.mouseY = MouseHandler.MouseHandler_y - var11; + var29.args = var9.onMouseRepeat; + Client.scriptEvents.addFirst(var29); + } + + if (var9.containsMouse && !var33) { + var9.containsMouse = false; + if (var9.onMouseLeave != null) { + var29 = new ScriptEvent(); + var29.isMouseInputEvent = true; + var29.widget = var9; + var29.mouseX = MouseHandler.MouseHandler_x - var10; + var29.mouseY = MouseHandler.MouseHandler_y - var11; + var29.args = var9.onMouseLeave; + Client.field823.addFirst(var29); + } + } + + if (var9.onTimer != null) { + var29 = new ScriptEvent(); + var29.widget = var9; + var29.args = var9.onTimer; + Client.field822.addFirst(var29); + } + + ScriptEvent var30; + int var35; + int var36; + if (var9.onVarTransmit != null && Client.field809 > var9.field2672) { + if (var9.varTransmitTriggers != null && Client.field809 - var9.field2672 <= 32) { + label900: + for (var35 = var9.field2672; var35 < Client.field809; ++var35) { + var23 = Client.field808[var35 & 31]; + + for (var36 = 0; var36 < var9.varTransmitTriggers.length; ++var36) { + if (var23 == var9.varTransmitTriggers[var36]) { + var30 = new ScriptEvent(); + var30.widget = var9; + var30.args = var9.onVarTransmit; + Client.scriptEvents.addFirst(var30); + break label900; + } + } + } + } else { + var29 = new ScriptEvent(); + var29.widget = var9; + var29.args = var9.onVarTransmit; + Client.scriptEvents.addFirst(var29); + } + + var9.field2672 = Client.field809; + } + + if (var9.onInvTransmit != null && Client.field811 > var9.field2673) { + if (var9.invTransmitTriggers != null && Client.field811 - var9.field2673 <= 32) { + label876: + for (var35 = var9.field2673; var35 < Client.field811; ++var35) { + var23 = Client.field810[var35 & 31]; + + for (var36 = 0; var36 < var9.invTransmitTriggers.length; ++var36) { + if (var23 == var9.invTransmitTriggers[var36]) { + var30 = new ScriptEvent(); + var30.widget = var9; + var30.args = var9.onInvTransmit; + Client.scriptEvents.addFirst(var30); + break label876; + } + } + } + } else { + var29 = new ScriptEvent(); + var29.widget = var9; + var29.args = var9.onInvTransmit; + Client.scriptEvents.addFirst(var29); + } + + var9.field2673 = Client.field811; + } + + if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field2674) { + if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field2674 <= 32) { + label852: + for (var35 = var9.field2674; var35 < Client.changedSkillsCount; ++var35) { + var23 = Client.changedSkills[var35 & 31]; + + for (var36 = 0; var36 < var9.statTransmitTriggers.length; ++var36) { + if (var23 == var9.statTransmitTriggers[var36]) { + var30 = new ScriptEvent(); + var30.widget = var9; + var30.args = var9.onStatTransmit; + Client.scriptEvents.addFirst(var30); + break label852; + } + } + } + } else { + var29 = new ScriptEvent(); + var29.widget = var9; + var29.args = var9.onStatTransmit; + Client.scriptEvents.addFirst(var29); + } + + var9.field2674 = Client.changedSkillsCount; + } + + if (Client.chatCycle > var9.field2529 && var9.onChatTransmit != null) { + var29 = new ScriptEvent(); + var29.widget = var9; + var29.args = var9.onChatTransmit; + Client.scriptEvents.addFirst(var29); + } + + if (Client.field815 > var9.field2529 && var9.onFriendTransmit != null) { + var29 = new ScriptEvent(); + var29.widget = var9; + var29.args = var9.onFriendTransmit; + Client.scriptEvents.addFirst(var29); + } + + if (Client.field816 > var9.field2529 && var9.onClanTransmit != null) { + var29 = new ScriptEvent(); + var29.widget = var9; + var29.args = var9.onClanTransmit; + Client.scriptEvents.addFirst(var29); + } + + if (Client.field866 > var9.field2529 && var9.onStockTransmit != null) { + var29 = new ScriptEvent(); + var29.widget = var9; + var29.args = var9.onStockTransmit; + Client.scriptEvents.addFirst(var29); + } + + if (Client.field818 > var9.field2529 && var9.field2655 != null) { + var29 = new ScriptEvent(); + var29.widget = var9; + var29.args = var9.field2655; + Client.scriptEvents.addFirst(var29); + } + + if (Client.field670 > var9.field2529 && var9.onMiscTransmit != null) { + var29 = new ScriptEvent(); + var29.widget = var9; + var29.args = var9.onMiscTransmit; + Client.scriptEvents.addFirst(var29); + } + + var9.field2529 = Client.cycleCntr; + if (var9.onKey != null) { + for (var35 = 0; var35 < Client.field844; ++var35) { + ScriptEvent var31 = new ScriptEvent(); + var31.widget = var9; + var31.keyTyped = Client.field846[var35]; + var31.keyPressed = Client.field845[var35]; + var31.args = var9.onKey; + Client.scriptEvents.addFirst(var31); + } + } + } + } + + if (!var9.isIf3) { + if (Client.clickedWidget != null || class4.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) { + class32.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; + } else { + class32.mousedOverWidgetIf1 = var9; + } + } + + if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + AbstractWorldMapIcon.field292 = var9; + } + + if (var9.scrollHeight > var9.height) { + class1.method16(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 var27 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); + if (var27 != null) { + if (var27.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { + for (ScriptEvent var28 = (ScriptEvent)Client.scriptEvents.last(); var28 != null; var28 = (ScriptEvent)Client.scriptEvents.previous()) { + if (var28.isMouseInputEvent) { + var28.remove(); + var28.widget.containsMouse = false; + } + } + + if (ArchiveLoader.widgetDragDuration == 0) { + Client.clickedWidget = null; + Client.clickedWidgetParent = null; + } + + if (!Client.isMenuOpen) { + GraphicsObject.addCancelMenuEntry(); + } + } + + TextureProvider.updateRootInterface(var27.group, var12, var13, var14, var15, var10, var11); + } + } + } + } + } } - class300.writeRandomDat(var0, var1, Client.randomDatData, 0, 24); } } diff --git a/runescape-client/src/main/java/Timer.java b/runescape-client/src/main/java/Timer.java index b4f4b1b897..9de9fa640e 100644 --- a/runescape-client/src/main/java/Timer.java +++ b/runescape-client/src/main/java/Timer.java @@ -4,144 +4,150 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jd") +@ObfuscatedName("jg") @Implements("Timer") public class Timer { - @ObfuscatedName("s") - @ObfuscatedGetter( - longValue = 7514932896341092199L + @ObfuscatedName("dw") + @ObfuscatedSignature( + signature = "Lio;" ) - long field3566; - @ObfuscatedName("j") + @Export("archive5") + static Archive archive5; + @ObfuscatedName("c") @ObfuscatedGetter( - longValue = -7624772815997057519L + longValue = -9171903714968866551L ) - long field3558; - @ObfuscatedName("i") - public boolean field3560; - @ObfuscatedName("k") - @ObfuscatedGetter( - longValue = -6215548007371773365L - ) - long field3561; - @ObfuscatedName("u") - @ObfuscatedGetter( - longValue = 1342387343954855195L - ) - long field3562; - @ObfuscatedName("n") - @ObfuscatedGetter( - longValue = 5626875843226124193L - ) - long field3559; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 1819950625 - ) - int field3564; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -100578869 - ) - int field3565; + long field3554; @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -762061045 + longValue = -5435914068902999871L ) - int field3563; + long field3550; + @ObfuscatedName("t") + public boolean field3549; + @ObfuscatedName("g") + @ObfuscatedGetter( + longValue = -1599166802350177409L + ) + long field3547; + @ObfuscatedName("l") + @ObfuscatedGetter( + longValue = 4372389580861267497L + ) + long field3551; + @ObfuscatedName("u") + @ObfuscatedGetter( + longValue = 5316590132412911643L + ) + long field3552; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 1679669669 + ) + int field3553; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -1804275999 + ) + int field3548; @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -528915323 + intValue = 899354811 ) - int field3567; + int field3555; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -1638408903 + ) + int field3557; public Timer() { - this.field3566 = -1L; - this.field3558 = -1L; - this.field3560 = false; - this.field3561 = 0L; - this.field3562 = 0L; - this.field3559 = 0L; - this.field3564 = 0; - this.field3565 = 0; - this.field3563 = 0; - this.field3567 = 0; + this.field3554 = -1L; + this.field3550 = -1L; + this.field3549 = false; + this.field3547 = 0L; + this.field3551 = 0L; + this.field3552 = 0L; + this.field3553 = 0; + this.field3548 = 0; + this.field3555 = 0; + this.field3557 = 0; } - @ObfuscatedName("s") + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1784177265" + ) + public void method4969() { + this.field3554 = SoundCache.method2480(); + } + + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(B)V", garbageValue = "0" ) - public void method4897() { - this.field3566 = SequenceDefinition.method4686(); - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1627555881" - ) - public void method4898() { - if (-1L != this.field3566) { - this.field3562 = SequenceDefinition.method4686() - this.field3566; - this.field3566 = -1L; + public void method4985() { + if (this.field3554 != -1L) { + this.field3551 = SoundCache.method2480() - this.field3554; + this.field3554 = -1L; } } - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "1" - ) - public void method4899(int var1) { - this.field3558 = SequenceDefinition.method4686(); - this.field3564 = var1; - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1290905083" - ) - public void method4900() { - if (this.field3558 != -1L) { - this.field3561 = SequenceDefinition.method4686() - this.field3558; - this.field3558 = -1L; - } - - ++this.field3563; - this.field3560 = true; - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-769614616" - ) - public void method4925() { - this.field3560 = false; - this.field3565 = 0; - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "15" - ) - public void method4901() { - this.method4900(); - } - @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lky;I)V", - garbageValue = "-1786942411" + signature = "(II)V", + garbageValue = "1453810338" + ) + public void method4971(int var1) { + this.field3550 = SoundCache.method2480(); + this.field3553 = var1; + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-81603528" + ) + public void method4972() { + if (-1L != this.field3550) { + this.field3547 = SoundCache.method2480() - this.field3550; + this.field3550 = -1L; + } + + ++this.field3555; + this.field3549 = true; + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "934380433" + ) + public void method4973() { + this.field3549 = false; + this.field3548 = 0; + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "122" + ) + public void method4982() { + this.method4972(); + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(Lkz;I)V", + garbageValue = "-1973767266" ) @Export("write") public void write(Buffer var1) { - long var2 = this.field3562; + long var2 = this.field3551; var2 /= 10L; if (var2 < 0L) { var2 = 0L; @@ -150,7 +156,8 @@ public class Timer { } var1.writeShort((int)var2); - long var4 = this.field3561; + VertexNormal.method2958(var1, this.field3547); + long var4 = this.field3552; var4 /= 10L; if (var4 < 0L) { var4 = 0L; @@ -159,18 +166,9 @@ public class Timer { } var1.writeShort((int)var4); - long var6 = this.field3559; - var6 /= 10L; - if (var6 < 0L) { - var6 = 0L; - } else if (var6 > 65535L) { - var6 = 65535L; - } - - var1.writeShort((int)var6); - var1.writeShort(this.field3564); - var1.writeShort(this.field3565); - var1.writeShort(this.field3563); - var1.writeShort(this.field3567); + var1.writeShort(this.field3553); + var1.writeShort(this.field3548); + var1.writeShort(this.field3555); + var1.writeShort(this.field3557); } } diff --git a/runescape-client/src/main/java/TriBool.java b/runescape-client/src/main/java/TriBool.java index 986ee711c9..843bb43685 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("jj") +@ObfuscatedName("jb") @Implements("TriBool") public class TriBool { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Ljj;" + signature = "Ljb;" ) @Export("TriBool_unknown") public static final TriBool TriBool_unknown; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Ljj;" + signature = "Ljb;" ) @Export("TriBool_true") public static final TriBool TriBool_true; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Ljj;" + signature = "Ljb;" ) @Export("TriBool_false") public static final TriBool TriBool_false; @@ -33,126 +33,4 @@ public class TriBool { TriBool() { } - - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lgk;I)I", - garbageValue = "-1496221651" - ) - @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 = FriendLoginUpdate.standardizeChar(var9, var2); - var10 = FriendLoginUpdate.standardizeChar(var10, var2); - if (var10 != var9 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { - var9 = Character.toLowerCase(var9); - var10 = Character.toLowerCase(var10); - if (var9 != var10) { - return JagexCache.lowercaseChar(var9, var2) - JagexCache.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 (var20 != var18 && Character.toUpperCase(var18) != Character.toUpperCase(var20)) { - var18 = Character.toLowerCase(var18); - var20 = Character.toLowerCase(var20); - if (var18 != var20) { - return JagexCache.lowercaseChar(var18, var2) - JagexCache.lowercaseChar(var20, var2); - } - } - } - - var17 = var3 - var4; - if (var17 != 0) { - return var17; - } else { - for (int var19 = 0; var19 < var16; ++var19) { - var20 = var0.charAt(var19); - char var13 = var1.charAt(var19); - if (var13 != var20) { - return JagexCache.lowercaseChar(var20, var2) - JagexCache.lowercaseChar(var13, var2); - } - } - - return 0; - } - } } diff --git a/runescape-client/src/main/java/UrlRequest.java b/runescape-client/src/main/java/UrlRequest.java index 1fc25ce178..e91ca6d826 100644 --- a/runescape-client/src/main/java/UrlRequest.java +++ b/runescape-client/src/main/java/UrlRequest.java @@ -1,25 +1,31 @@ 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("er") +@ObfuscatedName("eq") @Implements("UrlRequest") public class UrlRequest { - @ObfuscatedName("rb") - @ObfuscatedGetter( - intValue = 1189036032 + @ObfuscatedName("dk") + @ObfuscatedSignature( + signature = "Lio;" ) - static int field1932; - @ObfuscatedName("s") + @Export("archive19") + static Archive archive19; + @ObfuscatedName("gv") + @ObfuscatedSignature( + signature = "Lli;" + ) + @Export("compass") + static Sprite compass; + @ObfuscatedName("c") @Export("url") final URL url; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("isDone0") volatile boolean isDone0; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("response0") volatile byte[] response0; @@ -27,143 +33,35 @@ public class UrlRequest { this.url = var1; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "76" + signature = "(I)Z", + garbageValue = "18901995" ) @Export("isDone") public boolean isDone() { return this.isDone0; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(B)[B", - garbageValue = "0" + signature = "(I)[B", + garbageValue = "-1475340215" ) @Export("getResponse") public byte[] getResponse() { return this.response0; } - @ObfuscatedName("j") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;Llu;I)Ljava/lang/String;", - garbageValue = "238475307" + signature = "(II)V", + garbageValue = "-1057408025" ) - public static String method3264(CharSequence var0, LoginType var1) { - if (var0 == null) { - return null; - } else { - int var2 = 0; - - int var3; - for (var3 = var0.length(); var2 < var3 && FaceNormal.method3222(var0.charAt(var2)); ++var2) { - } - - while (var3 > var2 && FaceNormal.method3222(var0.charAt(var3 - 1))) { - --var3; - } - - int var4 = var3 - var2; - if (var4 >= 1) { - byte var6; - if (var1 == null) { - var6 = 12; - } else { - switch(var1.field4033) { - case 1: - var6 = 20; - break; - default: - var6 = 12; - } - } - - if (var4 <= var6) { - StringBuilder var12 = new StringBuilder(var4); - - for (int var14 = var2; var14 < var3; ++var14) { - char var7 = var0.charAt(var14); - boolean var8; - if (Character.isISOControl(var7)) { - var8 = false; - } else if (RouteStrategy.isAlphaNumeric(var7)) { - var8 = true; - } else { - char[] var13 = class338.field4038; - int var10 = 0; - - label83: - while (true) { - char var11; - if (var10 >= var13.length) { - var13 = class338.field4035; - - for (var10 = 0; var10 < var13.length; ++var10) { - var11 = var13[var10]; - if (var7 == var11) { - var8 = true; - break label83; - } - } - - var8 = false; - break; - } - - var11 = var13[var10]; - if (var11 == var7) { - var8 = true; - break; - } - - ++var10; - } - } - - if (var8) { - char var9 = StructDefinition.method4449(var7); - if (var9 != 0) { - var12.append(var9); - } - } - } - - if (var12.length() == 0) { - return null; - } - - return var12.toString(); - } - } - - return null; + static void method3276(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var1 != null) { + var1.remove(); } } - - @ObfuscatedName("kg") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "1388025296" - ) - static void method3258(String var0) { - Clock.field2037 = var0; - - try { - String var1 = WorldMapID.client.getParameter(Integer.toString(18)); - String var2 = WorldMapID.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=" + MusicPatchPcmStream.method3831(SequenceDefinition.method4686() + 94608000000L) + "; Max-Age=" + 94608000L; - } - - class47.method796(WorldMapID.client, "document.cookie=\"" + var3 + "\""); - } catch (Throwable var4) { - } - - } } diff --git a/runescape-client/src/main/java/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java index 31c9425c20..6e32823ba5 100644 --- a/runescape-client/src/main/java/UrlRequester.java +++ b/runescape-client/src/main/java/UrlRequester.java @@ -10,19 +10,16 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eg") +@ObfuscatedName("ed") @Implements("UrlRequester") public class UrlRequester implements Runnable { - @ObfuscatedName("q") - @Export("ItemDefinition_inMembersWorld") - public static boolean ItemDefinition_inMembersWorld; - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("thread") final Thread thread; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("isClosed") volatile boolean isClosed; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("requests") Queue requests; @@ -33,10 +30,10 @@ public class UrlRequester implements Runnable { this.thread.start(); } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/net/URL;I)Ler;", - garbageValue = "-2144304938" + signature = "(Ljava/net/URL;I)Leq;", + garbageValue = "1332012444" ) @Export("request") public UrlRequest request(URL var1) { @@ -48,10 +45,10 @@ public class UrlRequester implements Runnable { } } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1101438490" + garbageValue = "1487923235" ) @Export("close") public void close() { @@ -114,41 +111,18 @@ public class UrlRequester implements Runnable { } } catch (Exception var17) { - class3.RunException_sendStackTrace((String)null, var17); + class188.RunException_sendStackTrace((String)null, var17); } } } - @ObfuscatedName("u") + @ObfuscatedName("ge") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "-75" + signature = "(B)Z", + garbageValue = "6" ) - public static void method3250(int var0) { - if (var0 != -1) { - if (WorldMapDecoration.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; - } - - WorldMapDecoration.Widget_loadedInterfaces[var0] = false; - } - } - } + static boolean method3273() { + return (Client.drawPlayerNames & 8) != 0; } } diff --git a/runescape-client/src/main/java/User.java b/runescape-client/src/main/java/User.java index 58843dafae..3d8a7f22af 100644 --- a/runescape-client/src/main/java/User.java +++ b/runescape-client/src/main/java/User.java @@ -3,18 +3,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ju") +@ObfuscatedName("jw") @Implements("User") public class User implements Comparable { - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Ljx;" + signature = "Ljt;" ) @Export("username") Username username; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Ljx;" + signature = "Ljt;" ) @Export("previousUsername") Username previousUsername; @@ -22,40 +22,40 @@ public class User implements Comparable { User() { } - @ObfuscatedName("m") + @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "(B)Ljx;", - garbageValue = "32" + signature = "(I)Ljt;", + garbageValue = "1555546597" ) @Export("getUsername") public Username getUsername() { return this.username; } - @ObfuscatedName("o") + @ObfuscatedName("at") @ObfuscatedSignature( signature = "(I)Ljava/lang/String;", - garbageValue = "-1978694168" + garbageValue = "1766346006" ) @Export("getName") public String getName() { return this.username == null ? "" : this.username.getName(); } - @ObfuscatedName("av") + @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "(B)Ljava/lang/String;", - garbageValue = "1" + signature = "(I)Ljava/lang/String;", + garbageValue = "1018058811" ) @Export("getPreviousName") public String getPreviousName() { return this.previousUsername == null ? "" : this.previousUsername.getName(); } - @ObfuscatedName("am") + @ObfuscatedName("av") @ObfuscatedSignature( - signature = "(Ljx;Ljx;I)V", - garbageValue = "-906454666" + signature = "(Ljt;Ljt;I)V", + garbageValue = "2051055931" ) @Export("set") void set(Username var1, Username var2) { @@ -67,10 +67,10 @@ public class User implements Comparable { } } - @ObfuscatedName("ai") + @ObfuscatedName("an") @ObfuscatedSignature( - signature = "(Lju;B)I", - garbageValue = "1" + signature = "(Ljw;B)I", + garbageValue = "-92" ) @Export("compareTo_user") public int compareTo_user(User var1) { @@ -80,27 +80,4 @@ public class User implements Comparable { public int compareTo(Object var1) { return this.compareTo_user((User)var1); } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(IIII)I", - garbageValue = "-117811845" - ) - static final int method4969(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 = class13.method162(var3, var5); - int var8 = class13.method162(var3 + 1, var5); - int var9 = class13.method162(var3, var5 + 1); - int var10 = class13.method162(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); - int var16 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var6 * 1024 / var2] >> 1; - int var15 = ((65536 - var16) * var11 >> 16) + (var13 * var16 >> 16); - return var15; - } } diff --git a/runescape-client/src/main/java/UserComparator1.java b/runescape-client/src/main/java/UserComparator1.java index 9a3389a161..a489e0d4ae 100644 --- a/runescape-client/src/main/java/UserComparator1.java +++ b/runescape-client/src/main/java/UserComparator1.java @@ -4,16 +4,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lf") +@ObfuscatedName("lx") @Implements("UserComparator1") public class UserComparator1 implements Comparator { - @ObfuscatedName("i") - @Export("Interpreter_intLocals") - static int[] Interpreter_intLocals; - @ObfuscatedName("k") - @Export("Interpreter_stringLocals") - static String[] Interpreter_stringLocals; - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("reversed") final boolean reversed; @@ -21,21 +15,21 @@ public class UserComparator1 implements Comparator { this.reversed = var1; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lju;Lju;I)I", - garbageValue = "-414427589" + signature = "(Ljw;Ljw;B)I", + garbageValue = "-97" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { return this.reversed ? var1.compareTo_user(var2) : var2.compareTo_user(var1); } - public boolean equals(Object var1) { - return super.equals(var1); - } - public int compare(Object var1, Object var2) { return this.compare_bridged((User)var1, (User)var2); } + + public boolean equals(Object var1) { + return super.equals(var1); + } } diff --git a/runescape-client/src/main/java/UserComparator10.java b/runescape-client/src/main/java/UserComparator10.java index 5bebd44680..7f643c33ce 100644 --- a/runescape-client/src/main/java/UserComparator10.java +++ b/runescape-client/src/main/java/UserComparator10.java @@ -1,13 +1,24 @@ import 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("ew") @Implements("UserComparator10") public class UserComparator10 extends AbstractUserComparator { - @ObfuscatedName("s") + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "[Llt;" + ) + @Export("runesSprite") + static IndexedSprite[] runesSprite; + @ObfuscatedName("dn") + @ObfuscatedGetter( + longValue = -5864527508821093591L + ) + static long field1946; + @ObfuscatedName("c") @Export("reversed") final boolean reversed; @@ -15,10 +26,10 @@ public class UserComparator10 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljt;Ljt;B)I", - garbageValue = "-47" + signature = "(Lje;Lje;I)I", + garbageValue = "1179427520" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -33,400 +44,39 @@ public class UserComparator10 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "(Lhz;Lhz;Lhz;Lhz;I)V", - garbageValue = "34424485" - ) - @Export("Widget_setArchives") - public static void Widget_setArchives(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, AbstractArchive var3) { - Widget.Widget_archive = var0; - Huffman.Widget_modelsArchive = var1; - WorldMapSprite.Widget_spritesArchive = var2; - Widget.Widget_fontsArchive = var3; - Widget.Widget_interfaceComponents = new Widget[Widget.Widget_archive.getGroupCount()][]; - WorldMapDecoration.Widget_loadedInterfaces = new boolean[Widget.Widget_archive.getGroupCount()]; - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(ILcr;ZS)I", - garbageValue = "180" - ) - static int method3345(int var0, Script var1, boolean var2) { - int var3 = -1; - Widget var4; - if (var0 >= 2000) { - var0 -= 1000; - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var4 = WorldMapElement.getWidget(var3); - } else { - var4 = var2 ? class286.field3623 : class297.field3693; - } - - 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]; - FriendSystem.invalidateWidget(var4); - WorldMapID.client.alignWidget(var4); - if (var3 != -1 && var4.type == 0) { - WorldMapAreaData.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]; - FriendSystem.invalidateWidget(var4); - WorldMapID.client.alignWidget(var4); - if (var3 != -1 && var4.type == 0) { - WorldMapAreaData.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; - FriendSystem.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("c") @ObfuscatedSignature( - signature = "(IIIIIZI)Lls;", - garbageValue = "92039087" + signature = "(IB)I", + garbageValue = "-52" ) - @Export("getItemSprite") - public static final Sprite 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; + @Export("iLog") + public static int iLog(int var0) { + int var1 = 0; + if (var0 < 0 || var0 >= 65536) { + var0 >>>= 16; + var1 += 16; } - long var6 = ((long)var3 << 42) + ((long)var4 << 40) + ((long)var2 << 38) + (long)var0 + ((long)var1 << 16); - Sprite var8; - if (!var5) { - var8 = (Sprite)ItemDefinition.ItemDefinition_cachedSprites.get(var6); - if (var8 != null) { - return var8; - } + if (var0 >= 256) { + var0 >>>= 8; + var1 += 8; } - ItemDefinition var9 = WorldMapData_0.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 = WorldMapData_0.ItemDefinition_get(var10); - } + if (var0 >= 16) { + var0 >>>= 4; + var1 += 4; } - Model var19 = var9.getModel(1); - if (var19 == null) { - return null; - } else { - Sprite 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 Sprite(36, 32); - Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); - Rasterizer2D.Rasterizer2D_clear(); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - Rasterizer3D.method2929(16, 16); - Rasterizer3D.field1744 = 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.method2874(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(class96.method2201(var1), 0, 9, 16776960, 1); - } - - if (!var5) { - ItemDefinition.ItemDefinition_cachedSprites.put(var8, var6); - } - - Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); - Rasterizer2D.Rasterizer2D_setClipArray(var15); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - Rasterizer3D.field1744 = true; - return var8; - } - } - - @ObfuscatedName("eu") - @ObfuscatedSignature( - signature = "(IZZZI)Lid;", - garbageValue = "-1576468201" - ) - @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, WorldMapSection1.JagexCache_idxFiles[var0], 1000000); + if (var0 >= 4) { + var0 >>>= 2; + var1 += 2; } - return new Archive(var4, class293.masterDisk, var0, var1, var2, var3); - } - - @ObfuscatedName("gz") - @ObfuscatedSignature( - signature = "(IIIIII)V", - garbageValue = "-1531773798" - ) - @Export("drawObject") - static final void drawObject(int var0, int var1, int var2, int var3, int var4) { - long var5 = Player.scene.getBoundaryObjectTag(var0, var1, var2); - int var7; - int var8; - int var9; - int var10; - int var12; - int var13; - if (0L != var5) { - var7 = Player.scene.getObjectFlags(var0, var1, var2, var5); - var8 = var7 >> 6 & 3; - var9 = var7 & 31; - var10 = var3; - if (SpotAnimationDefinition.method4333(var5)) { - var10 = var4; - } - - int[] var11 = ParamDefinition.sceneMinimapSprite.pixels; - var12 = var1 * 4 + (103 - var2) * 2048 + 24624; - var13 = BoundaryObject.Entity_unpackID(var5); - ObjectDefinition var14 = class215.getObjectDefinition(var13); - if (var14.mapSceneId != -1) { - IndexedSprite var15 = GrandExchangeOfferOwnWorldComparator.mapSceneSprites[var14.mapSceneId]; - if (var15 != null) { - int var16 = (var14.sizeX * 4 - var15.subWidth) / 2; - int var17 = (var14.sizeY * 4 - var15.subHeight) / 2; - var15.drawAt(var1 * 4 + var16 + 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; - } - } - } + if (var0 >= 1) { + var0 >>>= 1; + ++var1; } - var5 = Player.scene.getGameObjectTag(var0, var1, var2); - if (0L != var5) { - var7 = Player.scene.getObjectFlags(var0, var1, var2, var5); - var8 = var7 >> 6 & 3; - var9 = var7 & 31; - var10 = BoundaryObject.Entity_unpackID(var5); - ObjectDefinition var24 = class215.getObjectDefinition(var10); - int var19; - if (var24.mapSceneId != -1) { - IndexedSprite var18 = GrandExchangeOfferOwnWorldComparator.mapSceneSprites[var24.mapSceneId]; - if (var18 != null) { - var13 = (var24.sizeX * 4 - var18.subWidth) / 2; - var19 = (var24.sizeY * 4 - var18.subHeight) / 2; - var18.drawAt(var1 * 4 + var13 + 48, var19 + (104 - var2 - var24.sizeY) * 4 + 48); - } - } else if (var9 == 9) { - var12 = 15658734; - if (SpotAnimationDefinition.method4333(var5)) { - var12 = 15597568; - } - - int[] var23 = ParamDefinition.sceneMinimapSprite.pixels; - var19 = var1 * 4 + (103 - var2) * 2048 + 24624; - if (var8 != 0 && var8 != 2) { - var23[var19] = var12; - var23[var19 + 1 + 512] = var12; - var23[var19 + 1024 + 2] = var12; - var23[var19 + 1536 + 3] = var12; - } else { - var23[var19 + 1536] = var12; - var23[var19 + 1 + 1024] = var12; - var23[var19 + 512 + 2] = var12; - var23[var19 + 3] = var12; - } - } - } - - var5 = Player.scene.getFloorDecorationTag(var0, var1, var2); - if (0L != var5) { - var7 = BoundaryObject.Entity_unpackID(var5); - ObjectDefinition var20 = class215.getObjectDefinition(var7); - if (var20.mapSceneId != -1) { - IndexedSprite var21 = GrandExchangeOfferOwnWorldComparator.mapSceneSprites[var20.mapSceneId]; - if (var21 != null) { - var10 = (var20.sizeX * 4 - var21.subWidth) / 2; - int var22 = (var20.sizeY * 4 - var21.subHeight) / 2; - var21.drawAt(var1 * 4 + var10 + 48, var22 + (104 - var2 - var20.sizeY) * 4 + 48); - } - } - } - - } - - @ObfuscatedName("jc") - @ObfuscatedSignature( - signature = "(Lhp;I)Z", - garbageValue = "-1592710646" - ) - @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 = AbstractByteArrayCopier.method3868(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 (var2 != var3) { - return false; - } - } - - return true; - } + return var0 + var1; } } diff --git a/runescape-client/src/main/java/UserComparator2.java b/runescape-client/src/main/java/UserComparator2.java index 06de303441..10db55a931 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("li") +@ObfuscatedName("le") @Implements("UserComparator2") public class UserComparator2 implements Comparator { - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("reversed") final boolean reversed; @@ -15,10 +15,10 @@ public class UserComparator2 implements Comparator { this.reversed = var1; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lju;Lju;I)I", - garbageValue = "1525984860" + signature = "(Ljw;Ljw;I)I", + garbageValue = "-1462037203" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { @@ -32,4 +32,10 @@ public class UserComparator2 implements Comparator { public int compare(Object var1, Object var2) { return this.compare_bridged((User)var1, (User)var2); } + + @ObfuscatedName("t") + @Export("ViewportMouse_unpackY") + public static int ViewportMouse_unpackY(long var0) { + return (int)(var0 >>> 14 & 3L); + } } diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java index ce76f1b8e3..b693a6a67a 100644 --- a/runescape-client/src/main/java/UserComparator3.java +++ b/runescape-client/src/main/java/UserComparator3.java @@ -3,16 +3,15 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fd") +@ObfuscatedName("ff") @Implements("UserComparator3") public class UserComparator3 extends AbstractUserComparator { - @ObfuscatedName("gp") - @ObfuscatedSignature( - signature = "Lls;" - ) - @Export("redHintArrowSprite") - static Sprite redHintArrowSprite; - @ObfuscatedName("s") + @ObfuscatedName("v") + @Export("Widget_loadedInterfaces") + static boolean[] Widget_loadedInterfaces; + @ObfuscatedName("p") + static int[][][] field1961; + @ObfuscatedName("c") @Export("reversed") final boolean reversed; @@ -20,10 +19,10 @@ public class UserComparator3 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljt;Ljt;I)I", - garbageValue = "-1087585771" + signature = "(Lje;Lje;I)I", + garbageValue = "-434078847" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -38,45 +37,28 @@ public class UserComparator3 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1811114805" + signature = "(I)V", + garbageValue = "1668063844" ) - public static int method3371() { - return ++MouseHandler.MouseHandler_idleCycles - 1; + @Export("HealthBarDefinition_clearCached") + public static void HealthBarDefinition_clearCached() { + HealthBarDefinition.HealthBarDefinition_cached.clear(); + HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); } - @ObfuscatedName("fj") + @ObfuscatedName("jk") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "35" + signature = "(II)V", + garbageValue = "1258062289" ) - @Export("processOverheadText") - static final void processOverheadText() { - int[] var0 = Players.Players_indices; - - int var1; - for (var1 = 0; var1 < Players.Players_count; ++var1) { - Player var2 = Client.players[var0[var1]]; - if (var2 != null && var2.overheadTextCyclesRemaining > 0) { - --var2.overheadTextCyclesRemaining; - if (var2.overheadTextCyclesRemaining == 0) { - var2.overheadText = null; - } - } - } - - for (var1 = 0; var1 < Client.npcCount; ++var1) { - int var4 = Client.npcIndices[var1]; - NPC var3 = Client.npcs[var4]; - if (var3 != null && var3.overheadTextCyclesRemaining > 0) { - --var3.overheadTextCyclesRemaining; - if (var3.overheadTextCyclesRemaining == 0) { - var3.overheadText = null; - } - } - } - + static void method3399(int var0) { + SoundCache.tempMenuAction = new MenuAction(); + SoundCache.tempMenuAction.argument1 = Client.menuArguments1[var0]; + SoundCache.tempMenuAction.argument2 = Client.menuArguments2[var0]; + SoundCache.tempMenuAction.opcode = Client.menuOpcodes[var0]; + SoundCache.tempMenuAction.argument0 = Client.menuIdentifiers[var0]; + SoundCache.tempMenuAction.action = Client.menuActions[var0]; } } diff --git a/runescape-client/src/main/java/UserComparator4.java b/runescape-client/src/main/java/UserComparator4.java index 9ec23a56e4..2d4d262644 100644 --- a/runescape-client/src/main/java/UserComparator4.java +++ b/runescape-client/src/main/java/UserComparator4.java @@ -3,15 +3,11 @@ 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("eb") +@ObfuscatedName("er") @Implements("UserComparator4") public class UserComparator4 implements Comparator { - @ObfuscatedName("t") - @Export("ByteArrayPool_alternativeSizes") - public static int[] ByteArrayPool_alternativeSizes; - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("reversed") final boolean reversed; @@ -19,49 +15,21 @@ public class UserComparator4 implements Comparator { this.reversed = var1; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljt;Ljt;B)I", - garbageValue = "-7" + signature = "(Lje;Lje;B)I", + garbageValue = "-78" ) @Export("compare_bridged") int compare_bridged(Buddy var1, Buddy var2) { return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; } - public boolean equals(Object var1) { - return super.equals(var1); - } - public int compare(Object var1, Object var2) { return this.compare_bridged((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)Ljava/lang/Class;", - garbageValue = "500061320" - ) - @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); - } + public boolean equals(Object var1) { + return super.equals(var1); } } diff --git a/runescape-client/src/main/java/UserComparator5.java b/runescape-client/src/main/java/UserComparator5.java index 50b85e49e6..bbeb076e5c 100644 --- a/runescape-client/src/main/java/UserComparator5.java +++ b/runescape-client/src/main/java/UserComparator5.java @@ -3,10 +3,18 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fz") +@ObfuscatedName("ft") @Implements("UserComparator5") public class UserComparator5 extends AbstractUserComparator { - @ObfuscatedName("s") + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "Lba;" + ) + @Export("loginScreenRunesAnimation") + static LoginScreenAnimation loginScreenRunesAnimation; + @ObfuscatedName("ez") + static int[] field1958; + @ObfuscatedName("c") @Export("reversed") final boolean reversed; @@ -14,10 +22,10 @@ public class UserComparator5 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljt;Ljt;I)I", - garbageValue = "1721818690" + signature = "(Lje;Lje;I)I", + garbageValue = "-234199662" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -36,25 +44,29 @@ public class UserComparator5 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("j") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(IIIIIII)I", - garbageValue = "-130960812" + signature = "([BI)V", + garbageValue = "303313970" ) - public static int method3366(int var0, int var1, int var2, int var3, int var4, int var5) { - if ((var5 & 1) == 1) { - int var6 = var3; - var3 = var4; - var4 = var6; - } - - var2 &= 3; - if (var2 == 0) { - return var0; - } else if (var2 == 1) { - return var1; + @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 { - return var2 == 2 ? 7 - var0 - (var3 - 1) : 7 - var1 - (var4 - 1); + if (WorldMapEvent.ByteArrayPool_arrays != null) { + for (int var1 = 0; var1 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var1) { + if (var0.length == ByteArrayPool.ByteArrayPool_alternativeSizes[var1] && Login.ByteArrayPool_altSizeArrayCounts[var1] < WorldMapEvent.ByteArrayPool_arrays[var1].length) { + WorldMapEvent.ByteArrayPool_arrays[var1][Login.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; + return; + } + } + } + } } } diff --git a/runescape-client/src/main/java/UserComparator6.java b/runescape-client/src/main/java/UserComparator6.java index eea44f9f86..274c453195 100644 --- a/runescape-client/src/main/java/UserComparator6.java +++ b/runescape-client/src/main/java/UserComparator6.java @@ -3,16 +3,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ff") +@ObfuscatedName("fm") @Implements("UserComparator6") public class UserComparator6 extends AbstractUserComparator { - @ObfuscatedName("ga") - @ObfuscatedSignature( - signature = "[Lls;" - ) - @Export("headIconPkSprites") - static Sprite[] headIconPkSprites; - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("reversed") final boolean reversed; @@ -20,10 +14,10 @@ public class UserComparator6 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljt;Ljt;B)I", - garbageValue = "11" + signature = "(Lje;Lje;I)I", + garbageValue = "1603380777" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -38,15 +32,27 @@ public class UserComparator6 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("ji") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "-1763118149" + signature = "(I)Lfk;", + garbageValue = "542497386" ) - @Export("runIntfCloseListeners") - static final void runIntfCloseListeners(int var0, int var1) { - if (Projectile.loadInterface(var0)) { - class189.runComponentCloseListeners(Widget.Widget_interfaceComponents[var0], var1); + @Export("newClock") + public static Clock newClock() { + try { + return new NanoClock(); + } catch (Throwable var1) { + return new MilliClock(); } } + + @ObfuscatedName("kw") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "0" + ) + static void method3417() { + Client.packetWriter.addNode(MenuAction.getPacketBufferNode(ClientPacket.field2254, Client.packetWriter.isaacCipher)); + Client.oculusOrbState = 0; + } } diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java index 88e96a99ff..a3a34dc4c4 100644 --- a/runescape-client/src/main/java/UserComparator7.java +++ b/runescape-client/src/main/java/UserComparator7.java @@ -1,25 +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("ev") +@ObfuscatedName("ex") @Implements("UserComparator7") public class UserComparator7 extends AbstractUserComparator { - @ObfuscatedName("fo") - @ObfuscatedSignature( - signature = "Lkr;" - ) - @Export("WorldMapElement_fonts") - static Fonts WorldMapElement_fonts; - @ObfuscatedName("hk") - @ObfuscatedGetter( - intValue = -246677649 - ) - @Export("cameraZ") - static int cameraZ; - @ObfuscatedName("s") + @ObfuscatedName("z") + @Export("Tiles_hue") + static int[] Tiles_hue; + @ObfuscatedName("c") @Export("reversed") final boolean reversed; @@ -27,10 +17,10 @@ public class UserComparator7 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljt;Ljt;I)I", - garbageValue = "-601545219" + signature = "(Lje;Lje;I)I", + garbageValue = "955067035" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -47,41 +37,51 @@ public class UserComparator7 extends AbstractUserComparator { @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "2" + signature = "(III)I", + garbageValue = "1115745838" ) - @Export("SpriteBuffer_clear") - public static void SpriteBuffer_clear() { - class325.SpriteBuffer_xOffsets = null; - class325.SpriteBuffer_yOffsets = null; - class325.SpriteBuffer_spriteWidths = null; - class225.SpriteBuffer_spriteHeights = null; - class325.SpriteBuffer_spritePalette = null; - WorldMapSection1.SpriteBuffer_pixels = null; - } + static int method3382(int var0, int var1) { + if (var0 == -2) { + return 12345678; + } else if (var0 == -1) { + if (var1 < 0) { + var1 = 0; + } else if (var1 > 127) { + var1 = 127; + } - @ObfuscatedName("r") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "0" - ) - @Export("openWorldSelect") - static void openWorldSelect() { - if (class173.loadWorlds()) { - Login.worldSelectOpen = true; - Login.worldSelectPage = 0; - Login.worldSelectPagesCount = 0; + 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("fr") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1359476152" + signature = "(II)Ljava/lang/String;", + garbageValue = "2041476927" ) - @Export("getWindowedMode") - static int getWindowedMode() { - return Client.isResizable ? 2 : 1; + @Export("colorStartTag") + static String colorStartTag(int var0) { + return ""; + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(Lhz;Ljava/lang/String;Ljava/lang/String;IZB)V", + garbageValue = "-11" + ) + public static void method3376(AbstractArchive var0, String var1, String var2, int var3, boolean var4) { + int var5 = var0.getGroupId(var1); + int var6 = var0.getFileId(var5, var2); + class49.method826(var0, var5, var6, var3, var4); } } diff --git a/runescape-client/src/main/java/UserComparator8.java b/runescape-client/src/main/java/UserComparator8.java index 679d5b213f..5ed68160f3 100644 --- a/runescape-client/src/main/java/UserComparator8.java +++ b/runescape-client/src/main/java/UserComparator8.java @@ -1,24 +1,14 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("el") +@ObfuscatedName("eu") @Implements("UserComparator8") public class UserComparator8 extends AbstractUserComparator { - @ObfuscatedName("al") - @ObfuscatedGetter( - intValue = 1658128897 - ) - static int field1957; - @ObfuscatedName("dz") - @ObfuscatedSignature( - signature = "Lid;" - ) - @Export("archive3") - static Archive archive3; - @ObfuscatedName("s") + @ObfuscatedName("j") + public static short[] field1944; + @ObfuscatedName("c") @Export("reversed") final boolean reversed; @@ -26,10 +16,10 @@ public class UserComparator8 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljt;Ljt;S)I", - garbageValue = "-29933" + signature = "(Lje;Lje;I)I", + garbageValue = "1986954422" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -48,12 +38,20 @@ public class UserComparator8 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("i") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(CS)C", - garbageValue = "8860" + signature = "([BZB)Ljava/lang/Object;", + garbageValue = "-87" ) - static char method3342(char var0) { - return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; + public static Object method3365(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; + } } } diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java index eaded6cf31..279fae828e 100644 --- a/runescape-client/src/main/java/UserComparator9.java +++ b/runescape-client/src/main/java/UserComparator9.java @@ -3,10 +3,17 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eu") +@ObfuscatedName("eh") @Implements("UserComparator9") public class UserComparator9 extends AbstractUserComparator { @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "Lhy;" + ) + static Widget field1941; + @ObfuscatedName("k") + public static String field1940; + @ObfuscatedName("c") @Export("reversed") final boolean reversed; @@ -14,10 +21,10 @@ public class UserComparator9 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljt;Ljt;B)I", - garbageValue = "-36" + signature = "(Lje;Lje;I)I", + garbageValue = "1325435162" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -32,25 +39,60 @@ public class UserComparator9 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("k") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lkx;I)I", - garbageValue = "555200658" + signature = "([Ljava/lang/String;[SIIB)V", + garbageValue = "1" ) - @Export("decode") - static int decode(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); + @Export("sortItemsByName") + static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) { + if (var2 < var3) { + int var4 = (var3 + var2) / 2; + int var5 = var2; + String var6 = var0[var4]; + var0[var4] = var0[var3]; + var0[var3] = var6; + short var7 = var1[var4]; + var1[var4] = var1[var3]; + var1[var3] = var7; + + for (int var8 = var2; var8 < var3; ++var8) { + if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { + String var9 = var0[var8]; + var0[var8] = var0[var5]; + var0[var5] = var9; + short var10 = var1[var8]; + var1[var8] = var1[var5]; + var1[var5++] = var10; + } + } + + var0[var3] = var0[var5]; + var0[var5] = var6; + var1[var3] = var1[var5]; + var1[var5] = var7; + sortItemsByName(var0, var1, var2, var5 - 1); + sortItemsByName(var0, var1, var5 + 1, var3); } - return var2; + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-2074784616" + ) + @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; } } diff --git a/runescape-client/src/main/java/UserList.java b/runescape-client/src/main/java/UserList.java index 4094a0a060..91616f4748 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("jw") +@ObfuscatedName("jm") @Implements("UserList") public abstract class UserList { - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -800073163 + intValue = -1621791481 ) @Export("capacity") final int capacity; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 894292329 + intValue = 1144199685 ) @Export("size") int size; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "[Lju;" + signature = "[Ljw;" ) @Export("array") User[] array; - @ObfuscatedName("t") + @ObfuscatedName("j") @Export("usernamesMap") HashMap usernamesMap; - @ObfuscatedName("q") + @ObfuscatedName("v") @Export("previousUsernamesMap") HashMap previousUsernamesMap; - @ObfuscatedName("x") + @ObfuscatedName("d") @Export("comparator") Comparator comparator; @@ -47,26 +47,26 @@ public abstract class UserList { this.previousUsernamesMap = new HashMap(var1 / 8); } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)Lju;", - garbageValue = "-192021045" + signature = "(I)Ljw;", + garbageValue = "-734254876" ) @Export("newInstance") abstract User newInstance(); - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(II)[Lju;", - garbageValue = "518998026" + signature = "(II)[Ljw;", + garbageValue = "1353779565" ) @Export("newTypedArray") abstract User[] newTypedArray(int var1); - @ObfuscatedName("x") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1494312128" + signature = "(B)V", + garbageValue = "-68" ) @Export("clear") public void clear() { @@ -76,30 +76,30 @@ public abstract class UserList { this.previousUsernamesMap.clear(); } - @ObfuscatedName("d") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1766865148" + garbageValue = "1829026437" ) @Export("getSize") public int getSize() { return this.size; } - @ObfuscatedName("f") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(B)Z", - garbageValue = "-128" + garbageValue = "90" ) @Export("isFull") public boolean isFull() { return this.size == this.capacity; } - @ObfuscatedName("c") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Ljx;S)Z", - garbageValue = "22737" + signature = "(Ljt;B)Z", + garbageValue = "9" ) @Export("contains") public boolean contains(Username var1) { @@ -110,10 +110,10 @@ public abstract class UserList { } } - @ObfuscatedName("r") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Ljx;I)Lju;", - garbageValue = "1058289920" + signature = "(Ljt;I)Ljw;", + garbageValue = "-920906156" ) @Export("getByUsername") public User getByUsername(Username var1) { @@ -121,30 +121,30 @@ public abstract class UserList { return var2 != null ? var2 : this.getByPreviousUsername(var1); } - @ObfuscatedName("y") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(Ljx;I)Lju;", - garbageValue = "558762699" + signature = "(Ljt;I)Ljw;", + garbageValue = "-1425311413" ) @Export("getByCurrentUsername") User getByCurrentUsername(Username var1) { return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); } - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Ljx;I)Lju;", - garbageValue = "1368217697" + signature = "(Ljt;B)Ljw;", + garbageValue = "-21" ) @Export("getByPreviousUsername") User getByPreviousUsername(Username var1) { return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); } - @ObfuscatedName("g") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Ljx;B)Z", - garbageValue = "-8" + signature = "(Ljt;I)Z", + garbageValue = "1391401816" ) @Export("removeByUsername") public final boolean removeByUsername(Username var1) { @@ -157,10 +157,10 @@ public abstract class UserList { } } - @ObfuscatedName("e") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lju;I)V", - garbageValue = "1902139593" + signature = "(Ljw;B)V", + garbageValue = "72" ) @Export("remove") final void remove(User var1) { @@ -171,20 +171,20 @@ public abstract class UserList { } } - @ObfuscatedName("z") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ljx;B)Lju;", - garbageValue = "118" + signature = "(Ljt;S)Ljw;", + garbageValue = "-26020" ) @Export("addLastNoPreviousUsername") User addLastNoPreviousUsername(Username var1) { return this.addLast(var1, (Username)null); } - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(Ljx;Ljx;I)Lju;", - garbageValue = "-1015341374" + signature = "(Ljt;Ljt;B)Ljw;", + garbageValue = "-33" ) @Export("addLast") User addLast(Username var1, Username var2) { @@ -199,10 +199,10 @@ public abstract class UserList { } } - @ObfuscatedName("l") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(II)Lju;", - garbageValue = "2118428404" + signature = "(II)Ljw;", + garbageValue = "669795741" ) @Export("get") public final User get(int var1) { @@ -213,10 +213,10 @@ public abstract class UserList { } } - @ObfuscatedName("h") + @ObfuscatedName("ag") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1838331070" + garbageValue = "-1292834798" ) @Export("sort") public final void sort() { @@ -228,10 +228,10 @@ public abstract class UserList { } - @ObfuscatedName("v") + @ObfuscatedName("at") @ObfuscatedSignature( - signature = "(Lju;Ljx;Ljx;I)V", - garbageValue = "2089175603" + signature = "(Ljw;Ljt;Ljt;B)V", + garbageValue = "60" ) @Export("changeName") final void changeName(User var1, Username var2, Username var3) { @@ -240,10 +240,10 @@ public abstract class UserList { this.mapPut(var1); } - @ObfuscatedName("m") + @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "(Lju;I)I", - garbageValue = "-2041490811" + signature = "(Ljw;S)I", + garbageValue = "27337" ) @Export("indexOf") final int indexOf(User var1) { @@ -256,10 +256,10 @@ public abstract class UserList { return -1; } - @ObfuscatedName("o") + @ObfuscatedName("av") @ObfuscatedSignature( - signature = "(Lju;B)V", - garbageValue = "97" + signature = "(Ljw;B)V", + garbageValue = "113" ) @Export("mapRemove") final void mapRemove(User var1) { @@ -273,20 +273,20 @@ public abstract class UserList { } } - @ObfuscatedName("av") + @ObfuscatedName("an") @ObfuscatedSignature( - signature = "(Lju;I)V", - garbageValue = "1221836772" + signature = "(Ljw;I)V", + garbageValue = "356769932" ) @Export("arrayAddLast") final void arrayAddLast(User var1) { this.array[++this.size - 1] = var1; } - @ObfuscatedName("am") + @ObfuscatedName("al") @ObfuscatedSignature( - signature = "(Lju;I)V", - garbageValue = "-1095094859" + signature = "(Ljw;I)V", + garbageValue = "-1802134549" ) @Export("mapPut") final void mapPut(User var1) { @@ -300,10 +300,10 @@ public abstract class UserList { } - @ObfuscatedName("ai") + @ObfuscatedName("as") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1995849592" + signature = "(IB)V", + garbageValue = "6" ) @Export("arrayRemove") final void arrayRemove(int var1) { @@ -314,20 +314,20 @@ public abstract class UserList { } - @ObfuscatedName("af") + @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "0" + signature = "(I)V", + garbageValue = "2144429485" ) @Export("removeComparator") public final void removeComparator() { this.comparator = null; } - @ObfuscatedName("az") + @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "(Ljava/util/Comparator;I)V", - garbageValue = "-1472739906" + signature = "(Ljava/util/Comparator;B)V", + garbageValue = "1" ) @Export("addComparator") public final void addComparator(Comparator var1) { @@ -338,30 +338,4 @@ public abstract class UserList { } } - - @ObfuscatedName("s") - @Export("sleepMillis") - public static final void sleepMillis(long var0) { - if (var0 > 0L) { - if (0L == var0 % 10L) { - long var2 = var0 - 1L; - - try { - Thread.sleep(var2); - } catch (InterruptedException var8) { - } - - try { - Thread.sleep(1L); - } catch (InterruptedException var7) { - } - } else { - try { - Thread.sleep(var0); - } catch (InterruptedException var6) { - } - } - - } - } } diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java index d213ad859e..0ae53e1da6 100644 --- a/runescape-client/src/main/java/Username.java +++ b/runescape-client/src/main/java/Username.java @@ -1,50 +1,227 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jx") +@ObfuscatedName("jt") @Implements("Username") public class Username implements Comparable { - @ObfuscatedName("s") + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -1583830617 + ) + static int field3594; + @ObfuscatedName("c") @Export("name") String name; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("cleanName") String cleanName; @ObfuscatedSignature( - signature = "(Ljava/lang/String;Llu;)V" + signature = "(Ljava/lang/String;Lll;)V" ) public Username(String var1, LoginType var2) { this.name = var1; - this.cleanName = UrlRequest.method3264(var1, var2); + String var4; + if (var1 == null) { + var4 = null; + } else { + int var5 = 0; + + int var6; + boolean var7; + char var8; + for (var6 = var1.length(); var5 < var6; ++var5) { + var8 = var1.charAt(var5); + var7 = var8 == 160 || var8 == ' ' || var8 == '_' || var8 == '-'; + if (!var7) { + break; + } + } + + while (var6 > var5) { + var8 = var1.charAt(var6 - 1); + var7 = var8 == 160 || var8 == ' ' || var8 == '_' || var8 == '-'; + if (!var7) { + break; + } + + --var6; + } + + int var17 = var6 - var5; + if (var17 >= 1 && var17 <= TaskHandler.method3464(var2)) { + StringBuilder var15 = new StringBuilder(var17); + + for (int var9 = var5; var9 < var6; ++var9) { + char var10 = var1.charAt(var9); + boolean var11; + if (Character.isISOControl(var10)) { + var11 = false; + } else if (HealthBar.isAlphaNumeric(var10)) { + var11 = true; + } else { + char[] var16 = class338.field4037; + int var13 = 0; + + label95: + while (true) { + char var14; + if (var13 >= var16.length) { + var16 = class338.field4038; + + for (var13 = 0; var13 < var16.length; ++var13) { + var14 = var16[var13]; + if (var14 == var10) { + var11 = true; + break label95; + } + } + + var11 = false; + break; + } + + var14 = var16[var13]; + if (var10 == var14) { + var11 = true; + break; + } + + ++var13; + } + } + + if (var11) { + char var12; + switch(var10) { + case ' ': + case '-': + case '_': + case ' ': + var12 = '_'; + break; + case '#': + case '[': + case ']': + var12 = var10; + break; + case 'À': + case 'Á': + case 'Â': + case 'Ã': + case 'Ä': + case 'à': + case 'á': + case 'â': + case 'ã': + case 'ä': + var12 = 'a'; + break; + case 'Ç': + case 'ç': + var12 = 'c'; + break; + case 'È': + case 'É': + case 'Ê': + case 'Ë': + case 'è': + case 'é': + case 'ê': + case 'ë': + var12 = 'e'; + break; + case 'Í': + case 'Î': + case 'Ï': + case 'í': + case 'î': + case 'ï': + var12 = 'i'; + break; + case 'Ñ': + case 'ñ': + var12 = 'n'; + break; + case 'Ò': + case 'Ó': + case 'Ô': + case 'Õ': + case 'Ö': + case 'ò': + case 'ó': + case 'ô': + case 'õ': + case 'ö': + var12 = 'o'; + break; + case 'Ù': + case 'Ú': + case 'Û': + case 'Ü': + case 'ù': + case 'ú': + case 'û': + case 'ü': + var12 = 'u'; + break; + case 'ß': + var12 = 'b'; + break; + case 'ÿ': + case 'Ÿ': + var12 = 'y'; + break; + default: + var12 = Character.toLowerCase(var10); + } + + if (var12 != 0) { + var15.append(var12); + } + } + } + + if (var15.length() == 0) { + var4 = null; + } else { + var4 = var15.toString(); + } + } else { + var4 = null; + } + } + + this.cleanName = var4; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)Ljava/lang/String;", - garbageValue = "-126" + signature = "(I)Ljava/lang/String;", + garbageValue = "-1478069507" ) @Export("getName") public String getName() { return this.name; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "85" + signature = "(I)Z", + garbageValue = "-1276407986" ) @Export("hasCleanName") public boolean hasCleanName() { return this.cleanName != null; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Ljx;I)I", - garbageValue = "2007819578" + signature = "(Ljt;I)I", + garbageValue = "1717930485" ) @Export("compareToTyped") public int compareToTyped(Username var1) { @@ -74,19 +251,23 @@ public class Username implements Comparable { return this.cleanName == null ? 0 : this.cleanName.hashCode(); } - public String abb() { - return this.getName(); - } - public int compareTo(Object var1) { return this.compareToTyped((Username)var1); } - public String abd() { - return this.getName(); - } - public String toString() { return this.getName(); } + + public String aai() { + return this.getName(); + } + + public String aan() { + return this.getName(); + } + + public String aar() { + return this.getName(); + } } diff --git a/runescape-client/src/main/java/Usernamed.java b/runescape-client/src/main/java/Usernamed.java index 7dd95727ab..d2fc0733b9 100644 --- a/runescape-client/src/main/java/Usernamed.java +++ b/runescape-client/src/main/java/Usernamed.java @@ -3,33 +3,33 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("js") +@ObfuscatedName("jj") @Implements("Usernamed") public interface Usernamed { @ObfuscatedSignature( - signature = "()Ljx;" + signature = "()Ljt;" ) - Username aba(); + Username aaa(); @ObfuscatedSignature( - signature = "()Ljx;" + signature = "()Ljt;" ) - Username aaj(); + Username aak(); @ObfuscatedSignature( - signature = "()Ljx;" + signature = "()Ljt;" ) - Username aag(); + Username aap(); @ObfuscatedSignature( - signature = "()Ljx;" + signature = "()Ljt;" ) - Username abc(); + Username aac(); - @ObfuscatedName("kk") + @ObfuscatedName("kp") @ObfuscatedSignature( - signature = "(I)Ljx;", - garbageValue = "962934553" + signature = "(B)Ljt;", + garbageValue = "1" ) @Export("username") Username username(); diff --git a/runescape-client/src/main/java/VarbitDefinition.java b/runescape-client/src/main/java/VarbitDefinition.java index a0163d53a2..1f64c40df7 100644 --- a/runescape-client/src/main/java/VarbitDefinition.java +++ b/runescape-client/src/main/java/VarbitDefinition.java @@ -4,36 +4,39 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("im") +@ObfuscatedName("it") @Implements("VarbitDefinition") public class VarbitDefinition extends DualNode { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "Lhz;" ) @Export("VarbitDefinition_archive") public static AbstractArchive VarbitDefinition_archive; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("VarbitDefinition_cached") public static EvictingDualNodeHashTable VarbitDefinition_cached; - @ObfuscatedName("i") + @ObfuscatedName("a") + @Export("BZip2Decompressor_block") + static int[] BZip2Decompressor_block; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 343295379 + intValue = -1892165457 ) @Export("baseVar") public int baseVar; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -213865641 + intValue = 810805195 ) @Export("startBit") public int startBit; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1172808511 + intValue = 1776174069 ) @Export("endBit") public int endBit; @@ -42,13 +45,16 @@ public class VarbitDefinition extends DualNode { VarbitDefinition_cached = new EvictingDualNodeHashTable(64); } - @ObfuscatedName("j") + VarbitDefinition() { + } + + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lky;I)V", - garbageValue = "-404678806" + signature = "(Lkz;I)V", + garbageValue = "-1056617467" ) @Export("decode") - public void decode(Buffer var1) { + void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { @@ -59,10 +65,10 @@ public class VarbitDefinition extends DualNode { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lky;IB)V", - garbageValue = "40" + signature = "(Lkz;IB)V", + garbageValue = "26" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -73,4 +79,39 @@ public class VarbitDefinition extends DualNode { } } + + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "(IIII)V", + garbageValue = "944071832" + ) + static final void method4499(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]; + } + + } } diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java index d9445817b0..7f937f0bfa 100644 --- a/runescape-client/src/main/java/VarcInt.java +++ b/runescape-client/src/main/java/VarcInt.java @@ -1,24 +1,31 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ip") +@ObfuscatedName("ih") @Implements("VarcInt") public class VarcInt extends DualNode { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "Lhz;" ) @Export("VarcInt_archive") - public static AbstractArchive VarcInt_archive; - @ObfuscatedName("j") + static AbstractArchive VarcInt_archive; + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("VarcInt_cached") static EvictingDualNodeHashTable VarcInt_cached; - @ObfuscatedName("i") + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -59845961 + ) + @Export("loginBoxCenter") + static int loginBoxCenter; + @ObfuscatedName("t") @Export("persist") public boolean persist; @@ -30,54 +37,49 @@ public class VarcInt extends DualNode { this.persist = false; } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lky;I)V", - garbageValue = "-1564347413" + signature = "(Lkz;B)V", + garbageValue = "9" ) - void method4314(Buffer var1) { + void method4394(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.method4315(var1, var2); + this.method4395(var1, var2); } } - @ObfuscatedName("i") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lky;II)V", - garbageValue = "-1760139411" + signature = "(Lkz;IB)V", + garbageValue = "-46" ) - void method4315(Buffer var1, int var2) { + void method4395(Buffer var1, int var2) { if (var2 == 2) { this.persist = true; } } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(II)Lis;", - garbageValue = "-1763982471" + signature = "(Lhz;I)V", + garbageValue = "-1900079219" ) - @Export("getParamDefinition") - public static ParamDefinition getParamDefinition(int var0) { - ParamDefinition var1 = (ParamDefinition)ParamDefinition.ParamDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = class339.ParamDefinition_archive.takeFile(11, var0); - var1 = new ParamDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } + public static void method4407(AbstractArchive var0) { + ParamDefinition.ParamDefinition_archive = var0; + } - var1.postDecode(); - ParamDefinition.ParamDefinition_cached.put(var1, (long)var0); - return var1; - } + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(B)[Lie;", + garbageValue = "-105" + ) + static HorizontalAlignment[] method4396() { + return new HorizontalAlignment[]{HorizontalAlignment.field3430, HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field3428}; } } diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index d2943eb760..dd81c55e2c 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -9,55 +9,57 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ch") +@ObfuscatedName("cj") @Implements("Varcs") public class Varcs { - @ObfuscatedName("f") - @Export("musicTrackBoolean") - public static boolean musicTrackBoolean; - @ObfuscatedName("i") + @ObfuscatedName("rm") + @ObfuscatedGetter( + intValue = -2086820043 + ) + static int field1242; + @ObfuscatedName("t") @Export("intsPersistence") boolean[] intsPersistence; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("map") Map map; - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("strings") String[] strings; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("unwrittenChanges") boolean unwrittenChanges; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedGetter( - longValue = -3102782666800977811L + longValue = -2615226300908847259L ) - long field1243; + long field1239; Varcs() { this.unwrittenChanges = false; - int var1 = HealthBarUpdate.archive2.getGroupFileCount(19); + int var1 = class173.archive2.getGroupFileCount(19); this.map = new HashMap(); this.intsPersistence = new boolean[var1]; int var2; for (var2 = 0; var2 < var1; ++var2) { - VarcInt var3 = FileSystem.method3447(var2); + VarcInt var3 = class186.method3609(var2); this.intsPersistence[var2] = var3.persist; } var2 = 0; - if (HealthBarUpdate.archive2.method4199(15)) { - var2 = HealthBarUpdate.archive2.getGroupFileCount(15); + if (class173.archive2.method4261(15)) { + var2 = class173.archive2.getGroupFileCount(15); } this.strings = new String[var2]; this.read(); } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "-1411494049" + signature = "(IIS)V", + garbageValue = "-1109" ) @Export("setInt") void setInt(int var1, int var2) { @@ -68,10 +70,10 @@ public class Varcs { } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "-102" + signature = "(II)I", + garbageValue = "1810097692" ) @Export("getInt") int getInt(int var1) { @@ -79,20 +81,20 @@ public class Varcs { return var2 instanceof Integer ? (Integer)var2 : -1; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(ILjava/lang/String;I)V", - garbageValue = "-461145893" + garbageValue = "-1074130602" ) @Export("setString") void setString(int var1, String var2) { this.map.put(var1, var2); } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(IB)Ljava/lang/String;", - garbageValue = "-6" + garbageValue = "68" ) @Export("getString") String getString(int var1) { @@ -100,30 +102,30 @@ public class Varcs { return var2 instanceof String ? (String)var2 : ""; } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(ILjava/lang/String;I)V", - garbageValue = "1336031066" + garbageValue = "-1450087250" ) @Export("setStringOld") void setStringOld(int var1, String var2) { this.strings[var1] = var2; } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(IB)Ljava/lang/String;", - garbageValue = "-122" + signature = "(II)Ljava/lang/String;", + garbageValue = "-1157824262" ) @Export("getStringOld") String getStringOld(int var1) { return this.strings[var1]; } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "30" + signature = "(I)V", + garbageValue = "844512682" ) @Export("clearTransient") void clearTransient() { @@ -140,20 +142,20 @@ public class Varcs { } - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(ZI)Lmm;", - garbageValue = "1411517965" + signature = "(ZI)Lmr;", + garbageValue = "-1276722644" ) @Export("getPreferencesFile") AccessFile getPreferencesFile(boolean var1) { - return TaskHandler.getPreferencesFile("2", WorldMapRectangle.field166.name, var1); + return GrandExchangeOfferUnitPriceComparator.getPreferencesFile("2", class43.field359.name, var1); } - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1634973674" + signature = "(B)V", + garbageValue = "51" ) @Export("write") void write() { @@ -173,105 +175,107 @@ public class Varcs { if (var7 instanceof Integer) { var2 += 4; } else if (var7 instanceof String) { - var2 += Buddy.stringCp1252NullTerminatedByteSize((String)var7); + var2 += stringCp1252NullTerminatedByteSize((String)var7); } ++var3; } } - Buffer var32 = new Buffer(var2); - var32.writeByte(2); - var32.writeShort(var3); - Iterator var33 = this.map.entrySet().iterator(); + Buffer var33 = new Buffer(var2); + var33.writeByte(2); + var33.writeShort(var3); + Iterator var34 = this.map.entrySet().iterator(); - label185: + label187: while (true) { - Entry var20; - int var21; + Entry var21; + int var22; do { - if (!var33.hasNext()) { - var1.write(var32.array, 0, var32.offset); - break label185; + if (!var34.hasNext()) { + var1.write(var33.array, 0, var33.offset); + break label187; } - var20 = (Entry)var33.next(); - var21 = (Integer)var20.getKey(); - } while(!this.intsPersistence[var21]); + var21 = (Entry)var34.next(); + var22 = (Integer)var21.getKey(); + } while(!this.intsPersistence[var22]); - var32.writeShort(var21); - Object var8 = var20.getValue(); + var33.writeShort(var22); + Object var8 = var21.getValue(); Class var10 = var8.getClass(); - class3[] var11 = class3.method44(); - int var12 = 0; + class3[] var11 = new class3[]{class3.field10, class3.field13, class3.field7}; + class3[] var12 = var11; + int var13 = 0; class3 var9; + class3 var14; while (true) { - if (var12 >= var11.length) { + if (var13 >= var12.length) { var9 = null; break; } - class3 var13 = var11[var12]; - if (var10 == var13.field29) { - var9 = var13; + var14 = var12[var13]; + if (var10 == var14.field11) { + var9 = var14; break; } - ++var12; + ++var13; } - var32.writeByte(var9.field18); - Class var34 = var8.getClass(); - class3[] var15 = class3.method44(); - int var16 = 0; + var33.writeByte(var9.field12); + Class var23 = var8.getClass(); + class3[] var15 = new class3[]{class3.field10, class3.field13, class3.field7}; + class3[] var16 = var15; + int var17 = 0; - class3 var14; while (true) { - if (var16 >= var15.length) { + if (var17 >= var16.length) { var14 = null; break; } - class3 var17 = var15[var16]; - if (var34 == var17.field29) { - var14 = var17; + class3 var18 = var16[var17]; + if (var23 == var18.field11) { + var14 = var18; break; } - ++var16; + ++var17; } if (var14 == null) { throw new IllegalArgumentException(); } - class0 var22 = var14.field13; - var22.vmethod58(var8, var32); + class0 var35 = var14.field8; + var35.vmethod42(var8, var33); } - } catch (Exception var30) { + } catch (Exception var31) { } finally { try { var1.close(); - } catch (Exception var29) { + } catch (Exception var30) { } } this.unwrittenChanges = false; - this.field1243 = SequenceDefinition.method4686(); + this.field1239 = SoundCache.method2480(); } - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "-85" + garbageValue = "97" ) @Export("read") void read() { AccessFile var1 = this.getPreferencesFile(false); - label229: { + label215: { try { byte[] var2 = new byte[(int)var1.length()]; @@ -283,67 +287,68 @@ public class Varcs { } } - Buffer var14 = new Buffer(var2); - if (var14.array.length - var14.offset >= 1) { - int var15 = var14.readUnsignedByte(); - if (var15 >= 0 && var15 <= 2) { - int var7; - int var8; - int var9; - int var16; - if (var15 >= 2) { - var16 = var14.readUnsignedShort(); - var7 = 0; - - while (true) { - if (var7 >= var16) { - break label229; - } - - var8 = var14.readUnsignedShort(); - var9 = var14.readUnsignedByte(); - class3 var10 = (class3)FriendSystem.findEnumerated(class3.method44(), var9); - Object var11 = var10.method43(var14); - if (this.intsPersistence[var8]) { - this.map.put(var8, var11); - } - - ++var7; - } - } else { - var16 = var14.readUnsignedShort(); - - for (var7 = 0; var7 < var16; ++var7) { - var8 = var14.readUnsignedShort(); - var9 = var14.readInt(); - if (this.intsPersistence[var8]) { - this.map.put(var8, var9); - } - } - - var7 = var14.readUnsignedShort(); - var8 = 0; - - while (true) { - if (var8 >= var7) { - break label229; - } - - var14.readUnsignedShort(); - var14.readStringCp1252NullTerminated(); - ++var8; - } - } - } - + Buffer var15 = new Buffer(var2); + if (var15.array.length - var15.offset < 1) { return; } - } catch (Exception var25) { - break label229; + + int var16 = var15.readUnsignedByte(); + if (var16 >= 0 && var16 <= 2) { + int var7; + int var8; + int var9; + int var17; + if (var16 >= 2) { + var17 = var15.readUnsignedShort(); + var7 = 0; + + while (true) { + if (var7 >= var17) { + break label215; + } + + var8 = var15.readUnsignedShort(); + var9 = var15.readUnsignedByte(); + class3[] var10 = new class3[]{class3.field10, class3.field13, class3.field7}; + class3 var11 = (class3)ServerPacket.findEnumerated(var10, var9); + Object var12 = var11.method37(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 label215; + } + + var15.readUnsignedShort(); + var15.readStringCp1252NullTerminated(); + ++var8; + } + } + } + } catch (Exception var26) { + break label215; } finally { try { var1.close(); - } catch (Exception var24) { + } catch (Exception var25) { } } @@ -354,26 +359,51 @@ public class Varcs { this.unwrittenChanges = false; } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "573629327" + garbageValue = "-1574159447" ) @Export("tryWrite") void tryWrite() { - if (this.unwrittenChanges && this.field1243 < SequenceDefinition.method4686() - 60000L) { + if (this.unwrittenChanges && this.field1239 < SoundCache.method2480() - 60000L) { this.write(); } } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "702857669" + signature = "(B)Z", + garbageValue = "53" ) @Export("hasUnwrittenChanges") boolean hasUnwrittenChanges() { return this.unwrittenChanges; } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(III)I", + garbageValue = "-2082115344" + ) + @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("ai") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;B)I", + garbageValue = "0" + ) + @Export("stringCp1252NullTerminatedByteSize") + public static int stringCp1252NullTerminatedByteSize(String var0) { + return var0.length() + 1; + } } diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java index 47fe90d68b..8fdb154360 100644 --- a/runescape-client/src/main/java/VarpDefinition.java +++ b/runescape-client/src/main/java/VarpDefinition.java @@ -4,30 +4,18 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("in") +@ObfuscatedName("is") @Implements("VarpDefinition") public class VarpDefinition extends DualNode { - @ObfuscatedName("s") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lhz;" - ) - @Export("VarpDefinition_archive") - static AbstractArchive VarpDefinition_archive; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -1812370505 - ) - @Export("VarpDefinition_fileCount") - public static int VarpDefinition_fileCount; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("VarpDefinition_cached") static EvictingDualNodeHashTable VarpDefinition_cached; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -559924911 + intValue = -1682787017 ) @Export("type") public int type; @@ -40,10 +28,10 @@ public class VarpDefinition extends DualNode { this.type = 0; } - @ObfuscatedName("i") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lky;B)V", - garbageValue = "-60" + signature = "(Lkz;B)V", + garbageValue = "76" ) @Export("decode") void decode(Buffer var1) { @@ -57,10 +45,10 @@ public class VarpDefinition extends DualNode { } } - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lky;IB)V", - garbageValue = "-93" + signature = "(Lkz;IB)V", + garbageValue = "86" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -70,54 +58,63 @@ public class VarpDefinition extends DualNode { } - @ObfuscatedName("jv") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lbq;ZI)V", - garbageValue = "50109421" + signature = "(Lhz;Lhz;ZIS)V", + garbageValue = "-8911" ) - @Export("closeInterface") - static final void closeInterface(InterfaceParent var0, boolean var1) { - int var2 = var0.group; - int var3 = (int)var0.key; - var0.remove(); - if (var1) { - UrlRequester.method3250(var2); - } - - for (IntegerNode var4 = (IntegerNode)Client.widgetClickMasks.first(); var4 != null; var4 = (IntegerNode)Client.widgetClickMasks.next()) { - if ((long)var2 == (var4.key >> 48 & 65535L)) { - var4.remove(); + static void method4354(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { + if (Login.field1181) { + if (var3 == 4) { + Login.loginIndex = 4; } - } - Widget var7 = WorldMapElement.getWidget(var3); - if (var7 != null) { - FriendSystem.invalidateWidget(var7); - } - - for (int var5 = 0; var5 < Client.menuOptionsCount; ++var5) { - if (PendingSpawn.isWidgetMenuOpcode(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; + } else { + Login.loginIndex = var3; + Rasterizer2D.Rasterizer2D_clear(); + byte[] var4 = var0.takeFileByNames("title.jpg", ""); + Login.leftTitleSprite = class16.convertJpgToSprite(var4); + class191.rightTitleSprite = Login.leftTitleSprite.mirrorHorizontally(); + if ((Client.worldProperties & 536870912) != 0) { + HealthBar.logoSprite = Interpreter.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); + } else { + HealthBar.logoSprite = Interpreter.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); } - } - GrandExchangeOfferNameComparator.calculateMenuBounds(); - if (Client.rootInterface != -1) { - UserComparator6.runIntfCloseListeners(Client.rootInterface, 1); - } + Login.titleboxSprite = Interpreter.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); + class191.titlebuttonSprite = Interpreter.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); + UserComparator10.runesSprite = GrandExchangeOfferNameComparator.method122(var1, "runes", ""); + FileSystem.title_muteSprite = GrandExchangeOfferNameComparator.method122(var1, "title_mute", ""); + GrandExchangeOfferWorldComparator.options_buttons_0Sprite = Interpreter.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); + Login.field1153 = Interpreter.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); + Login.options_buttons_2Sprite = Interpreter.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); + WorldMapDecoration.field202 = Interpreter.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); + class4.field17 = GrandExchangeOfferWorldComparator.options_buttons_0Sprite.subWidth; + class267.field3524 = GrandExchangeOfferWorldComparator.options_buttons_0Sprite.subHeight; + UserComparator5.loginScreenRunesAnimation = new LoginScreenAnimation(UserComparator10.runesSprite); + if (var2) { + Login.Login_username = ""; + Login.Login_password = ""; + } + class222.field2729 = 0; + class81.otp = ""; + Login.field1183 = true; + Login.worldSelectOpen = false; + if (!Actor.clientPreferences.titleMusicDisabled) { + PendingSpawn.method1681(2, WorldMapDecoration.archive6, "scape main", "", 255, false); + } else { + WallDecoration.method3256(2); + } + + class173.method3575(false); + Login.field1181 = true; + Login.xPadding = (GraphicsDefaults.canvasWidth - 765) / 2; + Login.loginBoxX = Login.xPadding + 202; + VarcInt.loginBoxCenter = Login.loginBoxX + 180; + Login.leftTitleSprite.drawAt(Login.xPadding, 0); + class191.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + HealthBar.logoSprite.drawAt(Login.xPadding + 382 - HealthBar.logoSprite.subWidth / 2, 18); + } } } diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java index f205b5913a..a25cd1f195 100644 --- a/runescape-client/src/main/java/Varps.java +++ b/runescape-client/src/main/java/Varps.java @@ -1,25 +1,26 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hi") +@ObfuscatedName("hc") @Implements("Varps") public class Varps { - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("Varps_masks") static int[] Varps_masks; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("Varps_temp") public static int[] Varps_temp; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("Varps_main") public static int[] Varps_main; - @ObfuscatedName("gc") - @ObfuscatedGetter( - intValue = 1888640319 + @ObfuscatedName("jz") + @ObfuscatedSignature( + signature = "Lby;" ) - static int field2507; + @Export("localPlayer") + static Player localPlayer; static { Varps_masks = new int[32]; @@ -33,4 +34,51 @@ public class Varps { Varps_temp = new int[4000]; Varps_main = new int[4000]; } + + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(Lio;IIIBZI)V", + garbageValue = "-902896741" + ) + @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/VertexNormal.java b/runescape-client/src/main/java/VertexNormal.java index 905337f70c..1324a9a411 100644 --- a/runescape-client/src/main/java/VertexNormal.java +++ b/runescape-client/src/main/java/VertexNormal.java @@ -4,30 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dl") +@ObfuscatedName("df") @Implements("VertexNormal") public class VertexNormal { - @ObfuscatedName("s") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1795200651 - ) - @Export("x") - int x; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -1592235953 + intValue = 717279929 ) @Export("y") int y; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 221616325 + intValue = 933713205 + ) + @Export("x") + int x; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -190922053 ) @Export("z") int z; - @ObfuscatedName("k") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1908751547 + intValue = 906423943 ) @Export("magnitude") int magnitude; @@ -36,7 +36,7 @@ public class VertexNormal { } @ObfuscatedSignature( - signature = "(Ldl;)V" + signature = "(Ldf;)V" ) VertexNormal(VertexNormal var1) { this.x = var1.x; @@ -45,15 +45,83 @@ public class VertexNormal { this.magnitude = var1.magnitude; } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(Lhz;Ljava/lang/String;Ljava/lang/String;S)Llq;", - garbageValue = "3108" + signature = "(IIIZIZI)V", + garbageValue = "-1345116753" ) - @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 Clock.SpriteBuffer_getIndexedSprite(var0, var3, var4); + @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 = World.World_worlds[var6]; + World.World_worlds[var6] = World.World_worlds[var1]; + World.World_worlds[var1] = var8; + + for (int var9 = var0; var9 < var1; ++var9) { + World var11 = World.World_worlds[var9]; + int var12 = VerticalAlignment.compareWorlds(var11, var8, var2, var3); + int var10; + if (var12 != 0) { + if (var3) { + var10 = -var12; + } else { + var10 = var12; + } + } else if (var4 == -1) { + var10 = 0; + } else { + int var13 = VerticalAlignment.compareWorlds(var11, var8, var4, var5); + if (var5) { + var10 = -var13; + } else { + var10 = var13; + } + } + + if (var10 <= 0) { + World var14 = World.World_worlds[var9]; + World.World_worlds[var9] = World.World_worlds[var7]; + World.World_worlds[var7++] = var14; + } + } + + World.World_worlds[var1] = World.World_worlds[var7]; + World.World_worlds[var7] = var8; + doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); + doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); + } + + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "(Lkz;J)V" + ) + static void method2958(Buffer var0, long var1) { + var1 /= 10L; + if (var1 < 0L) { + var1 = 0L; + } else if (var1 > 65535L) { + var1 = 65535L; + } + + var0.writeShort((int)var1); + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + signature = "(ZI)V", + garbageValue = "-214641711" + ) + public static void method2960(boolean var0) { + if (var0 != ItemDefinition.ItemDefinition_inMembersWorld) { + ItemDefinition.ItemDefinition_cached.clear(); + ItemDefinition.ItemDefinition_cachedModels.clear(); + ItemDefinition.ItemDefinition_cachedSprites.clear(); + ItemDefinition.ItemDefinition_inMembersWorld = var0; + } + } } diff --git a/runescape-client/src/main/java/VerticalAlignment.java b/runescape-client/src/main/java/VerticalAlignment.java index d24017a980..597347df11 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("ia") +@ObfuscatedName("ii") @Implements("VerticalAlignment") public enum VerticalAlignment implements Enumerated { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lia;" + signature = "Lii;" ) field3172(1, 0), - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lia;" + signature = "Lii;" ) @Export("VerticalAlignment_centered") - VerticalAlignment_centered(0, 1), - @ObfuscatedName("i") + VerticalAlignment_centered(2, 1), + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lia;" + signature = "Lii;" ) - field3174(2, 2); + field3170(0, 2); - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1694558565 + intValue = 1133132541 ) @Export("value") public final int value; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 817798203 + intValue = 544602367 ) @Export("id") final int id; @@ -42,13 +42,771 @@ public enum VerticalAlignment implements Enumerated { this.id = var4; } - @ObfuscatedName("j") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-32" + signature = "(I)I", + garbageValue = "-1410702910" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } + + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(I)Ljava/lang/String;", + garbageValue = "441666520" + ) + static String method4328() { + String var0; + if (Actor.clientPreferences.hideUsername) { + String var2 = Login.Login_username; + String var1 = HealthBarDefinition.method4481('*', var2.length()); + var0 = var1; + } else { + var0 = Login.Login_username; + } + + return var0; + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "(Lbb;Lbb;IZS)I", + garbageValue = "-22293" + ) + @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.method1753() ? (var1.method1753() ? 0 : 1) : (var1.method1753() ? -1 : 0); + } else if (var2 == 5) { + return var0.method1713() ? (var1.method1713() ? 0 : 1) : (var1.method1713() ? -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("fm") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1636025700" + ) + static final void method4329() { + for (int var0 = 0; var0 < Client.soundEffectCount; ++var0) { + int var10002 = Client.queuedSoundEffectDelays[var0]--; + if (Client.queuedSoundEffectDelays[var0] >= -10) { + SoundEffect var9 = Client.soundEffects[var0]; + if (var9 == null) { + Object var10000 = null; + var9 = SoundEffect.readSoundEffect(class13.archive4, Client.soundEffectIds[var0], 0); + if (var9 == null) { + continue; + } + + int[] var13 = Client.queuedSoundEffectDelays; + var13[var0] += var9.calculateDelay(); + Client.soundEffects[var0] = var9; + } + + 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 - Varps.localPlayer.x * -78439701; + if (var5 < 0) { + var5 = -var5; + } + + int var6 = Client.soundLocations[var0] >> 8 & 255; + int var7 = var6 * 128 + 64 - Varps.localPlayer.y; + if (var7 < 0) { + var7 = -var7; + } + + int var8 = var5 + var7 - 128; + if (var8 > var3) { + Client.queuedSoundEffectDelays[var0] = -100; + continue; + } + + if (var8 < 0) { + var8 = 0; + } + + var2 = (var3 - var8) * Client.field860 / var3; + } else { + var2 = Client.soundEffectVolume; + } + + if (var2 > 0) { + RawSound var10 = var9.toRawSound().resample(class81.decimator); + RawPcmStream var11 = RawPcmStream.createRawPcmStream(var10, 100, var2); + var11.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1); + class51.pcmStreamMixer.addSubStream(var11); + } + + Client.queuedSoundEffectDelays[var0] = -100; + } + } else { + --Client.soundEffectCount; + + for (int var1 = var0; var1 < Client.soundEffectCount; ++var1) { + Client.soundEffectIds[var1] = Client.soundEffectIds[var1 + 1]; + Client.soundEffects[var1] = Client.soundEffects[var1 + 1]; + Client.queuedSoundEffectLoops[var1] = Client.queuedSoundEffectLoops[var1 + 1]; + Client.queuedSoundEffectDelays[var1] = Client.queuedSoundEffectDelays[var1 + 1]; + Client.soundLocations[var1] = Client.soundLocations[var1 + 1]; + } + + --var0; + } + } + + if (Client.field746) { + boolean var12; + if (class197.field2376 != 0) { + var12 = true; + } else { + var12 = class197.midiPcmStream.isReady(); + } + + if (!var12) { + if (Client.field638 != 0 && Client.field857 != -1) { + class49.method826(WorldMapDecoration.archive6, Client.field857, 0, Client.field638, false); + } + + Client.field746 = false; + } + } + + } + + @ObfuscatedName("gq") + @ObfuscatedSignature( + signature = "(Lbe;IIIIII)V", + garbageValue = "2021063760" + ) + @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) { + NPCDefinition 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 && NetSocket.method3531((Player)var0)) { + Player var9 = (Player)var0; + if (var1 < var75) { + AttackOption.getActorScreenLocation(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.method4874()) { + AttackOption.getActorScreenLocation(var0, var0.defaultHeight + 15); + + for (HealthBar var87 = (HealthBar)var0.healthBars.last(); var87 != null; var87 = (HealthBar)var0.healthBars.previous()) { + HealthBarUpdate var77 = var87.get(Client.cycle); + if (var77 == null) { + if (var87.isEmpty()) { + var87.remove(); + } + } else { + HealthBarDefinition var12 = var87.definition; + Sprite var13 = var12.getBackSprite(); + Sprite var14 = var12.getFrontSprite(); + int var16 = 0; + if (var13 != null && var14 != null) { + if (var12.widthPadding * 2 < var14.subWidth) { + var16 = var12.widthPadding; + } + + var15 = var14.subWidth - var16 * 2; + } else { + var15 = var12.width; + } + + int var17 = 255; + boolean var18 = true; + int var19 = Client.cycle - var77.cycle; + int var20 = var15 * var77.health2 / var12.width; + int var21; + int var92; + if (var77.cycleOffset > var19) { + var21 = var12.int4 == 0 ? 0 : var12.int4 * (var19 / var12.int4); + var22 = var15 * var77.health / var12.width; + var92 = var21 * (var20 - var22) / var77.cycleOffset + var22; + } else { + var92 = var20; + var21 = var77.cycleOffset + var12.int5 - var19; + if (var12.int3 >= 0) { + var17 = (var21 << 8) / (var12.int5 - var12.int3); + } + } + + if (var77.health2 > 0 && var92 < 1) { + var92 = 1; + } + + if (var13 != null && var14 != null) { + if (var92 == var15) { + var92 += var16 * 2; + } else { + var92 += var16; + } + + var21 = var13.subHeight; + var76 += var21; + var22 = var2 + Client.viewportTempX - (var15 >> 1); + var23 = var3 + Client.viewportTempY - var76; + var22 -= var16; + if (var17 >= 0 && var17 < 255) { + var13.drawTransAt(var22, var23, var17); + Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var92 + var22, var23 + var21); + var14.drawTransAt(var22, var23, var17); + } else { + var13.drawTransBgAt(var22, var23); + Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var92 + var22, var23 + var21); + var14.drawTransBgAt(var22, var23); + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); + var76 += 2; + } else { + var76 += 5; + if (Client.viewportTempX > -1) { + var21 = var2 + Client.viewportTempX - (var15 >> 1); + var22 = var3 + Client.viewportTempY - var76; + Rasterizer2D.Rasterizer2D_fillRectangle(var21, var22, var92, 5, 65280); + Rasterizer2D.Rasterizer2D_fillRectangle(var92 + var21, var22, var15 - var92, 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) { + AttackOption.getActorScreenLocation(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + if (var88.headIconPk != -1) { + var76 += 25; + PlatformInfo.headIconPkSprites[var88.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); + } + + if (var88.headIconPrayer != -1) { + var76 += 25; + RouteStrategy.headIconPrayerSprites[var88.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); + } + } + } + + if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { + AttackOption.getActorScreenLocation(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + var76 += GrandExchangeEvents.headIconHintSprites[1].subHeight; + GrandExchangeEvents.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); + } + } + } else { + NPCDefinition var89 = ((NPC)var0).definition; + if (var89.transforms != null) { + var89 = var89.transform(); + } + + if (var89.headIconPrayer >= 0 && var89.headIconPrayer < RouteStrategy.headIconPrayerSprites.length) { + AttackOption.getActorScreenLocation(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + RouteStrategy.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) { + AttackOption.getActorScreenLocation(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + GrandExchangeEvents.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); + } + } + } + + if (var0.overheadText != null && (var1 >= var75 || !var0.field956 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { + AttackOption.getActorScreenLocation(var0, var0.defaultHeight); + if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { + Client.overheadTextXOffsets[Client.overheadTextCount] = HealthBar.fontBold12.stringWidth(var0.overheadText) / 2; + Client.overheadTextAscents[Client.overheadTextCount] = HealthBar.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 var79 = var0.hitSplatTypes[var78]; + HitSplatDefinition var91 = null; + int var80 = 0; + if (var79 >= 0) { + if (var90 <= Client.cycle) { + continue; + } + + var91 = Interpreter.HitSplatDefinition_get(var0.hitSplatTypes[var78]); + var80 = var91.field3306; + if (var91 != null && var91.transforms != null) { + var91 = var91.transform(); + if (var91 == null) { + var0.hitSplatCycles[var78] = -1; + continue; + } + } + } else if (var90 < 0) { + continue; + } + + var15 = var0.hitSplatTypes2[var78]; + HitSplatDefinition var81 = null; + if (var15 >= 0) { + var81 = Interpreter.HitSplatDefinition_get(var15); + if (var81 != null && var81.transforms != null) { + var81 = var81.transform(); + } + } + + if (var90 - var80 <= Client.cycle) { + if (var91 == null) { + var0.hitSplatCycles[var78] = -1; + } else { + AttackOption.getActorScreenLocation(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; + } + + Sprite var82 = null; + Sprite var83 = null; + Sprite var84 = null; + Sprite var85 = null; + var22 = 0; + var23 = 0; + int var24 = 0; + int var25 = 0; + int var26 = 0; + int var27 = 0; + int var28 = 0; + int var29 = 0; + Sprite var30 = null; + Sprite var31 = null; + Sprite var32 = null; + Sprite 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; + var82 = var91.method4568(); + int var43; + if (var82 != null) { + var22 = var82.subWidth; + var43 = var82.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var26 = var82.xOffset; + } + + var83 = var91.method4581(); + if (var83 != null) { + var23 = var83.subWidth; + var43 = var83.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var27 = var83.xOffset; + } + + var84 = var91.method4570(); + if (var84 != null) { + var24 = var84.subWidth; + var43 = var84.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var28 = var84.xOffset; + } + + var85 = var91.method4561(); + if (var85 != null) { + var25 = var85.subWidth; + var43 = var85.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var29 = var85.xOffset; + } + + if (var81 != null) { + var30 = var81.method4568(); + if (var30 != null) { + var34 = var30.subWidth; + var43 = var30.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var38 = var30.xOffset; + } + + var31 = var81.method4581(); + if (var31 != null) { + var35 = var31.subWidth; + var43 = var31.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var39 = var31.xOffset; + } + + var32 = var81.method4570(); + if (var32 != null) { + var36 = var32.subWidth; + var43 = var32.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var40 = var32.xOffset; + } + + var33 = var81.method4561(); + if (var33 != null) { + var37 = var33.subWidth; + var43 = var33.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var41 = var33.xOffset; + } + } + + Font var86 = var91.getFont(); + if (var86 == null) { + var86 = GrandExchangeEvent.fontPlain11; + } + + Font var44; + if (var81 != null) { + var44 = var81.getFont(); + if (var44 == null) { + var44 = GrandExchangeEvent.fontPlain11; + } + } else { + var44 = GrandExchangeEvent.fontPlain11; + } + + String var45 = null; + String var46 = null; + boolean var47 = false; + int var48 = 0; + var45 = var91.getString(var0.hitSplatValues[var78]); + int var93 = var86.stringWidth(var45); + if (var81 != null) { + var46 = var81.getString(var0.hitSplatValues2[var78]); + var48 = var44.stringWidth(var46); + } + + int var49 = 0; + int var50 = 0; + if (var23 > 0) { + if (var84 == null && var85 == null) { + var49 = 1; + } else { + var49 = var93 / var23 + 1; + } + } + + if (var81 != 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 - 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 (var81 != 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 = var35 * var50; + var51 += var62; + var61 += (var62 - var48) / 2; + } else { + var51 += var48; + } + + var60 = var51; + if (var37 > 0) { + var51 += var37; + } + } + + var62 = var0.hitSplatCycles[var78] - Client.cycle; + int var63 = var91.field3311 - var62 * var91.field3311 / var91.field3306; + int var64 = var62 * var91.field3310 / var91.field3306 + -var91.field3310; + 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.field3316 + 15; + int var70 = var69 - var86.maxAscent; + int var71 = var69 + var86.maxDescent; + if (var70 < var66) { + var67 = var70; + } + + if (var71 > var68) { + var68 = var71; + } + + int var72 = 0; + int var73; + int var74; + if (var81 != null) { + var72 = var66 + var81.field3316 + 15; + var73 = var72 - var44.maxAscent; + var74 = var72 + var44.maxDescent; + if (var73 < var67) { + ; + } + + if (var74 > var68) { + ; + } + } + + var73 = 255; + if (var91.field3307 >= 0) { + var73 = (var62 << 8) / (var91.field3306 - var91.field3307); + } + + if (var73 >= 0 && var73 < 255) { + if (var82 != null) { + var82.drawTransAt(var52 + var65 - var26, var66, var73); + } + + if (var84 != null) { + var84.drawTransAt(var65 + var53 - var28, var66, var73); + } + + if (var83 != null) { + for (var74 = 0; var74 < var49; ++var74) { + var83.drawTransAt(var74 * var23 + (var65 + var54 - var27), var66, var73); + } + } + + if (var85 != null) { + var85.drawTransAt(var56 + var65 - var29, var66, var73); + } + + var86.drawAlpha(var45, var65 + var55, var69, var91.textColor, 0, var73); + if (var81 != 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(var60 + var65 - var41, var66, var73); + } + + var44.drawAlpha(var46, var65 + var61, var72, var81.textColor, 0, var73); + } + } else { + if (var82 != null) { + var82.drawTransBgAt(var65 + var52 - var26, var66); + } + + if (var84 != null) { + var84.drawTransBgAt(var53 + var65 - var28, var66); + } + + if (var83 != null) { + for (var74 = 0; var74 < var49; ++var74) { + var83.drawTransBgAt(var74 * var23 + (var54 + var65 - var27), var66); + } + } + + if (var85 != null) { + var85.drawTransBgAt(var56 + var65 - var29, var66); + } + + var86.draw(var45, var65 + var55, var69, var91.textColor | -16777216, 0); + if (var81 != 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(var74 * var35 + (var65 + var59 - var39), var66); + } + } + + if (var33 != null) { + var33.drawTransBgAt(var65 + var60 - var41, var66); + } + + var44.draw(var46, var65 + var61, var72, var81.textColor | -16777216, 0); + } + } + } + } + } + } + + } + } } diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java index 00a8326345..323e7064c3 100644 --- a/runescape-client/src/main/java/ViewportMouse.java +++ b/runescape-client/src/main/java/ViewportMouse.java @@ -1,64 +1,56 @@ +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("df") +@ObfuscatedName("dk") @Implements("ViewportMouse") public class ViewportMouse { - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("ViewportMouse_isInViewport") - public static boolean ViewportMouse_isInViewport; - @ObfuscatedName("j") + static boolean ViewportMouse_isInViewport; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1673614765 + intValue = 1996252149 ) @Export("ViewportMouse_x") static int ViewportMouse_x; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 97939103 + intValue = 755947551 ) @Export("ViewportMouse_y") static int ViewportMouse_y; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("ViewportMouse_false0") static boolean ViewportMouse_false0; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 214371075 + intValue = -1736158671 ) - static int field1723; - @ObfuscatedName("n") + static int field1711; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -228881629 + intValue = 1750585749 ) - static int field1724; - @ObfuscatedName("q") + static int field1712; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1565231911 - ) - static int field1725; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -942869669 - ) - static int field1726; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = 155548297 - ) - static int field1727; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = 1633088205 + intValue = 999378931 ) @Export("ViewportMouse_entityCount") - public static int ViewportMouse_entityCount; + static int ViewportMouse_entityCount; @ObfuscatedName("p") @Export("ViewportMouse_entityTags") public static long[] ViewportMouse_entityTags; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 1855998549 + ) + @Export("cacheGamebuild") + static int cacheGamebuild; static { ViewportMouse_isInViewport = false; @@ -69,74 +61,248 @@ public class ViewportMouse { ViewportMouse_entityTags = new long[1000]; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "([BI)Ljava/lang/String;", - garbageValue = "1521597342" + signature = "(B)Z", + garbageValue = "-77" ) - public static String method2902(byte[] var0) { - return WorldMapSection0.method211(var0, 0, var0.length); - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "(II)Lii;", - garbageValue = "-1840851483" - ) - @Export("getNpcDefinition") - public static NPCDefinition getNpcDefinition(int var0) { - NPCDefinition var1 = (NPCDefinition)NPCDefinition.NpcDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = NPCDefinition.NpcDefinition_archive.takeFile(9, var0); - var1 = new NPCDefinition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - NPCDefinition.NpcDefinition_cached.put(var1, (long)var0); - return var1; + public static boolean method2957() { + long var0 = SoundCache.method2480(); + int var2 = (int)(var0 - NetCache.field3145); + NetCache.field3145 = var0; + if (var2 > 200) { + var2 = 200; } - } - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "([BIII)Ljava/lang/String;", - garbageValue = "810099755" - ) - @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 = class287.cp1252AsciiExtension[var6 - 128]; - if (var7 == 0) { - var7 = '?'; + 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; } - var6 = var7; + 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 (NetCache.NetCache_currentResponse == null) { + var5 = 8; + } else if (NetCache.field3154 == 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.field3158 != 0) { + for (var7 = 0; var7 < var6; ++var7) { + var10000 = NetCache.NetCache_responseHeaderBuffer.array; + var10001 = var7 + NetCache.NetCache_responseHeaderBuffer.offset; + var10000[var10001] ^= NetCache.field3158; + } + } + + var22 = NetCache.NetCache_responseHeaderBuffer; + var22.offset += var6; + if (NetCache.NetCache_responseHeaderBuffer.offset < var5) { + break; + } + + if (NetCache.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); + NetCache.field3156 = true; + if (var13 == null) { + var13 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var11); + NetCache.field3156 = false; + } + + if (var13 == null) { + throw new IOException(); + } + + int var14 = var9 == 0 ? 5 : 9; + NetCache.NetCache_currentResponse = var13; + class336.NetCache_responseArchiveBuffer = new Buffer(var10 + var14 + NetCache.NetCache_currentResponse.padding); + class336.NetCache_responseArchiveBuffer.writeByte(var9); + class336.NetCache_responseArchiveBuffer.writeInt(var10); + NetCache.field3154 = 8; + NetCache.NetCache_responseHeaderBuffer.offset = 0; + } else if (NetCache.field3154 == 0) { + if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { + NetCache.field3154 = 1; + NetCache.NetCache_responseHeaderBuffer.offset = 0; + } else { + NetCache.NetCache_currentResponse = null; + } + } + } else { + var6 = class336.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding; + var7 = 512 - NetCache.field3154; + if (var7 > var6 - class336.NetCache_responseArchiveBuffer.offset) { + var7 = var6 - class336.NetCache_responseArchiveBuffer.offset; + } + + if (var7 > var16) { + var7 = var16; + } + + NetCache.NetCache_socket.read(class336.NetCache_responseArchiveBuffer.array, class336.NetCache_responseArchiveBuffer.offset, var7); + if (NetCache.field3158 != 0) { + for (var8 = 0; var8 < var7; ++var8) { + var10000 = class336.NetCache_responseArchiveBuffer.array; + var10001 = var8 + class336.NetCache_responseArchiveBuffer.offset; + var10000[var10001] ^= NetCache.field3158; + } + } + + var22 = class336.NetCache_responseArchiveBuffer; + var22.offset += var7; + NetCache.field3154 += var7; + if (var6 == class336.NetCache_responseArchiveBuffer.offset) { + if (NetCache.NetCache_currentResponse.key == 16711935L) { + DevicePcmPlayerProvider.NetCache_reference = class336.NetCache_responseArchiveBuffer; + + for (var8 = 0; var8 < 256; ++var8) { + Archive var17 = NetCache.NetCache_archives[var8]; + if (var17 != null) { + DevicePcmPlayerProvider.NetCache_reference.offset = var8 * 8 + 5; + var10 = DevicePcmPlayerProvider.NetCache_reference.readInt(); + int var18 = DevicePcmPlayerProvider.NetCache_reference.readInt(); + var17.loadIndex(var10, var18); + } + } + } else { + NetCache.NetCache_crc.reset(); + NetCache.NetCache_crc.update(class336.NetCache_responseArchiveBuffer.array, 0, var6); + var8 = (int)NetCache.NetCache_crc.getValue(); + if (var8 != NetCache.NetCache_currentResponse.crc) { + try { + NetCache.NetCache_socket.close(); + } catch (Exception var20) { + } + + ++NetCache.NetCache_crcMismatches; + NetCache.NetCache_socket = null; + NetCache.field3158 = (byte)((int)(Math.random() * 255.0D + 1.0D)); + return false; + } + + NetCache.NetCache_crcMismatches = 0; + NetCache.NetCache_ioExceptions = 0; + NetCache.NetCache_currentResponse.archive.write((int)(NetCache.NetCache_currentResponse.key & 65535L), class336.NetCache_responseArchiveBuffer.array, (NetCache.NetCache_currentResponse.key & 16711680L) == 16711680L, NetCache.field3156); + } + + NetCache.NetCache_currentResponse.remove(); + if (NetCache.field3156) { + --NetCache.NetCache_pendingPriorityResponsesCount; + } else { + --NetCache.NetCache_pendingResponsesCount; + } + + NetCache.field3154 = 0; + NetCache.NetCache_currentResponse = null; + class336.NetCache_responseArchiveBuffer = null; + } else { + if (NetCache.field3154 != 512) { + break; + } + + NetCache.field3154 = 0; + } + } + } + + return true; + } + } catch (IOException var21) { + try { + NetCache.NetCache_socket.close(); + } catch (Exception var19) { } - var3[var4++] = (char)var6; + ++NetCache.NetCache_ioExceptions; + NetCache.NetCache_socket = null; + return false; + } + } + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "([BILjava/lang/CharSequence;I)I", + garbageValue = "-27737666" + ) + public static int method2956(byte[] var0, int var1, CharSequence var2) { + int var3 = var2.length(); + int var4 = var1; + + for (int var5 = 0; var5 < var3; ++var5) { + char var6 = var2.charAt(var5); + if (var6 <= 127) { + var0[var4++] = (byte)var6; + } else if (var6 <= 2047) { + var0[var4++] = (byte)(192 | var6 >> 6); + var0[var4++] = (byte)(128 | var6 & '?'); + } else { + var0[var4++] = (byte)(224 | var6 >> '\f'); + var0[var4++] = (byte)(128 | var6 >> 6 & 63); + var0[var4++] = (byte)(128 | var6 & '?'); } } - return new String(var3, 0, var4); - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "(Lct;B)V", - garbageValue = "16" - ) - public static final void method2891(PcmPlayerProvider var0) { - SecureRandomCallable.pcmPlayerProvider = var0; + return var4 - var1; } } diff --git a/runescape-client/src/main/java/VorbisCodebook.java b/runescape-client/src/main/java/VorbisCodebook.java index 9631c13ffc..7ec35d7338 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("cx") +@ObfuscatedName("cz") @Implements("VorbisCodebook") public class VorbisCodebook { - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("dimensions") int dimensions; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("entries") int entries; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("lengthMap") int[] lengthMap; - @ObfuscatedName("k") - int[] field1321; + @ObfuscatedName("g") + int[] field1313; + @ObfuscatedName("l") + float[][] field1314; @ObfuscatedName("u") - float[][] field1320; - @ObfuscatedName("n") @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(class160.iLog(this.entries - var2)); + int var4 = VorbisSample.readBits(UserComparator10.iLog(this.entries - var2)); for (var5 = 0; var5 < var4; ++var5) { this.lengthMap[var2++] = var3; @@ -53,7 +53,7 @@ public class VorbisCodebook { } } - this.method2252(); + this.method2310(); 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.field1321 = new int[var7]; + this.field1313 = new int[var7]; int var8; for (var8 = 0; var8 < var7; ++var8) { - this.field1321[var8] = VorbisSample.readBits(var5); + this.field1313[var8] = VorbisSample.readBits(var5); } - this.field1320 = new float[this.entries][this.dimensions]; + this.field1314 = 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.field1321[var12] * var16 + var15 + var9; - this.field1320[var8][var11] = var13; + float var13 = (float)this.field1313[var12] * var16 + var15 + var9; + this.field1314[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.field1321[var10] * var16 + var15 + var9; - this.field1320[var8][var11] = var17; + float var17 = (float)this.field1313[var10] * var16 + var15 + var9; + this.field1314[var8][var11] = var17; if (var6) { var9 = var17; } @@ -114,8 +114,8 @@ public class VorbisCodebook { } - @ObfuscatedName("j") - void method2252() { + @ObfuscatedName("x") + void method2310() { int[] var1 = new int[this.entries]; int[] var2 = new int[33]; @@ -208,8 +208,8 @@ public class VorbisCodebook { } - @ObfuscatedName("i") - int method2254() { + @ObfuscatedName("t") + int method2307() { 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("k") - float[] method2255() { - return this.field1320[this.method2254()]; + @ObfuscatedName("g") + float[] method2318() { + return this.field1314[this.method2307()]; } - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("mapType1QuantValues") static int mapType1QuantValues(int var0, int var1) { int var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; diff --git a/runescape-client/src/main/java/VorbisFloor.java b/runescape-client/src/main/java/VorbisFloor.java index d60b5b522f..2be3b7d555 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("dr") +@ObfuscatedName("dj") @Implements("VorbisFloor") public class VorbisFloor { - @ObfuscatedName("s") - static final int[] field1372; - @ObfuscatedName("j") + @ObfuscatedName("c") + static final int[] field1370; + @ObfuscatedName("x") @Export("VorbisFloor_decibelStatics") static final float[] VorbisFloor_decibelStatics; - @ObfuscatedName("d") + @ObfuscatedName("z") static int[] field1368; - @ObfuscatedName("f") - static int[] field1376; - @ObfuscatedName("c") - static boolean[] field1378; - @ObfuscatedName("i") - int[] field1367; - @ObfuscatedName("k") + @ObfuscatedName("n") + static int[] field1369; + @ObfuscatedName("h") + static boolean[] field1359; + @ObfuscatedName("t") + int[] field1361; + @ObfuscatedName("g") @Export("multiplier") int multiplier; - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("partitionClassList") int[] partitionClassList; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("classDimensions") int[] classDimensions; - @ObfuscatedName("t") + @ObfuscatedName("j") @Export("classSubClasses") int[] classSubClasses; - @ObfuscatedName("q") + @ObfuscatedName("v") @Export("classMasterbooks") int[] classMasterbooks; - @ObfuscatedName("x") + @ObfuscatedName("d") @Export("subclassBooks") int[][] subclassBooks; static { - field1372 = new int[]{256, 128, 86, 64}; + field1370 = 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[var9]]; } - this.field1367 = new int[var5]; - this.field1367[0] = 0; - this.field1367[1] = 1 << var4; + this.field1361 = new int[var5]; + this.field1361[0] = 0; + this.field1361[1] = 1 << var4; var5 = 2; for (var9 = 0; var9 < var2; ++var9) { var7 = this.partitionClassList[var9]; for (int var8 = 0; var8 < this.classDimensions[var7]; ++var8) { - this.field1367[var5++] = VorbisSample.readBits(var4); + this.field1361[var5++] = VorbisSample.readBits(var4); } } if (field1368 == null || field1368.length < var5) { field1368 = new int[var5]; - field1376 = new int[var5]; - field1378 = new boolean[var5]; + field1369 = new int[var5]; + field1359 = new boolean[var5]; } } } - @ObfuscatedName("i") - int method2315(int var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("t") + int method2373(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("k") - void method2317(int var1, int var2, int var3, int var4, float[] var5, int var6) { + @ObfuscatedName("g") + void method2383(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("u") + @ObfuscatedName("l") @Export("VarbisFloor_sort") void VarbisFloor_sort(int var1, int var2) { if (var1 < var2) { int var3 = var1; int var4 = field1368[var1]; - int var5 = field1376[var1]; - boolean var6 = field1378[var1]; + int var5 = field1369[var1]; + boolean var6 = field1359[var1]; for (int var7 = var1 + 1; var7 <= var2; ++var7) { int var8 = field1368[var7]; if (var8 < var4) { field1368[var3] = var8; - field1376[var3] = field1376[var7]; - field1378[var3] = field1378[var7]; + field1369[var3] = field1369[var7]; + field1359[var3] = field1359[var7]; ++var3; field1368[var7] = field1368[var3]; - field1376[var7] = field1376[var3]; - field1378[var7] = field1378[var3]; + field1369[var7] = field1369[var3]; + field1359[var7] = field1359[var3]; } } field1368[var3] = var4; - field1376[var3] = var5; - field1378[var3] = var6; + field1369[var3] = var5; + field1359[var3] = var6; this.VarbisFloor_sort(var1, var3 - 1); this.VarbisFloor_sort(var3 + 1, var2); } } - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("readSubmapFloor") boolean readSubmapFloor() { boolean var1 = VorbisSample.readBit() != 0; if (!var1) { return false; } else { - int var2 = this.field1367.length; + int var2 = this.field1361.length; int var3; for (var3 = 0; var3 < var2; ++var3) { - field1368[var3] = this.field1367[var3]; + field1368[var3] = this.field1361[var3]; } - var3 = field1372[this.multiplier - 1]; - int var4 = class160.iLog(var3 - 1); - field1376[0] = VorbisSample.readBits(var4); - field1376[1] = VorbisSample.readBits(var4); + var3 = field1370[this.multiplier - 1]; + int var4 = UserComparator10.iLog(var3 - 1); + field1369[0] = VorbisSample.readBits(var4); + field1369[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]].method2254(); + var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method2307(); } for (int var12 = 0; var12 < var8; ++var12) { int var13 = this.subclassBooks[var7][var11 & var10]; var11 >>>= var9; - field1376[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method2254() : 0; + field1369[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method2307() : 0; } } @@ -224,12 +224,12 @@ public class VorbisFloor { } } - @ObfuscatedName("t") - void method2321(float[] var1, int var2) { - int var3 = this.field1367.length; - int var4 = field1372[this.multiplier - 1]; - boolean[] var5 = field1378; - field1378[1] = true; + @ObfuscatedName("j") + void method2380(float[] var1, int var2) { + int var3 = this.field1361.length; + int var4 = field1370[this.multiplier - 1]; + boolean[] var5 = field1359; + field1359[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 = method2336(field1368, var6); - var8 = method2316(field1368, var6); - var9 = this.method2315(field1368[var7], field1376[var7], field1368[var8], field1376[var8], field1368[var6]); - var10 = field1376[var6]; + var7 = method2377(field1368, var6); + var8 = method2374(field1368, var6); + var9 = this.method2373(field1368[var7], field1369[var7], field1368[var8], field1369[var8], field1368[var6]); + var10 = field1369[var6]; int var11 = var4 - var9; int var13 = (var11 < var9 ? var11 : var9) << 1; if (var10 != 0) { - boolean[] var14 = field1378; - field1378[var8] = true; + boolean[] var14 = field1359; + field1359[var8] = true; var14[var7] = true; - field1378[var6] = true; + field1359[var6] = true; if (var10 >= var13) { - field1376[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; + field1369[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; } else { - field1376[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; + field1369[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; } } else { - field1378[var6] = false; - field1376[var6] = var9; + field1359[var6] = false; + field1369[var6] = var9; } } this.VarbisFloor_sort(0, var3 - 1); var6 = 0; - var7 = field1376[0] * this.multiplier; + var7 = field1369[0] * this.multiplier; for (var8 = 1; var8 < var3; ++var8) { - if (field1378[var8]) { + if (field1359[var8]) { var9 = field1368[var8]; - var10 = field1376[var8] * this.multiplier; - this.method2317(var6, var7, var9, var10, var1, var2); + var10 = field1369[var8] * this.multiplier; + this.method2383(var6, var7, var9, var10, var1, var2); if (var9 >= var2) { return; } @@ -286,8 +286,8 @@ public class VorbisFloor { } - @ObfuscatedName("s") - static int method2336(int[] var0, int var1) { + @ObfuscatedName("c") + static int method2377(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("j") - static int method2316(int[] var0, int var1) { + @ObfuscatedName("x") + static int method2374(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 e6be152a9c..7554885f73 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("dw") +@ObfuscatedName("dz") @Implements("VorbisMapping") public class VorbisMapping { - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("submaps") int submaps; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("mappingMux") int mappingMux; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("submapFloor") int[] submapFloor; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("submapResidue") int[] submapResidue; diff --git a/runescape-client/src/main/java/VorbisResidue.java b/runescape-client/src/main/java/VorbisResidue.java index 8c7313c5de..803180f3ea 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("dc") +@ObfuscatedName("dn") @Implements("VorbisResidue") public class VorbisResidue { - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("residueType") int residueType; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("begin") int begin; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("end") int end; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("partitionSize") int partitionSize; - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("classifications") int classifications; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("classbook") int classbook; - @ObfuscatedName("t") + @ObfuscatedName("j") @Export("cascade") int[] cascade; @@ -56,8 +56,8 @@ public class VorbisResidue { } - @ObfuscatedName("s") - void method2444(float[] var1, int var2, boolean var3) { + @ObfuscatedName("c") + void method2488(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].method2254(); + var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method2307(); 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 var16 = 0; var16 < var15; ++var16) { - float[] var17 = var14.method2255(); + float[] var17 = var14.method2318(); for (int var18 = 0; var18 < var14.dimensions; ++var18) { var1[var13 + var16 + var18 * var15] += var17[var18]; @@ -108,7 +108,7 @@ public class VorbisResidue { var15 = 0; while (var15 < this.partitionSize) { - float[] var19 = var14.method2255(); + float[] var19 = var14.method2318(); for (int var20 = 0; var20 < var14.dimensions; ++var20) { var1[var13 + var15] += var19[var20]; diff --git a/runescape-client/src/main/java/VorbisSample.java b/runescape-client/src/main/java/VorbisSample.java index 816a4027c6..f6600466af 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("cs") +@ObfuscatedName("cy") @Implements("VorbisSample") public class VorbisSample extends Node { - @ObfuscatedName("t") + @ObfuscatedName("j") @Export("VorbisSample_bytes") static byte[] VorbisSample_bytes; - @ObfuscatedName("q") + @ObfuscatedName("v") @Export("VorbisSample_byteOffset") static int VorbisSample_byteOffset; - @ObfuscatedName("x") + @ObfuscatedName("d") @Export("VorbisSample_bitOffset") static int VorbisSample_bitOffset; - @ObfuscatedName("d") + @ObfuscatedName("z") @Export("VorbisSample_blockSize0") static int VorbisSample_blockSize0; - @ObfuscatedName("f") + @ObfuscatedName("n") @Export("VorbisSample_blockSize1") static int VorbisSample_blockSize1; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "[Lcx;" + signature = "[Lcz;" ) @Export("VorbisSample_codebooks") static VorbisCodebook[] VorbisSample_codebooks; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "[Ldr;" + signature = "[Ldj;" ) @Export("VorbisSample_floors") static VorbisFloor[] VorbisSample_floors; - @ObfuscatedName("y") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "[Ldc;" + signature = "[Ldn;" ) @Export("VorbisSample_residues") static VorbisResidue[] VorbisSample_residues; @ObfuscatedName("p") @ObfuscatedSignature( - signature = "[Ldw;" + signature = "[Ldz;" ) @Export("VorbisSample_mappings") static VorbisMapping[] VorbisSample_mappings; - @ObfuscatedName("b") + @ObfuscatedName("e") @Export("VorbisSample_blockFlags") static boolean[] VorbisSample_blockFlags; - @ObfuscatedName("g") + @ObfuscatedName("i") @Export("VorbisSample_mapping") static int[] VorbisSample_mapping; - @ObfuscatedName("e") - static boolean field1345; - @ObfuscatedName("h") - static float[] field1329; - @ObfuscatedName("v") - static float[] field1330; + @ObfuscatedName("q") + static boolean field1323; @ObfuscatedName("m") - static float[] field1343; + static float[] field1324; @ObfuscatedName("o") - static float[] field1353; + static float[] field1343; + @ObfuscatedName("a") + static float[] field1344; + @ObfuscatedName("b") + static float[] field1345; + @ObfuscatedName("ag") + static float[] field1346; + @ObfuscatedName("at") + static float[] field1347; + @ObfuscatedName("ao") + static float[] field1348; @ObfuscatedName("av") - static float[] field1354; - @ObfuscatedName("am") - static float[] field1355; - @ObfuscatedName("ai") - static float[] field1356; - @ObfuscatedName("af") - static int[] field1357; - @ObfuscatedName("az") - static int[] field1341; - @ObfuscatedName("s") - byte[][] field1348; - @ObfuscatedName("j") + static int[] field1332; + @ObfuscatedName("an") + static int[] field1350; + @ObfuscatedName("c") + byte[][] field1349; + @ObfuscatedName("x") @Export("sampleRate") int sampleRate; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("sampleCount") int sampleCount; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("start") int start; - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("end") int end; - @ObfuscatedName("n") - boolean field1342; - @ObfuscatedName("z") - float[] field1346; - @ObfuscatedName("a") - int field1347; + @ObfuscatedName("u") + boolean field1325; + @ObfuscatedName("y") + float[] field1338; + @ObfuscatedName("r") + int field1339; + @ObfuscatedName("k") + int field1340; @ObfuscatedName("w") - int field1335; - @ObfuscatedName("l") - boolean field1349; - @ObfuscatedName("aj") + boolean field1337; + @ObfuscatedName("al") @Export("samples") byte[] samples; - @ObfuscatedName("an") - int field1360; - @ObfuscatedName("at") - int field1361; + @ObfuscatedName("as") + int field1352; + @ObfuscatedName("ad") + int field1353; static { - field1345 = false; + field1323 = false; } VorbisSample(byte[] var1) { this.read(var1); } - @ObfuscatedName("u") + @ObfuscatedName("l") @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.field1342 = true; + this.field1325 = true; } int var3 = var2.readInt(); - this.field1348 = new byte[var3][]; + this.field1349 = 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.field1348[var4] = var7; + this.field1349[var4] = var7; } } - @ObfuscatedName("t") - float[] method2282(int var1) { - VorbisSample_setData(this.field1348[var1], 0); + @ObfuscatedName("j") + float[] method2358(int var1) { + VorbisSample_setData(this.field1349[var1], 0); readBit(); - int var2 = readBits(class160.iLog(VorbisSample_mapping.length - 1)); + int var2 = readBits(UserComparator10.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 var18 = VorbisSample_residues[var14.submapResidue[var17]]; - float[] var19 = field1329; - var18.method2444(var19, var4 >> 1, var45); + float[] var19 = field1324; + var18.method2488(var19, var4 >> 1, var45); } int var40; if (!var15) { var17 = var14.mappingMux; var40 = var14.submapFloor[var17]; - VorbisSample_floors[var40].method2321(field1329, var4 >> 1); + VorbisSample_floors[var40].method2380(field1324, var4 >> 1); } int var42; if (var15) { for (var17 = var4 >> 1; var17 < var4; ++var17) { - field1329[var17] = 0.0F; + field1324[var17] = 0.0F; } } else { var17 = var4 >> 1; var40 = var4 >> 2; var42 = var4 >> 3; - float[] var43 = field1329; + float[] var43 = field1324; int var21; for (var21 = 0; var21 < var17; ++var21) { @@ -223,10 +223,10 @@ public class VorbisSample extends Node { var43[var21] = -var43[var4 - var21 - 1]; } - float[] var44 = var3 ? field1354 : field1330; - float[] var22 = var3 ? field1355 : field1343; - float[] var23 = var3 ? field1356 : field1353; - int[] var24 = var3 ? field1341 : field1357; + float[] var44 = var3 ? field1346 : field1343; + float[] var22 = var3 ? field1347 : field1344; + float[] var23 = var3 ? field1348 : field1345; + int[] var24 = var3 ? field1350 : field1332; int var25; float var26; @@ -257,7 +257,7 @@ public class VorbisSample extends Node { var43[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31; } - var25 = class160.iLog(var4 - 1); + var25 = UserComparator10.iLog(var4 - 1); int var47; int var48; @@ -357,49 +357,49 @@ public class VorbisSample extends Node { float[] var10000; for (var47 = var8; var47 < var9; ++var47) { var27 = (float)Math.sin(((double)(var47 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D); - var10000 = field1329; + var10000 = field1324; var10000[var47] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } for (var47 = var11; var47 < var12; ++var47) { var27 = (float)Math.sin(((double)(var47 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D); - var10000 = field1329; + var10000 = field1324; var10000[var47] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } } float[] var41 = null; - if (this.field1347 > 0) { - var40 = var4 + this.field1347 >> 2; + if (this.field1339 > 0) { + var40 = var4 + this.field1339 >> 2; var41 = new float[var40]; int var20; - if (!this.field1349) { - for (var42 = 0; var42 < this.field1335; ++var42) { - var20 = var42 + (this.field1347 >> 1); - var41[var42] += this.field1346[var20]; + if (!this.field1337) { + for (var42 = 0; var42 < this.field1340; ++var42) { + var20 = var42 + (this.field1339 >> 1); + var41[var42] += this.field1338[var20]; } } if (!var15) { for (var42 = var8; var42 < var4 >> 1; ++var42) { var20 = var41.length - (var4 >> 1) + var42; - var41[var20] += field1329[var42]; + var41[var20] += field1324[var42]; } } } - float[] var46 = this.field1346; - this.field1346 = field1329; - field1329 = var46; - this.field1347 = var4; - this.field1335 = var12 - (var4 >> 1); - this.field1349 = var15; + float[] var46 = this.field1338; + this.field1338 = field1324; + field1324 = var46; + this.field1339 = var4; + this.field1340 = var12 - (var4 >> 1); + this.field1337 = var15; return var41; } - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "([I)Lco;" + signature = "([I)Lcg;" ) @Export("toRawSound") RawSound toRawSound(int[] var1) { @@ -407,21 +407,21 @@ public class VorbisSample extends Node { return null; } else { if (this.samples == null) { - this.field1347 = 0; - this.field1346 = new float[VorbisSample_blockSize1]; + this.field1339 = 0; + this.field1338 = new float[VorbisSample_blockSize1]; this.samples = new byte[this.sampleCount]; - this.field1360 = 0; - this.field1361 = 0; + this.field1352 = 0; + this.field1353 = 0; } - for (; this.field1361 < this.field1348.length; ++this.field1361) { + for (; this.field1353 < this.field1349.length; ++this.field1353) { if (var1 != null && var1[0] <= 0) { return null; } - float[] var2 = this.method2282(this.field1361); + float[] var2 = this.method2358(this.field1353); if (var2 != null) { - int var3 = this.field1360; + int var3 = this.field1352; 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.field1360; + var1[0] -= var3 - this.field1352; } - this.field1360 = var3; + this.field1352 = var3; } } - this.field1346 = null; + this.field1338 = null; byte[] var7 = this.samples; this.samples = null; - return new RawSound(this.sampleRate, var7, this.start, this.end, this.field1342); + return new RawSound(this.sampleRate, var7, this.start, this.end, this.field1325); } } - @ObfuscatedName("s") + @ObfuscatedName("c") @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("j") + @ObfuscatedName("x") @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("i") + @ObfuscatedName("t") @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("k") + @ObfuscatedName("g") @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 method2294(byte[] var0) { + @ObfuscatedName("u") + static void method2341(byte[] var0) { VorbisSample_setData(var0, 0); VorbisSample_blockSize0 = 1 << readBits(4); VorbisSample_blockSize1 = 1 << readBits(4); - field1329 = new float[VorbisSample_blockSize1]; + field1324 = new float[VorbisSample_blockSize1]; int var1; int var2; @@ -546,22 +546,22 @@ public class VorbisSample extends Node { } int[] var14 = new int[var5]; - int var10 = class160.iLog(var5 - 1); + int var10 = UserComparator10.iLog(var5 - 1); for (int var11 = 0; var11 < var5; ++var11) { - var14[var11] = WorldMapSection0.method215(var11, var10); + var14[var11] = WorldMapSection1.method539(var11, var10); } if (var1 != 0) { - field1354 = var6; - field1355 = var12; - field1356 = var13; - field1341 = var14; + field1346 = var6; + field1347 = var12; + field1348 = var13; + field1350 = var14; } else { - field1330 = var6; - field1343 = var12; - field1353 = var13; - field1357 = var14; + field1343 = var6; + field1344 = var12; + field1345 = var13; + field1332 = var14; } } @@ -612,31 +612,31 @@ public class VorbisSample extends Node { } - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "(Lhz;)Z" ) - static boolean method2289(AbstractArchive var0) { - if (!field1345) { + static boolean method2343(AbstractArchive var0) { + if (!field1323) { byte[] var1 = var0.takeFile(0, 0); if (var1 == null) { return false; } - method2294(var1); - field1345 = true; + method2341(var1); + field1323 = true; } return true; } - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lhz;II)Lcs;" + signature = "(Lhz;II)Lcy;" ) @Export("readMusicSample") static VorbisSample readMusicSample(AbstractArchive var0, int var1, int var2) { - if (!method2289(var0)) { + if (!method2343(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 2e0af4c129..faba91df3b 100644 --- a/runescape-client/src/main/java/WallDecoration.java +++ b/runescape-client/src/main/java/WallDecoration.java @@ -1,87 +1,75 @@ -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; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ec") +@ObfuscatedName("es") @Implements("WallDecoration") public final class WallDecoration { - @ObfuscatedName("hs") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1884490031 - ) - @Export("cameraX") - static int cameraX; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -1455468639 + intValue = 100665877 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1625268339 - ) - @Export("x") - int x; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -1008616069 + intValue = 653989891 ) @Export("y") int y; - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1888618101 + intValue = 1548950965 + ) + @Export("x") + int x; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 1639714203 ) @Export("orientation") int orientation; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1426689619 + intValue = -625987959 ) @Export("orientation2") int orientation2; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1112566739 + intValue = -582928969 ) @Export("xOffset") int xOffset; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1176154873 + intValue = -134264581 ) @Export("yOffset") int yOffset; - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Len;" + signature = "Lel;" ) @Export("entity1") public Entity entity1; - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Len;" + signature = "Lel;" ) @Export("entity2") public Entity entity2; - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedGetter( - longValue = -7342954740036986227L + longValue = 6602395642985356173L ) @Export("tag") public long tag; - @ObfuscatedName("f") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 798817733 + intValue = -1233883707 ) @Export("flags") int flags; @@ -91,280 +79,576 @@ public final class WallDecoration { this.flags = 0; } - @ObfuscatedName("i") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/lang/Throwable;I)Ljava/lang/String;", - garbageValue = "-147056838" + signature = "(IB)Liy;", + garbageValue = "-29" ) - @Export("shortenStackTrace") - static String shortenStackTrace(Throwable var0) throws IOException { - String var1; - if (var0 instanceof RunException) { - RunException var2 = (RunException)var0; - var1 = var2.message + " | "; - var0 = var2.throwable; + @Export("getObjectDefinition") + public static ObjectDefinition getObjectDefinition(int var0) { + ObjectDefinition var1 = (ObjectDefinition)ObjectDefinition.ObjectDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; } 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 + ' '; + byte[] var2 = GrandExchangeOfferNameComparator.ObjectDefinition_archive.takeFile(6, var0); + var1 = new ObjectDefinition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); } + + var1.postDecode(); + if (var1.isSolid) { + var1.interactType = 0; + var1.boolean1 = false; + } + + ObjectDefinition.ObjectDefinition_cached.put(var1, (long)var0); + return var1; } } - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;B)I", - garbageValue = "42" + signature = "(IB)V", + garbageValue = "2" ) - @Export("parseInt") - public static int parseInt(CharSequence var0) { - return Ignored.parseIntCustomRadix(var0, 10, true); + public static void method3256(int var0) { + class197.field2376 = 1; + class197.musicTrackArchive = null; + class197.musicTrackGroupId = -1; + class197.musicTrackFileId = -1; + Canvas.field395 = 0; + MouseRecorder.musicTrackBoolean = false; + ModelData0.field1833 = var0; } - @ObfuscatedName("p") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "1" + signature = "(Lep;[Lfj;I)V", + garbageValue = "1960688399" ) - public static int method3245(int var0) { - if (var0 > 0) { - return 1; - } else { - return var0 < 0 ? -1 : 0; - } - } + static final void method3257(Scene var0, CollisionMap[] var1) { + int var2; + int var3; + int var4; + int var5; + for (var2 = 0; var2 < 4; ++var2) { + for (var3 = 0; var3 < 104; ++var3) { + for (var4 = 0; var4 < 104; ++var4) { + if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) == 1) { + var5 = var2; + if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { + var5 = var2 - 1; + } - @ObfuscatedName("au") - @ObfuscatedSignature( - signature = "(ILcr;ZI)I", - garbageValue = "234217690" - ) - static int method3243(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class173.loadWorlds() ? 1 : 0; - return 1; - } else { - World var3; - if (var0 == ScriptOpcodes.WORLDLIST_START) { - var3 = DevicePcmPlayerProvider.worldListStart(); - if (var3 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.id; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.properties; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.activity; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.location; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.population; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.host; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { - var3 = GrandExchangeOfferAgeComparator.getNextWorldListWorld(); - if (var3 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.id; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.properties; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.activity; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.location; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.population; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.host; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else { - World var4; - int var5; - int var7; - if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var4 = null; - - for (var5 = 0; var5 < World.World_count; ++var5) { - if (var7 == ChatChannel.World_worlds[var5].id) { - var4 = ChatChannel.World_worlds[var5]; - break; + if (var5 >= 0) { + var1[var5].setBlockedByFloor(var3, var4); } } - - if (var4 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.id; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.properties; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.activity; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.location; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.population; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.host; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { - Interpreter.Interpreter_intStackSize -= 4; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - boolean var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; - var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - boolean var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3] == 1; - MouseHandler.sortWorldList(var7, var10, var5, var6); - return 1; - } else if (var0 != ScriptOpcodes.GETWORLDINFO) { - if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { - Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else { - int var8; - ParamDefinition var9; - if (var0 == ScriptOpcodes.NC_PARAM) { - Interpreter.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var9 = VarcInt.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ViewportMouse.getNpcDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ViewportMouse.getNpcDefinition(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.LC_PARAM) { - Interpreter.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var9 = VarcInt.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class215.getObjectDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class215.getObjectDefinition(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_PARAM) { - Interpreter.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var9 = VarcInt.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = WorldMapData_0.ItemDefinition_get(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapData_0.ItemDefinition_get(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { - Interpreter.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - var9 = VarcInt.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class43.StructDefinition_getStructDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class43.StructDefinition_getStructDefinition(var7).getIntParam(var8, var9.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) { - --Interpreter.Interpreter_stringStackSize; - --Interpreter.Interpreter_intStackSize; - return 1; - } else if (var0 == 6523) { - --Interpreter.Interpreter_stringStackSize; - --Interpreter.Interpreter_intStackSize; - return 1; - } else if (var0 == ScriptOpcodes.BATTERYLEVEL) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - return 1; - } else if (var0 == ScriptOpcodes.BATTERYCHARGING) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - return 1; - } else if (var0 == ScriptOpcodes.WIFIAVAILABLE) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - return 1; - } else { - return 2; - } - } - } else { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var7 >= 0 && var7 < World.World_count) { - var4 = ChatChannel.World_worlds[var7]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.id; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.properties; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.activity; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.location; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.population; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.host; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - } - - return 1; } } } + + Tiles.field483 += (int)(Math.random() * 5.0D) - 2; + if (Tiles.field483 < -8) { + Tiles.field483 = -8; + } + + if (Tiles.field483 > 8) { + Tiles.field483 = 8; + } + + Tiles.field486 += (int)(Math.random() * 5.0D) - 2; + if (Tiles.field486 < -16) { + Tiles.field486 = -16; + } + + if (Tiles.field486 > 16) { + Tiles.field486 = 16; + } + + int var9; + int var10; + int var11; + int var12; + int var13; + int var14; + int var15; + int var16; + int[] var10000; + int var17; + int var18; + for (var2 = 0; var2 < 4; ++var2) { + byte[][] var44 = Tiles.field473[var2]; + var9 = (int)Math.sqrt(5100.0D); + var10 = var9 * 768 >> 8; + + int var19; + int var20; + for (var11 = 1; var11 < 103; ++var11) { + for (var12 = 1; var12 < 103; ++var12) { + var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11]; + var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1]; + var15 = (int)Math.sqrt((double)(var14 * var14 + var13 * var13 + 65536)); + var16 = (var13 << 8) / var15; + var17 = 65536 / var15; + var18 = (var14 << 8) / var15; + var19 = (var16 * -50 + var18 * -50 + var17 * -10) / var10 + 96; + var20 = (var44[var12][var11 + 1] >> 3) + (var44[var12 - 1][var11] >> 2) + (var44[var12][var11 - 1] >> 2) + (var44[var12 + 1][var11] >> 3) + (var44[var12][var11] >> 1); + class160.field1977[var12][var11] = var19 - var20; + } + } + + for (var11 = 0; var11 < 104; ++var11) { + UserComparator7.Tiles_hue[var11] = 0; + TileItem.Tiles_saturation[var11] = 0; + class1.Tiles_lightness[var11] = 0; + class42.Tiles_hueMultiplier[var11] = 0; + Tiles.field488[var11] = 0; + } + + for (var11 = -5; var11 < 109; ++var11) { + for (var12 = 0; var12 < 104; ++var12) { + var13 = var11 + 5; + int var10002; + if (var13 >= 0 && var13 < 104) { + var14 = Tiles.field476[var2][var13][var12] & 255; + if (var14 > 0) { + FloorUnderlayDefinition var49 = ServerPacket.FloorUnderlayDefinition_get(var14 - 1); + var10000 = UserComparator7.Tiles_hue; + var10000[var12] += var49.hue; + var10000 = TileItem.Tiles_saturation; + var10000[var12] += var49.saturation; + var10000 = class1.Tiles_lightness; + var10000[var12] += var49.lightness; + var10000 = class42.Tiles_hueMultiplier; + var10000[var12] += var49.hueMultiplier; + var10002 = Tiles.field488[var12]++; + } + } + + var14 = var11 - 5; + if (var14 >= 0 && var14 < 104) { + var15 = Tiles.field476[var2][var14][var12] & 255; + if (var15 > 0) { + FloorUnderlayDefinition var45 = ServerPacket.FloorUnderlayDefinition_get(var15 - 1); + var10000 = UserComparator7.Tiles_hue; + var10000[var12] -= var45.hue; + var10000 = TileItem.Tiles_saturation; + var10000[var12] -= var45.saturation; + var10000 = class1.Tiles_lightness; + var10000[var12] -= var45.lightness; + var10000 = class42.Tiles_hueMultiplier; + var10000[var12] -= var45.hueMultiplier; + var10002 = Tiles.field488[var12]--; + } + } + } + + if (var11 >= 1 && var11 < 103) { + var12 = 0; + var13 = 0; + var14 = 0; + var15 = 0; + var16 = 0; + + for (var17 = -5; var17 < 109; ++var17) { + var18 = var17 + 5; + if (var18 >= 0 && var18 < 104) { + var12 += UserComparator7.Tiles_hue[var18]; + var13 += TileItem.Tiles_saturation[var18]; + var14 += class1.Tiles_lightness[var18]; + var15 += class42.Tiles_hueMultiplier[var18]; + var16 += Tiles.field488[var18]; + } + + var19 = var17 - 5; + if (var19 >= 0 && var19 < 104) { + var12 -= UserComparator7.Tiles_hue[var19]; + var13 -= TileItem.Tiles_saturation[var19]; + var14 -= class1.Tiles_lightness[var19]; + var15 -= class42.Tiles_hueMultiplier[var19]; + var16 -= Tiles.field488[var19]; + } + + if (var17 >= 1 && var17 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var11][var17] & 2) != 0 || (Tiles.Tiles_renderFlags[var2][var11][var17] & 16) == 0)) { + if (var2 < Tiles.Tiles_minPlane) { + Tiles.Tiles_minPlane = var2; + } + + var20 = Tiles.field476[var2][var11][var17] & 255; + int var21 = class30.field257[var2][var11][var17] & 255; + if (var20 > 0 || var21 > 0) { + int var22 = Tiles.Tiles_heights[var2][var11][var17]; + int var23 = Tiles.Tiles_heights[var2][var11 + 1][var17]; + int var24 = Tiles.Tiles_heights[var2][var11 + 1][var17 + 1]; + int var25 = Tiles.Tiles_heights[var2][var11][var17 + 1]; + int var26 = class160.field1977[var11][var17]; + int var27 = class160.field1977[var11 + 1][var17]; + int var28 = class160.field1977[var11 + 1][var17 + 1]; + int var29 = class160.field1977[var11][var17 + 1]; + int var30 = -1; + int var31 = -1; + int var32; + int var33; + int var34; + if (var20 > 0) { + var32 = var12 * 256 / var15; + var33 = var13 / var16; + var34 = var14 / var16; + var30 = Entity.hslToRgb(var32, var33, var34); + var32 = var32 + Tiles.field483 & 255; + var34 += Tiles.field486; + if (var34 < 0) { + var34 = 0; + } else if (var34 > 255) { + var34 = 255; + } + + var31 = Entity.hslToRgb(var32, var33, var34); + } + + FloorOverlayDefinition var35; + if (var2 > 0) { + boolean var51 = true; + if (var20 == 0 && Tiles.field477[var2][var11][var17] != 0) { + var51 = false; + } + + if (var21 > 0) { + var34 = var21 - 1; + var35 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var34); + FloorOverlayDefinition var46; + if (var35 != null) { + var46 = var35; + } else { + byte[] var36 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var34); + var35 = new FloorOverlayDefinition(); + if (var36 != null) { + var35.decode(new Buffer(var36), var34); + } + + var35.postDecode(); + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var35, (long)var34); + var46 = var35; + } + + if (!var46.hideUnderlay) { + var51 = false; + } + } + + if (var51 && var23 == var22 && var22 == var24 && var25 == var22) { + var10000 = UserComparator3.field1961[var2][var11]; + var10000[var17] |= 2340; + } + } + + var32 = 0; + if (var31 != -1) { + var32 = Rasterizer3D.Rasterizer3D_colorPalette[MusicPatchNode.method3812(var31, 96)]; + } + + if (var21 == 0) { + var0.addTile(var2, var11, var17, 0, 0, -1, var22, var23, var24, var25, MusicPatchNode.method3812(var30, var26), MusicPatchNode.method3812(var30, var27), MusicPatchNode.method3812(var30, var28), MusicPatchNode.method3812(var30, var29), 0, 0, 0, 0, var32, 0); + } else { + var33 = Tiles.field477[var2][var11][var17] + 1; + byte var52 = HealthBar.field1089[var2][var11][var17]; + int var47 = var21 - 1; + FloorOverlayDefinition var37 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var47); + if (var37 != null) { + var35 = var37; + } else { + byte[] var38 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var47); + var37 = new FloorOverlayDefinition(); + if (var38 != null) { + var37.decode(new Buffer(var38), var47); + } + + var37.postDecode(); + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var37, (long)var47); + var35 = var37; + } + + int var48 = var35.texture; + int var39; + int var40; + int var41; + int var42; + if (var48 >= 0) { + var40 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var48); + var39 = -1; + } else if (var35.primaryRgb == 16711935) { + var39 = -2; + var48 = -1; + var40 = -2; + } else { + var39 = Entity.hslToRgb(var35.hue, var35.saturation, var35.lightness); + var41 = var35.hue + Tiles.field483 & 255; + var42 = var35.lightness + Tiles.field486; + if (var42 < 0) { + var42 = 0; + } else if (var42 > 255) { + var42 = 255; + } + + var40 = Entity.hslToRgb(var41, var35.saturation, var42); + } + + var41 = 0; + if (var40 != -2) { + var41 = Rasterizer3D.Rasterizer3D_colorPalette[FloorDecoration.method2812(var40, 96)]; + } + + if (var35.secondaryRgb != -1) { + var42 = var35.secondaryHue + Tiles.field483 & 255; + int var43 = var35.secondaryLightness + Tiles.field486; + if (var43 < 0) { + var43 = 0; + } else if (var43 > 255) { + var43 = 255; + } + + var40 = Entity.hslToRgb(var42, var35.secondarySaturation, var43); + var41 = Rasterizer3D.Rasterizer3D_colorPalette[FloorDecoration.method2812(var40, 96)]; + } + + var0.addTile(var2, var11, var17, var33, var52, var48, var22, var23, var24, var25, MusicPatchNode.method3812(var30, var26), MusicPatchNode.method3812(var30, var27), MusicPatchNode.method3812(var30, var28), MusicPatchNode.method3812(var30, var29), FloorDecoration.method2812(var39, var26), FloorDecoration.method2812(var39, var27), FloorDecoration.method2812(var39, var28), FloorDecoration.method2812(var39, var29), var32, var41); + } + } + } + } + } + } + + for (var11 = 1; var11 < 103; ++var11) { + for (var12 = 1; var12 < 103; ++var12) { + var0.setTileMinPlane(var2, var12, var11, Language.method3634(var2, var12, var11)); + } + } + + Tiles.field476[var2] = null; + class30.field257[var2] = null; + Tiles.field477[var2] = null; + HealthBar.field1089[var2] = null; + Tiles.field473[var2] = null; + } + + var0.method3072(-50, -10, -50); + + for (var2 = 0; var2 < 104; ++var2) { + for (var3 = 0; var3 < 104; ++var3) { + if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { + var0.setLinkBelow(var2, var3); + } + } + } + + var2 = 1; + var3 = 2; + var4 = 4; + + for (var5 = 0; var5 < 4; ++var5) { + if (var5 > 0) { + var2 <<= 3; + var3 <<= 3; + var4 <<= 3; + } + + for (int var6 = 0; var6 <= var5; ++var6) { + for (int var7 = 0; var7 <= 104; ++var7) { + for (int var8 = 0; var8 <= 104; ++var8) { + short var50; + if ((UserComparator3.field1961[var6][var8][var7] & var2) != 0) { + var9 = var7; + var10 = var7; + var11 = var6; + + for (var12 = var6; var9 > 0 && (UserComparator3.field1961[var6][var8][var9 - 1] & var2) != 0; --var9) { + } + + while (var10 < 104 && (UserComparator3.field1961[var6][var8][var10 + 1] & var2) != 0) { + ++var10; + } + + label495: + while (var11 > 0) { + for (var13 = var9; var13 <= var10; ++var13) { + if ((UserComparator3.field1961[var11 - 1][var8][var13] & var2) == 0) { + break label495; + } + } + + --var11; + } + + label484: + while (var12 < var5) { + for (var13 = var9; var13 <= var10; ++var13) { + if ((UserComparator3.field1961[var12 + 1][var8][var13] & var2) == 0) { + break label484; + } + } + + ++var12; + } + + var13 = (var10 - var9 + 1) * (var12 + 1 - var11); + if (var13 >= 8) { + var50 = 240; + var15 = Tiles.Tiles_heights[var12][var8][var9] - var50; + var16 = Tiles.Tiles_heights[var11][var8][var9]; + Scene.Scene_addOccluder(var5, 1, var8 * 128, var8 * 128, var9 * 128, var10 * 128 + 128, var15, var16); + + for (var17 = var11; var17 <= var12; ++var17) { + for (var18 = var9; var18 <= var10; ++var18) { + var10000 = UserComparator3.field1961[var17][var8]; + var10000[var18] &= ~var2; + } + } + } + } + + if ((UserComparator3.field1961[var6][var8][var7] & var3) != 0) { + var9 = var8; + var10 = var8; + var11 = var6; + + for (var12 = var6; var9 > 0 && (UserComparator3.field1961[var6][var9 - 1][var7] & var3) != 0; --var9) { + } + + while (var10 < 104 && (UserComparator3.field1961[var6][var10 + 1][var7] & var3) != 0) { + ++var10; + } + + label548: + while (var11 > 0) { + for (var13 = var9; var13 <= var10; ++var13) { + if ((UserComparator3.field1961[var11 - 1][var13][var7] & var3) == 0) { + break label548; + } + } + + --var11; + } + + label537: + while (var12 < var5) { + for (var13 = var9; var13 <= var10; ++var13) { + if ((UserComparator3.field1961[var12 + 1][var13][var7] & var3) == 0) { + break label537; + } + } + + ++var12; + } + + var13 = (var10 - var9 + 1) * (var12 + 1 - var11); + if (var13 >= 8) { + var50 = 240; + var15 = Tiles.Tiles_heights[var12][var9][var7] - var50; + var16 = Tiles.Tiles_heights[var11][var9][var7]; + Scene.Scene_addOccluder(var5, 2, var9 * 128, var10 * 128 + 128, var7 * 128, var7 * 128, var15, var16); + + for (var17 = var11; var17 <= var12; ++var17) { + for (var18 = var9; var18 <= var10; ++var18) { + var10000 = UserComparator3.field1961[var17][var18]; + var10000[var7] &= ~var3; + } + } + } + } + + if ((UserComparator3.field1961[var6][var8][var7] & var4) != 0) { + var9 = var8; + var10 = var8; + var11 = var7; + + for (var12 = var7; var11 > 0 && (UserComparator3.field1961[var6][var8][var11 - 1] & var4) != 0; --var11) { + } + + while (var12 < 104 && (UserComparator3.field1961[var6][var8][var12 + 1] & var4) != 0) { + ++var12; + } + + label601: + while (var9 > 0) { + for (var13 = var11; var13 <= var12; ++var13) { + if ((UserComparator3.field1961[var6][var9 - 1][var13] & var4) == 0) { + break label601; + } + } + + --var9; + } + + label590: + while (var10 < 104) { + for (var13 = var11; var13 <= var12; ++var13) { + if ((UserComparator3.field1961[var6][var10 + 1][var13] & var4) == 0) { + break label590; + } + } + + ++var10; + } + + if ((var10 - var9 + 1) * (var12 - var11 + 1) >= 4) { + var13 = Tiles.Tiles_heights[var6][var9][var11]; + Scene.Scene_addOccluder(var5, 4, var9 * 128, var10 * 128 + 128, var11 * 128, var12 * 128 + 128, var13, var13); + + for (var14 = var9; var14 <= var10; ++var14) { + for (var15 = var11; var15 <= var12; ++var15) { + var10000 = UserComparator3.field1961[var6][var14]; + var10000[var15] &= ~var4; + } + } + } + } + } + } + } + } + + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "7" + ) + protected static final void method3259() { + FriendSystem.clock.mark(); + + int var0; + for (var0 = 0; var0 < 32; ++var0) { + GameShell.field427[var0] = 0L; + } + + for (var0 = 0; var0 < 32; ++var0) { + GameShell.field418[var0] = 0L; + } + + GameShell.field423 = 0; + } + + @ObfuscatedName("jt") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-2004053653" + ) + @Export("FriendSystem_invalidateFriends") + static final void FriendSystem_invalidateFriends() { + for (int var0 = 0; var0 < Players.Players_count; ++var0) { + Player var1 = Client.players[Players.Players_indices[var0]]; + var1.clearIsFriend(); + } + + class192.method3648(); + if (GrandExchangeOfferUnitPriceComparator.clanChat != null) { + GrandExchangeOfferUnitPriceComparator.clanChat.clearFriends(); + } + } } diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index 9f4e9fba42..4d222d9322 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -4,697 +4,679 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hp") +@ObfuscatedName("hy") @Implements("Widget") public class Widget extends Node { - @ObfuscatedName("t") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "[[Lhp;" - ) - @Export("Widget_interfaceComponents") - public static Widget[][] Widget_interfaceComponents; - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lhz;" - ) - @Export("Widget_archive") - static AbstractArchive Widget_archive; - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Lhz;" - ) - @Export("Widget_fontsArchive") - static AbstractArchive Widget_fontsArchive; - @ObfuscatedName("r") - @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("Widget_cachedSprites") - static EvictingDualNodeHashTable Widget_cachedSprites; - @ObfuscatedName("y") + public static EvictingDualNodeHashTable Widget_cachedSprites; + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("Widget_cachedModels") - static EvictingDualNodeHashTable Widget_cachedModels; + public static EvictingDualNodeHashTable Widget_cachedModels; @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("Widget_cachedFonts") - static EvictingDualNodeHashTable Widget_cachedFonts; - @ObfuscatedName("b") + public static EvictingDualNodeHashTable Widget_cachedFonts; + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("Widget_cachedSpriteMasks") - static EvictingDualNodeHashTable Widget_cachedSpriteMasks; - @ObfuscatedName("g") - public static boolean field2579; - @ObfuscatedName("e") + public static EvictingDualNodeHashTable Widget_cachedSpriteMasks; + @ObfuscatedName("i") + public static boolean field2668; + @ObfuscatedName("q") @Export("isIf3") public boolean isIf3; - @ObfuscatedName("z") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1708719923 + intValue = -1907672421 ) @Export("id") public int id; - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 467661249 + intValue = 1945226707 ) @Export("childIndex") public int childIndex; - @ObfuscatedName("w") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1925555435 + intValue = -772276819 ) @Export("type") public int type; - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -275504647 + intValue = 328267473 ) @Export("buttonType") public int buttonType; - @ObfuscatedName("h") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 939098119 + intValue = -454562685 ) @Export("contentType") public int contentType; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -672675163 + intValue = 895820023 ) @Export("xAlignment") public int xAlignment; - @ObfuscatedName("m") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -2007868025 + intValue = 1916882485 ) @Export("yAlignment") public int yAlignment; - @ObfuscatedName("o") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 341778039 + intValue = 2100474417 ) @Export("widthAlignment") public int widthAlignment; - @ObfuscatedName("av") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 1959652011 + intValue = -1973607169 ) @Export("heightAlignment") public int heightAlignment; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 2096231869 + intValue = 1858248381 ) @Export("rawX") public int rawX; - @ObfuscatedName("ai") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 1182032235 + intValue = 240913587 ) @Export("rawY") public int rawY; - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 2138399125 + intValue = 861849893 ) @Export("rawWidth") public int rawWidth; - @ObfuscatedName("az") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -1680813471 + intValue = -2044035335 ) @Export("rawHeight") public int rawHeight; - @ObfuscatedName("aj") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 1019695869 + intValue = -761589597 ) @Export("x") public int x; - @ObfuscatedName("an") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -1173334909 + intValue = 319484797 ) @Export("y") public int y; - @ObfuscatedName("at") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -330046731 + intValue = -1718038251 ) @Export("width") public int width; - @ObfuscatedName("as") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -1817487801 + intValue = -674853749 ) @Export("height") public int height; - @ObfuscatedName("ak") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -959032847 + intValue = 1080920081 ) - public int field2538; - @ObfuscatedName("ao") + public int field2632; + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -275378447 + intValue = -907952667 ) - public int field2612; - @ObfuscatedName("ac") + public int field2556; + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 1923401589 + intValue = 1035091827 ) @Export("parentId") public int parentId; - @ObfuscatedName("ar") + @ObfuscatedName("af") @Export("isHidden") public boolean isHidden; - @ObfuscatedName("au") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 1482452977 + intValue = 104714479 ) @Export("scrollX") public int scrollX; - @ObfuscatedName("ax") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -2016289711 + intValue = 170496061 ) @Export("scrollY") public int scrollY; - @ObfuscatedName("ag") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 260494285 + intValue = -830534739 ) @Export("scrollWidth") public int scrollWidth; - @ObfuscatedName("aa") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -2146218681 + intValue = -1176297831 ) @Export("scrollHeight") public int scrollHeight; - @ObfuscatedName("ap") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -510289111 + intValue = 949515665 ) @Export("color") public int color; @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 69172767 + intValue = 921596793 ) @Export("color2") public int color2; - @ObfuscatedName("ay") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -1460620473 + intValue = -2025808895 ) @Export("mouseOverColor") public int mouseOverColor; - @ObfuscatedName("ad") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -1672372405 + intValue = -195673481 ) @Export("mouseOverColor2") public int mouseOverColor2; - @ObfuscatedName("al") + @ObfuscatedName("az") @Export("fill") public boolean fill; - @ObfuscatedName("ah") + @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "Llb;" + signature = "Llq;" ) @Export("fillMode") public FillMode fillMode; - @ObfuscatedName("ab") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -1495392275 + intValue = 1731186671 ) @Export("transparencyTop") public int transparencyTop; @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = -1571027933 + intValue = -1268087391 ) @Export("transparencyBot") public int transparencyBot; - @ObfuscatedName("ae") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -1813251577 + intValue = -2139231195 ) @Export("lineWid") public int lineWid; - @ObfuscatedName("bk") - public boolean field2601; - @ObfuscatedName("bw") + @ObfuscatedName("bg") + public boolean field2675; + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = 1520736473 + intValue = 934417717 ) @Export("spriteId2") public int spriteId2; - @ObfuscatedName("bo") + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = 1571387993 + intValue = 851339945 ) @Export("spriteId") public int spriteId; - @ObfuscatedName("bn") + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = -332735913 + intValue = 1927880711 ) @Export("spriteAngle") public int spriteAngle; - @ObfuscatedName("bp") + @ObfuscatedName("bu") @Export("spriteTiling") public boolean spriteTiling; - @ObfuscatedName("bz") + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = 1938856491 + intValue = -339926563 ) @Export("outline") public int outline; - @ObfuscatedName("bh") + @ObfuscatedName("bv") @ObfuscatedGetter( - intValue = 854730489 + intValue = -300201401 ) @Export("spriteShadow") public int spriteShadow; - @ObfuscatedName("bv") + @ObfuscatedName("bf") @Export("spriteFlipV") public boolean spriteFlipV; - @ObfuscatedName("bj") + @ObfuscatedName("bm") @Export("spriteFlipH") public boolean spriteFlipH; - @ObfuscatedName("bq") + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = 20966337 + intValue = 37345555 ) @Export("modelType") public int modelType; - @ObfuscatedName("by") + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = 1167866435 + intValue = -679429735 ) @Export("modelId") public int modelId; - @ObfuscatedName("bs") + @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = 1287087547 + intValue = -1068399227 ) @Export("modelType2") int modelType2; - @ObfuscatedName("bi") + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = -1636240977 + intValue = -1060754229 ) @Export("modelId2") int modelId2; - @ObfuscatedName("bf") + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = -1464893801 + intValue = -1598461627 ) @Export("sequenceId") public int sequenceId; - @ObfuscatedName("bd") + @ObfuscatedName("by") @ObfuscatedGetter( - intValue = 102645467 + intValue = 903177661 ) @Export("sequenceId2") public int sequenceId2; - @ObfuscatedName("br") + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = 1360150457 + intValue = 968200291 ) @Export("modelOffsetX") public int modelOffsetX; - @ObfuscatedName("bm") + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = -453431795 + intValue = -1396301049 ) @Export("modelOffsetY") public int modelOffsetY; - @ObfuscatedName("bu") + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = 787059755 + intValue = 2074763115 ) @Export("modelAngleX") public int modelAngleX; - @ObfuscatedName("bb") + @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = -1741571787 + intValue = -741034463 ) @Export("modelAngleY") public int modelAngleY; - @ObfuscatedName("bl") + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = 1967716375 + intValue = 1685270553 ) @Export("modelAngleZ") public int modelAngleZ; - @ObfuscatedName("bt") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = 1984472705 + intValue = 1323312973 ) @Export("modelZoom") public int modelZoom; - @ObfuscatedName("bx") + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = -1968433305 + intValue = -2064112683 ) - public int field2638; - @ObfuscatedName("ba") - @ObfuscatedGetter( - intValue = 1213259299 - ) - public int field2602; - @ObfuscatedName("bg") - @Export("modelOrthog") - public boolean modelOrthog; - @ObfuscatedName("be") - @Export("modelTransparency") - public boolean modelTransparency; + public int field2582; @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = 1215332137 + intValue = 2124528455 + ) + public int field2594; + @ObfuscatedName("br") + @Export("modelOrthog") + public boolean modelOrthog; + @ObfuscatedName("bx") + @Export("modelTransparency") + public boolean modelTransparency; + @ObfuscatedName("bq") + @ObfuscatedGetter( + intValue = 1270925291 ) @Export("itemQuantityMode") public int itemQuantityMode; - @ObfuscatedName("ce") + @ObfuscatedName("cb") @ObfuscatedGetter( - intValue = 1192242139 + intValue = 1153372709 ) @Export("fontId") public int fontId; - @ObfuscatedName("ci") + @ObfuscatedName("ct") @Export("text") public String text; - @ObfuscatedName("ck") + @ObfuscatedName("ch") @Export("text2") public String text2; @ObfuscatedName("cc") @ObfuscatedGetter( - intValue = 1510391685 + intValue = 1787043177 ) @Export("textLineHeight") public int textLineHeight; - @ObfuscatedName("cd") + @ObfuscatedName("cv") @ObfuscatedGetter( - intValue = -1557971945 + intValue = 1569630349 ) @Export("textXAlignment") public int textXAlignment; - @ObfuscatedName("cf") + @ObfuscatedName("cr") @ObfuscatedGetter( - intValue = -1274290249 + intValue = -324536737 ) @Export("textYAlignment") public int textYAlignment; - @ObfuscatedName("cw") + @ObfuscatedName("cl") @Export("textShadowed") public boolean textShadowed; - @ObfuscatedName("cj") + @ObfuscatedName("ca") @ObfuscatedGetter( - intValue = -705081305 + intValue = -1161115165 ) @Export("paddingX") public int paddingX; - @ObfuscatedName("cp") + @ObfuscatedName("ck") @ObfuscatedGetter( - intValue = 1539639069 + intValue = 1095310931 ) @Export("paddingY") public int paddingY; - @ObfuscatedName("cu") + @ObfuscatedName("cm") @Export("inventoryXOffsets") public int[] inventoryXOffsets; - @ObfuscatedName("cm") + @ObfuscatedName("ce") @Export("inventoryYOffsets") public int[] inventoryYOffsets; - @ObfuscatedName("cb") + @ObfuscatedName("cn") @Export("inventorySprites") public int[] inventorySprites; - @ObfuscatedName("ch") + @ObfuscatedName("cj") @Export("itemActions") public String[] itemActions; - @ObfuscatedName("cn") + @ObfuscatedName("cw") @ObfuscatedGetter( - intValue = -518716407 + intValue = 1071371379 ) @Export("clickMask") public int clickMask; - @ObfuscatedName("cr") - public boolean field2620; - @ObfuscatedName("cl") - public byte[][] field2631; - @ObfuscatedName("cg") - public byte[][] field2622; + @ObfuscatedName("cu") + public boolean field2612; + @ObfuscatedName("cd") + public byte[][] field2671; + @ObfuscatedName("cs") + public byte[][] field2614; @ObfuscatedName("cq") - public int[] field2623; - @ObfuscatedName("ct") - public int[] field2581; - @ObfuscatedName("dr") + public int[] field2615; + @ObfuscatedName("co") + public int[] field2616; + @ObfuscatedName("dj") @Export("dataText") public String dataText; - @ObfuscatedName("dd") + @ObfuscatedName("dh") @Export("actions") public String[] actions; - @ObfuscatedName("dv") + @ObfuscatedName("do") @ObfuscatedSignature( - signature = "Lhp;" + signature = "Lhy;" ) @Export("parent") public Widget parent; - @ObfuscatedName("da") + @ObfuscatedName("dm") @ObfuscatedGetter( - intValue = -288578645 + intValue = -429080415 ) @Export("dragZoneSize") public int dragZoneSize; - @ObfuscatedName("dh") + @ObfuscatedName("dy") @ObfuscatedGetter( - intValue = 340622083 + intValue = -1509482099 ) @Export("dragThreshold") public int dragThreshold; - @ObfuscatedName("dm") + @ObfuscatedName("dd") @Export("isScrollBar") public boolean isScrollBar; - @ObfuscatedName("dj") + @ObfuscatedName("dp") @Export("spellActionName") public String spellActionName; - @ObfuscatedName("dc") + @ObfuscatedName("dn") @Export("hasListener") public boolean hasListener; - @ObfuscatedName("db") + @ObfuscatedName("de") @Export("onLoad") public Object[] onLoad; - @ObfuscatedName("dx") + @ObfuscatedName("da") @Export("onClick") public Object[] onClick; - @ObfuscatedName("dp") + @ObfuscatedName("dl") @Export("onClickRepeat") public Object[] onClickRepeat; - @ObfuscatedName("dz") + @ObfuscatedName("dg") @Export("onRelease") public Object[] onRelease; - @ObfuscatedName("dw") + @ObfuscatedName("dz") @Export("onHold") public Object[] onHold; - @ObfuscatedName("dn") + @ObfuscatedName("dw") @Export("onMouseOver") public Object[] onMouseOver; - @ObfuscatedName("ds") + @ObfuscatedName("di") @Export("onMouseRepeat") public Object[] onMouseRepeat; @ObfuscatedName("dt") @Export("onMouseLeave") public Object[] onMouseLeave; - @ObfuscatedName("du") + @ObfuscatedName("dc") @Export("onDrag") public Object[] onDrag; - @ObfuscatedName("dq") + @ObfuscatedName("ds") @Export("onDragComplete") public Object[] onDragComplete; - @ObfuscatedName("dg") + @ObfuscatedName("dv") @Export("onTargetEnter") public Object[] onTargetEnter; - @ObfuscatedName("dy") + @ObfuscatedName("db") @Export("onTargetLeave") public Object[] onTargetLeave; - @ObfuscatedName("dk") + @ObfuscatedName("du") @Export("onVarTransmit") public Object[] onVarTransmit; - @ObfuscatedName("di") + @ObfuscatedName("dx") @Export("varTransmitTriggers") public int[] varTransmitTriggers; - @ObfuscatedName("de") + @ObfuscatedName("dq") @Export("onInvTransmit") public Object[] onInvTransmit; - @ObfuscatedName("do") + @ObfuscatedName("dr") @Export("invTransmitTriggers") public int[] invTransmitTriggers; - @ObfuscatedName("df") + @ObfuscatedName("dk") @Export("onStatTransmit") public Object[] onStatTransmit; - @ObfuscatedName("dl") + @ObfuscatedName("df") @Export("statTransmitTriggers") public int[] statTransmitTriggers; - @ObfuscatedName("eo") + @ObfuscatedName("ej") @Export("onTimer") public Object[] onTimer; - @ObfuscatedName("ef") + @ObfuscatedName("ec") @Export("onOp") public Object[] onOp; - @ObfuscatedName("ex") + @ObfuscatedName("en") @Export("onScroll") public Object[] onScroll; - @ObfuscatedName("ea") + @ObfuscatedName("ep") @Export("onChatTransmit") public Object[] onChatTransmit; - @ObfuscatedName("em") + @ObfuscatedName("eo") @Export("onKey") public Object[] onKey; - @ObfuscatedName("en") + @ObfuscatedName("el") @Export("onFriendTransmit") public Object[] onFriendTransmit; - @ObfuscatedName("ey") + @ObfuscatedName("ea") @Export("onClanTransmit") public Object[] onClanTransmit; - @ObfuscatedName("ei") + @ObfuscatedName("em") @Export("onMiscTransmit") public Object[] onMiscTransmit; - @ObfuscatedName("ee") + @ObfuscatedName("ev") @Export("onDialogAbort") public Object[] onDialogAbort; - @ObfuscatedName("eh") + @ObfuscatedName("eg") @Export("onSubChange") public Object[] onSubChange; - @ObfuscatedName("eq") + @ObfuscatedName("ek") @Export("onResize") public Object[] onResize; - @ObfuscatedName("ec") + @ObfuscatedName("es") @Export("onStockTransmit") public Object[] onStockTransmit; - @ObfuscatedName("ej") - public Object[] field2663; - @ObfuscatedName("eg") + @ObfuscatedName("ef") + public Object[] field2655; + @ObfuscatedName("ed") @Export("cs1Instructions") public int[][] cs1Instructions; - @ObfuscatedName("er") + @ObfuscatedName("eq") @Export("cs1Comparisons") public int[] cs1Comparisons; - @ObfuscatedName("ep") + @ObfuscatedName("et") @Export("cs1ComparisonValues") public int[] cs1ComparisonValues; - @ObfuscatedName("ek") + @ObfuscatedName("eb") @ObfuscatedGetter( - intValue = 43324545 + intValue = 2026797669 ) @Export("mouseOverRedirect") public int mouseOverRedirect; - @ObfuscatedName("et") + @ObfuscatedName("ei") @Export("spellName") public String spellName; - @ObfuscatedName("ed") + @ObfuscatedName("ey") @Export("buttonText") public String buttonText; - @ObfuscatedName("es") + @ObfuscatedName("ez") @Export("itemIds") public int[] itemIds; - @ObfuscatedName("ez") + @ObfuscatedName("ee") @Export("itemQuantities") public int[] itemQuantities; - @ObfuscatedName("eb") + @ObfuscatedName("er") @ObfuscatedGetter( - intValue = 516422107 + intValue = 1832105135 ) @Export("itemId") public int itemId; - @ObfuscatedName("eu") + @ObfuscatedName("eh") @ObfuscatedGetter( - intValue = -46773205 + intValue = 79160241 ) @Export("itemQuantity") public int itemQuantity; - @ObfuscatedName("el") + @ObfuscatedName("eu") @ObfuscatedGetter( - intValue = 311105125 + intValue = -511310017 ) @Export("modelFrame") public int modelFrame; @ObfuscatedName("ew") @ObfuscatedGetter( - intValue = -1489750537 + intValue = 1679664873 ) @Export("modelFrameCycle") public int modelFrameCycle; - @ObfuscatedName("ev") + @ObfuscatedName("ex") @ObfuscatedSignature( - signature = "[Lhp;" + signature = "[Lhy;" ) @Export("children") public Widget[] children; - @ObfuscatedName("fz") + @ObfuscatedName("ft") @Export("containsMouse") public boolean containsMouse; - @ObfuscatedName("fd") + @ObfuscatedName("ff") @Export("isClicked") public boolean isClicked; - @ObfuscatedName("fi") + @ObfuscatedName("fh") @ObfuscatedGetter( - intValue = -1141206537 + intValue = 2080687433 ) - public int field2679; - @ObfuscatedName("ff") + public int field2529; + @ObfuscatedName("fm") @ObfuscatedGetter( - intValue = -1086259501 + intValue = 1067729441 ) - public int field2680; - @ObfuscatedName("fn") + public int field2672; + @ObfuscatedName("fr") @ObfuscatedGetter( - intValue = -1915688435 + intValue = -1462037203 ) - public int field2681; - @ObfuscatedName("fc") + public int field2673; + @ObfuscatedName("fd") @ObfuscatedGetter( - intValue = -1456076353 + intValue = -884787153 ) - public int field2591; - @ObfuscatedName("fv") + public int field2674; + @ObfuscatedName("fe") @ObfuscatedGetter( - intValue = 1549084931 + intValue = -1645890297 ) @Export("rootIndex") public int rootIndex; - @ObfuscatedName("fy") + @ObfuscatedName("fz") @ObfuscatedGetter( - intValue = -139544989 + intValue = 1918887051 ) @Export("cycle") public int cycle; - @ObfuscatedName("fg") - public int[] field2685; - @ObfuscatedName("ft") + @ObfuscatedName("fs") + public int[] field2656; + @ObfuscatedName("fc") @Export("noClickThrough") public boolean noClickThrough; - @ObfuscatedName("fu") + @ObfuscatedName("fq") @Export("noScrollThrough") public boolean noScrollThrough; - @ObfuscatedName("fh") - public boolean field2688; + @ObfuscatedName("fy") + public boolean field2680; static { Widget_cachedSprites = new EvictingDualNodeHashTable(200); Widget_cachedModels = new EvictingDualNodeHashTable(50); Widget_cachedFonts = new EvictingDualNodeHashTable(20); Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(8); - field2579 = false; + field2668 = false; } public Widget() { @@ -715,8 +697,8 @@ public class Widget extends Node { this.y = 0; this.width = 0; this.height = 0; - this.field2538 = 1; - this.field2612 = 1; + this.field2632 = 1; + this.field2556 = 1; this.parentId = -1; this.isHidden = false; this.scrollX = 0; @@ -732,7 +714,7 @@ public class Widget extends Node { this.transparencyTop = 0; this.transparencyBot = 0; this.lineWid = 1; - this.field2601 = false; + this.field2675 = false; this.spriteId2 = -1; this.spriteId = -1; this.spriteAngle = 0; @@ -751,8 +733,8 @@ public class Widget extends Node { this.modelAngleY = 0; this.modelAngleZ = 0; this.modelZoom = 100; - this.field2638 = 0; - this.field2602 = 0; + this.field2582 = 0; + this.field2594 = 0; this.modelOrthog = false; this.modelTransparency = false; this.itemQuantityMode = 2; @@ -766,7 +748,7 @@ public class Widget extends Node { this.paddingX = 0; this.paddingY = 0; this.clickMask = 0; - this.field2620 = false; + this.field2612 = false; this.dataText = ""; this.parent = null; this.dragZoneSize = 0; @@ -783,21 +765,21 @@ public class Widget extends Node { this.modelFrameCycle = 0; this.containsMouse = false; this.isClicked = false; - this.field2679 = -1; - this.field2680 = 0; - this.field2681 = 0; - this.field2591 = 0; + this.field2529 = -1; + this.field2672 = 0; + this.field2673 = 0; + this.field2674 = 0; this.rootIndex = -1; this.cycle = -1; this.noClickThrough = false; this.noScrollThrough = false; - this.field2688 = false; + this.field2680 = false; } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Lky;I)V", - garbageValue = "-1799471265" + signature = "(Lkz;B)V", + garbageValue = "2" ) @Export("decodeLegacy") void decodeLegacy(Buffer var1) { @@ -981,7 +963,7 @@ public class Widget extends Node { } if (this.type == 7) { - this.itemIds = new int[this.rawWidth * this.rawHeight]; + this.itemIds = new int[this.rawHeight * this.rawWidth]; this.itemQuantities = new int[this.rawWidth * this.rawHeight]; this.textXAlignment = var1.readUnsignedByte(); this.fontId = var1.readUnsignedShort(); @@ -1051,10 +1033,10 @@ public class Widget extends Node { } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lky;B)V", - garbageValue = "-52" + signature = "(Lkz;I)V", + garbageValue = "1464139968" ) @Export("decode") void decode(Buffer var1) { @@ -1121,7 +1103,7 @@ public class Widget extends Node { this.modelOrthog = var1.readUnsignedByte() == 1; var1.readUnsignedShort(); if (this.widthAlignment != 0) { - this.field2638 = var1.readUnsignedShort(); + this.field2582 = var1.readUnsignedShort(); } if (this.heightAlignment != 0) { @@ -1152,7 +1134,7 @@ public class Widget extends Node { if (this.type == 9) { this.lineWid = var1.readUnsignedByte(); this.color = var1.readInt(); - this.field2601 = var1.readUnsignedByte() == 1; + this.field2675 = var1.readUnsignedByte() == 1; } this.clickMask = var1.readMedium(); @@ -1193,10 +1175,10 @@ public class Widget extends Node { this.statTransmitTriggers = this.readListenerTriggers(var1); } - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(Lky;B)[Ljava/lang/Object;", - garbageValue = "0" + signature = "(Lkz;I)[Ljava/lang/Object;", + garbageValue = "1663050003" ) @Export("readListener") Object[] readListener(Buffer var1) { @@ -1220,10 +1202,10 @@ public class Widget extends Node { } } - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lky;I)[I", - garbageValue = "1234207038" + signature = "(Lkz;B)[I", + garbageValue = "-96" ) @Export("readListenerTriggers") int[] readListenerTriggers(Buffer var1) { @@ -1241,10 +1223,10 @@ public class Widget extends Node { } } - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-311647147" + garbageValue = "1566748217" ) @Export("swapItems") public void swapItems(int var1, int var2) { @@ -1256,14 +1238,14 @@ public class Widget extends Node { this.itemQuantities[var1] = var3; } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(ZI)Lls;", - garbageValue = "1931893864" + signature = "(ZI)Lli;", + garbageValue = "29959208" ) @Export("getSprite") public Sprite getSprite(boolean var1) { - field2579 = false; + field2668 = false; int var2; if (var1) { var2 = this.spriteId; @@ -1274,14 +1256,14 @@ public class Widget extends Node { if (var2 == -1) { return null; } else { - long var3 = ((this.spriteFlipH ? 1L : 0L) << 39) + ((this.spriteFlipV ? 1L : 0L) << 38) + ((long)this.outline << 36) + (long)var2 + ((long)this.spriteShadow << 40); + long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipV ? 1L : 0L) << 38) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipH ? 1L : 0L) << 39); Sprite var5 = (Sprite)Widget_cachedSprites.get(var3); if (var5 != null) { return var5; } else { - var5 = TilePaint.SpriteBuffer_getSprite(WorldMapSprite.Widget_spritesArchive, var2, 0); + var5 = FillMode.SpriteBuffer_getSprite(HealthBar.Widget_spritesArchive, var2, 0); if (var5 == null) { - field2579 = true; + field2668 = true; return null; } else { if (this.spriteFlipV) { @@ -1315,14 +1297,14 @@ public class Widget extends Node { } } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(B)Lkb;", - garbageValue = "114" + signature = "(I)Lkf;", + garbageValue = "-925854975" ) @Export("getFont") public Font getFont() { - field2579 = false; + field2668 = false; if (this.fontId == -1) { return null; } else { @@ -1330,26 +1312,54 @@ public class Widget extends Node { if (var1 != null) { return var1; } else { - var1 = FileSystem.SpriteBuffer_getFont(WorldMapSprite.Widget_spritesArchive, Widget_fontsArchive, this.fontId, 0); - if (var1 != null) { - Widget_cachedFonts.put(var1, (long)this.fontId); + AbstractArchive var3 = HealthBar.Widget_spritesArchive; + AbstractArchive var4 = WorldMapSprite.Widget_fontsArchive; + int var5 = this.fontId; + byte[] var7 = var3.takeFile(var5, 0); + boolean var6; + if (var7 == null) { + var6 = false; } else { - field2579 = true; + GrandExchangeOfferWorldComparator.SpriteBuffer_decode(var7); + var6 = true; } - return var1; + Font var2; + if (!var6) { + var2 = null; + } else { + byte[] var8 = var4.takeFile(var5, 0); + Font var10; + if (var8 == null) { + var10 = null; + } else { + Font var9 = new Font(var8, class325.SpriteBuffer_xOffsets, SecureRandomCallable.SpriteBuffer_yOffsets, class325.SpriteBuffer_spriteWidths, SoundSystem.SpriteBuffer_spriteHeights, class325.SpriteBuffer_spritePalette, InvDefinition.SpriteBuffer_pixels); + class192.SpriteBuffer_clear(); + var10 = var9; + } + + var2 = var10; + } + + if (var2 != null) { + Widget_cachedFonts.put(var2, (long)this.fontId); + } else { + field2668 = true; + } + + return var2; } } } - @ObfuscatedName("r") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(II)Lls;", - garbageValue = "1971687026" + signature = "(II)Lli;", + garbageValue = "-1753653810" ) @Export("getInventorySprite") public Sprite getInventorySprite(int var1) { - field2579 = false; + field2668 = false; if (var1 >= 0 && var1 < this.inventorySprites.length) { int var2 = this.inventorySprites[var1]; if (var2 == -1) { @@ -1359,11 +1369,11 @@ public class Widget extends Node { if (var3 != null) { return var3; } else { - var3 = TilePaint.SpriteBuffer_getSprite(WorldMapSprite.Widget_spritesArchive, var2, 0); + var3 = FillMode.SpriteBuffer_getSprite(HealthBar.Widget_spritesArchive, var2, 0); if (var3 != null) { Widget_cachedSprites.put(var3, (long)var2); } else { - field2579 = true; + field2668 = true; } return var3; @@ -1374,14 +1384,14 @@ public class Widget extends Node { } } - @ObfuscatedName("y") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(Lij;IZLhy;I)Ldo;", - garbageValue = "1039139865" + signature = "(Liw;IZLhl;I)Ldr;", + garbageValue = "927690576" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerAppearance var4) { - field2579 = false; + field2668 = false; int var5; int var6; if (var3) { @@ -1401,9 +1411,9 @@ public class Widget extends Node { if (var7 == null) { ModelData var8; if (var5 == 1) { - var8 = ModelData.ModelData_get(Huffman.Widget_modelsArchive, var6, 0); + var8 = ModelData.ModelData_get(class293.Widget_modelsArchive, var6, 0); if (var8 == null) { - field2579 = true; + field2668 = true; return null; } @@ -1411,9 +1421,9 @@ public class Widget extends Node { } if (var5 == 2) { - var8 = ViewportMouse.getNpcDefinition(var6).getModelData(); + var8 = FontName.getNpcDefinition(var6).getModelData(); if (var8 == null) { - field2579 = true; + field2668 = true; return null; } @@ -1427,7 +1437,7 @@ public class Widget extends Node { var8 = var4.getModelData(); if (var8 == null) { - field2579 = true; + field2668 = true; return null; } @@ -1435,10 +1445,10 @@ public class Widget extends Node { } if (var5 == 4) { - ItemDefinition var9 = WorldMapData_0.ItemDefinition_get(var6); + ItemDefinition var9 = Player.ItemDefinition_get(var6); var8 = var9.getModelData(10); if (var8 == null) { - field2579 = true; + field2668 = true; return null; } @@ -1456,10 +1466,10 @@ public class Widget extends Node { } } - @ObfuscatedName("p") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(ZB)Lhg;", - garbageValue = "-6" + signature = "(ZI)Lhi;", + garbageValue = "-689140907" ) @Export("getSpriteMask") public SpriteMask getSpriteMask(boolean var1) { @@ -1471,7 +1481,7 @@ public class Widget extends Node { if (var2 == -1) { return null; } else { - long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipV ? 1L : 0L) << 38) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipH ? 1L : 0L) << 39); + long var3 = ((this.spriteFlipH ? 1L : 0L) << 39) + ((this.spriteFlipV ? 1L : 0L) << 38) + (long)var2 + ((long)this.outline << 36) + ((long)this.spriteShadow << 40); SpriteMask var5 = (SpriteMask)Widget_cachedSpriteMasks.get(var3); if (var5 != null) { return var5; @@ -1515,10 +1525,10 @@ public class Widget extends Node { } } - @ObfuscatedName("e") + @ObfuscatedName("r") @ObfuscatedSignature( signature = "(ILjava/lang/String;I)V", - garbageValue = "425838029" + garbageValue = "-1185181318" ) @Export("setAction") public void setAction(int var1, String var2) { @@ -1536,26 +1546,24 @@ public class Widget extends Node { this.actions[var1] = var2; } - @ObfuscatedName("j") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(II)Lij;", - garbageValue = "981086484" + signature = "(I)V", + garbageValue = "-847806020" ) - @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)); + static void method4074() { + for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var0.stream1 != null) { + class51.pcmStreamMixer.removeSubStream(var0.stream1); + var0.stream1 = null; } - var1.postDecode(); - SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); - return var1; + if (var0.stream2 != null) { + class51.pcmStreamMixer.removeSubStream(var0.stream2); + var0.stream2 = null; + } } + + ObjectSound.objectSounds.clear(); } } diff --git a/runescape-client/src/main/java/World.java b/runescape-client/src/main/java/World.java index e620836264..7751f70c72 100644 --- a/runescape-client/src/main/java/World.java +++ b/runescape-client/src/main/java/World.java @@ -3,73 +3,73 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bl") +@ObfuscatedName("bb") @Implements("World") public class World { - @ObfuscatedName("sd") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Llx;" + signature = "[Lbb;" ) - @Export("platformInfo") - static PlatformInfo platformInfo; - @ObfuscatedName("n") + @Export("World_worlds") + static World[] World_worlds; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1559226187 + intValue = 1009032865 ) @Export("World_count") static int World_count; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 315503089 + intValue = -816913473 ) @Export("World_listCount") static int World_listCount; - @ObfuscatedName("q") + @ObfuscatedName("v") @Export("World_sortOption2") static int[] World_sortOption2; - @ObfuscatedName("x") + @ObfuscatedName("d") @Export("World_sortOption1") static int[] World_sortOption1; - @ObfuscatedName("ka") - @ObfuscatedGetter( - intValue = 1149397885 + @ObfuscatedName("ju") + @ObfuscatedSignature( + signature = "Lhy;" ) - @Export("menuWidth") - static int menuWidth; - @ObfuscatedName("f") + static Widget field996; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1230812985 + intValue = -1056642955 ) @Export("id") int id; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1926875123 + intValue = -1368963491 ) @Export("properties") int properties; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -999023629 + intValue = 122779381 ) @Export("population") int population; - @ObfuscatedName("y") + @ObfuscatedName("s") @Export("host") String host; @ObfuscatedName("p") @Export("activity") String activity; - @ObfuscatedName("b") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -307094013 + intValue = -1609624191 ) @Export("location") int location; - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 392698997 + intValue = 1550083331 ) @Export("index") int index; @@ -84,77 +84,114 @@ public class World { World() { } - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "1463155043" + signature = "(B)Z", + garbageValue = "64" ) @Export("isMembersOnly") boolean isMembersOnly() { return (1 & this.properties) != 0; } - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "1651148983" + garbageValue = "-20923274" ) - boolean method1687() { + boolean method1713() { return (2 & this.properties) != 0; } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-2074539917" + garbageValue = "-1975172927" ) @Export("isPvp") boolean isPvp() { return (4 & this.properties) != 0; } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(S)Z", - garbageValue = "128" + signature = "(I)Z", + garbageValue = "-1825927120" ) - boolean method1689() { + boolean method1753() { return (8 & this.properties) != 0; } - @ObfuscatedName("r") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1238207705" + garbageValue = "-2106663519" ) @Export("isDeadman") boolean isDeadman() { return (536870912 & this.properties) != 0; } - @ObfuscatedName("y") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "877895545" + garbageValue = "-1161464357" ) @Export("isBeta") boolean isBeta() { return (33554432 & this.properties) != 0; } - @ObfuscatedName("x") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lhz;IIB)Z", - garbageValue = "-20" + signature = "(Lkz;Ljava/lang/String;I)I", + garbageValue = "-1736176836" ) - @Export("SpriteBuffer_bufferFile") - public static boolean SpriteBuffer_bufferFile(AbstractArchive var0, int var1, int var2) { - byte[] var3 = var0.takeFile(var1, var2); - if (var3 == null) { - return false; + public static int method1755(Buffer var0, String var1) { + int var2 = var0.offset; + byte[] var3 = ChatChannel.method2212(var1); + var0.writeSmartByteShort(var3.length); + var0.offset += class210.huffman.compress(var3, 0, var3.length, var0.array, var0.offset); + return var0.offset - var2; + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + signature = "(ILcu;ZI)I", + garbageValue = "1117911862" + ) + static int method1762(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.GETWINDOWMODE) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = class43.getWindowedMode(); + return 1; } else { - Player.SpriteBuffer_decode(var3); - return true; + int var3; + if (var0 == ScriptOpcodes.SETWINDOWMODE) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + if (var3 == 1 || var3 == 2) { + MusicPatchNode.setWindowedMode(var3); + } + + return 1; + } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Actor.clientPreferences.windowMode; + return 1; + } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { + if (var0 == 5310) { + --class160.Interpreter_intStackSize; + return 1; + } else { + return 2; + } + } else { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + if (var3 == 1 || var3 == 2) { + Actor.clientPreferences.windowMode = var3; + class296.savePreferences(); + } + + return 1; + } } } } diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index 6570b24d1a..819c5ed9e2 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("lv") +@ObfuscatedName("ln") @Implements("WorldMap") public class WorldMap { - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Lkz;" + signature = "Lkn;" ) @Export("fontNameVerdana11") static final FontName fontNameVerdana11; - @ObfuscatedName("f") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lkz;" + signature = "Lkn;" ) @Export("fontNameVerdana13") static final FontName fontNameVerdana13; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Lkz;" + signature = "Lkn;" ) @Export("fontNameVerdana15") static final FontName fontNameVerdana15; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "Lhz;" ) @Export("WorldMap_archive") AbstractArchive WorldMap_archive; - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "Lhz;" ) @Export("WorldMap_geographyArchive") AbstractArchive WorldMap_geographyArchive; - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "Lhz;" ) @Export("WorldMap_groundArchive") AbstractArchive WorldMap_groundArchive; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lkb;" + signature = "Lkf;" ) @Export("font") Font font; - @ObfuscatedName("y") + @ObfuscatedName("s") @Export("fonts") HashMap fonts; @ObfuscatedName("p") @ObfuscatedSignature( - signature = "[Llq;" + signature = "[Llt;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("b") + @ObfuscatedName("e") @Export("details") HashMap details; - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lav;" + signature = "Lag;" ) @Export("mainMapArea") WorldMapArea mainMapArea; - @ObfuscatedName("e") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lav;" + signature = "Lag;" ) @Export("currentMapArea") WorldMapArea currentMapArea; - @ObfuscatedName("z") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lav;" + signature = "Lag;" ) - WorldMapArea field3948; - @ObfuscatedName("a") + WorldMapArea field3962; + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "Lao;" + signature = "Laj;" ) @Export("worldMapManager") WorldMapManager worldMapManager; - @ObfuscatedName("w") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lla;" + signature = "Lly;" ) @Export("cacheLoader") WorldMapArchiveLoader cacheLoader; - @ObfuscatedName("l") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1709631313 + intValue = 303275685 ) @Export("centerTileX") int centerTileX; - @ObfuscatedName("h") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -148565401 + intValue = -225681019 ) @Export("centerTileY") int centerTileY; - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1426592379 + intValue = 1238415701 ) @Export("worldMapTargetX") int worldMapTargetX; - @ObfuscatedName("m") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -131532783 + intValue = -264227245 ) @Export("worldMapTargetY") int worldMapTargetY; - @ObfuscatedName("o") + @ObfuscatedName("b") @Export("zoom") float zoom; - @ObfuscatedName("av") + @ObfuscatedName("ag") @Export("zoomTarget") float zoomTarget; - @ObfuscatedName("am") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -940091853 + intValue = -596782653 ) @Export("worldMapDisplayWidth") int worldMapDisplayWidth; - @ObfuscatedName("ai") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -99260469 + intValue = -1953124645 ) @Export("worldMapDisplayHeight") int worldMapDisplayHeight; - @ObfuscatedName("af") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -137724383 + intValue = 15596265 ) @Export("worldMapDisplayX") int worldMapDisplayX; - @ObfuscatedName("az") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -128088417 + intValue = 1826675017 ) @Export("worldMapDisplayY") int worldMapDisplayY; - @ObfuscatedName("aj") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -226377957 + intValue = 172866649 ) @Export("maxFlashCount") int maxFlashCount; - @ObfuscatedName("an") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -1119044333 + intValue = -957491597 ) @Export("cyclesPerFlash") int cyclesPerFlash; - @ObfuscatedName("at") + @ObfuscatedName("ad") @Export("perpetualFlash") boolean perpetualFlash; - @ObfuscatedName("as") + @ObfuscatedName("ap") @Export("flashingElements") HashSet flashingElements; - @ObfuscatedName("ak") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 1909795063 + intValue = 168471107 ) @Export("flashCount") int flashCount; - @ObfuscatedName("ao") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 277662661 + intValue = -247291767 ) @Export("flashCycle") int flashCycle; - @ObfuscatedName("ac") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 982159619 + intValue = -1300084977 ) - int field3947; - @ObfuscatedName("ar") + int field3981; + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -1274299191 + intValue = -212325427 ) - int field3970; - @ObfuscatedName("au") + int field3982; + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -271346277 + intValue = -488627691 ) - int field3984; - @ObfuscatedName("ax") + int field3983; + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -1131249789 - ) - int field3985; - @ObfuscatedName("ag") - @ObfuscatedGetter( - longValue = 2241719861447572733L - ) - long field3986; - @ObfuscatedName("aa") - @ObfuscatedGetter( - intValue = -2045594623 + intValue = -793458395 ) int field3987; - @ObfuscatedName("ap") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 1831517127 + longValue = -8307106057108321705L ) - int field3988; + long field3985; + @ObfuscatedName("ah") + @ObfuscatedGetter( + intValue = -2042558413 + ) + int field3986; + @ObfuscatedName("aa") + @ObfuscatedGetter( + intValue = -1762125431 + ) + int field3948; @ObfuscatedName("aq") - boolean field3989; - @ObfuscatedName("al") + boolean field3988; + @ObfuscatedName("az") @Export("enabledElements") HashSet enabledElements; - @ObfuscatedName("ah") + @ObfuscatedName("ai") @Export("enabledCategories") HashSet enabledCategories; - @ObfuscatedName("ab") + @ObfuscatedName("am") @Export("enabledElementIds") HashSet enabledElementIds; @ObfuscatedName("aw") - HashSet field3993; - @ObfuscatedName("ae") + HashSet field3992; + @ObfuscatedName("au") @Export("elementsDisabled") boolean elementsDisabled; - @ObfuscatedName("bk") + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = 6416933 + intValue = -1597124293 ) - int field3995; - @ObfuscatedName("bo") + int field3994; + @ObfuscatedName("bk") @Export("menuOpcodes") final int[] menuOpcodes; - @ObfuscatedName("bn") - List field3980; @ObfuscatedName("bp") + List field3996; + @ObfuscatedName("bu") @Export("iconIterator") Iterator iconIterator; - @ObfuscatedName("bz") - HashSet field4001; - @ObfuscatedName("bh") + @ObfuscatedName("bi") + HashSet field3998; + @ObfuscatedName("bv") @ObfuscatedSignature( - signature = "Lhd;" + signature = "Lhj;" ) @Export("mouseCoord") Coord mouseCoord; - @ObfuscatedName("bv") + @ObfuscatedName("bf") @Export("showCoord") public boolean showCoord; - @ObfuscatedName("bj") + @ObfuscatedName("bm") @ObfuscatedSignature( - signature = "Lls;" + signature = "Lli;" ) @Export("sprite") Sprite sprite; - @ObfuscatedName("bq") + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = -1765997917 + intValue = 1403177589 ) @Export("cachedPixelsPerTile") int cachedPixelsPerTile; - @ObfuscatedName("by") + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = 366025991 + intValue = -1012368723 ) @Export("minCachedTileX") int minCachedTileX; - @ObfuscatedName("bs") + @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = 1657101787 + intValue = 428445179 ) @Export("minCachedTileY") int minCachedTileY; - @ObfuscatedName("bi") + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = 1737203703 + intValue = -2041822163 ) - int field4006; + int field4005; static { fontNameVerdana11 = FontName.FontName_verdana11; @@ -304,30 +304,30 @@ public class WorldMap { this.flashingElements = null; this.flashCount = -1; this.flashCycle = -1; - this.field3947 = -1; - this.field3970 = -1; - this.field3984 = -1; - this.field3985 = -1; - this.field3989 = true; + this.field3981 = -1; + this.field3982 = -1; + this.field3983 = -1; + this.field3987 = -1; + this.field3988 = true; this.enabledElements = new HashSet(); this.enabledCategories = new HashSet(); this.enabledElementIds = new HashSet(); - this.field3993 = new HashSet(); + this.field3992 = new HashSet(); this.elementsDisabled = false; - this.field3995 = 0; + this.field3994 = 0; this.menuOpcodes = new int[]{1008, 1009, 1010, 1011, 1012}; - this.field4001 = new HashSet(); + this.field3998 = new HashSet(); this.mouseCoord = null; this.showCoord = false; this.minCachedTileX = -1; this.minCachedTileY = -1; - this.field4006 = -1; + this.field4005 = -1; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lhz;Lhz;Lhz;Lkb;Ljava/util/HashMap;[Llq;I)V", - garbageValue = "-1501971523" + signature = "(Lhz;Lhz;Lhz;Lkf;Ljava/util/HashMap;[Llt;B)V", + garbageValue = "54" ) @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.field295.name); + int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field294.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.field3948 = null; + this.field3962 = null; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1074851156" + garbageValue = "1992204657" ) - public void method6187() { - WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); + public void method6291() { + class162.method3424(); } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(IIZIIIIB)V", - garbageValue = "21" + garbageValue = "-58" ) @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.method629(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.method601(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(); class81.runScriptEvent(var14)) { + for (var12 = var10.iterator(); var12.hasNext(); SecureRandomFuture.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.field4001.contains(var13)) { + if (this.field3998.contains(var13)) { var14.setType(17); } else { var14.setType(15); } } - var12 = this.field4001.iterator(); + var12 = this.field3998.iterator(); while (var12.hasNext()) { var13 = (AbstractWorldMapIcon)var12.next(); @@ -410,73 +410,82 @@ public class WorldMap { var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); var14.setArgs(new Object[]{var15, var1, var2}); var14.setType(16); - class81.runScriptEvent(var14); + SecureRandomFuture.runScriptEvent(var14); } } - this.field4001 = var11; + this.field3998 = var11; } } } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(IIZZI)V", - garbageValue = "929867253" + signature = "(IIZZB)V", + garbageValue = "45" ) - public void method6185(int var1, int var2, boolean var3, boolean var4) { - long var5 = SequenceDefinition.method4686(); - this.method6186(var1, var2, var4, var5); + public void method6284(int var1, int var2, boolean var3, boolean var4) { + long var5 = SoundCache.method2480(); + this.method6316(var1, var2, var4, var5); if (!this.hasTarget() && (var4 || var3)) { if (var4) { - this.field3984 = var1; - this.field3985 = var2; - this.field3947 = this.centerTileX; - this.field3970 = this.centerTileY; + this.field3983 = var1; + this.field3987 = var2; + this.field3981 = this.centerTileX; + this.field3982 = this.centerTileY; } - if (this.field3947 != -1) { - int var7 = var1 - this.field3984; - int var8 = var2 - this.field3985; - this.setWorldMapPosition(this.field3947 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field3970, false); + if (this.field3981 != -1) { + int var7 = var1 - this.field3983; + int var8 = var2 - this.field3987; + this.setWorldMapPosition(this.field3981 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field3982, false); } } else { - this.method6330(); + this.method6272(); } if (var4) { - this.field3986 = var5; - this.field3987 = var1; - this.field3988 = var2; + this.field3985 = var5; + this.field3986 = var1; + this.field3948 = var2; } } - @ObfuscatedName("u") - void method6186(int var1, int var2, boolean var3, long var4) { + @ObfuscatedName("l") + void method6316(int var1, int var2, boolean var3, long var4) { if (this.currentMapArea != null) { int var6 = (int)((float)this.centerTileX + ((float)(var1 - this.worldMapDisplayX) - (float)this.getDisplayWith() * this.zoom / 2.0F) / this.zoom); int var7 = (int)((float)this.centerTileY - ((float)(var2 - this.worldMapDisplayY) - (float)this.getDisplayHeight() * this.zoom / 2.0F) / this.zoom); this.mouseCoord = this.currentMapArea.coord(var6 + this.currentMapArea.getRegionLowX() * 64, var7 + this.currentMapArea.getRegionLowY() * 64); if (this.mouseCoord != null && var3) { - boolean var8 = Client.staffModLevel >= 2; - if (var8 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { - BoundaryObject.method3215(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); + int var9; + int var10; + if (SecureRandomCallable.method1092() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { + int var13 = this.mouseCoord.x; + var9 = this.mouseCoord.y; + var10 = this.mouseCoord.plane; + PacketBufferNode var11 = MenuAction.getPacketBufferNode(ClientPacket.field2187, Client.packetWriter.isaacCipher); + var11.packetBuffer.method5500(var13); + var11.packetBuffer.writeShort(var9); + var11.packetBuffer.method5491(var10); + var11.packetBuffer.writeIntLE16(0); + Client.packetWriter.addNode(var11); } else { - boolean var9 = true; - if (this.field3989) { - int var10 = var1 - this.field3987; - int var11 = var2 - this.field3988; - if (var4 - this.field3986 > 500L || var10 < -25 || var10 > 25 || var11 < -25 || var11 > 25) { - var9 = false; + boolean var8 = true; + if (this.field3988) { + var9 = var1 - this.field3986; + var10 = var2 - this.field3948; + if (var4 - this.field3985 > 500L || var9 < -25 || var9 > 25 || var10 < -25 || var10 > 25) { + var8 = false; } } - if (var9) { - PacketBufferNode var12 = MenuAction.getPacketBufferNode(ClientPacket.field2230, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeIntME(this.mouseCoord.packed()); + if (var8) { + PacketBufferNode var12 = MenuAction.getPacketBufferNode(ClientPacket.field2223, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeShortLE(this.mouseCoord.packed()); Client.packetWriter.addNode(var12); - this.field3986 = 0L; + this.field3985 = 0L; } } } @@ -486,18 +495,18 @@ public class WorldMap { } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-70" + signature = "(I)V", + garbageValue = "1791757992" ) @Export("smoothZoom") void smoothZoom() { - if (GameObject.field1921 != null) { + if (MenuAction.field1133 != null) { this.zoom = this.zoomTarget; } else { if (this.zoom < this.zoomTarget) { - this.zoom = Math.min(this.zoomTarget, this.zoom + this.zoom / 30.0F); + this.zoom = Math.min(this.zoomTarget, this.zoom / 30.0F + this.zoom); } if (this.zoom > this.zoomTarget) { @@ -507,10 +516,10 @@ public class WorldMap { } } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1338341298" + garbageValue = "-2031541689" ) @Export("scrollToTarget") void scrollToTarget() { @@ -526,7 +535,7 @@ public class WorldMap { } this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); - if (this.centerTileX == this.worldMapTargetX && this.centerTileY == this.worldMapTargetY) { + if (this.worldMapTargetX == this.centerTileX && this.worldMapTargetY == this.centerTileY) { this.worldMapTargetX = -1; this.worldMapTargetY = -1; } @@ -534,48 +543,48 @@ public class WorldMap { } } - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(IIZI)V", - garbageValue = "1410268107" + signature = "(IIZB)V", + garbageValue = "-39" ) @Export("setWorldMapPosition") final void setWorldMapPosition(int var1, int var2, boolean var3) { this.centerTileX = var1; this.centerTileY = var2; - SequenceDefinition.method4686(); + SoundCache.method2480(); if (var3) { - this.method6330(); + this.method6272(); } } - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-616749103" - ) - final void method6330() { - this.field3985 = -1; - this.field3984 = -1; - this.field3970 = -1; - this.field3947 = -1; - } - @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "-26" + signature = "(I)V", + garbageValue = "1320678525" + ) + final void method6272() { + this.field3987 = -1; + this.field3983 = -1; + this.field3982 = -1; + this.field3981 = -1; + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "(I)Z", + garbageValue = "1096342718" ) @Export("hasTarget") boolean hasTarget() { return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(IIIB)Lav;", - garbageValue = "1" + signature = "(IIIB)Lag;", + garbageValue = "45" ) @Export("mapAreaAtCoord") public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) { @@ -593,12 +602,12 @@ public class WorldMap { return var5; } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(IIIZI)V", - garbageValue = "-1201377679" + garbageValue = "1738744053" ) - public void method6193(int var1, int var2, int var3, boolean var4) { + public void method6275(int var1, int var2, int var3, boolean var4) { WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); if (var5 == null) { if (!var4) { @@ -609,8 +618,8 @@ public class WorldMap { } boolean var6 = false; - if (var5 != this.field3948 || var4) { - this.field3948 = var5; + if (var5 != this.field3962 || var4) { + this.field3962 = var5; this.setCurrentMapArea(var5); var6 = true; } @@ -621,10 +630,10 @@ public class WorldMap { } - @ObfuscatedName("r") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "552511282" + garbageValue = "-2088562038" ) @Export("setCurrentMapAreaId") public void setCurrentMapAreaId(int var1) { @@ -635,30 +644,30 @@ public class WorldMap { } - @ObfuscatedName("y") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "2" + signature = "(I)I", + garbageValue = "-303428785" ) @Export("currentMapAreaId") public int currentMapAreaId() { return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); } - @ObfuscatedName("p") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)Lav;", - garbageValue = "-1424371982" + signature = "(B)Lag;", + garbageValue = "1" ) @Export("getCurrentMapArea") public WorldMapArea getCurrentMapArea() { return this.currentMapArea; } - @ObfuscatedName("g") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(Lav;I)V", - garbageValue = "2090991872" + signature = "(Lag;B)V", + garbageValue = "-27" ) @Export("setCurrentMapArea") void setCurrentMapArea(WorldMapArea var1) { @@ -668,10 +677,10 @@ public class WorldMap { } } - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lav;B)V", - garbageValue = "14" + signature = "(Lag;B)V", + garbageValue = "63" ) @Export("initializeWorldMapManager") void initializeWorldMapManager(WorldMapArea var1) { @@ -680,12 +689,12 @@ public class WorldMap { this.cacheLoader.reset(this.currentMapArea.getInternalName()); } - @ObfuscatedName("z") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lav;Lhd;Lhd;ZB)V", - garbageValue = "120" + signature = "(Lag;Lhj;Lhj;ZB)V", + garbageValue = "0" ) - public void method6199(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { + public void method6431(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { if (var1 != null) { if (this.currentMapArea == null || var1 != this.currentMapArea) { this.initializeWorldMapManager(var1); @@ -700,10 +709,10 @@ public class WorldMap { } } - @ObfuscatedName("w") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IIII)V", - garbageValue = "1231444564" + signature = "(IIIB)V", + garbageValue = "-47" ) @Export("jump") void jump(int var1, int var2, int var3) { @@ -718,16 +727,16 @@ public class WorldMap { this.worldMapTargetY = -1; this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); this.zoomTarget = this.zoom; - this.field3980 = null; + this.field3996 = null; this.iconIterator = null; this.worldMapManager.clearIcons(); } } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIIIII)V", - garbageValue = "-2106180683" + signature = "(IIIIIB)V", + garbageValue = "13" ) @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5) { @@ -761,20 +770,18 @@ public class WorldMap { int var8 = (int)Math.ceil((double)((float)var3 / this.zoom)); int var9 = (int)Math.ceil((double)((float)var4 / this.zoom)); this.worldMapManager.drawTiles(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4); - boolean var10; if (!this.elementsDisabled) { - var10 = false; - if (var5 - this.field3995 > 100) { - this.field3995 = var5; + boolean var10 = false; + if (var5 - this.field3994 > 100) { + this.field3994 = 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.field3993, 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.field3992, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); } - this.method6203(var1, var2, var3, var4, var8, var9); - var10 = Client.staffModLevel >= 2; - if (var10 && this.showCoord && this.mouseCoord != null) { + this.method6341(var1, var2, var3, var4, var8, var9); + if (SecureRandomCallable.method1092() && this.showCoord && this.mouseCoord != null) { this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1); } @@ -786,18 +793,18 @@ public class WorldMap { } } - @ObfuscatedName("h") + @ObfuscatedName("a") @ObfuscatedSignature( signature = "(IIIIIII)Z", - garbageValue = "-163932423" + garbageValue = "-943191584" ) - boolean method6296(int var1, int var2, int var3, int var4, int var5, int var6) { + boolean method6419(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.field4006 != Client.field892) { + } else if (this.field4005 != Client.field892) { return true; } else if (var3 <= 0 && var4 <= 0) { return var3 + var1 < var5 || var2 + var4 < var6; @@ -809,13 +816,13 @@ public class WorldMap { } } - @ObfuscatedName("v") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(IIIIIIS)V", - garbageValue = "32313" + signature = "(IIIIIIB)V", + garbageValue = "-74" ) - void method6203(int var1, int var2, int var3, int var4, int var5, int var6) { - if (GameObject.field1921 != null) { + void method6341(int var1, int var2, int var3, int var4, int var5, int var6) { + if (MenuAction.field1133 != null) { int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); int var8 = var3 + 512; int var9 = var4 + 512; @@ -826,7 +833,7 @@ public class WorldMap { int var12 = this.getDisplayY() - var6 / 2 - var7; int var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); - if (this.method6296(var8, var9, var13, var14, var3, var4)) { + if (this.method6419(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 { @@ -836,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; - GameObject.field1921.method4242(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); - this.field4006 = Client.field892; - var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; + MenuAction.field1133.method4296(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); + this.field4005 = Client.field892; + 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 (1.0F == var10) { - this.sprite.method6014(var13, var14, 192); + if (var10 == 1.0F) { + this.sprite.method6096(var13, var14, 192); } else { - this.sprite.method6017(var13, var14, (int)((float)var8 * var10), (int)((float)var9 * var10), 192); + this.sprite.method6099(var13, var14, (int)((float)var8 * var10), (int)((float)var9 * var10), 192); } } } - @ObfuscatedName("m") + @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "(IIIIB)V", - garbageValue = "81" + signature = "(IIIII)V", + garbageValue = "330665907" ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4) { @@ -871,20 +878,20 @@ public class WorldMap { } } - @ObfuscatedName("o") + @ObfuscatedName("at") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-178698826" + signature = "(IB)V", + garbageValue = "0" ) @Export("setZoomPercentage") public void setZoomPercentage(int var1) { this.zoomTarget = this.getZoomFromPercentage(var1); } - @ObfuscatedName("av") + @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "(IIIIIS)V", - garbageValue = "510" + signature = "(IIIIII)V", + garbageValue = "1308590489" ) @Export("drawLoading") void drawLoading(int var1, int var2, int var3, int var4, int var5) { @@ -894,13 +901,13 @@ public class WorldMap { Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); Rasterizer2D.Rasterizer2D_drawRectangle(var7 - 152, var8, 304, 34, -65536); Rasterizer2D.Rasterizer2D_fillRectangle(var7 - 150, var8 + 2, var5 * 3, 30, -65536); - this.font.drawCentered("Loading...", var7, var6 + var8, -1, -1); + this.font.drawCentered("Loading...", var7, var8 + var6, -1, -1); } - @ObfuscatedName("am") + @ObfuscatedName("av") @ObfuscatedSignature( - signature = "(IB)F", - garbageValue = "71" + signature = "(II)F", + garbageValue = "-2084145204" ) @Export("getZoomFromPercentage") float getZoomFromPercentage(int var1) { @@ -917,50 +924,50 @@ public class WorldMap { } } - @ObfuscatedName("ai") + @ObfuscatedName("an") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "666427478" + signature = "(B)I", + garbageValue = "-83" ) @Export("getZoomLevel") public int getZoomLevel() { if ((double)this.zoomTarget == 1.0D) { return 25; - } else if (1.5D == (double)this.zoomTarget) { + } else if ((double)this.zoomTarget == 1.5D) { return 37; } else if (2.0D == (double)this.zoomTarget) { return 50; } 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("af") + @ObfuscatedName("al") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "301674641" + garbageValue = "1483543470" ) @Export("loadCache") public void loadCache() { this.cacheLoader.load(); } - @ObfuscatedName("az") + @ObfuscatedName("as") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "-80" + signature = "(I)Z", + garbageValue = "259244874" ) @Export("isCacheLoaded") public boolean isCacheLoaded() { return this.cacheLoader.isLoaded(); } - @ObfuscatedName("aj") + @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "(IB)Lav;", - garbageValue = "97" + signature = "(II)Lag;", + garbageValue = "-1932249076" ) @Export("getMapArea") public WorldMapArea getMapArea(int var1) { @@ -978,10 +985,10 @@ public class WorldMap { return var3; } - @ObfuscatedName("an") + @ObfuscatedName("ap") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "938749797" + garbageValue = "-75183731" ) @Export("setWorldMapPositionTarget") public void setWorldMapPositionTarget(int var1, int var2) { @@ -991,10 +998,10 @@ public class WorldMap { } } - @ObfuscatedName("at") + @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "-30" + signature = "(III)V", + garbageValue = "1776242940" ) @Export("setWorldMapPositionTargetInstant") public void setWorldMapPositionTargetInstant(int var1, int var2) { @@ -1005,10 +1012,10 @@ public class WorldMap { } } - @ObfuscatedName("as") + @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "(IIIB)V", - garbageValue = "1" + signature = "(IIII)V", + garbageValue = "183887580" ) @Export("jumpToSourceCoord") public void jumpToSourceCoord(int var1, int var2, int var3) { @@ -1021,10 +1028,10 @@ public class WorldMap { } } - @ObfuscatedName("ak") + @ObfuscatedName("ab") @ObfuscatedSignature( signature = "(IIII)V", - garbageValue = "-183605322" + garbageValue = "283279247" ) @Export("jumpToSourceCoordInstant") public void jumpToSourceCoordInstant(int var1, int var2, int var3) { @@ -1037,60 +1044,60 @@ public class WorldMap { } } - @ObfuscatedName("ao") + @ObfuscatedName("af") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "418458900" + garbageValue = "-1849438841" ) @Export("getDisplayX") public int getDisplayX() { return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; } - @ObfuscatedName("ac") + @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "8" + signature = "(S)I", + garbageValue = "10636" ) @Export("getDisplayY") public int getDisplayY() { return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; } - @ObfuscatedName("ar") + @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "(B)Lhd;", - garbageValue = "122" + signature = "(I)Lhj;", + garbageValue = "1205285454" ) @Export("getDisplayCoord") public Coord getDisplayCoord() { return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); } - @ObfuscatedName("au") + @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1924193012" + signature = "(S)I", + garbageValue = "32767" ) @Export("getDisplayWith") public int getDisplayWith() { return this.worldMapDisplayWidth; } - @ObfuscatedName("ax") + @ObfuscatedName("ah") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "2076966029" + garbageValue = "1098284021" ) @Export("getDisplayHeight") public int getDisplayHeight() { return this.worldMapDisplayHeight; } - @ObfuscatedName("ag") + @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "-106" + signature = "(II)V", + garbageValue = "572826072" ) @Export("setMaxFlashCount") public void setMaxFlashCount(int var1) { @@ -1100,20 +1107,20 @@ public class WorldMap { } - @ObfuscatedName("aa") + @ObfuscatedName("aq") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "499272419" + garbageValue = "-950358190" ) @Export("resetMaxFlashCount") public void resetMaxFlashCount() { this.maxFlashCount = 3; } - @ObfuscatedName("ap") + @ObfuscatedName("ar") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1568353274" + garbageValue = "420340879" ) @Export("setCyclesPerFlash") public void setCyclesPerFlash(int var1) { @@ -1123,30 +1130,30 @@ public class WorldMap { } - @ObfuscatedName("aq") + @ObfuscatedName("ac") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1817487801" + garbageValue = "-2062037621" ) @Export("resetCyclesPerFlash") public void resetCyclesPerFlash() { this.cyclesPerFlash = 50; } - @ObfuscatedName("ay") + @ObfuscatedName("az") @ObfuscatedSignature( signature = "(ZB)V", - garbageValue = "14" + garbageValue = "0" ) @Export("setPerpetualFlash") public void setPerpetualFlash(boolean var1) { this.perpetualFlash = var1; } - @ObfuscatedName("ad") + @ObfuscatedName("ai") @ObfuscatedSignature( signature = "(IB)V", - garbageValue = "-91" + garbageValue = "-68" ) @Export("flashElement") public void flashElement(int var1) { @@ -1156,10 +1163,10 @@ public class WorldMap { this.flashCycle = 0; } - @ObfuscatedName("al") + @ObfuscatedName("am") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-1948560443" + garbageValue = "-774711731" ) @Export("flashCategory") public void flashCategory(int var1) { @@ -1168,37 +1175,37 @@ public class WorldMap { this.flashCycle = 0; for (int var2 = 0; var2 < WorldMapElement.WorldMapElement_count; ++var2) { - if (WorldMapData_0.WorldMapElement_get(var2) != null && WorldMapData_0.WorldMapElement_get(var2).category == var1) { - this.flashingElements.add(WorldMapData_0.WorldMapElement_get(var2).objectId); + if (WorldMapSection1.WorldMapElement_get(var2) != null && WorldMapSection1.WorldMapElement_get(var2).category == var1) { + this.flashingElements.add(WorldMapSection1.WorldMapElement_get(var2).objectId); } } } - @ObfuscatedName("ah") + @ObfuscatedName("aw") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-290125378" + garbageValue = "-1418784886" ) @Export("stopCurrentFlashes") public void stopCurrentFlashes() { this.flashingElements = null; } - @ObfuscatedName("ab") + @ObfuscatedName("au") @ObfuscatedSignature( - signature = "(ZS)V", - garbageValue = "12874" + signature = "(ZI)V", + garbageValue = "-259302748" ) @Export("setElementsDisabled") public void setElementsDisabled(boolean var1) { this.elementsDisabled = !var1; } - @ObfuscatedName("aw") + @ObfuscatedName("bg") @ObfuscatedSignature( - signature = "(IZS)V", - garbageValue = "256" + signature = "(IZI)V", + garbageValue = "-1998188868" ) @Export("disableElement") public void disableElement(int var1, boolean var2) { @@ -1208,13 +1215,13 @@ public class WorldMap { this.enabledElements.remove(var1); } - this.method6235(); + this.method6317(); } - @ObfuscatedName("ae") + @ObfuscatedName("bn") @ObfuscatedSignature( signature = "(IZB)V", - garbageValue = "24" + garbageValue = "51" ) @Export("setCategoryDisabled") public void setCategoryDisabled(int var1, boolean var2) { @@ -1225,8 +1232,8 @@ public class WorldMap { } for (int var3 = 0; var3 < WorldMapElement.WorldMapElement_count; ++var3) { - if (WorldMapData_0.WorldMapElement_get(var3) != null && WorldMapData_0.WorldMapElement_get(var3).category == var1) { - int var4 = WorldMapData_0.WorldMapElement_get(var3).objectId; + if (WorldMapSection1.WorldMapElement_get(var3) != null && WorldMapSection1.WorldMapElement_get(var3).category == var1) { + int var4 = WorldMapSection1.WorldMapElement_get(var3).objectId; if (!var2) { this.enabledElementIds.add(var4); } else { @@ -1235,61 +1242,61 @@ public class WorldMap { } } - this.method6235(); + this.method6317(); } @ObfuscatedName("bk") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-1573190720" + signature = "(B)Z", + garbageValue = "8" ) @Export("getElementsDisabled") public boolean getElementsDisabled() { return !this.elementsDisabled; } - @ObfuscatedName("bw") + @ObfuscatedName("bp") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "245562250" + garbageValue = "138663468" ) @Export("isElementDisabled") public boolean isElementDisabled(int var1) { return !this.enabledElements.contains(var1); } - @ObfuscatedName("bo") + @ObfuscatedName("bu") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "2145379299" + garbageValue = "194496667" ) @Export("isCategoryDisabled") public boolean isCategoryDisabled(int var1) { return !this.enabledCategories.contains(var1); } - @ObfuscatedName("bn") + @ObfuscatedName("bi") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "2006376266" + signature = "(B)V", + garbageValue = "65" ) - void method6235() { - this.field3993.clear(); - this.field3993.addAll(this.enabledElements); - this.field3993.addAll(this.enabledElementIds); + void method6317() { + this.field3992.clear(); + this.field3992.addAll(this.enabledElements); + this.field3992.addAll(this.enabledElementIds); } - @ObfuscatedName("bp") + @ObfuscatedName("bv") @ObfuscatedSignature( signature = "(IIIIIII)V", - garbageValue = "2038457926" + garbageValue = "1508673538" ) @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.method629(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.method601(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(); @@ -1300,12 +1307,12 @@ public class WorldMap { } AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); - WorldMapElement var12 = WorldMapData_0.WorldMapElement_get(var11.getElement()); + WorldMapElement var12 = WorldMapSection1.WorldMapElement_get(var11.getElement()); var13 = false; for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { if (var12.menuActions[var14] != null) { - WorldMapData_0.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); + FontName.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); var13 = true; } } @@ -1315,12 +1322,12 @@ public class WorldMap { } } - @ObfuscatedName("bz") + @ObfuscatedName("bf") @ObfuscatedSignature( - signature = "(ILhd;I)Lhd;", - garbageValue = "-440389364" + signature = "(ILhj;B)Lhj;", + garbageValue = "13" ) - public Coord method6237(int var1, Coord var2) { + public Coord method6319(int var1, Coord var2) { if (!this.cacheLoader.isLoaded()) { return null; } else if (!this.worldMapManager.isLoaded()) { @@ -1361,10 +1368,10 @@ public class WorldMap { } } - @ObfuscatedName("bh") + @ObfuscatedName("bm") @ObfuscatedSignature( - signature = "(IILhd;Lhd;B)V", - garbageValue = "-119" + signature = "(IILhj;Lhj;I)V", + garbageValue = "-1682434011" ) @Export("menuAction") public void menuAction(int var1, int var2, Coord var3, Coord var4) { @@ -1388,13 +1395,13 @@ public class WorldMap { var5.setType(14); } - class81.runScriptEvent(var5); + SecureRandomFuture.runScriptEvent(var5); } - @ObfuscatedName("bv") + @ObfuscatedName("bw") @ObfuscatedSignature( - signature = "(I)Las;", - garbageValue = "-1599933443" + signature = "(I)Lap;", + garbageValue = "-1152647604" ) @Export("iconStart") public AbstractWorldMapIcon iconStart() { @@ -1404,23 +1411,23 @@ public class WorldMap { return null; } else { HashMap var1 = this.worldMapManager.buildIcons(); - this.field3980 = new LinkedList(); + this.field3996 = new LinkedList(); Iterator var2 = var1.values().iterator(); while (var2.hasNext()) { List var3 = (List)var2.next(); - this.field3980.addAll(var3); + this.field3996.addAll(var3); } - this.iconIterator = this.field3980.iterator(); + this.iconIterator = this.field3996.iterator(); return this.iconNext(); } } - @ObfuscatedName("bj") + @ObfuscatedName("bs") @ObfuscatedSignature( - signature = "(I)Las;", - garbageValue = "-1237024182" + signature = "(I)Lap;", + garbageValue = "770535012" ) @Export("iconNext") public AbstractWorldMapIcon iconNext() { diff --git a/runescape-client/src/main/java/WorldMapArchiveLoader.java b/runescape-client/src/main/java/WorldMapArchiveLoader.java index 4102743218..92d15cecee 100644 --- a/runescape-client/src/main/java/WorldMapArchiveLoader.java +++ b/runescape-client/src/main/java/WorldMapArchiveLoader.java @@ -4,25 +4,25 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("la") +@ObfuscatedName("ly") @Implements("WorldMapArchiveLoader") public class WorldMapArchiveLoader { - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("cacheName") String cacheName; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "Lhz;" ) @Export("archive") AbstractArchive archive; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -726522089 + intValue = 1194864205 ) @Export("percentLoaded") int percentLoaded; - @ObfuscatedName("q") + @ObfuscatedName("v") @Export("loaded") boolean loaded; @@ -35,10 +35,10 @@ public class WorldMapArchiveLoader { this.archive = var1; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(Ljava/lang/String;B)V", - garbageValue = "-7" + garbageValue = "-36" ) @Export("reset") void reset(String var1) { @@ -52,15 +52,15 @@ public class WorldMapArchiveLoader { } } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1496070348" + garbageValue = "1679536571" ) @Export("load") int load() { if (this.percentLoaded < 33) { - if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field290.name, this.cacheName)) { + if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field295.name, this.cacheName)) { return this.percentLoaded; } @@ -68,7 +68,7 @@ public class WorldMapArchiveLoader { } if (this.percentLoaded == 33) { - if (this.archive.isValidFileName(WorldMapCacheName.field291.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field291.name, this.cacheName)) { + if (this.archive.isValidFileName(WorldMapCacheName.field296.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field296.name, this.cacheName)) { return this.percentLoaded; } @@ -76,7 +76,7 @@ public class WorldMapArchiveLoader { } if (this.percentLoaded == 66) { - if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field293.name)) { + if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field298.name)) { return this.percentLoaded; } @@ -87,20 +87,20 @@ public class WorldMapArchiveLoader { return this.percentLoaded; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "30" + signature = "(I)Z", + garbageValue = "-528257438" ) @Export("isLoaded") boolean isLoaded() { return this.loaded; } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "-94" + garbageValue = "11" ) @Export("getPercentLoaded") int getPercentLoaded() { diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java index 334c5dfc97..69bde5de26 100644 --- a/runescape-client/src/main/java/WorldMapArea.java +++ b/runescape-client/src/main/java/WorldMapArea.java @@ -1,5 +1,4 @@ import java.util.Iterator; -import java.util.LinkedHashMap; import java.util.LinkedList; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; @@ -7,67 +6,80 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("av") +@ObfuscatedName("ag") @Implements("WorldMapArea") public class WorldMapArea { - @ObfuscatedName("s") + @ObfuscatedName("qq") @ObfuscatedGetter( - intValue = 1092118655 + intValue = 1818020345 + ) + static int field211; + @ObfuscatedName("bs") + static String field217; + @ObfuscatedName("df") + @ObfuscatedSignature( + signature = "Lio;" + ) + @Export("archive18") + static Archive archive18; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -1655735229 ) @Export("id") int id; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("internalName") String internalName; - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("externalName") String externalName; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -254766629 + intValue = 1137317827 ) @Export("backGroundColor") int backGroundColor; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1599697543 + intValue = -1994031909 ) @Export("zoom") int zoom; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lhd;" + signature = "Lhj;" ) @Export("origin") Coord origin; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -798691043 + intValue = -1491107613 ) @Export("regionLowX") int regionLowX; - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -415983949 + intValue = 606325911 ) @Export("regionHighX") int regionHighX; - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -103515401 + intValue = -2012001011 ) @Export("regionLowY") int regionLowY; - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1136743993 + intValue = -303428785 ) @Export("regionHighY") int regionHighY; - @ObfuscatedName("f") + @ObfuscatedName("n") @Export("isMain") boolean isMain; - @ObfuscatedName("c") + @ObfuscatedName("h") @Export("sections") LinkedList sections; @@ -83,10 +95,10 @@ public class WorldMapArea { this.isMain = false; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lky;IB)V", - garbageValue = "25" + signature = "(Lkz;II)V", + garbageValue = "-895936628" ) @Export("read") public void read(Buffer var1, int var2) { @@ -108,30 +120,30 @@ public class WorldMapArea { this.setBounds(); } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lky;I)Lac;", - garbageValue = "1253292592" + signature = "(Lkz;B)Lab;", + garbageValue = "-54" ) @Export("readWorldMapSection") WorldMapSection readWorldMapSection(Buffer var1) { int var2 = var1.readUnsignedByte(); - WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.WORLDMAPSECTIONTYPE2, WorldMapSectionType.WORLDMAPSECTIONTYPE3, WorldMapSectionType.WORLDMAPSECTIONTYPE0, WorldMapSectionType.WORLDMAPSECTIONTYPE1}; - WorldMapSectionType var4 = (WorldMapSectionType)FriendSystem.findEnumerated(var3, var2); + WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.WORLDMAPSECTIONTYPE3, WorldMapSectionType.WORLDMAPSECTIONTYPE1, WorldMapSectionType.WORLDMAPSECTIONTYPE0, WorldMapSectionType.WORLDMAPSECTIONTYPE2}; + WorldMapSectionType var4 = (WorldMapSectionType)ServerPacket.findEnumerated(var3, var2); Object var5 = null; switch(var4.type) { case 0: - var5 = new WorldMapSection0(); - break; - case 1: var5 = new WorldMapSection1(); break; - case 2: + case 1: var5 = new class42(); break; - case 3: + case 2: var5 = new WorldMapSection2(); break; + case 3: + var5 = new WorldMapSection0(); + break; default: throw new IllegalStateException(""); } @@ -140,10 +152,10 @@ public class WorldMapArea { return (WorldMapSection)var5; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IIIB)Z", - garbageValue = "-80" + signature = "(IIII)Z", + garbageValue = "937674966" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -161,10 +173,10 @@ public class WorldMapArea { return true; } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(III)Z", - garbageValue = "1925873214" + garbageValue = "1788477948" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { @@ -192,10 +204,10 @@ public class WorldMapArea { } } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(IIII)[I", - garbageValue = "1386977444" + signature = "(IIIB)[I", + garbageValue = "124" ) @Export("position") public int[] position(int var1, int var2, int var3) { @@ -213,10 +225,10 @@ public class WorldMapArea { return var5.getBorderTileLengths(var1, var2, var3); } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(III)Lhd;", - garbageValue = "-1952348656" + signature = "(IIB)Lhj;", + garbageValue = "-63" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -234,10 +246,10 @@ public class WorldMapArea { return var4.coord(var1, var2); } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-205538232" + garbageValue = "1096430580" ) @Export("setBounds") void setBounds() { @@ -250,195 +262,286 @@ public class WorldMapArea { } - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-848943890" + signature = "(B)I", + garbageValue = "-25" ) @Export("getId") public int getId() { return this.id; } - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-731208789" + signature = "(B)Z", + garbageValue = "63" ) @Export("getIsMain") public boolean getIsMain() { return this.isMain; } - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(B)Ljava/lang/String;", - garbageValue = "5" + signature = "(I)Ljava/lang/String;", + garbageValue = "1625444828" ) @Export("getInternalName") public String getInternalName() { return this.internalName; } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(I)Ljava/lang/String;", - garbageValue = "-10827335" + signature = "(B)Ljava/lang/String;", + garbageValue = "69" ) @Export("getExternalName") public String getExternalName() { return this.externalName; } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1129400396" + garbageValue = "1831557755" ) @Export("getBackGroundColor") int getBackGroundColor() { return this.backGroundColor; } - @ObfuscatedName("r") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1627458520" + garbageValue = "201981881" ) @Export("getZoom") public int getZoom() { return this.zoom; } - @ObfuscatedName("y") + @ObfuscatedName("i") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1112975954" + garbageValue = "-1169721837" ) @Export("getRegionLowX") public int getRegionLowX() { return this.regionLowX; } - @ObfuscatedName("p") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-1527013006" + signature = "(S)I", + garbageValue = "255" ) @Export("getRegionHighX") public int getRegionHighX() { return this.regionHighX; } - @ObfuscatedName("g") + @ObfuscatedName("r") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-492028203" + garbageValue = "-1241081128" ) @Export("getRegionLowY") public int getRegionLowY() { return this.regionLowY; } - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "789236832" + garbageValue = "-711950518" ) @Export("getRegionHighY") public int getRegionHighY() { return this.regionHighY; } - @ObfuscatedName("z") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1012366175" + signature = "(B)I", + garbageValue = "35" ) @Export("getOriginX") public int getOriginX() { return this.origin.x; } - @ObfuscatedName("w") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "50" + signature = "(I)I", + garbageValue = "-377438716" ) @Export("getOriginPlane") public int getOriginPlane() { return this.origin.plane; } - @ObfuscatedName("l") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "840568751" + garbageValue = "2063463136" ) @Export("getOriginY") public int getOriginY() { return this.origin.y; } - @ObfuscatedName("h") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(B)Lhd;", - garbageValue = "63" + signature = "(I)Lhj;", + garbageValue = "-1241114474" ) @Export("getOrigin") public Coord getOrigin() { return new Coord(this.origin); } - @ObfuscatedName("s") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lhz;Lhz;I)V", - garbageValue = "-1168462803" + signature = "(IILfw;Lfj;I)Z", + garbageValue = "-2082294853" ) - @Export("NpcDefinition_setArchives") - public static void NpcDefinition_setArchives(AbstractArchive var0, AbstractArchive var1) { - NPCDefinition.NpcDefinition_archive = var0; - NPCDefinition.NpcDefinition_modelArchive = var1; - } + static final boolean method315(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; + class173.directions[var6][var7] = 99; + class173.distances[var6][var7] = 0; + byte var10 = 0; + int var11 = 0; + class173.bufferX[var10] = var0; + byte var10001 = var10; + int var18 = var10 + 1; + class173.bufferY[var10001] = var1; + int[][] var12 = var3.flags; - @ObfuscatedName("aj") - @ObfuscatedSignature( - signature = "(Ldz;S)V", - garbageValue = "7503" - ) - @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("fn") - @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "-1974361592" - ) - static final void method358(boolean var0) { - if (var0) { - Client.field870 = Login.field1171 ? class160.field1982 : class160.field1983; - } else { - LinkedHashMap var1 = GrandExchangeOffer.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); + while (var11 != var18) { + var4 = class173.bufferX[var11]; + var5 = class173.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)) { + class173.field2063 = var4; + class173.field2068 = var5; + return true; } - Client.field870 = var1.containsKey(var5) ? class160.field1988 : class160.field1984; + int var15 = class173.distances[var16][var17] + 1; + if (var16 > 0 && class173.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) { + class173.bufferX[var18] = var4 - 1; + class173.bufferY[var18] = var5; + var18 = var18 + 1 & 4095; + class173.directions[var16 - 1][var17] = 2; + class173.distances[var16 - 1][var17] = var15; + } + + if (var16 < 126 && class173.directions[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) { + class173.bufferX[var18] = var4 + 1; + class173.bufferY[var18] = var5; + var18 = var18 + 1 & 4095; + class173.directions[var16 + 1][var17] = 8; + class173.distances[var16 + 1][var17] = var15; + } + + if (var17 > 0 && class173.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) { + class173.bufferX[var18] = var4; + class173.bufferY[var18] = var5 - 1; + var18 = var18 + 1 & 4095; + class173.directions[var16][var17 - 1] = 1; + class173.distances[var16][var17 - 1] = var15; + } + + if (var17 < 126 && class173.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) { + class173.bufferX[var18] = var4; + class173.bufferY[var18] = var5 + 1; + var18 = var18 + 1 & 4095; + class173.directions[var16][var17 + 1] = 4; + class173.distances[var16][var17 + 1] = var15; + } + + if (var16 > 0 && var17 > 0 && class173.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) { + class173.bufferX[var18] = var4 - 1; + class173.bufferY[var18] = var5 - 1; + var18 = var18 + 1 & 4095; + class173.directions[var16 - 1][var17 - 1] = 3; + class173.distances[var16 - 1][var17 - 1] = var15; + } + + if (var16 < 126 && var17 > 0 && class173.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) { + class173.bufferX[var18] = var4 + 1; + class173.bufferY[var18] = var5 - 1; + var18 = var18 + 1 & 4095; + class173.directions[var16 + 1][var17 - 1] = 9; + class173.distances[var16 + 1][var17 - 1] = var15; + } + + if (var16 > 0 && var17 < 126 && class173.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) { + class173.bufferX[var18] = var4 - 1; + class173.bufferY[var18] = var5 + 1; + var18 = var18 + 1 & 4095; + class173.directions[var16 - 1][var17 + 1] = 6; + class173.distances[var16 - 1][var17 + 1] = var15; + } + + if (var16 < 126 && var17 < 126 && class173.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) { + class173.bufferX[var18] = var4 + 1; + class173.bufferY[var18] = var5 + 1; + var18 = var18 + 1 & 4095; + class173.directions[var16 + 1][var17 + 1] = 12; + class173.distances[var16 + 1][var17 + 1] = var15; + } } + class173.field2063 = var4; + class173.field2068 = var5; + return false; + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "(IIIIB)V", + garbageValue = "127" + ) + @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]; + } + + 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/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index f65b67e126..b1d0c1311e 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -5,14 +5,15 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ar") +@ObfuscatedName("af") @Implements("WorldMapAreaData") public class WorldMapAreaData extends WorldMapArea { - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("worldMapData0Set") HashSet worldMapData0Set; - @ObfuscatedName("y") + @ObfuscatedName("s") @Export("worldMapData1Set") HashSet worldMapData1Set; @ObfuscatedName("p") @@ -22,10 +23,10 @@ public class WorldMapAreaData extends WorldMapArea { WorldMapAreaData() { } - @ObfuscatedName("bx") + @ObfuscatedName("ba") @ObfuscatedSignature( - signature = "(Lky;Lky;IZI)V", - garbageValue = "543700314" + signature = "(Lkz;Lkz;IZI)V", + garbageValue = "419518570" ) @Export("init") void init(Buffer var1, Buffer var2, int var3, boolean var4) { @@ -64,10 +65,10 @@ public class WorldMapAreaData extends WorldMapArea { this.initIconsList(var2, var4); } - @ObfuscatedName("ba") + @ObfuscatedName("bz") @ObfuscatedSignature( - signature = "(Lky;ZB)V", - garbageValue = "23" + signature = "(Lkz;ZI)V", + garbageValue = "-889272811" ) @Export("initIconsList") void initIconsList(Buffer var1, boolean var2) { @@ -75,7 +76,7 @@ public class WorldMapAreaData extends WorldMapArea { int var3 = var1.readUnsignedShort(); for (int var4 = 0; var4 < var3; ++var4) { - int var5 = var1.method5602(); + int var5 = var1.method5623(); Coord var6 = new Coord(var1.readInt()); boolean var7 = var1.readUnsignedByte() == 1; if (var2 || !var7) { @@ -85,158 +86,347 @@ public class WorldMapAreaData extends WorldMapArea { } - @ObfuscatedName("s") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;B)Ljava/lang/String;", - garbageValue = "-101" + signature = "(IIIIIII)I", + garbageValue = "1344959877" ) - public static String method658(CharSequence var0) { - int var1 = var0.length(); - StringBuilder var2 = new StringBuilder(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 = class14.charToByteCp1252(var4); - var2.append('%'); - int var6 = var5 >> 4 & 15; - if (var6 >= 10) { - var2.append((char)(var6 + 55)); - } else { - var2.append((char)(var6 + 48)); - } - - var6 = var5 & 15; - if (var6 >= 10) { - var2.append((char)(var6 + 55)); - } else { - var2.append((char)(var6 + 48)); - } - } - } else { - var2.append(var4); - } + public static int method673(int var0, int var1, int var2, int var3, int var4, int var5) { + if ((var5 & 1) == 1) { + int var6 = var3; + var3 = var4; + var4 = var6; } - return var2.toString(); - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "-1956472070" - ) - static final int method650(int var0, int var1) { - int var2 = var0 + var1 * 57; - var2 ^= var2 << 13; - int var3 = (var2 * var2 * 15731 + 789221) * var2 + 1376312589 & Integer.MAX_VALUE; - return var3 >> 19 & 255; - } - - @ObfuscatedName("ew") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "2080251380" - ) - static void method654() { - Client.packetWriter.clearBuffer(); - Client.packetWriter.packetBuffer.offset = 0; - Client.packetWriter.serverPacket = null; - Client.packetWriter.field1295 = null; - Client.packetWriter.field1296 = null; - Client.packetWriter.field1291 = null; - Client.packetWriter.serverPacketLength = 0; - Client.packetWriter.field1293 = 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; - } - - WorldMapIcon_1.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); - FloorDecoration.updateGameState(30); - - for (var0 = 0; var0 < 100; ++var0) { - Client.field703[var0] = true; - } - - WorldMapCacheName.method593(); - } - - @ObfuscatedName("ga") - @ObfuscatedSignature( - signature = "(IIIB)V", - garbageValue = "-124" - ) - @Export("worldToScreen") - static final void worldToScreen(int var0, int var1, int var2) { - if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { - int var3 = GrandExchangeOfferTotalQuantityComparator.getTileHeight(var0, var1, ItemContainer.plane) - var2; - var0 -= WallDecoration.cameraX; - var3 -= Coord.cameraY; - var1 -= UserComparator7.cameraZ; - int var4 = Rasterizer3D.Rasterizer3D_sine[class43.cameraPitch]; - int var5 = Rasterizer3D.Rasterizer3D_cosine[class43.cameraPitch]; - int var6 = Rasterizer3D.Rasterizer3D_sine[class40.cameraYaw]; - int var7 = Rasterizer3D.Rasterizer3D_cosine[class40.cameraYaw]; - int var8 = var6 * var1 + var0 * var7 >> 16; - var1 = var7 * var1 - var0 * var6 >> 16; - var0 = var8; - var8 = var5 * var3 - var4 * var1 >> 16; - var1 = var4 * var3 + 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; - } - + var2 &= 3; + if (var2 == 0) { + return var0; + } else if (var2 == 1) { + return var1; } else { - Client.viewportTempX = -1; - Client.viewportTempY = -1; + return var2 == 2 ? 7 - var0 - (var3 - 1) : 7 - var1 - (var4 - 1); } } - @ObfuscatedName("ik") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "([Lhp;Lhp;ZB)V", - garbageValue = "84" + signature = "(ILcu;ZB)I", + garbageValue = "76" ) - @Export("revalidateWidgetScroll") - static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { - int var3 = var1.scrollWidth != 0 ? var1.scrollWidth : var1.width; - int var4 = var1.scrollHeight != 0 ? var1.scrollHeight : var1.height; - ItemContainer.resizeInterface(var0, var1.id, var3, var4, var2); - if (var1.children != null) { - ItemContainer.resizeInterface(var1.children, var1.id, var3, var4, var2); + static int method670(int var0, Script var1, boolean var2) { + if (var0 < 1000) { + return TileItem.method2091(var0, var1, var2); + } else if (var0 < 1100) { + return WorldMapManager.method626(var0, var1, var2); + } else if (var0 < 1200) { + return method668(var0, var1, var2); + } else if (var0 < 1300) { + return WorldMapLabelSize.method166(var0, var1, var2); + } else if (var0 < 1400) { + return WorldMapData_1.method705(var0, var1, var2); + } else if (var0 < 1500) { + return class216.method4015(var0, var1, var2); + } else if (var0 < 1600) { + return WorldMapRectangle.method255(var0, var1, var2); + } else if (var0 < 1700) { + return ModelData0.method3221(var0, var1, var2); + } else if (var0 < 1800) { + return PlayerAppearance.method3990(var0, var1, var2); + } else if (var0 < 1900) { + return AbstractWorldMapIcon.method576(var0, var1, var2); + } else if (var0 < 2000) { + return ArchiveLoader.method1096(var0, var1, var2); + } else if (var0 < 2100) { + return WorldMapManager.method626(var0, var1, var2); + } else if (var0 < 2200) { + return method668(var0, var1, var2); + } else if (var0 < 2300) { + return WorldMapLabelSize.method166(var0, var1, var2); + } else if (var0 < 2400) { + return WorldMapData_1.method705(var0, var1, var2); + } else if (var0 < 2500) { + return class216.method4015(var0, var1, var2); + } else if (var0 < 2600) { + return ModelData0.method3219(var0, var1, var2); + } else if (var0 < 2700) { + return class16.method162(var0, var1, var2); + } else if (var0 < 2800) { + return PlayerType.method4121(var0, var1, var2); + } else if (var0 < 2900) { + return class51.method861(var0, var1, var2); + } else if (var0 < 3000) { + return ArchiveLoader.method1096(var0, var1, var2); + } else if (var0 < 3200) { + return Messages.method2194(var0, var1, var2); + } else if (var0 < 3300) { + return FloorUnderlayDefinition.method4423(var0, var1, var2); + } else if (var0 < 3400) { + return class226.method4109(var0, var1, var2); + } else if (var0 < 3500) { + return DevicePcmPlayerProvider.method809(var0, var1, var2); + } else if (var0 < 3700) { + return WorldMapData_1.method702(var0, var1, var2); + } else if (var0 < 4000) { + return Clock.method3490(var0, var1, var2); + } else if (var0 < 4100) { + return HealthBar.method2006(var0, var1, var2); + } else if (var0 < 4200) { + return class49.method829(var0, var1, var2); + } else if (var0 < 4300) { + return MusicPatchNode2.method3666(var0, var1, var2); + } else if (var0 < 5100) { + return class218.method4091(var0, var1, var2); + } else if (var0 < 5400) { + return World.method1762(var0, var1, var2); + } else if (var0 < 5600) { + return SequenceDefinition.method4799(var0, var1, var2); + } else if (var0 < 5700) { + return HealthBar.method1999(var0, var1, var2); + } else if (var0 < 6300) { + return Decimator.method2494(var0, var1, var2); + } else if (var0 < 6600) { + return GrandExchangeOffer.method103(var0, var1, var2); + } else { + return var0 < 6700 ? ObjectSound.method1884(var0, var1, var2) : 2; + } + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "(ILcu;ZS)I", + garbageValue = "-53" + ) + static int method668(int var0, Script var1, boolean var2) { + int var4 = -1; + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var4 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + var3 = Player.getWidget(var4); + } else { + var3 = var2 ? UserComparator9.field1941 : MidiPcmStream.field2410; } - InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); - if (var5 != null) { - GrandExchangeOfferNameComparator.resizeComponents(var5.group, var3, var4, var2); - } + if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { + class160.Interpreter_intStackSize -= 2; + var3.scrollX = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + if (var3.scrollX > var3.scrollWidth - var3.width) { + var3.scrollX = var3.scrollWidth - var3.width; + } - if (var1.contentType == 1337) { - } + if (var3.scrollX < 0) { + var3.scrollX = 0; + } + var3.scrollY = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + if (var3.scrollY > var3.scrollHeight - var3.height) { + var3.scrollY = var3.scrollHeight - var3.height; + } + + if (var3.scrollY < 0) { + var3.scrollY = 0; + } + + WorldMapID.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { + var3.color = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + WorldMapID.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETFILL) { + var3.fill = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + WorldMapID.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTRANS) { + var3.transparencyTop = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + WorldMapID.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { + var3.lineWid = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + WorldMapID.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { + var3.spriteId2 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + WorldMapID.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { + var3.spriteAngle = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + WorldMapID.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTILING) { + var3.spriteTiling = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + WorldMapID.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETMODEL) { + var3.modelType = 1; + var3.modelId = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + WorldMapID.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { + class160.Interpreter_intStackSize -= 6; + var3.modelOffsetX = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var3.modelOffsetY = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + var3.modelAngleX = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 2]; + var3.modelAngleY = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 3]; + var3.modelAngleZ = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 4]; + var3.modelZoom = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 5]; + WorldMapID.invalidateWidget(var3); + return 1; + } else { + int var8; + if (var0 == ScriptOpcodes.CC_SETMODELANIM) { + var8 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + if (var8 != var3.sequenceId) { + var3.sequenceId = var8; + var3.modelFrame = 0; + var3.modelFrameCycle = 0; + WorldMapID.invalidateWidget(var3); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { + var3.modelOrthog = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + WorldMapID.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTEXT) { + String var7 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + if (!var7.equals(var3.text)) { + var3.text = var7; + WorldMapID.invalidateWidget(var3); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { + var3.fontId = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + WorldMapID.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { + class160.Interpreter_intStackSize -= 3; + var3.textXAlignment = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var3.textYAlignment = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + var3.textLineHeight = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 2]; + WorldMapID.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { + var3.textShadowed = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + WorldMapID.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { + var3.outline = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + WorldMapID.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { + var3.spriteShadow = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + WorldMapID.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { + var3.spriteFlipV = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + WorldMapID.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { + var3.spriteFlipH = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + WorldMapID.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { + class160.Interpreter_intStackSize -= 2; + var3.scrollWidth = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var3.scrollHeight = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + WorldMapID.invalidateWidget(var3); + if (var4 != -1 && var3.type == 0) { + class197.revalidateWidgetScroll(class289.Widget_interfaceComponents[var4 >> 16], var3, false); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { + WorldMapSection1.resumePauseWidget(var3.id, var3.childIndex); + Client.meslayerContinueWidget = var3; + WorldMapID.invalidateWidget(var3); + return 1; + } else if (var0 == 1122) { + var3.spriteId = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + WorldMapID.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { + var3.color2 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + WorldMapID.invalidateWidget(var3); + return 1; + } else if (var0 == 1124) { + var3.transparencyBot = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + WorldMapID.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETFILLMODE) { + var8 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + FillMode var6 = (FillMode)ServerPacket.findEnumerated(class227.FillMode_values(), var8); + if (var6 != null) { + var3.fillMode = var6; + WorldMapID.invalidateWidget(var3); + } + + return 1; + } else { + boolean var5; + if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { + var5 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + var3.field2675 = var5; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { + var5 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + var3.modelTransparency = var5; + return 1; + } else { + return 2; + } + } + } + } + + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "(IIIIIIII)Z", + garbageValue = "-1111796932" + ) + static final boolean method671(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; + } else { + var7 = ViewportMouse.ViewportMouse_x + var6; + if (var7 < var3 && var7 < var4 && var7 < var5) { + return false; + } else { + var7 = ViewportMouse.ViewportMouse_x - var6; + return var7 <= var3 || var7 <= var4 || var7 <= var5; + } + } + } + } + + @ObfuscatedName("gt") + @ObfuscatedSignature( + signature = "(IIII)I", + garbageValue = "588671931" + ) + @Export("getTileHeight") + static final int getTileHeight(int var0, int var1, int var2) { + int var3 = var0 >> 7; + int var4 = var1 >> 7; + if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { + int var5 = var2; + if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { + var5 = var2 + 1; + } + + int var6 = var0 & 127; + int var7 = var1 & 127; + int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4] >> 7; + int var9 = var6 * Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] + Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) >> 7; + return var8 * (128 - var7) + var9 * var7 >> 7; + } else { + return 0; + } } } diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java index 00756740cb..f739d74b12 100644 --- a/runescape-client/src/main/java/WorldMapCacheName.java +++ b/runescape-client/src/main/java/WorldMapCacheName.java @@ -1,83 +1,165 @@ import 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("ak") +@ObfuscatedName("ax") @Implements("WorldMapCacheName") public class WorldMapCacheName { - @ObfuscatedName("sr") - @ObfuscatedSignature( - signature = "Llv;" + @ObfuscatedName("qa") + @ObfuscatedGetter( + intValue = -159199451 ) - @Export("worldMap") - static WorldMap worldMap; - @ObfuscatedName("s") + static int field301; + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lak;" + signature = "Lax;" + ) + public static final WorldMapCacheName field294; + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "Lax;" ) public static final WorldMapCacheName field295; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lak;" + signature = "Lax;" ) - public static final WorldMapCacheName field290; - @ObfuscatedName("i") + public static final WorldMapCacheName field296; + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lak;" + signature = "Lax;" ) - public static final WorldMapCacheName field291; - @ObfuscatedName("k") + static final WorldMapCacheName field297; + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Lak;" + signature = "Lax;" ) - static final WorldMapCacheName field292; + public static final WorldMapCacheName field298; @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lak;" - ) - public static final WorldMapCacheName field293; - @ObfuscatedName("n") @Export("name") public final String name; static { - field295 = new WorldMapCacheName("details"); - field290 = new WorldMapCacheName("compositemap"); - field291 = new WorldMapCacheName("compositetexture"); - field292 = new WorldMapCacheName("area"); - field293 = new WorldMapCacheName("labels"); + field294 = new WorldMapCacheName("details"); + field295 = new WorldMapCacheName("compositemap"); + field296 = new WorldMapCacheName("compositetexture"); + field297 = new WorldMapCacheName("area"); + field298 = new WorldMapCacheName("labels"); } WorldMapCacheName(String var1) { this.name = var1; } - @ObfuscatedName("fw") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "40" + signature = "(B)I", + garbageValue = "105" ) - static void method593() { - PacketBufferNode var0 = MenuAction.getPacketBufferNode(ClientPacket.field2220, Client.packetWriter.isaacCipher); - var0.packetBuffer.writeByte(UserComparator7.getWindowedMode()); - var0.packetBuffer.writeShort(KitDefinition.canvasWidth); - var0.packetBuffer.writeShort(class30.canvasHeight); - Client.packetWriter.addNode(var0); + static int method594() { + return ++Messages.Messages_count - 1; } - @ObfuscatedName("kl") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "350490543" + signature = "(II)I", + garbageValue = "1942800503" ) - @Export("clanKickUser") - static final void clanKickUser(String var0) { - if (Client.clanChat != null) { - PacketBufferNode var1 = MenuAction.getPacketBufferNode(ClientPacket.field2198, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); + @Export("getVarbit") + public static int getVarbit(int var0) { + VarbitDefinition var1 = Language.method3627(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("x") + @ObfuscatedSignature( + signature = "(ILjava/lang/String;Ljava/lang/String;B)V", + garbageValue = "63" + ) + @Export("addGameMessage") + static void addGameMessage(int var0, String var1, String var2) { + UserComparator9.addChatMessage(var0, var1, var2, (String)null); + } + + @ObfuscatedName("hd") + @ObfuscatedSignature( + signature = "(III)V", + garbageValue = "1635496001" + ) + @Export("updateItemPile") + static final void updateItemPile(int var0, int var1) { + NodeDeque var2 = Client.groundItems[MouseRecorder.plane][var0][var1]; + if (var2 == null) { + WorldMapIcon_1.scene.removeGroundItemPile(MouseRecorder.plane, var0, var1); + } else { + long var3 = -99999999L; + TileItem var5 = null; + + TileItem var6; + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { + ItemDefinition var7 = Player.ItemDefinition_get(var6.id); + long var8 = (long)var7.price; + if (var7.isStackable == 1) { + var8 *= (long)(var6.quantity + 1); + } + + if (var8 > var3) { + var3 = var8; + var5 = var6; + } + } + + if (var5 == null) { + WorldMapIcon_1.scene.removeGroundItemPile(MouseRecorder.plane, var0, var1); + } else { + var2.addLast(var5); + TileItem var12 = null; + TileItem var11 = null; + + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { + if (var6.id != var5.id) { + if (var12 == null) { + var12 = var6; + } + + if (var6.id != var12.id && var11 == null) { + var11 = var6; + } + } + } + + long var9 = WorldMapIcon_1.calculateTag(var0, var1, 3, false, 0); + WorldMapIcon_1.scene.newGroundItemPile(MouseRecorder.plane, var0, var1, WorldMapAreaData.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, MouseRecorder.plane), var5, var9, var12, var11); + } } } + + @ObfuscatedName("hz") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "2017044879" + ) + @Export("getNewestMenuIdx") + static final int getNewestMenuIdx() { + return Client.menuOptionsCount - 1; + } + + @ObfuscatedName("jz") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-415764372" + ) + static final void method592() { + for (int var0 = 0; var0 < Players.Players_count; ++var0) { + Player var1 = Client.players[Players.Players_indices[var0]]; + var1.clearIsInClanChat(); + } + + } } diff --git a/runescape-client/src/main/java/WorldMapData_0.java b/runescape-client/src/main/java/WorldMapData_0.java index 5576f41a22..29935d0830 100644 --- a/runescape-client/src/main/java/WorldMapData_0.java +++ b/runescape-client/src/main/java/WorldMapData_0.java @@ -3,21 +3,34 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("b") +@ObfuscatedName("e") @Implements("WorldMapData_0") public class WorldMapData_0 extends AbstractWorldMapData { + @ObfuscatedName("dg") + @ObfuscatedSignature( + signature = "Lio;" + ) + @Export("archive3") + static Archive archive3; + @ObfuscatedName("ds") + @ObfuscatedSignature( + signature = "Lio;" + ) + @Export("archive9") + static Archive archive9; + WorldMapData_0() { } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lky;I)V", - garbageValue = "1629688583" + signature = "(Lkz;I)V", + garbageValue = "-1670112809" ) @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); - if (var2 != WorldMapID.field260.value) { + if (var2 != WorldMapID.field263.value) { throw new IllegalStateException(""); } else { super.minPlane = var1.readUnsignedByte(); @@ -26,26 +39,26 @@ public class WorldMapData_0 extends AbstractWorldMapData { super.regionYLow = var1.readUnsignedShort() * 4096; super.regionX = var1.readUnsignedShort(); super.regionY = var1.readUnsignedShort(); - super.groupId = var1.method5602(); - super.fileId = var1.method5602(); + super.groupId = var1.method5623(); + super.fileId = var1.method5623(); } } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lky;B)V", - garbageValue = "120" + signature = "(Lkz;I)V", + garbageValue = "-1969615810" ) @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.field145 = new byte[super.planes][64][64]; - super.field156 = new byte[super.planes][64][64]; + super.field163 = new byte[super.planes][64][64]; + super.field159 = new byte[super.planes][64][64]; super.decorations = new WorldMapDecoration[super.planes][64][64][]; int var2 = var1.readUnsignedByte(); - if (var2 != class30.field251.value) { + if (var2 != class30.field253.value) { throw new IllegalStateException(""); } else { int var3 = var1.readUnsignedByte(); @@ -63,164 +76,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 && var2.regionY == super.regionY; + return super.regionX == var2.regionX && var2.regionY == super.regionY; } } - public int hashCode() { - return super.regionX | super.regionY << 8; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "(IS)Liq;", - garbageValue = "-23193" - ) - @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("j") - @ObfuscatedSignature( - signature = "(II)Liu;", - garbageValue = "-1815953126" - ) - @Export("ItemDefinition_get") - public static ItemDefinition ItemDefinition_get(int var0) { - ItemDefinition var1 = (ItemDefinition)ItemDefinition.ItemDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = class65.ItemDefinition_archive.takeFile(10, var0); - var1 = new ItemDefinition(); - 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 (!UrlRequester.ItemDefinition_inMembersWorld && var1.isMembersOnly) { - var1.name = "Members object"; - var1.isTradable = false; - var1.groundActions = null; - var1.inventoryActions = null; - var1.shiftClickIndex = -1; - var1.team = 0; - if (var1.params != null) { - boolean var3 = false; - - for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { - ParamDefinition var5 = VarcInt.getParamDefinition((int)var4.key); - if (var5.autoDisable) { - var4.remove(); - } else { - var3 = true; - } - } - - if (!var3) { - var1.params = null; - } - } - } - - ItemDefinition.ItemDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("f") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "2096168309" + garbageValue = "-1591253708" ) - public static void method177() { - HitSplatDefinition.HitSplatDefinition_cached.clear(); - HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); - HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); + static void method157() { + for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var0.obj != null) { + var0.set(); + } + } + } - @ObfuscatedName("gu") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-503004443" + signature = "(IB)Lbj;", + garbageValue = "-43" ) - @Export("getHighestVisiblePlane") - static final int getHighestVisiblePlane() { - if (GrandExchangeOffer.clientPreferences.roofsHidden) { - return ItemContainer.plane; - } else { - int var0 = GrandExchangeOfferTotalQuantityComparator.getTileHeight(WallDecoration.cameraX, UserComparator7.cameraZ, ItemContainer.plane); - return var0 - Coord.cameraY < 800 && (Tiles.Tiles_renderFlags[ItemContainer.plane][WallDecoration.cameraX >> 7][UserComparator7.cameraZ >> 7] & 4) != 0 ? ItemContainer.plane : 3; - } + @Export("Messages_getMessage") + static Message Messages_getMessage(int var0) { + return (Message)Messages.Messages_hashTable.get((long)var0); } @ObfuscatedName("hm") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "-28266" + signature = "(III)V", + garbageValue = "-1345116753" ) - static final void method176() { - int var0 = MilliClock.menuX; - int var1 = class96.menuY; - int var2 = World.menuWidth; - int var3 = class1.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); - class43.fontBold12.draw("Choose Option", var0 + 3, var1 + 14, var4, -1); - int var5 = MouseHandler.MouseHandler_x; - int var6 = MouseHandler.MouseHandler_y; + static final void method160(int var0, int var1) { + if (Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) { + if (Client.showMouseOverText) { + int var2 = WorldMapCacheName.getNewestMenuIdx(); + String var3; + if (Client.isItemSelected == 1 && Client.menuOptionsCount < 2) { + var3 = "Use" + " " + Client.selectedItemName + " " + "->"; + } else if (Client.isSpellSelected && Client.menuOptionsCount < 2) { + var3 = Client.selectedSpellActionName + " " + Client.selectedSpellName + " " + "->"; + } else { + var3 = class188.method3620(var2); + } - for (int var7 = 0; var7 < Client.menuOptionsCount; ++var7) { - int var8 = var1 + (Client.menuOptionsCount - 1 - var7) * 15 + 31; - int var9 = 16777215; - if (var5 > var0 && var5 < var2 + var0 && var6 > var8 - 13 && var6 < var8 + 3) { - var9 = 16776960; + if (Client.menuOptionsCount > 2) { + var3 = var3 + UserComparator7.colorStartTag(16777215) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options"; + } + + HealthBar.fontBold12.drawRandomAlphaAndSpacing(var3, var0 + 4, var1 + 15, 16777215, 0, Client.cycle / 1000); } - - Font var10 = class43.fontBold12; - String var11; - if (var7 < 0) { - var11 = ""; - } else if (Client.menuTargets[var7].length() > 0) { - var11 = Client.menuActions[var7] + " " + Client.menuTargets[var7]; - } else { - var11 = Client.menuActions[var7]; - } - - var10.draw(var11, var0 + 3, var8, var9, 0); } - - FriendsList.method5102(MilliClock.menuX, class96.menuY, World.menuWidth, class1.menuHeight); - } - - @ObfuscatedName("ia") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;IIIII)V", - garbageValue = "400023400" - ) - @Export("insertMenuItemNoShift") - public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { - NetCache.insertMenuItem(var0, var1, var2, var3, var4, var5, false); } } diff --git a/runescape-client/src/main/java/WorldMapData_1.java b/runescape-client/src/main/java/WorldMapData_1.java index 25edfbddbb..7ddb643568 100644 --- a/runescape-client/src/main/java/WorldMapData_1.java +++ b/runescape-client/src/main/java/WorldMapData_1.java @@ -1,42 +1,37 @@ +import java.lang.reflect.Field; +import java.lang.reflect.Method; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("au") +@ObfuscatedName("ak") @Implements("WorldMapData_1") public class WorldMapData_1 extends AbstractWorldMapData { - @ObfuscatedName("af") - @Export("fontHelvetica13") - static java.awt.Font fontHelvetica13; - @ObfuscatedName("gh") - @ObfuscatedSignature( - signature = "[Lls;" - ) - @Export("headIconHintSprites") - static Sprite[] headIconHintSprites; - @ObfuscatedName("b") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 481404885 + intValue = -947867455 ) @Export("chunkXLow") int chunkXLow; - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1912285693 + intValue = -35118865 ) @Export("chunkYLow") int chunkYLow; - @ObfuscatedName("e") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1552157643 + intValue = -622760109 ) @Export("chunkX") int chunkX; - @ObfuscatedName("z") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 730581483 + intValue = 332325747 ) @Export("chunkY") int chunkY; @@ -44,15 +39,15 @@ public class WorldMapData_1 extends AbstractWorldMapData { WorldMapData_1() { } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lky;I)V", - garbageValue = "-1265892747" + signature = "(Lkz;I)V", + garbageValue = "-1217403817" ) @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); - if (var2 != WorldMapID.field257.value) { + if (var2 != WorldMapID.field264.value) { throw new IllegalStateException(""); } else { super.minPlane = var1.readUnsignedByte(); @@ -65,26 +60,26 @@ public class WorldMapData_1 extends AbstractWorldMapData { super.regionY = var1.readUnsignedShort(); this.chunkX = var1.readUnsignedByte(); this.chunkY = var1.readUnsignedByte(); - super.groupId = var1.method5602(); - super.fileId = var1.method5602(); + super.groupId = var1.method5623(); + super.fileId = var1.method5623(); } } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lky;B)V", - garbageValue = "120" + signature = "(Lkz;I)V", + garbageValue = "-1969615810" ) @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.field145 = new byte[super.planes][64][64]; - super.field156 = new byte[super.planes][64][64]; + super.field163 = new byte[super.planes][64][64]; + super.field159 = new byte[super.planes][64][64]; super.decorations = new WorldMapDecoration[super.planes][64][64][]; int var2 = var1.readUnsignedByte(); - if (var2 != class30.field250.value) { + if (var2 != class30.field254.value) { throw new IllegalStateException(""); } else { int var3 = var1.readUnsignedByte(); @@ -104,40 +99,40 @@ public class WorldMapData_1 extends AbstractWorldMapData { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "18" + signature = "(I)I", + garbageValue = "-42087770" ) @Export("getChunkXLow") int getChunkXLow() { return this.chunkXLow; } - @ObfuscatedName("au") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1399552642" + garbageValue = "-194521742" ) @Export("getChunkYLow") int getChunkYLow() { return this.chunkYLow; } - @ObfuscatedName("ax") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "234574049" + signature = "(B)I", + garbageValue = "123" ) @Export("getChunkX") int getChunkX() { return this.chunkX; } - @ObfuscatedName("ag") + @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "2005972449" + signature = "(B)I", + garbageValue = "10" ) @Export("getChunkY") int getChunkY() { @@ -149,7 +144,7 @@ public class WorldMapData_1 extends AbstractWorldMapData { return false; } else { WorldMapData_1 var2 = (WorldMapData_1)var1; - if (var2.regionX == super.regionX && var2.regionY == super.regionY) { + if (super.regionX == var2.regionX && super.regionY == var2.regionY) { return this.chunkX == var2.chunkX && this.chunkY == var2.chunkY; } else { return false; @@ -161,101 +156,658 @@ public class WorldMapData_1 extends AbstractWorldMapData { return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; } - @ObfuscatedName("ha") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "129676953" + signature = "(IIB)V", + garbageValue = "10" ) - @Export("calculateMenuBounds") - static void calculateMenuBounds(int var0, int var1) { - int var2 = class43.fontBold12.stringWidth("Choose Option"); - - int var3; - for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { - Font var4 = class43.fontBold12; - String var5; - if (var3 < 0) { - var5 = ""; - } else if (Client.menuTargets[var3].length() > 0) { - var5 = Client.menuActions[var3] + " " + Client.menuTargets[var3]; - } else { - var5 = Client.menuActions[var3]; - } - - int var6 = var4.stringWidth(var5); - if (var6 > var2) { - var2 = var6; - } + public static void method703(int var0, int var1) { + VarbitDefinition var2 = Language.method3627(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; } - var2 += 8; - var3 = Client.menuOptionsCount * 15 + 22; - int var7 = var0 - var2 / 2; - if (var7 + var2 > KitDefinition.canvasWidth) { - var7 = KitDefinition.canvasWidth - var2; - } - - if (var7 < 0) { - var7 = 0; - } - - int var8 = var1; - if (var3 + var1 > class30.canvasHeight) { - var8 = class30.canvasHeight - var3; - } - - if (var8 < 0) { - var8 = 0; - } - - MilliClock.menuX = var7; - class96.menuY = var8; - World.menuWidth = var2; - class1.menuHeight = Client.menuOptionsCount * 15 + 22; + var6 <<= var4; + Varps.Varps_main[var3] = Varps.Varps_main[var3] & ~var6 | var1 << var4 & var6; } - @ObfuscatedName("ij") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lhp;IIIIIII)V", - garbageValue = "-599054515" + signature = "(Lkz;II)V", + garbageValue = "-891659032" ) - static final void method682(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (Client.field725) { - Client.alternativeScrollbarWidth = 32; - } else { - Client.alternativeScrollbarWidth = 0; + @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] = Projectile.loadClassFromDescriptor(var8[var12]); + } + + Class var22 = Projectile.loadClassFromDescriptor(var20); + if (Projectile.loadClassFromDescriptor(var5).getClassLoader() == null) { + throw new SecurityException(); + } + + Method[] var13 = Projectile.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 (var17.length == var21.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 (Projectile.loadClassFromDescriptor(var5).getClassLoader() == null) { + throw new SecurityException(); + } + + var2.fields[var3] = Reflection.findField(Projectile.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; + } } - Client.field725 = false; - int var7; - if (MouseHandler.MouseHandler_currentButton == 1 || !FriendSystem.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { - if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { - var0.scrollY -= 4; - FriendSystem.invalidateWidget(var0); - } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { - var0.scrollY += 4; - FriendSystem.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; + class96.reflectionChecks.addFirst(var2); + } + + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "(ILcu;ZS)I", + garbageValue = "10127" + ) + static int method705(int var0, Script var1, boolean var2) { + boolean var3 = true; + Widget var4; + if (var0 >= 2000) { + var0 -= 1000; + var4 = Player.getWidget(Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]); + var3 = false; + } else { + var4 = var2 ? UserComparator9.field1941 : MidiPcmStream.field2410; + } + + int var11; + if (var0 == ScriptOpcodes.CC_SETOP) { + var11 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] - 1; + if (var11 >= 0 && var11 <= 9) { + var4.setAction(var11, Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]); + return 1; + } else { + --TextureProvider.Interpreter_stringStackSize; + return 1; + } + } else { + int var6; + if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { + class160.Interpreter_intStackSize -= 2; + var11 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var6 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + var4.parent = class49.getWidgetChild(var11, var6); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { + var4.isScrollBar = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { + var4.dragZoneSize = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { + var4.dragThreshold = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { + var4.dataText = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { + var4.spellActionName = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { + var4.actions = null; + return 1; + } else if (var0 == 1308) { + var4.field2680 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + return 1; + } else { + int var7; + byte[] var9; + if (var0 != ScriptOpcodes.CC_SETOPKEY) { + byte var5; + if (var0 == ScriptOpcodes.CC_SETOPTKEY) { + class160.Interpreter_intStackSize -= 2; + var5 = 10; + var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]}; + byte[] var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]}; + WorldMapIcon_0.Widget_setKey(var4, var5, var9, var10); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { + class160.Interpreter_intStackSize -= 3; + var11 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize] - 1; + var6 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + var7 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 2]; + if (var11 >= 0 && var11 <= 9) { + GrandExchangeOfferAgeComparator.Widget_setKeyRate(var4, var11, var6, var7); + return 1; + } else { + throw new RuntimeException(); + } + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { + var5 = 10; + var6 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + GrandExchangeOfferAgeComparator.Widget_setKeyRate(var4, var5, var6, var7); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { + --class160.Interpreter_intStackSize; + var11 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize] - 1; + if (var11 >= 0 && var11 <= 9) { + ReflectionCheck.Widget_setKeyIgnoreHeld(var4, var11); + return 1; + } else { + throw new RuntimeException(); + } + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { + var5 = 10; + ReflectionCheck.Widget_setKeyIgnoreHeld(var4, var5); + return 1; + } else { + return 2; + } + } else { + byte[] var8 = null; + var9 = null; + if (var3) { + class160.Interpreter_intStackSize -= 10; + + for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + class160.Interpreter_intStackSize] >= 0; var7 += 2) { + } + + if (var7 > 0) { + var8 = new byte[var7 / 2]; + var9 = new byte[var7 / 2]; + + for (var7 -= 2; var7 >= 0; var7 -= 2) { + var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class160.Interpreter_intStackSize]; + var9[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + class160.Interpreter_intStackSize + 1]; + } + } + } else { + class160.Interpreter_intStackSize -= 2; + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]}; + var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]}; + } + + var7 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] - 1; + if (var7 >= 0 && var7 <= 9) { + WorldMapIcon_0.Widget_setKey(var4, var7, var8, var9); + return 1; + } else { + throw new RuntimeException(); + } + } + } + } + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + signature = "(ILcu;ZB)I", + garbageValue = "112" + ) + static int method702(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.FRIEND_COUNT) { + if (class218.friendSystem.field1034 == 0) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -2; + } else if (class218.friendSystem.field1034 == 1) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = class218.friendSystem.friendsList.getSize(); + } + + return 1; + } else { + int var3; + if (var0 == ScriptOpcodes.FRIEND_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + if (class218.friendSystem.method1825() && var3 >= 0 && var3 < class218.friendSystem.friendsList.getSize()) { + Friend var8 = (Friend)class218.friendSystem.friendsList.get(var3); + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var8.getName(); + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var8.getPreviousName(); + } else { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; } - int var8 = var6 - var2 - 16 - var7 / 2; - int var9 = var3 - 32 - var7; - var0.scrollY = var8 * (var4 - var3) / var9; - FriendSystem.invalidateWidget(var0); - Client.field725 = true; + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + if (class218.friendSystem.method1825() && var3 >= 0 && var3 < class218.friendSystem.friendsList.getSize()) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = ((Buddy)class218.friendSystem.friendsList.get(var3)).world; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + if (class218.friendSystem.method1825() && var3 >= 0 && var3 < class218.friendSystem.friendsList.getSize()) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = ((Buddy)class218.friendSystem.friendsList.get(var3)).rank; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else { + String var5; + if (var0 == ScriptOpcodes.FRIEND_SETRANK) { + var5 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + int var6 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + ByteArrayPool.method5750(var5, var6); + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_ADD) { + var5 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + class218.friendSystem.addFriend(var5); + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_DEL) { + var5 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + class218.friendSystem.removeFriend(var5); + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_ADD) { + var5 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + class218.friendSystem.addIgnore(var5); + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_DEL) { + var5 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + class218.friendSystem.removeIgnore(var5); + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_TEST) { + var5 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + var5 = GrandExchangeEvents.method68(var5); + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = class218.friendSystem.isFriended(new Username(var5, class4.loginType), false) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { + if (GrandExchangeOfferUnitPriceComparator.clanChat != null) { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = GrandExchangeOfferUnitPriceComparator.clanChat.name; + } else { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { + if (GrandExchangeOfferUnitPriceComparator.clanChat != null) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.clanChat.getSize(); + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + if (GrandExchangeOfferUnitPriceComparator.clanChat != null && var3 < GrandExchangeOfferUnitPriceComparator.clanChat.getSize()) { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = GrandExchangeOfferUnitPriceComparator.clanChat.get(var3).getUsername().getName(); + } else { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + if (GrandExchangeOfferUnitPriceComparator.clanChat != null && var3 < GrandExchangeOfferUnitPriceComparator.clanChat.getSize()) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = ((Buddy)GrandExchangeOfferUnitPriceComparator.clanChat.get(var3)).getWorld(); + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + if (GrandExchangeOfferUnitPriceComparator.clanChat != null && var3 < GrandExchangeOfferUnitPriceComparator.clanChat.getSize()) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = ((Buddy)GrandExchangeOfferUnitPriceComparator.clanChat.get(var3)).rank; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.clanChat != null ? GrandExchangeOfferUnitPriceComparator.clanChat.minKick : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { + var5 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + class197.clanKickUser(var5); + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = GrandExchangeOfferUnitPriceComparator.clanChat != null ? GrandExchangeOfferUnitPriceComparator.clanChat.rank : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { + var5 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + WorldMapID.Clan_joinChat(var5); + return 1; + } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { + class51.Clan_leaveChat(); + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { + if (!class218.friendSystem.method1825()) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = class218.friendSystem.ignoreList.getSize(); + } + + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + if (class218.friendSystem.method1825() && var3 >= 0 && var3 < class218.friendSystem.ignoreList.getSize()) { + Ignored var4 = (Ignored)class218.friendSystem.ignoreList.get(var3); + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var4.getName(); + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var4.getPreviousName(); + } else { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_TEST) { + var5 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + var5 = GrandExchangeEvents.method68(var5); + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = class218.friendSystem.isIgnored(new Username(var5, class4.loginType)) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + if (GrandExchangeOfferUnitPriceComparator.clanChat != null && var3 < GrandExchangeOfferUnitPriceComparator.clanChat.getSize() && GrandExchangeOfferUnitPriceComparator.clanChat.get(var3).getUsername().equals(Varps.localPlayer.username)) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { + if (GrandExchangeOfferUnitPriceComparator.clanChat != null && GrandExchangeOfferUnitPriceComparator.clanChat.owner != null) { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = GrandExchangeOfferUnitPriceComparator.clanChat.owner; + } else { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + if (GrandExchangeOfferUnitPriceComparator.clanChat != null && var3 < GrandExchangeOfferUnitPriceComparator.clanChat.getSize() && ((ClanMate)GrandExchangeOfferUnitPriceComparator.clanChat.get(var3)).isFriend()) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { + if (var0 == 3628) { + class218.friendSystem.friendsList.removeComparator(); + return 1; + } else { + boolean var7; + if (var0 == 3629) { + var7 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + class218.friendSystem.friendsList.addComparator(new UserComparator1(var7)); + return 1; + } else if (var0 == 3630) { + var7 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + class218.friendSystem.friendsList.addComparator(new UserComparator2(var7)); + return 1; + } else if (var0 == 3631) { + var7 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + class218.friendSystem.friendsList.addComparator(new UserComparator3(var7)); + return 1; + } else if (var0 == 3632) { + var7 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + class218.friendSystem.friendsList.addComparator(new UserComparator4(var7)); + return 1; + } else if (var0 == 3633) { + var7 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + class218.friendSystem.friendsList.addComparator(new UserComparator5(var7)); + return 1; + } else if (var0 == 3634) { + var7 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + class218.friendSystem.friendsList.addComparator(new UserComparator6(var7)); + return 1; + } else if (var0 == 3635) { + var7 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + class218.friendSystem.friendsList.addComparator(new UserComparator7(var7)); + return 1; + } else if (var0 == 3636) { + var7 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + class218.friendSystem.friendsList.addComparator(new UserComparator8(var7)); + return 1; + } else if (var0 == 3637) { + var7 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + class218.friendSystem.friendsList.addComparator(new UserComparator9(var7)); + return 1; + } else if (var0 == 3638) { + var7 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + class218.friendSystem.friendsList.addComparator(new UserComparator10(var7)); + return 1; + } else if (var0 == 3639) { + class218.friendSystem.friendsList.sort(); + return 1; + } else if (var0 == 3640) { + class218.friendSystem.ignoreList.removeComparator(); + return 1; + } else if (var0 == 3641) { + var7 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + class218.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); + return 1; + } else if (var0 == 3642) { + var7 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + class218.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); + return 1; + } else if (var0 == 3643) { + class218.friendSystem.ignoreList.sort(); + return 1; + } else if (var0 == 3644) { + if (GrandExchangeOfferUnitPriceComparator.clanChat != null) { + GrandExchangeOfferUnitPriceComparator.clanChat.removeComparator(); + } + + return 1; + } else if (var0 == 3645) { + var7 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + if (GrandExchangeOfferUnitPriceComparator.clanChat != null) { + GrandExchangeOfferUnitPriceComparator.clanChat.addComparator(new UserComparator1(var7)); + } + + return 1; + } else if (var0 == 3646) { + var7 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + if (GrandExchangeOfferUnitPriceComparator.clanChat != null) { + GrandExchangeOfferUnitPriceComparator.clanChat.addComparator(new UserComparator2(var7)); + } + + return 1; + } else if (var0 == 3647) { + var7 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + if (GrandExchangeOfferUnitPriceComparator.clanChat != null) { + GrandExchangeOfferUnitPriceComparator.clanChat.addComparator(new UserComparator3(var7)); + } + + return 1; + } else if (var0 == 3648) { + var7 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + if (GrandExchangeOfferUnitPriceComparator.clanChat != null) { + GrandExchangeOfferUnitPriceComparator.clanChat.addComparator(new UserComparator4(var7)); + } + + return 1; + } else if (var0 == 3649) { + var7 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + if (GrandExchangeOfferUnitPriceComparator.clanChat != null) { + GrandExchangeOfferUnitPriceComparator.clanChat.addComparator(new UserComparator5(var7)); + } + + return 1; + } else if (var0 == 3650) { + var7 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + if (GrandExchangeOfferUnitPriceComparator.clanChat != null) { + GrandExchangeOfferUnitPriceComparator.clanChat.addComparator(new UserComparator6(var7)); + } + + return 1; + } else if (var0 == 3651) { + var7 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + if (GrandExchangeOfferUnitPriceComparator.clanChat != null) { + GrandExchangeOfferUnitPriceComparator.clanChat.addComparator(new UserComparator7(var7)); + } + + return 1; + } else if (var0 == 3652) { + var7 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + if (GrandExchangeOfferUnitPriceComparator.clanChat != null) { + GrandExchangeOfferUnitPriceComparator.clanChat.addComparator(new UserComparator8(var7)); + } + + return 1; + } else if (var0 == 3653) { + var7 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + if (GrandExchangeOfferUnitPriceComparator.clanChat != null) { + GrandExchangeOfferUnitPriceComparator.clanChat.addComparator(new UserComparator9(var7)); + } + + return 1; + } else if (var0 == 3654) { + var7 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + if (GrandExchangeOfferUnitPriceComparator.clanChat != null) { + GrandExchangeOfferUnitPriceComparator.clanChat.addComparator(new UserComparator10(var7)); + } + + return 1; + } else if (var0 == 3655) { + if (GrandExchangeOfferUnitPriceComparator.clanChat != null) { + GrandExchangeOfferUnitPriceComparator.clanChat.sort(); + } + + return 1; + } else if (var0 == 3656) { + var7 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + class218.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); + return 1; + } else if (var0 == 3657) { + var7 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + if (GrandExchangeOfferUnitPriceComparator.clanChat != null) { + GrandExchangeOfferUnitPriceComparator.clanChat.addComparator(new BuddyRankComparator(var7)); + } + + return 1; + } else { + return 2; + } + } + } else { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + if (GrandExchangeOfferUnitPriceComparator.clanChat != null && var3 < GrandExchangeOfferUnitPriceComparator.clanChat.getSize() && ((ClanMate)GrandExchangeOfferUnitPriceComparator.clanChat.get(var3)).isIgnored()) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } } } + } - if (Client.mouseWheelRotation != 0) { - var7 = var0.width; - if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { - var0.scrollY += Client.mouseWheelRotation * 45; - FriendSystem.invalidateWidget(var0); - } + @ObfuscatedName("fe") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "-1914093616" + ) + @Export("playSong") + static void playSong(int var0) { + if (var0 == -1 && !Client.field746) { + class226.method4108(); + } else if (var0 != -1 && var0 != Client.field857 && Client.field638 != 0 && !Client.field746) { + Archive var1 = WorldMapDecoration.archive6; + int var2 = Client.field638; + class197.field2376 = 1; + class197.musicTrackArchive = var1; + class197.musicTrackGroupId = var0; + class197.musicTrackFileId = 0; + Canvas.field395 = var2; + MouseRecorder.musicTrackBoolean = false; + ModelData0.field1833 = 2; } + Client.field857 = var0; } } diff --git a/runescape-client/src/main/java/WorldMapDecoration.java b/runescape-client/src/main/java/WorldMapDecoration.java index 407deb0eae..4e4fa6a212 100644 --- a/runescape-client/src/main/java/WorldMapDecoration.java +++ b/runescape-client/src/main/java/WorldMapDecoration.java @@ -4,50 +4,41 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("o") +@ObfuscatedName("b") @Implements("WorldMapDecoration") public class WorldMapDecoration { - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "Lhz;" - ) - @Export("musicTrackArchive") - public static AbstractArchive musicTrackArchive; - @ObfuscatedName("q") - @Export("Widget_loadedInterfaces") - static boolean[] Widget_loadedInterfaces; - @ObfuscatedName("dn") - @ObfuscatedSignature( - signature = "Lid;" - ) - @Export("archive5") - static Archive archive5; - @ObfuscatedName("dq") - @ObfuscatedSignature( - signature = "Lid;" - ) - @Export("archive9") - static Archive archive9; - @ObfuscatedName("lx") - @ObfuscatedSignature( - signature = "Lhp;" - ) - static Widget field198; @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "Llt;" + ) + static IndexedSprite field202; + @ObfuscatedName("di") + @ObfuscatedSignature( + signature = "Lio;" + ) + @Export("archive6") + static Archive archive6; + @ObfuscatedName("dc") + @ObfuscatedSignature( + signature = "Lio;" + ) + @Export("archive8") + static Archive archive8; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1098374609 + intValue = 1850288081 ) @Export("objectDefinitionId") final int objectDefinitionId; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1500543801 + intValue = -20995345 ) @Export("decoration") final int decoration; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1821120363 + intValue = 563692881 ) @Export("rotation") final int rotation; @@ -58,567 +49,82 @@ public class WorldMapDecoration { this.rotation = var3; } - @ObfuscatedName("s") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(B)[Lgt;", - garbageValue = "17" + signature = "(CI)C", + garbageValue = "1722829704" ) - public static class185[] method327() { - return new class185[]{class185.field2301, class185.field2306, class185.field2298, class185.field2299, class185.field2300, class185.field2304, class185.field2302, class185.field2297, class185.field2303, class185.field2305}; + static char method302(char var0) { + return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; } - @ObfuscatedName("n") + @ObfuscatedName("jg") @ObfuscatedSignature( - signature = "(Lbw;B)V", - garbageValue = "2" + signature = "([Lhy;II)V", + garbageValue = "2021423451" ) - static void method326(GameShell var0) { - if (Login.worldSelectOpen) { - MusicPatchNode.method3772(var0); - } else { - if ((MouseHandler.MouseHandler_lastButton == 1 || !FriendSystem.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { - GrandExchangeOffer.clientPreferences.titleMusicDisabled = !GrandExchangeOffer.clientPreferences.titleMusicDisabled; - GrandExchangeOfferAgeComparator.savePreferences(); - if (!GrandExchangeOffer.clientPreferences.titleMusicDisabled) { - Archive var1 = GrandExchangeEvent.archive6; - int var2 = var1.getGroupId("scape main"); - int var3 = var1.getFileId(var2, ""); - PacketBufferNode.method3574(var1, var2, var3, 255, false); - } else { - class197.midiPcmStream.clear(); - class197.field2378 = 1; - musicTrackArchive = null; - } - } - - if (Client.gameState != 5) { - if (Login.field1179 == -1L) { - Login.field1179 = SequenceDefinition.method4686() + 1000L; - } - - long var12 = SequenceDefinition.method4686(); - boolean var16; - if (Client.archiveLoaders != null && Client.archiveLoaderArchive < Client.archiveLoaders.size()) { - while (true) { - if (Client.archiveLoaderArchive >= Client.archiveLoaders.size()) { - var16 = true; - break; - } - - ArchiveLoader var4 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoaderArchive); - if (!var4.isLoaded()) { - var16 = false; - break; - } - - ++Client.archiveLoaderArchive; + @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 || !NetCache.isComponentHidden(var3))) { + int var5; + if (var3.type == 0) { + if (!var3.isIf3 && NetCache.isComponentHidden(var3) && var3 != class32.mousedOverWidgetIf1) { + continue; } - } else { - var16 = true; - } - if (var16 && Login.field1150 == -1L) { - Login.field1150 = var12; - if (Login.field1150 > Login.field1179) { - Login.field1179 = Login.field1150; + 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 (TaskHandler.loadInterface(var5)) { + drawModelComponents(class289.Widget_interfaceComponents[var5], -1); + } } } - if (Client.gameState == 10 || Client.gameState == 11) { - int var14; - if (class60.clientLanguage == Language.Language_EN) { - if (MouseHandler.MouseHandler_lastButton == 1 || !FriendSystem.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { - var14 = Login.xPadding + 5; - short var5 = 463; - byte var6 = 100; - byte var7 = 35; - if (MouseHandler.MouseHandler_lastPressedX >= var14 && MouseHandler.MouseHandler_lastPressedX <= var14 + var6 && MouseHandler.MouseHandler_lastPressedY >= var5 && MouseHandler.MouseHandler_lastPressedY <= var5 + var7) { - UserComparator7.openWorldSelect(); - return; - } - } - - if (IgnoreList.World_request != null) { - UserComparator7.openWorldSelect(); - } - } - - var14 = MouseHandler.MouseHandler_lastButton; - int var17 = MouseHandler.MouseHandler_lastPressedX; - int var18 = MouseHandler.MouseHandler_lastPressedY; - if (var14 == 0) { - var17 = MouseHandler.MouseHandler_x; - var18 = MouseHandler.MouseHandler_y; - } - - if (!FriendSystem.mouseCam && var14 == 4) { - var14 = 1; - } - - int var8; - short var9; - if (Login.loginIndex == 0) { - boolean var19 = false; - - while (FontName.isKeyDown()) { - if (ReflectionCheck.field1307 == 84) { - var19 = true; - } - } - - var8 = Login.loginBoxCenter - 80; - var9 = 291; - if (var14 == 1 && var17 >= var8 - 75 && var17 <= var8 + 75 && var18 >= var9 - 20 && var18 <= var9 + 20) { - GameObject.openURL(RouteStrategy.method3534("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); - } - - var8 = Login.loginBoxCenter + 80; - if (var14 == 1 && var17 >= var8 - 75 && var17 <= var8 + 75 && var18 >= var9 - 20 && var18 <= var9 + 20 || var19) { - 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 { - GZipDecompressor.method6390(false); - } - } - } else { - int var20; - short var22; - if (Login.loginIndex != 1) { - boolean var10; - int var11; - short var21; - if (Login.loginIndex == 2) { - var21 = 201; - var20 = var21 + 52; - if (var14 == 1 && var18 >= var20 - 12 && var18 < var20 + 2) { - Login.currentLoginField = 0; - } - - var20 += 15; - if (var14 == 1 && var18 >= var20 - 12 && var18 < var20 + 2) { - Login.currentLoginField = 1; - } - - var20 += 15; - var21 = 361; - if (Decimator.field1443 != null) { - var8 = Decimator.field1443.highX / 2; - if (var14 == 1 && var17 >= Decimator.field1443.lowX - var8 && var17 <= var8 + Decimator.field1443.lowX && var18 >= var21 - 15 && var18 < var21) { - switch(Login.field1161) { - case 1: - GrandExchangeOfferOwnWorldComparator.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: - GameObject.openURL("https://support.runescape.com/hc/en-gb", true, false); - } - } - } - - var8 = Login.loginBoxCenter - 80; - var9 = 321; - if (var14 == 1 && var17 >= var8 - 75 && var17 <= var8 + 75 && var18 >= var9 - 20 && var18 <= var9 + 20) { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - GrandExchangeOfferOwnWorldComparator.setLoginResponseString("", "Please enter your username/email address.", ""); - return; - } - - if (Login.Login_password.length() == 0) { - GrandExchangeOfferOwnWorldComparator.setLoginResponseString("", "Please enter your password.", ""); - return; - } - - GrandExchangeOfferOwnWorldComparator.setLoginResponseString("", "Connecting to server...", ""); - WorldMapArea.method358(false); - FloorDecoration.updateGameState(20); - return; - } - - var8 = Login.loginBoxX + 180 + 80; - if (var14 == 1 && var17 >= var8 - 75 && var17 <= var8 + 75 && var18 >= var9 - 20 && var18 <= var9 + 20) { - Login.loginIndex = 0; - Login.Login_username = ""; - Login.Login_password = ""; - SecureRandomCallable.field500 = 0; - WorldMapSection1.otp = ""; - Login.field1171 = true; - } - - var8 = Login.loginBoxCenter + -117; - var9 = 277; - Login.field1169 = var17 >= var8 && var17 < var8 + UserComparator8.field1957 && var18 >= var9 && var18 < var9 + class173.field2079; - if (var14 == 1 && Login.field1169) { - Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; - if (!Client.Login_isUsernameRemembered && GrandExchangeOffer.clientPreferences.rememberedUsername != null) { - GrandExchangeOffer.clientPreferences.rememberedUsername = null; - GrandExchangeOfferAgeComparator.savePreferences(); - } - } - - var8 = Login.loginBoxCenter + 24; - var9 = 277; - Login.field1170 = var17 >= var8 && var17 < var8 + UserComparator8.field1957 && var18 >= var9 && var18 < var9 + class173.field2079; - if (var14 == 1 && Login.field1170) { - GrandExchangeOffer.clientPreferences.hideUsername = !GrandExchangeOffer.clientPreferences.hideUsername; - if (!GrandExchangeOffer.clientPreferences.hideUsername) { - Login.Login_username = ""; - GrandExchangeOffer.clientPreferences.rememberedUsername = null; - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { - Login.currentLoginField = 1; - } else { - Login.currentLoginField = 0; - } - } - - GrandExchangeOfferAgeComparator.savePreferences(); - } - - while (true) { - while (FontName.isKeyDown()) { - var10 = false; - - for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var11) { - if (SpriteMask.field2499 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11)) { - var10 = true; - break; - } - } - - if (ReflectionCheck.field1307 == 13) { - Login.loginIndex = 0; - Login.Login_username = ""; - Login.Login_password = ""; - SecureRandomCallable.field500 = 0; - WorldMapSection1.otp = ""; - Login.field1171 = true; - } else if (Login.currentLoginField == 0) { - if (ReflectionCheck.field1307 == 85 && Login.Login_username.length() > 0) { - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (ReflectionCheck.field1307 == 84 || ReflectionCheck.field1307 == 80) { - Login.currentLoginField = 1; - } - - if (var10 && Login.Login_username.length() < 320) { - Login.Login_username = Login.Login_username + SpriteMask.field2499; - } - } else if (Login.currentLoginField == 1) { - if (ReflectionCheck.field1307 == 85 && Login.Login_password.length() > 0) { - Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); - } - - if (ReflectionCheck.field1307 == 84 || ReflectionCheck.field1307 == 80) { - Login.currentLoginField = 0; - } - - if (ReflectionCheck.field1307 == 84) { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - GrandExchangeOfferOwnWorldComparator.setLoginResponseString("", "Please enter your username/email address.", ""); - return; - } - - if (Login.Login_password.length() == 0) { - GrandExchangeOfferOwnWorldComparator.setLoginResponseString("", "Please enter your password.", ""); - return; - } - - GrandExchangeOfferOwnWorldComparator.setLoginResponseString("", "Connecting to server...", ""); - WorldMapArea.method358(false); - FloorDecoration.updateGameState(20); - return; - } - - if (var10 && Login.Login_password.length() < 20) { - Login.Login_password = Login.Login_password + SpriteMask.field2499; - } - } - } - - return; - } - } else if (Login.loginIndex == 3) { - var20 = Login.loginBoxX + 180; - var22 = 276; - if (var14 == 1 && var17 >= var20 - 75 && var17 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { - GZipDecompressor.method6390(false); - } - - var20 = Login.loginBoxX + 180; - var22 = 326; - if (var14 == 1 && var17 >= var20 - 75 && var17 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { - GrandExchangeOfferOwnWorldComparator.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 var24; - if (Login.loginIndex == 4) { - var20 = Login.loginBoxX + 180 - 80; - var22 = 321; - if (var14 == 1 && var17 >= var20 - 75 && var17 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { - WorldMapSection1.otp.trim(); - if (WorldMapSection1.otp.length() != 6) { - GrandExchangeOfferOwnWorldComparator.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); - return; - } - - SecureRandomCallable.field500 = Integer.parseInt(WorldMapSection1.otp); - WorldMapSection1.otp = ""; - WorldMapArea.method358(true); - GrandExchangeOfferOwnWorldComparator.setLoginResponseString("", "Connecting to server...", ""); - FloorDecoration.updateGameState(20); - return; - } - - if (var14 == 1 && var17 >= Login.loginBoxX + 180 - 9 && var17 <= Login.loginBoxX + 180 + 130 && var18 >= 263 && var18 <= 296) { - Login.field1171 = !Login.field1171; - } - - if (var14 == 1 && var17 >= Login.loginBoxX + 180 - 34 && var17 <= Login.loginBoxX + 34 + 180 && var18 >= 351 && var18 <= 363) { - GameObject.openURL(RouteStrategy.method3534("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); - } - - var20 = Login.loginBoxX + 180 + 80; - if (var14 == 1 && var17 >= var20 - 75 && var17 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { - Login.loginIndex = 0; - Login.Login_username = ""; - Login.Login_password = ""; - SecureRandomCallable.field500 = 0; - WorldMapSection1.otp = ""; - } - - while (FontName.isKeyDown()) { - boolean var23 = false; - - for (var24 = 0; var24 < "1234567890".length(); ++var24) { - if (SpriteMask.field2499 == "1234567890".charAt(var24)) { - var23 = true; - break; - } - } - - if (ReflectionCheck.field1307 == 13) { - Login.loginIndex = 0; - Login.Login_username = ""; - Login.Login_password = ""; - SecureRandomCallable.field500 = 0; - WorldMapSection1.otp = ""; - } else { - if (ReflectionCheck.field1307 == 85 && WorldMapSection1.otp.length() > 0) { - WorldMapSection1.otp = WorldMapSection1.otp.substring(0, WorldMapSection1.otp.length() - 1); - } - - if (ReflectionCheck.field1307 == 84) { - WorldMapSection1.otp.trim(); - if (WorldMapSection1.otp.length() != 6) { - GrandExchangeOfferOwnWorldComparator.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); - return; - } - - SecureRandomCallable.field500 = Integer.parseInt(WorldMapSection1.otp); - WorldMapSection1.otp = ""; - WorldMapArea.method358(true); - GrandExchangeOfferOwnWorldComparator.setLoginResponseString("", "Connecting to server...", ""); - FloorDecoration.updateGameState(20); - return; - } - - if (var23 && WorldMapSection1.otp.length() < 6) { - WorldMapSection1.otp = WorldMapSection1.otp + SpriteMask.field2499; - } - } - } - } else if (Login.loginIndex == 5) { - var20 = Login.loginBoxX + 180 - 80; - var22 = 321; - if (var14 == 1 && var17 >= var20 - 75 && var17 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { - ItemContainer.method1118(); - return; - } - - var20 = Login.loginBoxX + 180 + 80; - if (var14 == 1 && var17 >= var20 - 75 && var17 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { - GZipDecompressor.method6390(true); - } - - var9 = 361; - if (MusicPatchPcmStream.field2466 != null) { - var24 = MusicPatchPcmStream.field2466.highX / 2; - if (var14 == 1 && var17 >= MusicPatchPcmStream.field2466.lowX - var24 && var17 <= var24 + MusicPatchPcmStream.field2466.lowX && var18 >= var9 - 15 && var18 < var9) { - GameObject.openURL(RouteStrategy.method3534("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); - } - } - - while (FontName.isKeyDown()) { - var10 = false; - - for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var11) { - if (SpriteMask.field2499 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11)) { - var10 = true; - break; - } - } - - if (ReflectionCheck.field1307 == 13) { - GZipDecompressor.method6390(true); - } else { - if (ReflectionCheck.field1307 == 85 && Login.Login_username.length() > 0) { - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (ReflectionCheck.field1307 == 84) { - ItemContainer.method1118(); - return; - } - - if (var10 && Login.Login_username.length() < 320) { - Login.Login_username = Login.Login_username + SpriteMask.field2499; - } - } - } - } else if (Login.loginIndex == 6) { - while (true) { - do { - if (!FontName.isKeyDown()) { - var21 = 321; - if (var14 == 1 && var18 >= var21 - 20 && var18 <= var21 + 20) { - GZipDecompressor.method6390(true); - } - - return; - } - } while(ReflectionCheck.field1307 != 84 && ReflectionCheck.field1307 != 13); - - GZipDecompressor.method6390(true); - } - } else if (Login.loginIndex == 7) { - var20 = Login.loginBoxX + 180 - 80; - var22 = 321; - if (var14 == 1 && var17 >= var20 - 75 && var17 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { - GameObject.openURL(RouteStrategy.method3534("secure", true) + "m=dob/set_dob.ws", true, false); - GrandExchangeOfferOwnWorldComparator.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); - Login.loginIndex = 6; - return; - } - - var20 = Login.loginBoxX + 180 + 80; - if (var14 == 1 && var17 >= var20 - 75 && var17 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { - GZipDecompressor.method6390(true); - } - } else if (Login.loginIndex == 8) { - var20 = Login.loginBoxX + 180 - 80; - var22 = 321; - if (var14 == 1 && var17 >= var20 - 75 && var17 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { - GameObject.openURL("https://www.jagex.com/terms/privacy/#eight", true, false); - GrandExchangeOfferOwnWorldComparator.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); - Login.loginIndex = 6; - return; - } - - var20 = Login.loginBoxX + 180 + 80; - if (var14 == 1 && var17 >= var20 - 75 && var17 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { - GZipDecompressor.method6390(true); - } - } else if (Login.loginIndex == 12) { - String var15 = ""; - switch(Login.field1160) { - case 0: - var15 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; - break; - case 1: - var15 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; - break; - default: - GZipDecompressor.method6390(false); - } - - var8 = Login.loginBoxX + 180; - var9 = 276; - if (var14 == 1 && var17 >= var8 - 75 && var17 <= var8 + 75 && var18 >= var9 - 20 && var18 <= var9 + 20) { - GameObject.openURL(var15, true, false); - GrandExchangeOfferOwnWorldComparator.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); - Login.loginIndex = 6; - return; - } - - var8 = Login.loginBoxX + 180; - var9 = 326; - if (var14 == 1 && var17 >= var8 - 75 && var17 <= var8 + 75 && var18 >= var9 - 20 && var18 <= var9 + 20) { - GZipDecompressor.method6390(false); - } - } else if (Login.loginIndex == 24) { - var20 = Login.loginBoxX + 180; - var22 = 301; - if (var14 == 1 && var17 >= var20 - 75 && var17 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { - GZipDecompressor.method6390(false); - } - } - } + if (var3.type == 6) { + if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { + boolean var7 = Tile.runCs1(var3); + if (var7) { + var5 = var3.sequenceId2; } else { - while (FontName.isKeyDown()) { - if (ReflectionCheck.field1307 == 84) { - GZipDecompressor.method6390(false); - } else if (ReflectionCheck.field1307 == 13) { - Login.loginIndex = 0; + var5 = var3.sequenceId; + } + + if (var5 != -1) { + SequenceDefinition var6 = class83.SequenceDefinition_get(var5); + + for (var3.modelFrameCycle += Client.field683; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; WorldMapID.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; + } } } - - var20 = Login.loginBoxCenter - 80; - var22 = 321; - if (var14 == 1 && var17 >= var20 - 75 && var17 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { - GZipDecompressor.method6390(false); - } - - var20 = Login.loginBoxCenter + 80; - if (var14 == 1 && var17 >= var20 - 75 && var17 <= var20 + 75 && var18 >= var22 - 20 && var18 <= var22 + 20) { - Login.loginIndex = 0; - } } } + if (var3.field2594 != 0 && !var3.isIf3) { + int var8 = var3.field2594 >> 16; + var5 = var3.field2594 << 16 >> 16; + var8 *= Client.field683; + var5 *= Client.field683; + var3.modelAngleX = var8 + var3.modelAngleX & 2047; + var3.modelAngleY = var5 + var3.modelAngleY & 2047; + WorldMapID.invalidateWidget(var3); + } } } } + } } diff --git a/runescape-client/src/main/java/WorldMapDecorationType.java b/runescape-client/src/main/java/WorldMapDecorationType.java index f8d5412fe9..4e81c592d1 100644 --- a/runescape-client/src/main/java/WorldMapDecorationType.java +++ b/runescape-client/src/main/java/WorldMapDecorationType.java @@ -1,131 +1,136 @@ +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("hb") +@ObfuscatedName("ha") @Implements("WorldMapDecorationType") public enum WorldMapDecorationType implements Enumerated { - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "Lhb;" - ) - field2701(0, 0), - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "Lhb;" - ) - field2703(1, 0), - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lhb;" - ) - field2702(2, 0), - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Lhb;" - ) - field2704(3, 0), - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lhb;" - ) - field2721(9, 2), - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "Lhb;" - ) - field2718(4, 1), - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Lhb;" - ) - field2706(5, 1), - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "Lhb;" - ) - field2707(6, 1), - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lhb;" - ) - field2708(7, 1), - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "Lhb;" - ) - field2709(8, 1), - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Lhb;" - ) - field2710(12, 2), @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lhb;" + signature = "Lha;" ) - field2700(13, 2), - @ObfuscatedName("r") + field2704(0, 0), + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lhb;" + signature = "Lha;" ) - field2712(14, 2), - @ObfuscatedName("y") + field2694(1, 0), + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lhb;" + signature = "Lha;" ) - field2713(15, 2), - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lhb;" - ) - field2714(16, 2), - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Lhb;" - ) - field2715(17, 2), + field2695(2, 0), @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lhb;" + signature = "Lha;" ) - field2716(18, 2), - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lhb;" - ) - field2717(19, 2), - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "Lhb;" - ) - field2720(20, 2), - @ObfuscatedName("a") - @ObfuscatedSignature( - signature = "Lhb;" - ) - field2719(21, 2), - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lhb;" - ) - field2711(10, 2), + field2697(3, 0), @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Lhb;" + signature = "Lha;" ) - field2705(11, 2), + field2698(9, 2), + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2699(4, 1), + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2700(5, 1), + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2701(6, 1), + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2702(7, 1), + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2703(8, 1), + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2708(12, 2), @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Lhb;" + signature = "Lha;" ) - field2722(22, 3); + field2709(13, 2), + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2706(14, 2), + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2705(15, 2), + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2717(16, 2), + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2696(17, 2), + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2710(18, 2), + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2711(19, 2), + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2712(20, 2), + @ObfuscatedName("r") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2713(21, 2), + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2714(10, 2), + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2715(11, 2), + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Lha;" + ) + field2716(22, 3); - @ObfuscatedName("v") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1508062065 + intValue = -465928431 ) @Export("id") public final int id; @@ -138,57 +143,218 @@ public enum WorldMapDecorationType implements Enumerated { this.id = var3; } - @ObfuscatedName("j") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-32" + signature = "(I)I", + garbageValue = "-1410702910" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("jx") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Lhp;B)V", - garbageValue = "10" + signature = "(B)V", + garbageValue = "25" ) - static final void method4030(Widget var0) { - int var1 = var0.contentType; - if (var1 == 324) { - if (Client.field733 == -1) { - Client.field733 = var0.spriteId2; - Client.field888 = var0.spriteId; + static void method4099() { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + Canvas.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(GrandExchangeEvents.method67("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 var23 = var7.readLong(); + var1 = var23; + break; + } + + var7.offset += var8; + if (var7.offset >= 1000) { + var1 = 0L; + break; + } + } + } catch (Exception var34) { + var1 = 0L; } - if (Client.playerAppearance.isFemale) { - var0.spriteId2 = Client.field733; + byte var0; + if (var1 == 0L) { + var0 = 5; } else { - var0.spriteId2 = Client.field888; + String var35 = Login.Login_username; + Random var36 = new Random(); + Buffer var27 = new Buffer(128); + Buffer var9 = new Buffer(128); + int[] var10 = new int[]{var36.nextInt(), var36.nextInt(), (int)(var1 >> 32), (int)var1}; + var27.writeByte(10); + + int var11; + for (var11 = 0; var11 < 4; ++var11) { + var27.writeInt(var36.nextInt()); + } + + var27.writeInt(var10[0]); + var27.writeInt(var10[1]); + var27.writeLong(var1); + var27.writeLong(0L); + + for (var11 = 0; var11 < 4; ++var11) { + var27.writeInt(var36.nextInt()); + } + + var27.encryptRsa(class80.field1105, class80.field1106); + var9.writeByte(10); + + for (var11 = 0; var11 < 3; ++var11) { + var9.writeInt(var36.nextInt()); + } + + var9.writeLong(var36.nextLong()); + var9.writeLongMedium(var36.nextLong()); + SequenceDefinition.method4770(var9); + var9.writeLong(var36.nextLong()); + var9.encryptRsa(class80.field1105, class80.field1106); + var11 = Varcs.stringCp1252NullTerminatedByteSize(var35); + if (var11 % 8 != 0) { + var11 += 8 - var11 % 8; + } + + Buffer var12 = new Buffer(var11); + var12.writeStringCp1252NullTerminated(var35); + var12.offset = var11; + var12.xteaEncryptAll(var10); + Buffer var13 = new Buffer(var12.offset + var27.offset + var9.offset + 5); + var13.writeByte(2); + var13.writeByte(var27.offset); + var13.writeBytes(var27.array, 0, var27.offset); + var13.writeByte(var9.offset); + var13.writeBytes(var9.array, 0, var9.offset); + var13.writeShort(var12.offset); + var13.writeBytes(var12.array, 0, var12.offset); + byte[] var15 = var13.array; + int var17 = var15.length; + StringBuilder var18 = new StringBuilder(); + + int var21; + for (int var19 = 0; var19 < var17 + 0; var19 += 3) { + int var20 = var15[var19] & 255; + var18.append(class289.field3626[var20 >>> 2]); + if (var19 < var17 - 1) { + var21 = var15[var19 + 1] & 255; + var18.append(class289.field3626[(var20 & 3) << 4 | var21 >>> 4]); + if (var19 < var17 - 2) { + int var22 = var15[var19 + 2] & 255; + var18.append(class289.field3626[(var21 & 15) << 2 | var22 >>> 6]).append(class289.field3626[var22 & 63]); + } else { + var18.append(class289.field3626[(var21 & 15) << 2]).append("="); + } + } else { + var18.append(class289.field3626[(var20 & 3) << 4]).append("=="); + } + } + + String var16 = var18.toString(); + var16 = var16; + + byte var31; + try { + URL var28 = new URL(GrandExchangeEvents.method67("services", false) + "m=accountappeal/login.ws"); + URLConnection var37 = var28.openConnection(); + var37.setDoInput(true); + var37.setDoOutput(true); + var37.setConnectTimeout(5000); + OutputStreamWriter var29 = new OutputStreamWriter(var37.getOutputStream()); + var29.write("data2=" + FriendsList.method5163(var16) + "&dest=" + FriendsList.method5163("passwordchoice.ws")); + var29.flush(); + InputStream var30 = var37.getInputStream(); + var13 = new Buffer(new byte[1000]); + + while (true) { + var21 = var30.read(var13.array, var13.offset, 1000 - var13.offset); + if (var21 == -1) { + var29.close(); + var30.close(); + String var32 = new String(var13.array); + if (var32.startsWith("OFFLINE")) { + var31 = 4; + } else if (var32.startsWith("WRONG")) { + var31 = 7; + } else if (var32.startsWith("RELOAD")) { + var31 = 3; + } else if (var32.startsWith("Not permitted for social network accounts.")) { + var31 = 6; + } else { + var13.xteaDecryptAll(var10); + + while (var13.offset > 0 && var13.array[var13.offset - 1] == 0) { + --var13.offset; + } + + var32 = new String(var13.array, 0, var13.offset); + if (MouseRecorder.isValidURL(var32)) { + WorldMapIcon_0.openURL(var32, true, false); + var31 = 2; + } else { + var31 = 5; + } + } + break; + } + + var13.offset += var21; + if (var13.offset >= 1000) { + var31 = 5; + break; + } + } + } catch (Throwable var33) { + var33.printStackTrace(); + var31 = 5; + } + + var0 = var31; } - } else if (var1 == 325) { - if (Client.field733 == -1) { - Client.field733 = var0.spriteId2; - Client.field888 = var0.spriteId; + switch(var0) { + case 2: + Canvas.setLoginResponseString(Strings.field3008, Strings.field2966, Strings.field2844); + Login.loginIndex = 6; + break; + case 3: + Canvas.setLoginResponseString("", "Error connecting to server.", ""); + break; + case 4: + Canvas.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); + break; + case 5: + Canvas.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); + break; + case 6: + Canvas.setLoginResponseString("", "Error connecting to server.", ""); + break; + case 7: + Canvas.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."); } - if (Client.playerAppearance.isFemale) { - var0.spriteId2 = Client.field888; - } else { - var0.spriteId2 = Client.field733; - } - - } 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/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index ff479c4e84..f461384360 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -4,112 +4,112 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iq") +@ObfuscatedName("iu") @Implements("WorldMapElement") public class WorldMapElement extends DualNode { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "Lhz;" ) @Export("WorldMapElement_archive") public static AbstractArchive WorldMapElement_archive; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "[Liq;" + signature = "[Liu;" ) @Export("WorldMapElement_cached") public static WorldMapElement[] WorldMapElement_cached; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -855102923 + intValue = 471217631 ) @Export("WorldMapElement_count") public static int WorldMapElement_count; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lep;" + signature = "Let;" ) @Export("WorldMapElement_cachedSprites") static EvictingDualNodeHashTable WorldMapElement_cachedSprites; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1739070481 + intValue = 1264216493 ) @Export("objectId") public final int objectId; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1614113825 + intValue = -617299153 ) @Export("sprite1") public int sprite1; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1422179555 + intValue = 599415769 ) @Export("sprite2") int sprite2; - @ObfuscatedName("q") + @ObfuscatedName("v") @Export("name") public String name; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -662975939 - ) - public int field3200; @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -885213857 + intValue = -732973265 + ) + public int field3195; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -215017427 ) @Export("textSize") public int textSize; - @ObfuscatedName("c") + @ObfuscatedName("h") @Export("menuActions") public String[] menuActions; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("menuTargetName") public String menuTargetName; - @ObfuscatedName("y") - int[] field3201; + @ObfuscatedName("s") + int[] field3183; @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -614594231 + intValue = -391425933 ) - int field3204; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -1806876145 - ) - int field3206; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -1042672469 - ) - int field3207; + int field3194; @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -566631507 + intValue = -1176780449 ) - int field3208; - @ObfuscatedName("z") + int field3198; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 284270197 + ) + int field3199; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -572189601 + ) + int field3200; + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lib;" + signature = "Lie;" ) @Export("horizontalAlignment") public HorizontalAlignment horizontalAlignment; - @ObfuscatedName("a") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "Lia;" + signature = "Lii;" ) @Export("verticalAlignment") public VerticalAlignment verticalAlignment; + @ObfuscatedName("k") + int[] field3203; @ObfuscatedName("w") - int[] field3211; - @ObfuscatedName("l") - byte[] field3192; - @ObfuscatedName("h") + byte[] field3204; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -481850779 + intValue = 1900378841 ) @Export("category") public int category; @@ -123,20 +123,20 @@ public class WorldMapElement extends DualNode { this.sprite2 = -1; this.textSize = 0; this.menuActions = new String[5]; - this.field3204 = Integer.MAX_VALUE; - this.field3206 = Integer.MAX_VALUE; - this.field3207 = Integer.MIN_VALUE; - this.field3208 = Integer.MIN_VALUE; + this.field3194 = Integer.MAX_VALUE; + this.field3198 = Integer.MAX_VALUE; + this.field3199 = Integer.MIN_VALUE; + this.field3200 = Integer.MIN_VALUE; this.horizontalAlignment = HorizontalAlignment.HorizontalAlignment_centered; this.verticalAlignment = VerticalAlignment.VerticalAlignment_centered; this.category = -1; this.objectId = var1; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lky;I)V", - garbageValue = "-46357468" + signature = "(Lkz;I)V", + garbageValue = "-766770853" ) @Export("decode") public void decode(Buffer var1) { @@ -150,21 +150,21 @@ public class WorldMapElement extends DualNode { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lky;II)V", - garbageValue = "-1426592379" + signature = "(Lkz;II)V", + garbageValue = "801744823" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { - this.sprite1 = var1.method5602(); + this.sprite1 = var1.method5623(); } else if (var2 == 2) { - this.sprite2 = var1.method5602(); + this.sprite2 = var1.method5623(); } else if (var2 == 3) { this.name = var1.readStringCp1252NullTerminated(); } else if (var2 == 4) { - this.field3200 = var1.readMedium(); + this.field3195 = var1.readMedium(); } else if (var2 == 5) { var1.readMedium(); } else if (var2 == 6) { @@ -184,32 +184,32 @@ public class WorldMapElement extends DualNode { this.menuActions[var2 - 10] = var1.readStringCp1252NullTerminated(); } else if (var2 == 15) { var3 = var1.readUnsignedByte(); - this.field3201 = new int[var3 * 2]; + this.field3183 = new int[var3 * 2]; int var4; for (var4 = 0; var4 < var3 * 2; ++var4) { - this.field3201[var4] = var1.readShort(); + this.field3183[var4] = var1.readShort(); } var1.readInt(); var4 = var1.readUnsignedByte(); - this.field3211 = new int[var4]; + this.field3203 = new int[var4]; int var5; - for (var5 = 0; var5 < this.field3211.length; ++var5) { - this.field3211[var5] = var1.readInt(); + for (var5 = 0; var5 < this.field3203.length; ++var5) { + this.field3203[var5] = var1.readInt(); } - this.field3192 = new byte[var3]; + this.field3204 = new byte[var3]; for (var5 = 0; var5 < var3; ++var5) { - this.field3192[var5] = var1.readByte(); + this.field3204[var5] = var1.readByte(); } } else if (var2 != 16) { if (var2 == 17) { this.menuTargetName = var1.readStringCp1252NullTerminated(); } else if (var2 == 18) { - var1.method5602(); + var1.method5623(); } else if (var2 == 19) { this.category = var1.readUnsignedShort(); } else if (var2 == 21) { @@ -224,48 +224,47 @@ public class WorldMapElement extends DualNode { var1.readShort(); var1.readShort(); } else if (var2 == 25) { - var1.method5602(); + var1.method5623(); } else if (var2 == 28) { var1.readUnsignedByte(); } else if (var2 == 29) { - HorizontalAlignment[] var6 = new HorizontalAlignment[]{HorizontalAlignment.field3435, HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field3436}; - this.horizontalAlignment = (HorizontalAlignment)FriendSystem.findEnumerated(var6, var1.readUnsignedByte()); + this.horizontalAlignment = (HorizontalAlignment)ServerPacket.findEnumerated(VarcInt.method4396(), var1.readUnsignedByte()); } else if (var2 == 30) { - this.verticalAlignment = (VerticalAlignment)FriendSystem.findEnumerated(FriendSystem.method1830(), var1.readUnsignedByte()); + this.verticalAlignment = (VerticalAlignment)ServerPacket.findEnumerated(ItemContainer.method1120(), var1.readUnsignedByte()); } } } } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "89" + signature = "(I)V", + garbageValue = "1597557891" ) - public void method4290() { - if (this.field3201 != null) { - for (int var1 = 0; var1 < this.field3201.length; var1 += 2) { - if (this.field3201[var1] < this.field3204) { - this.field3204 = this.field3201[var1]; - } else if (this.field3201[var1] > this.field3207) { - this.field3207 = this.field3201[var1]; + public void method4378() { + if (this.field3183 != null) { + for (int var1 = 0; var1 < this.field3183.length; var1 += 2) { + if (this.field3183[var1] < this.field3194) { + this.field3194 = this.field3183[var1]; + } else if (this.field3183[var1] > this.field3199) { + this.field3199 = this.field3183[var1]; } - if (this.field3201[var1 + 1] < this.field3206) { - this.field3206 = this.field3201[var1 + 1]; - } else if (this.field3201[var1 + 1] > this.field3208) { - this.field3208 = this.field3201[var1 + 1]; + if (this.field3183[var1 + 1] < this.field3198) { + this.field3198 = this.field3183[var1 + 1]; + } else if (this.field3183[var1 + 1] > this.field3200) { + this.field3200 = this.field3183[var1 + 1]; } } } } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(ZI)Lls;", - garbageValue = "-944749033" + signature = "(ZB)Lli;", + garbageValue = "24" ) @Export("getSpriteBool") public Sprite getSpriteBool(boolean var1) { @@ -273,10 +272,10 @@ public class WorldMapElement extends DualNode { return this.getSprite(var2); } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(II)Lls;", - garbageValue = "-995868610" + signature = "(IB)Lli;", + garbageValue = "37" ) @Export("getSprite") Sprite getSprite(int var1) { @@ -287,7 +286,7 @@ public class WorldMapElement extends DualNode { if (var2 != null) { return var2; } else { - var2 = TilePaint.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); + var2 = FillMode.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); if (var2 != null) { WorldMapElement_cachedSprites.put(var2, (long)var1); } @@ -297,367 +296,127 @@ public class WorldMapElement extends DualNode { } } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-2089637637" + garbageValue = "-854181096" ) @Export("getObjectId") public int getObjectId() { return this.objectId; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IB)Lhp;", - garbageValue = "-72" + signature = "(IB)I", + garbageValue = "-13" ) - @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 = Projectile.loadInterface(var1); - if (!var3) { - return null; + public static int method4390(int var0) { + return var0 >> 11 & 63; + } + + @ObfuscatedName("hi") + @ObfuscatedSignature( + signature = "(ZLkt;B)V", + garbageValue = "-4" + ) + @Export("updateNpcs") + static final void updateNpcs(boolean var0, PacketBuffer var1) { + Client.field742 = 0; + Client.field666 = 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.field731[++Client.field742 - 1] = Client.npcIndices[var4]; } } - return Widget.Widget_interfaceComponents[var1][var2]; - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "([BB)V", - garbageValue = "41" - ) - @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; + if (var3 > Client.npcCount) { + throw new RuntimeException(""); } else { - if (FaceNormal.ByteArrayPool_arrays != null) { - for (int var1 = 0; var1 < UserComparator4.ByteArrayPool_alternativeSizes.length; ++var1) { - if (var0.length == UserComparator4.ByteArrayPool_alternativeSizes[var1] && ByteArrayPool.ByteArrayPool_altSizeArrayCounts[var1] < FaceNormal.ByteArrayPool_arrays[var1].length) { - FaceNormal.ByteArrayPool_arrays[var1][ByteArrayPool.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; - return; + Client.npcCount = 0; + + for (var4 = 0; var4 < var3; ++var4) { + int var5 = Client.npcIndices[var4]; + NPC var6 = Client.npcs[var5]; + int var7 = var2.readBits(1); + if (var7 == 0) { + Client.npcIndices[++Client.npcCount - 1] = var5; + var6.npcCycle = Client.cycle; + } else { + int var8 = var2.readBits(2); + if (var8 == 0) { + Client.npcIndices[++Client.npcCount - 1] = var5; + var6.npcCycle = Client.cycle; + Client.field881[++Client.field666 - 1] = var5; + } else { + int var9; + int var10; + if (var8 == 1) { + Client.npcIndices[++Client.npcCount - 1] = var5; + var6.npcCycle = Client.cycle; + var9 = var2.readBits(3); + var6.method2010(var9, (byte)1); + var10 = var2.readBits(1); + if (var10 == 1) { + Client.field881[++Client.field666 - 1] = var5; + } + } else if (var8 == 2) { + Client.npcIndices[++Client.npcCount - 1] = var5; + var6.npcCycle = Client.cycle; + var9 = var2.readBits(3); + var6.method2010(var9, (byte)2); + var10 = var2.readBits(3); + var6.method2010(var10, (byte)2); + int var11 = var2.readBits(1); + if (var11 == 1) { + Client.field881[++Client.field666 - 1] = var5; + } + } else if (var8 == 3) { + Client.field731[++Client.field742 - 1] = var5; + } } } } + class1.method15(var0, var1); + ObjectSound.method1888(var1); + + int var12; + for (var12 = 0; var12 < Client.field742; ++var12) { + var3 = Client.field731[var12]; + 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 (var12 = 0; var12 < Client.npcCount; ++var12) { + if (Client.npcs[Client.npcIndices[var12]] == null) { + throw new RuntimeException(var12 + "," + Client.npcCount); + } + } + + } } } - @ObfuscatedName("gt") + @ObfuscatedName("hs") @ObfuscatedSignature( signature = "(IIIII)V", - garbageValue = "-1612596971" + garbageValue = "-1891347440" ) - @Export("drawEntities") - static final void drawEntities(int var0, int var1, int var2, int var3) { - ++Client.viewportDrawCount; - if (WorldMapIcon_1.localPlayer.x >> 7 == Client.destinationX && WorldMapIcon_1.localPlayer.y >> 7 == Client.destinationY) { - Client.destinationX = 0; - } - - if (Client.renderSelf) { - class80.addPlayerToScene(WorldMapIcon_1.localPlayer, false); - } - - AbstractByteArrayCopier.method3878(); - KeyHandler.addNpcsToScene(true); - InvDefinition.method4273(); - KeyHandler.addNpcsToScene(false); - ModelData0.drawProjectiles(); - ServerPacket.method3555(); - LoginScreenAnimation.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 var4; - int var5; - int var6; - int var7; - int var8; - int var9; - int var10; - int var11; - int var12; - int var13; - int var14; - if (!Client.isCameraLocked) { - var4 = Client.camAngleX; - if (Client.field635 / 256 > var4) { - var4 = Client.field635 / 256; + static final void method4392(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.field828[var4] = true; } - - if (Client.field897[4] && Client.field694[4] + 128 > var4) { - var4 = Client.field694[4] + 128; - } - - var5 = Client.camAngleY & 2047; - var6 = DynamicObject.oculusOrbFocalPointX; - var7 = ScriptEvent.field559; - var8 = FriendSystem.oculusOrbFocalPointY; - var9 = var4 * 3 + 600; - var10 = ArchiveLoader.method1100(var9, var3); - var11 = 2048 - var4 & 2047; - var12 = 2048 - var5 & 2047; - var13 = 0; - var14 = 0; - int var15 = var10; - int var16; - int var17; - int var18; - if (var11 != 0) { - var16 = Rasterizer3D.Rasterizer3D_sine[var11]; - var17 = Rasterizer3D.Rasterizer3D_cosine[var11]; - var18 = var17 * var14 - var10 * var16 >> 16; - var15 = var17 * var10 + var16 * var14 >> 16; - var14 = var18; - } - - if (var12 != 0) { - var16 = Rasterizer3D.Rasterizer3D_sine[var12]; - var17 = Rasterizer3D.Rasterizer3D_cosine[var12]; - var18 = var15 * var16 + var17 * var13 >> 16; - var15 = var17 * var15 - var13 * var16 >> 16; - var13 = var18; - } - - WallDecoration.cameraX = var6 - var13; - Coord.cameraY = var7 - var14; - UserComparator7.cameraZ = var8 - var15; - class43.cameraPitch = var4; - class40.cameraYaw = var5; - if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (DynamicObject.oculusOrbFocalPointX >> 7 != WorldMapIcon_1.localPlayer.x >> 7 || FriendSystem.oculusOrbFocalPointY >> 7 != WorldMapIcon_1.localPlayer.y >> 7)) { - var16 = WorldMapIcon_1.localPlayer.plane; - var17 = PacketWriter.baseX * 64 + (DynamicObject.oculusOrbFocalPointX >> 7); - var18 = RouteStrategy.baseY * 64 + (FriendSystem.oculusOrbFocalPointY >> 7); - BoundaryObject.method3215(var17, var18, var16, true); - } - } - - if (!Client.isCameraLocked) { - if (GrandExchangeOffer.clientPreferences.roofsHidden) { - var5 = ItemContainer.plane; - } else { - label391: { - var6 = 3; - if (class43.cameraPitch < 310) { - label389: { - if (Client.oculusOrbState == 1) { - var7 = DynamicObject.oculusOrbFocalPointX >> 7; - var8 = FriendSystem.oculusOrbFocalPointY >> 7; - } else { - var7 = WorldMapIcon_1.localPlayer.x >> 7; - var8 = WorldMapIcon_1.localPlayer.y >> 7; - } - - var9 = WallDecoration.cameraX >> 7; - var10 = UserComparator7.cameraZ >> 7; - if (var9 >= 0 && var10 >= 0 && var9 < 104 && var10 < 104) { - if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { - if ((Tiles.Tiles_renderFlags[ItemContainer.plane][var9][var10] & 4) != 0) { - var6 = ItemContainer.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 (true) { - if (var9 == var7) { - break label389; - } - - if (var9 < var7) { - ++var9; - } else if (var9 > var7) { - --var9; - } - - if ((Tiles.Tiles_renderFlags[ItemContainer.plane][var9][var10] & 4) != 0) { - var6 = ItemContainer.plane; - } - - var14 += var13; - if (var14 >= 65536) { - var14 -= 65536; - if (var10 < var8) { - ++var10; - } else if (var10 > var8) { - --var10; - } - - if ((Tiles.Tiles_renderFlags[ItemContainer.plane][var9][var10] & 4) != 0) { - var6 = ItemContainer.plane; - } - } - } - } else { - if (var12 > 0) { - var13 = var11 * 65536 / var12; - var14 = 32768; - - while (var10 != var8) { - if (var10 < var8) { - ++var10; - } else if (var10 > var8) { - --var10; - } - - if ((Tiles.Tiles_renderFlags[ItemContainer.plane][var9][var10] & 4) != 0) { - var6 = ItemContainer.plane; - } - - var14 += var13; - if (var14 >= 65536) { - var14 -= 65536; - if (var9 < var7) { - ++var9; - } else if (var9 > var7) { - --var9; - } - - if ((Tiles.Tiles_renderFlags[ItemContainer.plane][var9][var10] & 4) != 0) { - var6 = ItemContainer.plane; - } - } - } - } - break label389; - } - } - - var5 = ItemContainer.plane; - break label391; - } - - var5 = ItemContainer.plane; - break label391; - } - } - - if (WorldMapIcon_1.localPlayer.x >= 0 && WorldMapIcon_1.localPlayer.y >= 0 && WorldMapIcon_1.localPlayer.x < 13312 && WorldMapIcon_1.localPlayer.y < 13312) { - if ((Tiles.Tiles_renderFlags[ItemContainer.plane][WorldMapIcon_1.localPlayer.x >> 7][WorldMapIcon_1.localPlayer.y >> 7] & 4) != 0) { - var6 = ItemContainer.plane; - } - - var5 = var6; - } else { - var5 = ItemContainer.plane; - } - } - } - - var4 = var5; - } else { - var4 = WorldMapData_0.getHighestVisiblePlane(); - } - - var5 = WallDecoration.cameraX; - var6 = Coord.cameraY; - var7 = UserComparator7.cameraZ; - var8 = class43.cameraPitch; - var9 = class40.cameraYaw; - - for (var10 = 0; var10 < 5; ++var10) { - if (Client.field897[var10]) { - var11 = (int)(Math.random() * (double)(Client.field869[var10] * 2 + 1) - (double)Client.field869[var10] + Math.sin((double)Client.field872[var10] * ((double)Client.field758[var10] / 100.0D)) * (double)Client.field694[var10]); - if (var10 == 0) { - WallDecoration.cameraX += var11; - } - - if (var10 == 1) { - Coord.cameraY += var11; - } - - if (var10 == 2) { - UserComparator7.cameraZ += var11; - } - - if (var10 == 3) { - class40.cameraYaw = var11 + class40.cameraYaw & 2047; - } - - if (var10 == 4) { - class43.cameraPitch += var11; - if (class43.cameraPitch < 128) { - class43.cameraPitch = 128; - } - - if (class43.cameraPitch > 383) { - class43.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) { - ItemDefinition.method4629(var10 - var0, var11 - var1); - } else { - ViewportMouse.ViewportMouse_isInViewport = false; - ViewportMouse.ViewportMouse_entityCount = 0; - } - - WorldMapSectionType.playPcmPlayers(); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); - WorldMapSectionType.playPcmPlayers(); - var12 = Rasterizer3D.Rasterizer3D_zoom; - Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; - Player.scene.draw(WallDecoration.cameraX, Coord.cameraY, UserComparator7.cameraZ, class43.cameraPitch, class40.cameraYaw, var4); - Rasterizer3D.Rasterizer3D_zoom = var12; - WorldMapSectionType.playPcmPlayers(); - Player.scene.clearTempGameObjects(); - ItemContainer.method1119(var0, var1, var2, var3); - if (Client.hintArrowType == 2) { - WorldMapAreaData.worldToScreen(Client.hintArrowSubX * 64 + (Client.hintArrowX - PacketWriter.baseX * 64 << 7), (Client.hintArrowY - RouteStrategy.baseY * 64 << 7) + Client.hintArrowSubY * 4096, Client.hintArrowHeight * 2); - if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { - WorldMapData_1.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); - } - } - - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field879); - MusicPatchNode.method3771(var0, var1, var2, var3); - WallDecoration.cameraX = var5; - Coord.cameraY = var6; - UserComparator7.cameraZ = var7; - class43.cameraPitch = var8; - class40.cameraYaw = var9; - if (Client.isLoading && class222.method4035(true, false) == 0) { - Client.isLoading = false; - } - - if (Client.isLoading) { - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); - MusicPatch.drawLoadingMessage("Loading - please wait.", false); } } diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java index 61e33379cc..c61c8913a7 100644 --- a/runescape-client/src/main/java/WorldMapEvent.java +++ b/runescape-client/src/main/java/WorldMapEvent.java @@ -1,33 +1,43 @@ +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("ag") +@ObfuscatedName("ae") @Implements("WorldMapEvent") public class WorldMapEvent { - @ObfuscatedName("s") + @ObfuscatedName("d") + @Export("ByteArrayPool_arrays") + static byte[][][] ByteArrayPool_arrays; + @ObfuscatedName("ey") + @Export("secureRandom") + static SecureRandom secureRandom; + @ObfuscatedName("gn") + @Export("regionMapArchiveIds") + static int[] regionMapArchiveIds; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 79767661 + intValue = -85527785 ) @Export("mapElement") public int mapElement; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lhd;" + signature = "Lhj;" ) @Export("coord1") public Coord coord1; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lhd;" + signature = "Lhj;" ) @Export("coord2") public Coord coord2; @ObfuscatedSignature( - signature = "(ILhd;Lhd;)V" + signature = "(ILhj;Lhj;)V" ) public WorldMapEvent(int var1, Coord var2, Coord var3) { this.mapElement = var1; @@ -35,8 +45,40 @@ public class WorldMapEvent { this.coord2 = var3; } - @ObfuscatedName("s") - static boolean method730(long var0) { - return class40.method729(var0) == 2; + @ObfuscatedName("ij") + @ObfuscatedSignature( + signature = "(Lhy;III)V", + garbageValue = "-2056894678" + ) + @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/WorldMapID.java b/runescape-client/src/main/java/WorldMapID.java index b44e489c22..06ffdbe9a5 100644 --- a/runescape-client/src/main/java/WorldMapID.java +++ b/runescape-client/src/main/java/WorldMapID.java @@ -1,99 +1,210 @@ +import java.util.Date; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("aj") +@ObfuscatedName("al") @Implements("WorldMapID") public class WorldMapID { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Laj;" + signature = "Lal;" ) - static final WorldMapID field260; - @ObfuscatedName("j") + static final WorldMapID field263; + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Laj;" + signature = "Lal;" ) - static final WorldMapID field257; - @ObfuscatedName("aw") - @Export("client") - @ObfuscatedSignature( - signature = "Lclient;" - ) - static Client client; - @ObfuscatedName("di") - @ObfuscatedSignature( - signature = "Lid;" - ) - @Export("archive13") - static Archive archive13; - @ObfuscatedName("i") + static final WorldMapID field264; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -2063866403 + intValue = 1185944763 ) @Export("value") final int value; static { - field260 = new WorldMapID(0); - field257 = new WorldMapID(1); + field263 = new WorldMapID(0); + field264 = new WorldMapID(1); } WorldMapID(int var1) { this.value = var1; } - @ObfuscatedName("j") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lhz;IIB)[Lls;", - garbageValue = "32" + signature = "(Lhz;Lhz;I)V", + garbageValue = "969965104" ) - @Export("SpriteBuffer_getSpriteArray") - public static Sprite[] SpriteBuffer_getSpriteArray(AbstractArchive var0, int var1, int var2) { - return !World.SpriteBuffer_bufferFile(var0, var1, var2) ? null : GameShell.method897(); + public static void method526(AbstractArchive var0, AbstractArchive var1) { + KitDefinition.KitDefinition_archive = var0; + KitDefinition.KitDefinition_modelsArchive = var1; + KitDefinition.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); } - @ObfuscatedName("ic") + @ObfuscatedName("c") + public static String method522(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("g") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "-6260" + signature = "(IIIIB)V", + garbageValue = "1" ) - @Export("sortMenuEntries") - static final void sortMenuEntries() { - boolean var0 = false; + static void method521(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.field1043 * 16384) { + var5 += var1 - var4.field1043 * 16384; + } else if (var1 < var4.x * 16384) { + var5 += var4.x * 16384 - var1; + } - while (!var0) { - var0 = true; + if (var2 > var4.field1051 * 16384) { + var5 += var2 - var4.field1051 * 16384; + } else if (var2 < var4.y * 16384) { + var5 += var4.y * 16384 - var2; + } - 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; + if (var5 - 64 <= var4.field1039 && Client.field860 != 0 && var0 == var4.plane) { + var5 -= 64; + if (var5 < 0) { + var5 = 0; + } + + int var6 = (var4.field1039 - var5) * Client.field860 / var4.field1039; + if (var4.stream1 == null) { + if (var4.soundEffectId >= 0) { + SoundEffect var7 = SoundEffect.readSoundEffect(class13.archive4, var4.soundEffectId, 0); + if (var7 != null) { + RawSound var8 = var7.toRawSound().resample(class81.decimator); + RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6); + var9.setNumLoops(-1); + class51.pcmStreamMixer.addSubStream(var9); + var4.stream1 = var9; + } + } + } else { + var4.stream1.method2514(var6); + } + + if (var4.stream2 == null) { + if (var4.soundEffectIds != null && (var4.field1042 -= var3) <= 0) { + int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length); + SoundEffect var12 = SoundEffect.readSoundEffect(class13.archive4, var4.soundEffectIds[var11], 0); + if (var12 != null) { + RawSound var13 = var12.toRawSound().resample(class81.decimator); + RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6); + var10.setNumLoops(0); + class51.pcmStreamMixer.addSubStream(var10); + var4.stream2 = var10; + var4.field1042 = var4.field1048 + (int)(Math.random() * (double)(var4.field1049 - var4.field1048)); + } + } + } else { + var4.stream2.method2514(var6); + if (!var4.stream2.hasNext()) { + var4.stream2 = null; + } + } + } else { + if (var4.stream1 != null) { + class51.pcmStreamMixer.removeSubStream(var4.stream1); + var4.stream1 = null; + } + + if (var4.stream2 != null) { + class51.pcmStreamMixer.removeSubStream(var4.stream2); + var4.stream2 = null; + } } } } } + + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "(IZIZI)V", + garbageValue = "-704520516" + ) + @Export("sortWorldList") + static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { + if (World.World_worlds != null) { + VertexNormal.doWorldSorting(0, World.World_worlds.length - 1, var0, var1, var2, var3); + } + + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "(ZI)V", + garbageValue = "-354748408" + ) + static void method520(boolean var0) { + Login.Login_response1 = ""; + Login.Login_response2 = "Enter your username/email & password."; + Login.Login_response3 = ""; + Login.loginIndex = 2; + if (var0) { + Login.Login_password = ""; + } + + if (Login.Login_username == null || Login.Login_username.length() <= 0) { + if (Actor.clientPreferences.rememberedUsername != null) { + Login.Login_username = Actor.clientPreferences.rememberedUsername; + Client.Login_isUsernameRemembered = true; + } else { + Client.Login_isUsernameRemembered = false; + } + } + + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { + Login.currentLoginField = 1; + } else { + Login.currentLoginField = 0; + } + + } + + @ObfuscatedName("js") + @ObfuscatedSignature( + signature = "(Lhy;B)V", + garbageValue = "-19" + ) + @Export("invalidateWidget") + static void invalidateWidget(Widget var0) { + if (var0.cycle == Client.field826) { + Client.field827[var0.rootIndex] = true; + } + + } + + @ObfuscatedName("kr") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;B)V", + garbageValue = "1" + ) + @Export("Clan_joinChat") + static final void Clan_joinChat(String var0) { + if (!var0.equals("")) { + PacketBufferNode var1 = MenuAction.getPacketBufferNode(ClientPacket.field2252, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(Varcs.stringCp1252NullTerminatedByteSize(var0)); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); + } + } } diff --git a/runescape-client/src/main/java/WorldMapIcon_0.java b/runescape-client/src/main/java/WorldMapIcon_0.java index dc0d5a4a11..726f73fa1d 100644 --- a/runescape-client/src/main/java/WorldMapIcon_0.java +++ b/runescape-client/src/main/java/WorldMapIcon_0.java @@ -1,63 +1,47 @@ -import java.awt.image.BufferedImage; -import java.awt.image.PixelGrabber; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import javax.imageio.ImageIO; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("z") +@ObfuscatedName("y") @Implements("WorldMapIcon_0") public class WorldMapIcon_0 extends AbstractWorldMapIcon { - @ObfuscatedName("pw") - @ObfuscatedSignature( - signature = "Lkk;" - ) - @Export("privateChatMode") - static PrivateChatMode privateChatMode; - @ObfuscatedName("fn") - @ObfuscatedSignature( - signature = "Lft;" - ) - @Export("socketTask") - static Task socketTask; - @ObfuscatedName("s") + @ObfuscatedName("cm") + public static char field126; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -845470175 + intValue = 948071377 ) @Export("element") final int element; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lai;" + signature = "Lao;" ) @Export("label") final WorldMapLabel label; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -890681173 + intValue = -2038423021 ) @Export("subWidth") final int subWidth; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1039826219 + intValue = -1663169023 ) @Export("subHeight") final int subHeight; @ObfuscatedSignature( - signature = "(Lhd;Lhd;ILai;)V" + signature = "(Lhj;Lhj;ILao;)V" ) WorldMapIcon_0(Coord var1, Coord var2, int var3, WorldMapLabel var4) { super(var1, var2); this.element = var3; this.label = var4; - WorldMapElement var5 = WorldMapData_0.WorldMapElement_get(this.getElement()); + WorldMapElement var5 = WorldMapSection1.WorldMapElement_get(this.getElement()); Sprite var6 = var5.getSpriteBool(false); if (var6 != null) { this.subWidth = var6.subWidth; @@ -69,221 +53,432 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "78" + signature = "(I)I", + garbageValue = "861849893" ) @Export("getElement") public int getElement() { return this.element; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(B)Lai;", - garbageValue = "1" + signature = "(I)Lao;", + garbageValue = "1066707711" ) @Export("getLabel") WorldMapLabel getLabel() { return this.label; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1930584854" + garbageValue = "-1386026878" ) @Export("getSubWidth") int getSubWidth() { return this.subWidth; } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-56" + signature = "(I)I", + garbageValue = "174908718" ) @Export("getSubHeight") int getSubHeight() { return this.subHeight; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "([BB)Lls;", - garbageValue = "-64" + signature = "(IIILfw;Lfj;Z[I[II)I", + garbageValue = "-1532162381" ) - @Export("convertJpgToSprite") - public static final Sprite 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 Sprite(var4, var2, var3); - } catch (IOException var7) { - } catch (InterruptedException var8) { + public static int method194(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) { + class173.directions[var8][var9] = 0; + class173.distances[var8][var9] = 99999999; + } } - return new Sprite(0, 0); + int var10; + int var11; + byte var13; + int var14; + int var15; + int var17; + int var19; + int var20; + int var21; + boolean var28; + int var30; + int var31; + int var33; + if (var2 == 1) { + var10 = var0; + var11 = var1; + byte var12 = 64; + var13 = 64; + var14 = var0 - var12; + var15 = var1 - var13; + class173.directions[var12][var13] = 99; + class173.distances[var12][var13] = 0; + byte var16 = 0; + var17 = 0; + class173.bufferX[var16] = var0; + var33 = var16 + 1; + class173.bufferY[var16] = var1; + int[][] var18 = var4.flags; + + boolean var29; + while (true) { + if (var33 == var17) { + class173.field2063 = var10; + class173.field2068 = var11; + var29 = false; + break; + } + + var10 = class173.bufferX[var17]; + var11 = class173.bufferY[var17]; + var17 = var17 + 1 & 4095; + var30 = var10 - var14; + var31 = var11 - var15; + var19 = var10 - var4.xInset; + var20 = var11 - var4.yInset; + if (var3.hasArrived(1, var10, var11, var4)) { + class173.field2063 = var10; + class173.field2068 = var11; + var29 = true; + break; + } + + var21 = class173.distances[var30][var31] + 1; + if (var30 > 0 && class173.directions[var30 - 1][var31] == 0 && (var18[var19 - 1][var20] & 19136776) == 0) { + class173.bufferX[var33] = var10 - 1; + class173.bufferY[var33] = var11; + var33 = var33 + 1 & 4095; + class173.directions[var30 - 1][var31] = 2; + class173.distances[var30 - 1][var31] = var21; + } + + if (var30 < 127 && class173.directions[var30 + 1][var31] == 0 && (var18[var19 + 1][var20] & 19136896) == 0) { + class173.bufferX[var33] = var10 + 1; + class173.bufferY[var33] = var11; + var33 = var33 + 1 & 4095; + class173.directions[var30 + 1][var31] = 8; + class173.distances[var30 + 1][var31] = var21; + } + + if (var31 > 0 && class173.directions[var30][var31 - 1] == 0 && (var18[var19][var20 - 1] & 19136770) == 0) { + class173.bufferX[var33] = var10; + class173.bufferY[var33] = var11 - 1; + var33 = var33 + 1 & 4095; + class173.directions[var30][var31 - 1] = 1; + class173.distances[var30][var31 - 1] = var21; + } + + if (var31 < 127 && class173.directions[var30][var31 + 1] == 0 && (var18[var19][var20 + 1] & 19136800) == 0) { + class173.bufferX[var33] = var10; + class173.bufferY[var33] = var11 + 1; + var33 = var33 + 1 & 4095; + class173.directions[var30][var31 + 1] = 4; + class173.distances[var30][var31 + 1] = var21; + } + + if (var30 > 0 && var31 > 0 && class173.directions[var30 - 1][var31 - 1] == 0 && (var18[var19 - 1][var20 - 1] & 19136782) == 0 && (var18[var19 - 1][var20] & 19136776) == 0 && (var18[var19][var20 - 1] & 19136770) == 0) { + class173.bufferX[var33] = var10 - 1; + class173.bufferY[var33] = var11 - 1; + var33 = var33 + 1 & 4095; + class173.directions[var30 - 1][var31 - 1] = 3; + class173.distances[var30 - 1][var31 - 1] = var21; + } + + if (var30 < 127 && var31 > 0 && class173.directions[var30 + 1][var31 - 1] == 0 && (var18[var19 + 1][var20 - 1] & 19136899) == 0 && (var18[var19 + 1][var20] & 19136896) == 0 && (var18[var19][var20 - 1] & 19136770) == 0) { + class173.bufferX[var33] = var10 + 1; + class173.bufferY[var33] = var11 - 1; + var33 = var33 + 1 & 4095; + class173.directions[var30 + 1][var31 - 1] = 9; + class173.distances[var30 + 1][var31 - 1] = var21; + } + + if (var30 > 0 && var31 < 127 && class173.directions[var30 - 1][var31 + 1] == 0 && (var18[var19 - 1][var20 + 1] & 19136824) == 0 && (var18[var19 - 1][var20] & 19136776) == 0 && (var18[var19][var20 + 1] & 19136800) == 0) { + class173.bufferX[var33] = var10 - 1; + class173.bufferY[var33] = var11 + 1; + var33 = var33 + 1 & 4095; + class173.directions[var30 - 1][var31 + 1] = 6; + class173.distances[var30 - 1][var31 + 1] = var21; + } + + if (var30 < 127 && var31 < 127 && class173.directions[var30 + 1][var31 + 1] == 0 && (var18[var19 + 1][var20 + 1] & 19136992) == 0 && (var18[var19 + 1][var20] & 19136896) == 0 && (var18[var19][var20 + 1] & 19136800) == 0) { + class173.bufferX[var33] = var10 + 1; + class173.bufferY[var33] = var11 + 1; + var33 = var33 + 1 & 4095; + class173.directions[var30 + 1][var31 + 1] = 12; + class173.distances[var30 + 1][var31 + 1] = var21; + } + } + + var28 = var29; + } else if (var2 == 2) { + var28 = WorldMapArea.method315(var0, var1, var3, var4); + } else { + var28 = Strings.method4103(var0, var1, var2, var3, var4); + } + + var9 = var0 - 64; + var10 = var1 - 64; + var11 = class173.field2063; + var30 = class173.field2068; + 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 <= var32 + var17; ++var21) { + int var22 = var20 - var9; + int var23 = var21 - var10; + if (var22 >= 0 && var23 >= 0 && var22 < 128 && var23 < 128 && class173.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 || var31 == var26 && class173.distances[var22][var23] < var14) { + var31 = var26; + var14 = class173.distances[var22][var23]; + var11 = var20; + var30 = var21; + } + } + } + } + + if (var31 == Integer.MAX_VALUE) { + return -1; + } + } + + if (var0 == var11 && var30 == var1) { + return 0; + } else { + var13 = 0; + class173.bufferX[var13] = var11; + var31 = var13 + 1; + class173.bufferY[var13] = var30; + + for (var14 = var15 = class173.directions[var11 - var9][var30 - var10]; var0 != var11 || var30 != var1; var14 = class173.directions[var11 - var9][var30 - var10]) { + if (var14 != var15) { + var15 = var14; + class173.bufferX[var31] = var11; + class173.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] = class173.bufferX[var31]; + var7[var33++] = class173.bufferY[var31]; + if (var33 >= var6.length) { + break; + } + } + + return var33; + } + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;ZZI)V", + garbageValue = "-1584053866" + ) + @Export("openURL") + public static void openURL(String var0, boolean var1, boolean var2) { + class42.method754(var0, var1, "openjs", var2); } @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IIII)I", - garbageValue = "1576824193" + signature = "(III)V", + garbageValue = "651689176" ) - @Export("WorldMap_hslToRgb") - static int WorldMap_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; + public static final void method174(int var0, int var1) { + ViewportMouse.ViewportMouse_x = var0; + ViewportMouse.ViewportMouse_y = var1; + ViewportMouse.ViewportMouse_isInViewport = true; + ViewportMouse.ViewportMouse_entityCount = 0; + ViewportMouse.ViewportMouse_false0 = false; } - @ObfuscatedName("i") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(ILkv;Lid;I)V", - garbageValue = "-1841388138" + signature = "(Ljava/lang/CharSequence;S)I", + garbageValue = "23261" ) - static void method191(int var0, ArchiveDisk var1, Archive var2) { - byte[] var3 = null; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - for (ArchiveDiskAction var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var5 != null; var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { - if (var5.key == (long)var0 && var1 == var5.archiveDisk && var5.type == 0) { - var3 = var5.data; - break; - } - } + public static int method195(CharSequence var0) { + int var1 = var0.length(); + int var2 = 0; + + for (int var3 = 0; var3 < var1; ++var3) { + var2 = (var2 << 5) - var2 + var0.charAt(var3); } - if (var3 != null) { - var2.load(var1, var0, var3, true); - } else { - byte[] var4 = var1.read(var0); - var2.load(var1, var0, var4, true); - } + return var2; } - @ObfuscatedName("n") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "([BIILea;[Lfm;I)V", - garbageValue = "-144892898" + signature = "(Lhy;I[B[BI)V", + garbageValue = "2116245618" ) - static final void method203(byte[] var0, int var1, int var2, Scene var3, CollisionMap[] var4) { - Buffer var5 = new Buffer(var0); - int var6 = -1; - - while (true) { - int var7 = var5.method5565(); - if (var7 == 0) { + @Export("Widget_setKey") + static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { + if (var0.field2671 == null) { + if (var2 == null) { return; } - var6 += var7; - int var8 = 0; + var0.field2671 = new byte[11][]; + var0.field2614 = new byte[11][]; + var0.field2615 = new int[11]; + var0.field2616 = new int[11]; + } - while (true) { - int var9 = var5.readUShortSmart(); - if (var9 == 0) { + var0.field2671[var1] = var2; + if (var2 != null) { + var0.field2612 = true; + } else { + var0.field2612 = false; + + for (int var4 = 0; var4 < var0.field2671.length; ++var4) { + if (var0.field2671[var4] != null) { + var0.field2612 = true; 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; - } + var0.field2614[var1] = var3; + } - CollisionMap var19 = null; - if (var18 >= 0) { - var19 = var4[var18]; - } + @ObfuscatedName("es") + @ObfuscatedSignature( + signature = "(IB)V", + garbageValue = "0" + ) + @Export("updateGameState") + static void updateGameState(int var0) { + if (var0 != Client.gameState) { + if (Client.gameState == 0) { + Coord.client.method915(); + } - class32.method544(var12, var16, var17, var6, var15, var14, var3, var19); + if (var0 == 20 || var0 == 40 || var0 == 45) { + Client.loginState = 0; + Client.field656 = 0; + Client.field841 = 0; + Client.timer.method4971(var0); + if (var0 != 20) { + PacketWriter.method2238(false); } } + + if (var0 != 20 && var0 != 40 && ArchiveLoader.field512 != null) { + ArchiveLoader.field512.close(); + ArchiveLoader.field512 = null; + } + + if (Client.gameState == 25) { + Client.field678 = 0; + Client.field674 = 0; + Client.field851 = 1; + Client.field676 = 0; + Client.field872 = 1; + } + + if (var0 != 5 && var0 != 10) { + if (var0 == 20) { + VarpDefinition.method4354(FontName.archive10, WorldMapDecoration.archive8, true, Client.gameState == 11 ? 4 : 0); + } else if (var0 == 11) { + VarpDefinition.method4354(FontName.archive10, WorldMapDecoration.archive8, false, 4); + } else if (Login.field1181) { + Login.titleboxSprite = null; + class191.titlebuttonSprite = null; + UserComparator10.runesSprite = null; + Login.leftTitleSprite = null; + class191.rightTitleSprite = null; + HealthBar.logoSprite = null; + FileSystem.title_muteSprite = null; + GrandExchangeOfferWorldComparator.options_buttons_0Sprite = null; + Login.options_buttons_2Sprite = null; + class162.worldSelectBackSprites = null; + PlayerType.worldSelectFlagSprites = null; + FileSystem.worldSelectArrows = null; + class226.worldSelectStars = null; + GrandExchangeOfferWorldComparator.field32 = null; + UserComparator5.loginScreenRunesAnimation.method1795(); + WallDecoration.method3256(2); + class173.method3575(true); + Login.field1181 = false; + } + } else { + VarpDefinition.method4354(FontName.archive10, WorldMapDecoration.archive8, true, 0); + } + + Client.gameState = var0; } } - @ObfuscatedName("m") + @ObfuscatedName("ew") @ObfuscatedSignature( - signature = "(ILcr;ZB)I", - garbageValue = "92" + signature = "(II)V", + garbageValue = "-934752862" ) - static int method206(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.SOUND_SYNTH) { - Interpreter.Interpreter_intStackSize -= 3; - GrandExchangeOfferUnitPriceComparator.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) { - SoundCache.playSong(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - return 1; - } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { - Interpreter.Interpreter_intStackSize -= 2; - MouseRecorder.playSoundJingle(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - return 1; - } else { - return 2; - } - } - - @ObfuscatedName("jw") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1558558130" - ) - static void method207() { - for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { - int var1 = var0.group; - if (Projectile.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 = WorldMapElement.getWidget(var4); - if (var5 != null) { - FriendSystem.invalidateWidget(var5); - } - } - } + static final void method196(int var0) { + class40.method736(); + switch(var0) { + case 1: + Login.loginIndex = 24; + Canvas.setLoginResponseString("", "You were disconnected from the server.", ""); + break; + case 2: + Login.loginIndex = 24; + Canvas.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); } } diff --git a/runescape-client/src/main/java/WorldMapIcon_1.java b/runescape-client/src/main/java/WorldMapIcon_1.java index deedbef9cd..d74076eef5 100644 --- a/runescape-client/src/main/java/WorldMapIcon_1.java +++ b/runescape-client/src/main/java/WorldMapIcon_1.java @@ -3,67 +3,67 @@ 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("v") +@ObfuscatedName("o") @Implements("WorldMapIcon_1") public class WorldMapIcon_1 extends AbstractWorldMapIcon { - @ObfuscatedName("nj") + @ObfuscatedName("ql") @ObfuscatedSignature( - signature = "[Lhp;" + signature = "Ldh;" ) - static Widget[] field174; - @ObfuscatedName("ef") + @Export("pcmPlayer0") + static PcmPlayer pcmPlayer0; + @ObfuscatedName("gf") @ObfuscatedSignature( - signature = "Lid;" + signature = "Lep;" ) - @Export("archive17") - static Archive archive17; - @ObfuscatedName("jl") + @Export("scene") + static Scene scene; + @ObfuscatedName("gx") @ObfuscatedSignature( - signature = "Lbd;" + signature = "[Llt;" ) - @Export("localPlayer") - static Player localPlayer; - @ObfuscatedName("s") + @Export("scrollBarSprites") + static IndexedSprite[] scrollBarSprites; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1136778235 + intValue = 638368553 ) @Export("objectDefId") final int objectDefId; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Laf;" + signature = "Lav;" ) @Export("region") final WorldMapRegion region; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1028371623 + intValue = 815655685 ) @Export("element") int element; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lai;" + signature = "Lao;" ) @Export("label") WorldMapLabel label; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1027796521 + intValue = 1653555009 ) @Export("subWidth") int subWidth; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1822952027 + intValue = -499996175 ) @Export("subHeight") int subHeight; @ObfuscatedSignature( - signature = "(Lhd;Lhd;ILaf;)V" + signature = "(Lhj;Lhj;ILav;)V" ) WorldMapIcon_1(Coord var1, Coord var2, int var3, WorldMapRegion var4) { super(var1, var2); @@ -72,56 +72,56 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { this.init(); } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "78" + signature = "(I)I", + garbageValue = "861849893" ) @Export("getElement") public int getElement() { return this.element; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(B)Lai;", - garbageValue = "1" + signature = "(I)Lao;", + garbageValue = "1066707711" ) @Export("getLabel") WorldMapLabel getLabel() { return this.label; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1930584854" + garbageValue = "-1386026878" ) @Export("getSubWidth") int getSubWidth() { return this.subWidth; } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-56" + signature = "(I)I", + garbageValue = "174908718" ) @Export("getSubHeight") int getSubHeight() { return this.subHeight; } - @ObfuscatedName("c") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1614216514" + signature = "(S)V", + garbageValue = "3174" ) @Export("init") void init() { - this.element = class215.getObjectDefinition(this.objectDefId).transform().mapIconId; - this.label = this.region.createMapLabel(WorldMapData_0.WorldMapElement_get(this.element)); - WorldMapElement var1 = WorldMapData_0.WorldMapElement_get(this.getElement()); + this.element = WallDecoration.getObjectDefinition(this.objectDefId).transform().mapIconId; + this.label = this.region.createMapLabel(WorldMapSection1.WorldMapElement_get(this.element)); + WorldMapElement var1 = WorldMapSection1.WorldMapElement_get(this.getElement()); Sprite var2 = var1.getSpriteBool(false); if (var2 != null) { this.subWidth = var2.subWidth; @@ -133,474 +133,63 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { } - @ObfuscatedName("s") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "-1744841172" + signature = "(IIIZII)J", + garbageValue = "583805703" ) - public static int method301(int var0, int var1) { - int var2; - if (var1 > var0) { - var2 = var0; - var0 = var1; - var1 = var2; + @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; } - while (var1 != 0) { - var2 = var0 % var1; - var0 = var1; - var1 = var2; - } - - return var0; + return var5; } - @ObfuscatedName("j") + @ObfuscatedName("is") @ObfuscatedSignature( - signature = "(Lby;IB)V", - garbageValue = "-74" + signature = "(IIIIIIB)V", + garbageValue = "-116" ) - @Export("runScript") - static void runScript(ScriptEvent var0, int var1) { - Object[] var2 = var0.args; - Script var3; - int var17; - if (DirectByteArrayCopier.isWorldMapEvent(var0.type)) { - class162.worldMapEvent = (WorldMapEvent)var2[0]; - WorldMapElement var4 = WorldMapData_0.WorldMapElement_get(class162.worldMapEvent.mapElement); - var3 = class30.getWorldMapScript(var0.type, var4.objectId, var4.category); - } else { - var17 = (Integer)var2[0]; - var3 = ArchiveLoader.getScript(var17); + static final void method278(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 (var3 != null) { - Interpreter.Interpreter_intStackSize = 0; - Interpreter.Interpreter_stringStackSize = 0; - var17 = -1; - int[] var5 = var3.opcodes; - int[] var6 = var3.intOperands; - byte var7 = -1; - Interpreter.Interpreter_frameDepth = 0; - Interpreter.field1074 = false; - - try { - int var10; - try { - UserComparator1.Interpreter_intLocals = new int[var3.localIntCount]; - int var8 = 0; - UserComparator1.Interpreter_stringLocals = new String[var3.localStringCount]; - int var9 = 0; - - int var11; - String var18; - for (var10 = 1; var10 < var2.length; ++var10) { - if (var2[var10] instanceof Integer) { - var11 = (Integer)var2[var10]; - if (var11 == -2147483647) { - var11 = var0.mouseX; - } - - if (var11 == -2147483646) { - var11 = var0.mouseY; - } - - if (var11 == -2147483645) { - var11 = var0.widget != null ? var0.widget.id : -1; - } - - if (var11 == -2147483644) { - var11 = var0.opIndex; - } - - if (var11 == -2147483643) { - var11 = var0.widget != null ? var0.widget.childIndex : -1; - } - - if (var11 == -2147483642) { - var11 = var0.dragTarget != null ? var0.dragTarget.id : -1; - } - - if (var11 == -2147483641) { - var11 = var0.dragTarget != null ? var0.dragTarget.childIndex : -1; - } - - if (var11 == -2147483640) { - var11 = var0.keyTyped; - } - - if (var11 == -2147483639) { - var11 = var0.keyPressed; - } - - UserComparator1.Interpreter_intLocals[var8++] = var11; - } else if (var2[var10] instanceof String) { - var18 = (String)var2[var10]; - if (var18.equals("event_opbase")) { - var18 = var0.targetName; - } - - UserComparator1.Interpreter_stringLocals[var9++] = var18; - } - } - - var10 = 0; - Interpreter.field1064 = var0.field555; - - while (true) { - ++var10; - if (var10 > var1) { - throw new RuntimeException(); - } - - ++var17; - int var29 = var5[var17]; - int var20; - if (var29 >= 100) { - boolean var32; - if (var3.intOperands[var17] == 1) { - var32 = true; - } else { - var32 = false; - } - - var20 = TileItemPile.method2701(var29, var3, var32); - switch(var20) { - case 0: - return; - case 1: - default: - break; - case 2: - throw new IllegalStateException(); - } - } else if (var29 == 0) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6[var17]; - } else if (var29 == ScriptOpcodes.GET_VARP) { - var11 = var6[var17]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Varps.Varps_main[var11]; - } else if (var29 == ScriptOpcodes.SET_VARP) { - var11 = var6[var17]; - Varps.Varps_main[var11] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - ObjectSound.method1837(var11); - } else if (var29 == ScriptOpcodes.SCONST) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.stringOperands[var17]; - } else if (var29 == ScriptOpcodes.JUMP) { - var17 += var6[var17]; - } else if (var29 == ScriptOpcodes.IF_ICMPNE) { - Interpreter.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.IF_ICMPEQ) { - Interpreter.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.IF_ICMPLT) { - Interpreter.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.IF_ICMPGT) { - Interpreter.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.RETURN) { - if (Interpreter.Interpreter_frameDepth == 0) { - return; - } - - ScriptFrame var34 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; - var3 = var34.script; - var5 = var3.opcodes; - var6 = var3.intOperands; - var17 = var34.pc; - UserComparator1.Interpreter_intLocals = var34.intLocals; - UserComparator1.Interpreter_stringLocals = var34.stringLocals; - } else if (var29 == ScriptOpcodes.GET_VARBIT) { - var11 = var6[var17]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class208.getVarbit(var11); - } else if (var29 == ScriptOpcodes.SET_VARBIT) { - var11 = var6[var17]; - MouseHandler.method1040(var11, Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - } else if (var29 == ScriptOpcodes.IF_ICMPLE) { - Interpreter.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.IF_ICMPGE) { - Interpreter.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.ILOAD) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = UserComparator1.Interpreter_intLocals[var6[var17]]; - } else if (var29 == ScriptOpcodes.ISTORE) { - UserComparator1.Interpreter_intLocals[var6[var17]] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - } else if (var29 == ScriptOpcodes.SLOAD) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = UserComparator1.Interpreter_stringLocals[var6[var17]]; - } else if (var29 == ScriptOpcodes.SSTORE) { - UserComparator1.Interpreter_stringLocals[var6[var17]] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - } else if (var29 == ScriptOpcodes.JOIN_STRING) { - var11 = var6[var17]; - Interpreter.Interpreter_stringStackSize -= var11; - String var31 = GrandExchangeOfferWorldComparator.method74(Interpreter.Interpreter_stringStack, Interpreter.Interpreter_stringStackSize, var11); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var31; - } else if (var29 == ScriptOpcodes.POP_INT) { - --Interpreter.Interpreter_intStackSize; - } else if (var29 == ScriptOpcodes.POP_STRING) { - --Interpreter.Interpreter_stringStackSize; - } else { - int var15; - if (var29 != ScriptOpcodes.INVOKE) { - if (var29 == ScriptOpcodes.GET_VARC_INT) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = KeyHandler.varcs.getInt(var6[var17]); - } else if (var29 == ScriptOpcodes.SET_VARC_INT) { - KeyHandler.varcs.setInt(var6[var17], Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - } else if (var29 == ScriptOpcodes.DEFINE_ARRAY) { - var11 = var6[var17] >> 16; - var20 = var6[var17] & 65535; - int var21 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var21 < 0 || var21 > 5000) { - throw new RuntimeException(); - } - - Interpreter.Interpreter_arrayLengths[var11] = var21; - byte var22 = -1; - if (var20 == 105) { - var22 = 0; - } - - for (var15 = 0; var15 < var21; ++var15) { - Interpreter.Interpreter_arrays[var11][var15] = var22; - } - } else if (var29 == ScriptOpcodes.GET_ARRAY_INT) { - var11 = var6[var17]; - var20 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { - throw new RuntimeException(); - } - - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var11][var20]; - } else if (var29 == ScriptOpcodes.SET_ARRAY_INT) { - var11 = var6[var17]; - Interpreter.Interpreter_intStackSize -= 2; - var20 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { - throw new RuntimeException(); - } - - Interpreter.Interpreter_arrays[var11][var20] = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - } else if (var29 == ScriptOpcodes.GET_VARC_STRING_OLD) { - var18 = KeyHandler.varcs.getStringOld(var6[var17]); - if (var18 == null) { - var18 = "null"; - } - - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var18; - } else if (var29 == ScriptOpcodes.SET_VARC_STRING_OLD) { - KeyHandler.varcs.setStringOld(var6[var17], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); - } else if (var29 == ScriptOpcodes.GET_VARC_STRING) { - var18 = KeyHandler.varcs.getString(var6[var17]); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var18; - } else if (var29 == ScriptOpcodes.SET_VARC_STRING) { - KeyHandler.varcs.setString(var6[var17], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); - } else { - if (var29 != ScriptOpcodes.SWITCH) { - throw new IllegalStateException(); - } - - IterableNodeHashTable var33 = var3.switches[var6[var17]]; - IntegerNode var30 = (IntegerNode)var33.get((long)Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - if (var30 != null) { - var17 += var30.integer; - } - } - } else { - var11 = var6[var17]; - Script var12 = ArchiveLoader.getScript(var11); - int[] var13 = new int[var12.localIntCount]; - String[] var14 = new String[var12.localStringCount]; - - for (var15 = 0; var15 < var12.intArgumentCount; ++var15) { - var13[var15] = Interpreter.Interpreter_intStack[var15 + (Interpreter.Interpreter_intStackSize - var12.intArgumentCount)]; - } - - for (var15 = 0; var15 < var12.stringArgumentCount; ++var15) { - var14[var15] = Interpreter.Interpreter_stringStack[var15 + (Interpreter.Interpreter_stringStackSize - var12.stringArgumentCount)]; - } - - Interpreter.Interpreter_intStackSize -= var12.intArgumentCount; - Interpreter.Interpreter_stringStackSize -= var12.stringArgumentCount; - ScriptFrame var19 = new ScriptFrame(); - var19.script = var3; - var19.pc = var17; - var19.intLocals = UserComparator1.Interpreter_intLocals; - var19.stringLocals = UserComparator1.Interpreter_stringLocals; - Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var19; - var3 = var12; - var5 = var12.opcodes; - var6 = var12.intOperands; - var17 = -1; - UserComparator1.Interpreter_intLocals = var13; - UserComparator1.Interpreter_stringLocals = var14; - } - } - } - } catch (Exception var27) { - StringBuilder var24 = new StringBuilder(30); - var24.append("").append(var3.key).append(" "); - - for (var10 = Interpreter.Interpreter_frameDepth - 1; var10 >= 0; --var10) { - var24.append("").append(Interpreter.Interpreter_frames[var10].script.key).append(" "); - } - - var24.append("").append(var7); - class3.RunException_sendStackTrace(var24.toString(), var27); - } - } finally { - if (Interpreter.field1074) { - Interpreter.field1072 = true; - ParamDefinition.method4424(); - Interpreter.field1072 = false; - Interpreter.field1074 = false; - } - + 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 + var6 + var13; + int var21 = var15 + var1; + int var22 = var1 - var16; + int var23 = var7 + var1 - var16; + int var24 = var7 + var15 + var1; + Rasterizer3D.method2970(var17, var18, var19); + Rasterizer3D.method2990(var21, var22, var23, var17, var18, var19, var4); + Rasterizer3D.method2970(var17, var19, var20); + Rasterizer3D.method2990(var21, var23, var24, var17, var19, var20, var4); } } - - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "(Lky;IB)V", - garbageValue = "-54" - ) - public static void method295(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) { - } - } - - } - - @ObfuscatedName("fp") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-60" - ) - static final void method294() { - int var0 = GraphicsObject.field1079 * 128 + 64; - int var1 = class3.field24 * 128 + 64; - int var2 = GrandExchangeOfferTotalQuantityComparator.getTileHeight(var0, var1, ItemContainer.plane) - WorldMapSection0.field129; - if (WallDecoration.cameraX < var0) { - WallDecoration.cameraX = (var0 - WallDecoration.cameraX) * WorldMapSection2.field191 / 1000 + WallDecoration.cameraX + WorldMapSectionType.field142; - if (WallDecoration.cameraX > var0) { - WallDecoration.cameraX = var0; - } - } - - if (WallDecoration.cameraX > var0) { - WallDecoration.cameraX -= WorldMapSection2.field191 * (WallDecoration.cameraX - var0) / 1000 + WorldMapSectionType.field142; - if (WallDecoration.cameraX < var0) { - WallDecoration.cameraX = var0; - } - } - - if (Coord.cameraY < var2) { - Coord.cameraY = (var2 - Coord.cameraY) * WorldMapSection2.field191 / 1000 + Coord.cameraY + WorldMapSectionType.field142; - if (Coord.cameraY > var2) { - Coord.cameraY = var2; - } - } - - if (Coord.cameraY > var2) { - Coord.cameraY -= WorldMapSection2.field191 * (Coord.cameraY - var2) / 1000 + WorldMapSectionType.field142; - if (Coord.cameraY < var2) { - Coord.cameraY = var2; - } - } - - if (UserComparator7.cameraZ < var1) { - UserComparator7.cameraZ = (var1 - UserComparator7.cameraZ) * WorldMapSection2.field191 / 1000 + UserComparator7.cameraZ + WorldMapSectionType.field142; - if (UserComparator7.cameraZ > var1) { - UserComparator7.cameraZ = var1; - } - } - - if (UserComparator7.cameraZ > var1) { - UserComparator7.cameraZ -= WorldMapSection2.field191 * (UserComparator7.cameraZ - var1) / 1000 + WorldMapSectionType.field142; - if (UserComparator7.cameraZ < var1) { - UserComparator7.cameraZ = var1; - } - } - - var0 = WorldMapSection2.field190 * 16384 + 64; - var1 = UrlRequest.field1932 * 128 + 64; - var2 = GrandExchangeOfferTotalQuantityComparator.getTileHeight(var0, var1, ItemContainer.plane) - GameShell.field446; - int var3 = var0 - WallDecoration.cameraX; - int var4 = var2 - Coord.cameraY; - int var5 = var1 - UserComparator7.cameraZ; - int var6 = (int)Math.sqrt((double)(var3 * var3 + var5 * var5)); - 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 (class43.cameraPitch < var7) { - class43.cameraPitch = (var7 - class43.cameraPitch) * Player.field605 / 1000 + class43.cameraPitch + GrandExchangeOfferWorldComparator.field34; - if (class43.cameraPitch > var7) { - class43.cameraPitch = var7; - } - } - - if (class43.cameraPitch > var7) { - class43.cameraPitch -= Player.field605 * (class43.cameraPitch - var7) / 1000 + GrandExchangeOfferWorldComparator.field34; - if (class43.cameraPitch < var7) { - class43.cameraPitch = var7; - } - } - - int var9 = var8 - class40.cameraYaw; - if (var9 > 1024) { - var9 -= 2048; - } - - if (var9 < -1024) { - var9 += 2048; - } - - if (var9 > 0) { - class40.cameraYaw = var9 * Player.field605 / 1000 + class40.cameraYaw + GrandExchangeOfferWorldComparator.field34; - class40.cameraYaw &= 2047; - } - - if (var9 < 0) { - class40.cameraYaw -= GrandExchangeOfferWorldComparator.field34 + -var9 * Player.field605 / 1000; - class40.cameraYaw &= 2047; - } - - int var10 = var8 - class40.cameraYaw; - if (var10 > 1024) { - var10 -= 2048; - } - - if (var10 < -1024) { - var10 += 2048; - } - - if (var10 < 0 && var9 > 0 || var10 > 0 && var9 < 0) { - class40.cameraYaw = var8; - } - - } } diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java index 253bcf6f4f..27c809d0d9 100644 --- a/runescape-client/src/main/java/WorldMapLabel.java +++ b/runescape-client/src/main/java/WorldMapLabel.java @@ -4,39 +4,39 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ai") +@ObfuscatedName("ao") @Implements("WorldMapLabel") public class WorldMapLabel { - @ObfuscatedName("gl") + @ObfuscatedName("dq") @ObfuscatedSignature( - signature = "[Lls;" + signature = "Lio;" ) - @Export("mapDotSprites") - static Sprite[] mapDotSprites; - @ObfuscatedName("s") + @Export("archive14") + static Archive archive14; + @ObfuscatedName("c") @Export("text") String text; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -100160843 + intValue = 1500544575 ) @Export("width") int width; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1360429455 + intValue = 654109137 ) @Export("height") int height; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Le;" + signature = "Lq;" ) @Export("size") WorldMapLabelSize size; @ObfuscatedSignature( - signature = "(Ljava/lang/String;IILe;)V" + signature = "(Ljava/lang/String;IILq;)V" ) WorldMapLabel(String var1, int var2, int var3, WorldMapLabelSize var4) { this.text = var1; @@ -44,4 +44,27 @@ public class WorldMapLabel { this.height = var3; this.size = var4; } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + signature = "(II)I", + garbageValue = "55939772" + ) + static int method381(int var0) { + return (int)((Math.log((double)var0) / Interpreter.field1070 - 7.0D) * 256.0D); + } + + @ObfuscatedName("ju") + @ObfuscatedSignature( + signature = "(Lhy;I)Lhy;", + garbageValue = "-658225047" + ) + static Widget method382(Widget var0) { + Widget var1 = FontName.method5290(var0); + if (var1 == null) { + var1 = var0.parent; + } + + return var1; + } } diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java index 1d40a25e5a..08a14193ba 100644 --- a/runescape-client/src/main/java/WorldMapLabelSize.java +++ b/runescape-client/src/main/java/WorldMapLabelSize.java @@ -3,192 +3,170 @@ 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("e") +@ObfuscatedName("q") @Implements("WorldMapLabelSize") public class WorldMapLabelSize { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Le;" + signature = "Lq;" ) @Export("WorldMapLabelSize_small") public static final WorldMapLabelSize WorldMapLabelSize_small; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Le;" + signature = "Lq;" ) @Export("WorldMapLabelSize_medium") public static final WorldMapLabelSize WorldMapLabelSize_medium; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Le;" + signature = "Lq;" ) @Export("WorldMapLabelSize_large") public static final WorldMapLabelSize WorldMapLabelSize_large; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 658824929 + @ObfuscatedName("gy") + @ObfuscatedSignature( + signature = "[Lli;" ) - final int field108; + @Export("mapMarkerSprites") + static Sprite[] mapMarkerSprites; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -776092595 + ) + final int field113; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 1063281473 + ) + final int field114; @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -84893291 + intValue = 1099337759 ) - final int field105; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 1954115307 - ) - final int field110; + final int field116; static { WorldMapLabelSize_small = new WorldMapLabelSize(1, 0, 4); - WorldMapLabelSize_medium = new WorldMapLabelSize(0, 1, 2); - WorldMapLabelSize_large = new WorldMapLabelSize(2, 2, 0); + WorldMapLabelSize_medium = new WorldMapLabelSize(2, 1, 2); + WorldMapLabelSize_large = new WorldMapLabelSize(0, 2, 0); } WorldMapLabelSize(int var1, int var2, int var3) { - this.field108 = var1; - this.field105 = var2; - this.field110 = var3; + this.field113 = var1; + this.field114 = var2; + this.field116 = var3; + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(FB)Z", + garbageValue = "104" + ) + boolean method167(float var1) { + return var1 >= (float)this.field116; } @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(FI)Z", - garbageValue = "-1981348285" + signature = "(ILcu;ZI)I", + garbageValue = "966574081" ) - boolean method185(float var1) { - return var1 >= (float)this.field110; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "(I)[Le;", - garbageValue = "-1460468047" - ) - static WorldMapLabelSize[] method190() { - return new WorldMapLabelSize[]{WorldMapLabelSize_small, WorldMapLabelSize_large, WorldMapLabelSize_medium}; - } - - @ObfuscatedName("n") - static boolean method186(long var0) { - return (int)(var0 >>> 16 & 1L) == 1; - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "(Lkx;II)Z", - garbageValue = "751514225" - ) - @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 var6 = Client.players[var1] = new Player(); - var6.index = var1; - if (Players.field1219[var1] != null) { - var6.read(Players.field1219[var1]); - } - - var6.orientation = Players.Players_orientations[var1]; - var6.targetIndex = Players.Players_targetIndices[var1]; - var7 = Players.Players_regions[var1]; - var8 = var7 >> 28; - var9 = var7 >> 14 & 255; - var10 = var7 & 255; - var6.pathTraversed[0] = Players.field1230[var1]; - var6.plane = (byte)var8; - var6.resetPath((var9 << 13) + var3 - PacketWriter.baseX * 64, (var10 << 13) + var4 - RouteStrategy.baseY * 64); - var6.field614 = 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; + static int method166(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var3 = Player.getWidget(Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]); } else { - int var5; - int var11; - if (var2 == 2) { - var3 = var0.readBits(5); - var4 = var3 >> 3; - var5 = var3 & 7; - var11 = Players.Players_regions[var1]; - var7 = (var11 >> 28) + var4 & 3; - var8 = var11 >> 14 & 255; - var9 = var11 & 255; - if (var5 == 0) { - --var8; - --var9; - } + var3 = var2 ? UserComparator9.field1941 : MidiPcmStream.field2410; + } - 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; + WorldMapID.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[--class160.Interpreter_intStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { + var3.modelType = 3; + var3.modelId = Varps.localPlayer.appearance.getChatHeadId(); + return 1; } else { - var3 = var0.readBits(18); - var4 = var3 >> 16; - var5 = var3 >> 8 & 255; - var11 = var3 & 255; - var7 = Players.Players_regions[var1]; - var8 = (var7 >> 28) + var4 & 3; - var9 = var5 + (var7 >> 14) & 255; - var10 = var7 + var11 & 255; - Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); - return false; + return 2; } + } else { + class160.Interpreter_intStackSize -= 2; + int var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + int var5 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + var3.itemId = var4; + var3.itemQuantity = var5; + ItemDefinition var6 = Player.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.field2582 > 0) { + var3.modelZoom = var3.modelZoom * 32 / var3.field2582; + } else if (var3.rawWidth > 0) { + var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; + } + + return 1; } } + + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;B)V", + garbageValue = "-55" + ) + static final void method172(String var0) { + PacketBufferNode var1 = MenuAction.getPacketBufferNode(ClientPacket.field2190, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(Varcs.stringCp1252NullTerminatedByteSize(var0)); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); + } + + @ObfuscatedName("hp") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "408332868" + ) + static final void method173() { + int var0 = FileSystem.menuX; + int var1 = class83.menuY; + int var2 = class173.menuWidth; + int var3 = FaceNormal.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); + HealthBar.fontBold12.draw("Choose Option", var0 + 3, var1 + 14, var4, -1); + int var5 = MouseHandler.MouseHandler_x; + int var6 = MouseHandler.MouseHandler_y; + + for (int var7 = 0; var7 < Client.menuOptionsCount; ++var7) { + int var8 = var1 + (Client.menuOptionsCount - 1 - var7) * 15 + 31; + int var9 = 16777215; + if (var5 > var0 && var5 < var2 + var0 && var6 > var8 - 13 && var6 < var8 + 3) { + var9 = 16776960; + } + + HealthBar.fontBold12.draw(class188.method3620(var7), var0 + 3, var8, var9, 0); + } + + WorldMapElement.method4392(FileSystem.menuX, class83.menuY, class173.menuWidth, FaceNormal.menuHeight); + } } diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java index 9cfacbc381..0a67b0887a 100644 --- a/runescape-client/src/main/java/WorldMapManager.java +++ b/runescape-client/src/main/java/WorldMapManager.java @@ -1,3 +1,5 @@ +import java.io.File; +import java.io.IOException; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -8,98 +10,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("ao") +@ObfuscatedName("aj") @Implements("WorldMapManager") public final class WorldMapManager { - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("loaded") boolean loaded; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("loadStarted") boolean loadStarted; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lar;" + signature = "Laf;" ) @Export("mapAreaData") WorldMapAreaData mapAreaData; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lls;" + signature = "Lli;" ) @Export("compositeTextureSprite") Sprite compositeTextureSprite; - @ObfuscatedName("u") + @ObfuscatedName("l") @Export("icons") HashMap icons; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "[[Laf;" + signature = "[[Lav;" ) @Export("regions") WorldMapRegion[][] regions; - @ObfuscatedName("t") - HashMap field302; - @ObfuscatedName("q") + @ObfuscatedName("j") + HashMap field316; + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "[Llq;" + signature = "[Llt;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "Lhz;" ) @Export("geographyArchive") final AbstractArchive geographyArchive; - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "Lhz;" ) @Export("groundArchive") final AbstractArchive groundArchive; - @ObfuscatedName("f") + @ObfuscatedName("n") @Export("fonts") final HashMap fonts; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1743305305 + intValue = 1330898357 ) @Export("tileX") int tileX; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1546792937 + intValue = 1132932451 ) @Export("tileY") int tileY; - @ObfuscatedName("y") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1288809152 + intValue = 1471356409 ) @Export("tileWidth") int tileWidth; @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1862567616 + intValue = -937081536 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("b") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1246718237 + intValue = 1622137941 ) @Export("pixelsPerTile") public int pixelsPerTile; @ObfuscatedSignature( - signature = "([Llq;Ljava/util/HashMap;Lhz;Lhz;)V" + signature = "([Llt;Ljava/util/HashMap;Lhz;Lhz;)V" ) public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, AbstractArchive var4) { this.loaded = false; this.loadStarted = false; - this.field302 = new HashMap(); + this.field316 = new HashMap(); this.pixelsPerTile = 0; this.mapSceneSprites = var1; this.fonts = var2; @@ -107,10 +110,10 @@ public final class WorldMapManager { this.groundArchive = var4; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(Lhz;Ljava/lang/String;ZI)V", - garbageValue = "763570790" + garbageValue = "1921148815" ) @Export("load") public void load(AbstractArchive var1, String var2, boolean var3) { @@ -118,10 +121,10 @@ public final class WorldMapManager { this.loaded = false; this.loadStarted = true; System.nanoTime(); - int var4 = var1.getGroupId(WorldMapCacheName.field295.name); + int var4 = var1.getGroupId(WorldMapCacheName.field294.name); int var5 = var1.getFileId(var4, var2); - Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field295.name, var2)); - Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field290.name, var2)); + Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field294.name, var2)); + Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field295.name, var2)); System.nanoTime(); System.nanoTime(); this.mapAreaData = new WorldMapAreaData(); @@ -137,13 +140,13 @@ public final class WorldMapManager { this.mapAreaData.getOriginY(); this.tileX = this.mapAreaData.getRegionLowX() * 64; this.tileY = this.mapAreaData.getRegionLowY() * 64; - this.tileWidth = (this.mapAreaData.getRegionHighX() - this.mapAreaData.getRegionLowX() + 1) * 4096; + this.tileWidth = (this.mapAreaData.getRegionHighX() - this.mapAreaData.getRegionLowX() + 1) * 64; this.tileHeight = (this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1) * 4096; int var16 = this.mapAreaData.getRegionHighX() - this.mapAreaData.getRegionLowX() + 1; int var9 = this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1; System.nanoTime(); System.nanoTime(); - class247.WorldMapRegion_clearCachedSprites(); + ScriptFrame.WorldMapRegion_clearCachedSprites(); this.regions = new WorldMapRegion[var16][var9]; Iterator var10 = this.mapAreaData.worldMapData0Set.iterator(); @@ -168,9 +171,9 @@ public final class WorldMapManager { System.nanoTime(); System.nanoTime(); - if (var1.isValidFileName(WorldMapCacheName.field291.name, var2)) { - byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field291.name, var2); - this.compositeTextureSprite = WorldMapIcon_0.convertJpgToSprite(var20); + if (var1.isValidFileName(WorldMapCacheName.field296.name, var2)) { + byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field296.name, var2); + this.compositeTextureSprite = class16.convertJpgToSprite(var20); } System.nanoTime(); @@ -180,20 +183,20 @@ public final class WorldMapManager { } } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1852285013" + signature = "(B)V", + garbageValue = "23" ) @Export("clearIcons") public final void clearIcons() { this.icons = null; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(IIIIIIIII)V", - garbageValue = "-77241448" + garbageValue = "1356275131" ) @Export("drawTiles") public final void drawTiles(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { @@ -206,41 +209,41 @@ public final class WorldMapManager { float var14 = this.getPixelsPerTile(var7 - var5, var3 - var1); int var15 = (int)Math.ceil((double)var14); this.pixelsPerTile = var15; - if (!this.field302.containsKey(var15)) { + if (!this.field316.containsKey(var15)) { class40 var16 = new class40(var15); var16.init(); - this.field302.put(var15, var16); + this.field316.put(var15, var16); } - int var23 = var13.width + var13.x - 1; + int var23 = var13.x + var13.width - 1; int var17 = var13.y + var13.height - 1; int var18; int var19; for (var18 = var13.x; var18 <= var23; ++var18) { for (var19 = var13.y; var19 <= var17; ++var19) { - this.regions[var18][var19].drawTile(var15, (class40)this.field302.get(var15), this.mapSceneSprites, this.geographyArchive, this.groundArchive); + this.regions[var18][var19].drawTile(var15, (class40)this.field316.get(var15), this.mapSceneSprites, this.geographyArchive, this.groundArchive); } } Rasterizer2D.Rasterizer2D_replace(var9, var10, var11); Rasterizer2D.Rasterizer2D_setClipArray(var12); - var18 = (int)(var14 * 64.0F); + var18 = (int)(64.0F * var14); var19 = this.tileX * 4096 + var1; int var20 = this.tileY * 4096 + var2; - for (int var21 = var13.x; var21 < var13.x + var13.width; ++var21) { + for (int var21 = var13.x; var21 < var13.width + var13.x; ++var21) { for (int var22 = var13.y; var22 < var13.height + var13.y; ++var22) { - this.regions[var21][var22].method476(var5 + var18 * (this.regions[var21][var22].regionX * 64 - var19) / 64, var8 - var18 * (this.regions[var21][var22].regionY * 64 - var20 + 64) / 64, var18); + this.regions[var21][var22].method384(var5 + var18 * (this.regions[var21][var22].regionX * 64 - var19) / 64, var8 - var18 * (this.regions[var21][var22].regionY * 64 - var20 + 64) / 64, var18); } } } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZB)V", - garbageValue = "-63" + signature = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZI)V", + garbageValue = "-1964916849" ) @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) { @@ -253,18 +256,18 @@ public final class WorldMapManager { int var19; int var20; 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) { if (var13) { this.regions[var19][var20].initWorldMapIcon1s(); } - this.regions[var19][var20].method408(var5 + var16 * (this.regions[var19][var20].regionX * 64 - var17) / 64, var8 - var16 * (this.regions[var19][var20].regionY * 64 - var18 + 64) / 64, var16, var9); + this.regions[var19][var20].method390(var5 + var16 * (this.regions[var19][var20].regionX * 64 - var17) / 64, var8 - var16 * (this.regions[var19][var20].regionY * 64 - var18 + 64) / 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); } } @@ -272,10 +275,10 @@ public final class WorldMapManager { } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(IIIILjava/util/HashSet;III)V", - garbageValue = "-394950327" + signature = "(IIIILjava/util/HashSet;IIB)V", + garbageValue = "-15" ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4, HashSet var5, int var6, int var7) { @@ -303,7 +306,7 @@ public final class WorldMapManager { while (var11.hasNext()) { AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var11.next(); - int var13 = var3 * (var12.coord2.x - this.tileX * 4096) / (this.tileWidth * 64); + int var13 = var3 * (var12.coord2.x - this.tileX * 4096) / (this.tileWidth * 4096); int var14 = var4 - (var12.coord2.y - this.tileY * 4096) * var4 / (this.tileHeight * 64); Rasterizer2D.Rasterizer2D_drawCircleAlpha(var13 + var1, var14 + var2, 2, 16776960, 256); } @@ -312,25 +315,25 @@ public final class WorldMapManager { } } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(IIIIIIIIIII)Ljava/util/List;", - garbageValue = "458020889" + garbageValue = "1014404462" ) - public List method629(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { + public List method601(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)(var13 * 64.0F); + int var14 = (int)(64.0F * var13); int var15 = this.tileX * 4096 + var1; int var16 = this.tileY * 4096 + var2; for (int var17 = var12.x; var17 < var12.x + var12.width; ++var17) { - for (int var18 = var12.y; var18 < var12.y + var12.height; ++var18) { - List var19 = this.regions[var17][var18].method439(var5 + var14 * (this.regions[var17][var18].regionX * 64 - var15) / 64, var8 + var6 - var14 * (this.regions[var17][var18].regionY * 64 - var16 + 64) / 64, var14, var9, var10); + for (int var18 = var12.y; var18 < var12.height + var12.y; ++var18) { + List var19 = this.regions[var17][var18].method415(var5 + var14 * (this.regions[var17][var18].regionX * 64 - var15) / 64, var8 + var6 - var14 * (this.regions[var17][var18].regionY * 64 - var16 + 64) / 64, var14, var9, var10); if (!var19.isEmpty()) { var11.addAll(var19); } @@ -341,10 +344,10 @@ public final class WorldMapManager { } } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IIIII)Lh;", - garbageValue = "11285133" + signature = "(IIIIB)Lm;", + garbageValue = "72" ) @Export("createWorldMapRectangle") WorldMapRectangle createWorldMapRectangle(int var1, int var2, int var3, int var4) { @@ -384,20 +387,20 @@ public final class WorldMapManager { return var5; } - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-238758713" + garbageValue = "2078225278" ) @Export("isLoaded") public boolean isLoaded() { return this.loaded; } - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(I)Ljava/util/HashMap;", - garbageValue = "2030529445" + garbageValue = "99820694" ) @Export("buildIcons") public HashMap buildIcons() { @@ -405,10 +408,10 @@ public final class WorldMapManager { return this.icons; } - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "65536" + garbageValue = "1308712327" ) @Export("buildIcons0") void buildIcons0() { @@ -442,10 +445,10 @@ public final class WorldMapManager { } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(III)F", - garbageValue = "610428928" + garbageValue = "1710515807" ) @Export("getPixelsPerTile") float getPixelsPerTile(int var1, int var2) { @@ -460,41 +463,103 @@ public final class WorldMapManager { } } - @ObfuscatedName("hi") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lbm;I)V", - garbageValue = "-798263374" + signature = "(Ljava/io/File;Ljava/io/File;I)V", + garbageValue = "788469236" ) - static final void method607(PendingSpawn var0) { - long var1 = 0L; + static void method611(File var0, File var1) { + try { + AccessFile var2 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); + Buffer var3 = new Buffer(500); + var3.writeByte(3); + var3.writeByte(var1 != null ? 1 : 0); + var3.writeCESU8(var0.getPath()); + if (var1 != null) { + var3.writeCESU8(""); + } + + var2.write(var3.array, 0, var3.offset); + var2.close(); + } catch (IOException var4) { + var4.printStackTrace(); + } + + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "(ILcu;ZB)I", + garbageValue = "-62" + ) + static int method626(int var0, Script var1, boolean var2) { int var3 = -1; - int var4 = 0; - int var5 = 0; - if (var0.type == 0) { - var1 = Player.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); + Widget var4; + if (var0 >= 2000) { + var0 -= 1000; + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + var4 = Player.getWidget(var3); + } else { + var4 = var2 ? UserComparator9.field1941 : MidiPcmStream.field2410; } - if (var0.type == 1) { - var1 = Player.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); - } + if (var0 == ScriptOpcodes.CC_SETPOSITION) { + class160.Interpreter_intStackSize -= 4; + var4.rawX = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var4.rawY = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + var4.xAlignment = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 2]; + var4.yAlignment = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 3]; + WorldMapID.invalidateWidget(var4); + Coord.client.alignWidget(var4); + if (var3 != -1 && var4.type == 0) { + class197.revalidateWidgetScroll(class289.Widget_interfaceComponents[var3 >> 16], var4, false); + } - if (var0.type == 2) { - var1 = Player.scene.getGameObjectTag(var0.plane, var0.x, var0.y); - } + return 1; + } else if (var0 == ScriptOpcodes.CC_SETSIZE) { + class160.Interpreter_intStackSize -= 4; + var4.rawWidth = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var4.rawHeight = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + var4.widthAlignment = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 2]; + var4.heightAlignment = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 3]; + WorldMapID.invalidateWidget(var4); + Coord.client.alignWidget(var4); + if (var3 != -1 && var4.type == 0) { + class197.revalidateWidgetScroll(class289.Widget_interfaceComponents[var3 >> 16], var4, false); + } - if (var0.type == 3) { - var1 = Player.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); - } + return 1; + } else if (var0 == ScriptOpcodes.CC_SETHIDE) { + boolean var5 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + if (var5 != var4.isHidden) { + var4.isHidden = var5; + WorldMapID.invalidateWidget(var4); + } - if (var1 != 0L) { - int var6 = Player.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); - var3 = BoundaryObject.Entity_unpackID(var1); - var4 = var6 & 31; - var5 = var6 >> 6 & 3; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { + var4.noClickThrough = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { + var4.noScrollThrough = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1; + return 1; + } else { + return 2; } + } - var0.objectId = var3; - var0.field903 = var4; - var0.field907 = var5; + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "(II)I", + garbageValue = "-1672724249" + ) + @Export("Messages_getNextChatID") + static int Messages_getNextChatID(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; + } } } diff --git a/runescape-client/src/main/java/WorldMapRectangle.java b/runescape-client/src/main/java/WorldMapRectangle.java index eaf5fa93f4..a8042d2a22 100644 --- a/runescape-client/src/main/java/WorldMapRectangle.java +++ b/runescape-client/src/main/java/WorldMapRectangle.java @@ -3,100 +3,125 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("h") +@ObfuscatedName("m") @Implements("WorldMapRectangle") public final class WorldMapRectangle { - @ObfuscatedName("bp") + @ObfuscatedName("bd") @ObfuscatedSignature( - signature = "Lhv;" + signature = "Llt;" ) - static StudioGame field166; - @ObfuscatedName("dy") - @ObfuscatedSignature( - signature = "Lid;" - ) - @Export("archive11") - static Archive archive11; - @ObfuscatedName("eq") + @Export("worldSelectRightSprite") + static IndexedSprite worldSelectRightSprite; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 161269475 - ) - @Export("port1") - static int port1; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -35093497 + intValue = -862599519 ) @Export("width") int width; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -975025893 + intValue = -1046105525 ) @Export("height") int height; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1556626299 + intValue = -686803507 ) @Export("x") int x; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1692274853 + intValue = -1467646057 ) @Export("y") int y; // $FF: synthetic field @ObfuscatedSignature( - signature = "Lao;" + signature = "Laj;" ) final WorldMapManager this$0; @ObfuscatedSignature( - signature = "(Lao;)V" + signature = "(Laj;)V" ) WorldMapRectangle(WorldMapManager var1) { this.this$0 = var1; } - @ObfuscatedName("z") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Ljava/lang/String;IB)V", - garbageValue = "87" + signature = "(ILcu;ZI)I", + garbageValue = "1965047031" ) - static final void method281(String var0, int var1) { - PacketBufferNode var2 = MenuAction.getPacketBufferNode(ClientPacket.field2269, Client.packetWriter.isaacCipher); - var2.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var0) + 1); - var2.packetBuffer.writeStringCp1252NullTerminated(var0); - var2.packetBuffer.writeByte(var1); - Client.packetWriter.addNode(var2); + static int method255(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? UserComparator9.field1941 : MidiPcmStream.field2410; + if (var0 == ScriptOpcodes.CC_GETX) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.x; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETY) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.y; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.width; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.height; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETHIDE) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETLAYER) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.parentId; + return 1; + } else { + return 2; + } } - @ObfuscatedName("fx") + @ObfuscatedName("jo") + @ObfuscatedSignature( + signature = "(III)V", + garbageValue = "-228783790" + ) + @Export("runIntfCloseListeners") + static final void runIntfCloseListeners(int var0, int var1) { + if (TaskHandler.loadInterface(var0)) { + class32.runComponentCloseListeners(class289.Widget_interfaceComponents[var0], var1); + } + } + + @ObfuscatedName("jr") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1711181474" + garbageValue = "262144" ) - static final void method280() { - for (int var0 = 0; var0 < Client.npcCount; ++var0) { - int var1 = Client.npcIndices[var0]; - NPC var2 = Client.npcs[var1]; - if (var2 != null) { - class1.calculateActorPosition(var2, var2.definition.size); + static void method257() { + for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { + int var1 = var0.group; + if (TaskHandler.loadInterface(var1)) { + boolean var2 = true; + Widget[] var3 = class289.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 = Player.getWidget(var4); + if (var5 != null) { + WorldMapID.invalidateWidget(var5); + } + } } } } - - @ObfuscatedName("kd") - @ObfuscatedSignature( - signature = "(Lhp;B)Z", - garbageValue = "1" - ) - @Export("isComponentHidden") - static boolean isComponentHidden(Widget var0) { - return var0.isHidden; - } } diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index dff2786ea3..6397a080b6 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -9,57 +9,56 @@ 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("af") +@ObfuscatedName("av") @Implements("WorldMapRegion") public class WorldMapRegion { - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Les;" + signature = "Lez;" ) @Export("WorldMapRegion_cachedSprites") - public static DemotingHashTable WorldMapRegion_cachedSprites; - @ObfuscatedName("n") + static DemotingHashTable WorldMapRegion_cachedSprites; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -2122468343 + intValue = 243577095 ) @Export("regionX") int regionX; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1416092147 + intValue = 1620113083 ) @Export("regionY") int regionY; - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Lb;" + signature = "Le;" ) @Export("worldMapData_0") WorldMapData_0 worldMapData_0; - @ObfuscatedName("x") + @ObfuscatedName("d") @Export("worldMapData1List") LinkedList worldMapData1List; - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1536391847 + intValue = 419659793 ) @Export("backgroundColor") int backgroundColor; - @ObfuscatedName("f") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1012366175 + intValue = -1412542037 ) @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("c") + @ObfuscatedName("h") @Export("icon0List") List icon0List; - @ObfuscatedName("r") + @ObfuscatedName("f") @Export("iconMap") HashMap iconMap; - @ObfuscatedName("y") + @ObfuscatedName("s") @Export("fonts") final HashMap fonts; @@ -77,16 +76,13 @@ public class WorldMapRegion { this.fonts = var4; } - @ObfuscatedName("k") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(IIII)V", - garbageValue = "1799679643" + garbageValue = "382627216" ) - void method476(int var1, int var2, int var3) { - int var5 = this.regionX; - int var6 = this.regionY; - int var7 = this.pixelsPerTile; - Sprite var4 = (Sprite)WorldMapRegion_cachedSprites.get(ClientPacket.getWorldMapSpriteHash(var5, var6, var7)); + void method384(int var1, int var2, int var3) { + Sprite var4 = ScriptFrame.method1085(this.regionX, this.regionY, this.pixelsPerTile); if (var4 != null) { if (var3 == this.pixelsPerTile * 64) { var4.drawAt(var1, var2); @@ -99,8 +95,8 @@ public class WorldMapRegion { @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Lb;Ljava/util/List;I)V", - garbageValue = "-1364217193" + signature = "(Le;Ljava/util/List;I)V", + garbageValue = "-91985940" ) @Export("initWorldMapData0") void initWorldMapData0(WorldMapData_0 var1, List var2) { @@ -109,10 +105,10 @@ public class WorldMapRegion { this.addAllToIconList(var2); } - @ObfuscatedName("n") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(Ljava/util/HashSet;Ljava/util/List;I)V", - garbageValue = "1227010449" + garbageValue = "288554490" ) @Export("initWorldMapData1") void initWorldMapData1(HashSet var1, List var2) { @@ -129,15 +125,15 @@ public class WorldMapRegion { this.addAllToIconList(var2); } - @ObfuscatedName("t") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(IIIILl;I)V", - garbageValue = "661255427" + signature = "(IIIILw;B)V", + garbageValue = "35" ) @Export("getIconsForTiles") void getIconsForTiles(int var1, int var2, int var3, int var4, AbstractWorldMapData var5) { for (int var6 = var1; var6 < var3 + var1; ++var6) { - label74: + label72: for (int var7 = var2; var7 < var2 + var4; ++var7) { for (int var8 = 0; var8 < var5.planes; ++var8) { WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; @@ -147,23 +143,23 @@ public class WorldMapRegion { for (int var11 = 0; var11 < var10.length; ++var11) { ObjectDefinition var13; boolean var14; - label65: { + label63: { WorldMapDecoration var12 = var10[var11]; - var13 = class215.getObjectDefinition(var12.objectDefinitionId); + var13 = WallDecoration.getObjectDefinition(var12.objectDefinitionId); if (var13.transforms != null) { int[] var15 = var13.transforms; for (int var16 = 0; var16 < var15.length; ++var16) { int var17 = var15[var16]; - ObjectDefinition var18 = class215.getObjectDefinition(var17); + ObjectDefinition var18 = WallDecoration.getObjectDefinition(var17); if (var18.mapIconId != -1) { var14 = true; - break label65; + break label63; } } } else if (var13.mapIconId != -1) { var14 = true; - break label65; + break label63; } var14 = false; @@ -171,7 +167,7 @@ public class WorldMapRegion { if (var14) { this.getIcon(var13, var8, var6, var7, var5); - continue label74; + continue label72; } } } @@ -181,10 +177,10 @@ public class WorldMapRegion { } - @ObfuscatedName("q") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lik;IIILl;I)V", - garbageValue = "-1125061375" + signature = "(Liy;IIILw;I)V", + garbageValue = "-1575746805" ) @Export("getIcon") void getIcon(ObjectDefinition var1, int var2, int var3, int var4, AbstractWorldMapData var5) { @@ -201,17 +197,17 @@ public class WorldMapRegion { if (var1.transforms != null) { var10 = new WorldMapIcon_1(var7, var6, var1.id, this); } else { - WorldMapElement var9 = WorldMapData_0.WorldMapElement_get(var1.mapIconId); + WorldMapElement var9 = WorldMapSection1.WorldMapElement_get(var1.mapIconId); var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); } this.iconMap.put(new Coord(0, var3, var4), var10); } - @ObfuscatedName("x") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-13" + signature = "(I)V", + garbageValue = "-1714857908" ) @Export("initWorldMapIcon1s") void initWorldMapIcon1s() { @@ -226,10 +222,10 @@ public class WorldMapRegion { } - @ObfuscatedName("d") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(Ljava/util/List;I)V", - garbageValue = "-232716755" + garbageValue = "725025175" ) @Export("addAllToIconList") void addAllToIconList(List var1) { @@ -238,19 +234,19 @@ public class WorldMapRegion { while (var2.hasNext()) { WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next(); if (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.method437(var3.element)); + WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method513(var3.element)); this.icon0List.add(var4); } } } - @ObfuscatedName("f") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-12" + signature = "(I)V", + garbageValue = "-1774169765" ) - void method415() { + void method391() { if (this.worldMapData_0 != null) { this.worldMapData_0.reset(); } else { @@ -264,10 +260,10 @@ public class WorldMapRegion { } - @ObfuscatedName("c") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(Lhz;I)Z", - garbageValue = "-1549952231" + garbageValue = "-707338536" ) @Export("loadGeography") boolean loadGeography(AbstractArchive var1) { @@ -303,59 +299,56 @@ public class WorldMapRegion { } } - @ObfuscatedName("r") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "(ILax;[Llq;Lhz;Lhz;I)V", - garbageValue = "733361193" + signature = "(ILay;[Llt;Lhz;Lhz;B)V", + garbageValue = "76" ) @Export("drawTile") void drawTile(int var1, class40 var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) { this.pixelsPerTile = var1; if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { - int var7 = this.regionX; - int var8 = this.regionY; - Sprite var6 = (Sprite)WorldMapRegion_cachedSprites.get(ClientPacket.getWorldMapSpriteHash(var7, var8, var1)); - if (var6 == null) { - boolean var9 = true; - var9 &= this.loadGeography(var4); - int var11; + if (ScriptFrame.method1085(this.regionX, this.regionY, var1) == null) { + boolean var6 = true; + var6 &= this.loadGeography(var4); + int var8; if (this.worldMapData_0 != null) { - var11 = this.worldMapData_0.groupId; + var8 = this.worldMapData_0.groupId; } else { - var11 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; + var8 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; } - var9 &= var5.tryLoadGroup(var11); - if (var9) { - byte[] var10 = var5.takeFileFlat(var11); - WorldMapSprite var12; - if (var10 == null) { - var12 = new WorldMapSprite(); + var6 &= var5.tryLoadGroup(var8); + if (var6) { + byte[] var7 = var5.takeFileFlat(var8); + WorldMapSprite var9; + if (var7 == null) { + var9 = new WorldMapSprite(); } else { - var12 = new WorldMapSprite(WorldMapIcon_0.convertJpgToSprite(var10).pixels); + var9 = new WorldMapSprite(class16.convertJpgToSprite(var7).pixels); } - Sprite var14 = new Sprite(this.pixelsPerTile * 64, this.pixelsPerTile * 64); - var14.setRaster(); + Sprite var11 = new Sprite(this.pixelsPerTile * 64, this.pixelsPerTile * 64); + var11.setRaster(); if (this.worldMapData_0 != null) { - this.method420(var2, var3, var12); + this.method447(var2, var3, var9); } else { - this.method421(var2, var3, var12); + this.method397(var2, var3, var9); } - class16.method181(var14, this.regionX, this.regionY, this.pixelsPerTile); - this.method415(); + Buffer.method5703(var11, this.regionX, this.regionY, this.pixelsPerTile); + this.method391(); } } } } - @ObfuscatedName("y") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(IIILjava/util/HashSet;I)V", - garbageValue = "-1247984556" + garbageValue = "-535095440" ) - void method408(int var1, int var2, int var3, HashSet var4) { + void method390(int var1, int var2, int var3, HashSet var4) { if (var4 == null) { var4 = new HashSet(); } @@ -364,10 +357,10 @@ public class WorldMapRegion { this.drawMapLinks(var1, var2, var4, var3); } - @ObfuscatedName("p") + @ObfuscatedName("r") @ObfuscatedSignature( signature = "(Ljava/util/HashSet;III)V", - garbageValue = "475052278" + garbageValue = "1375112705" ) @Export("flashElements") void flashElements(HashSet var1, int var2, int var3) { @@ -378,44 +371,44 @@ public class WorldMapRegion { if (var5.hasValidElement()) { int var6 = var5.getElement(); if (var1.contains(var6)) { - WorldMapElement var7 = WorldMapData_0.WorldMapElement_get(var6); + WorldMapElement var7 = WorldMapSection1.WorldMapElement_get(var6); this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); } } } - this.method515(var1, var2, var3); + this.method405(var1, var2, var3); } - @ObfuscatedName("g") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lax;[Llq;Lam;I)V", - garbageValue = "-1525649588" + signature = "(Lay;[Llt;Lat;B)V", + garbageValue = "-57" ) - void method420(class40 var1, IndexedSprite[] var2, WorldMapSprite var3) { + void method447(class40 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.method447(var4, var5, this.worldMapData_0, var1); + this.method400(var4, var5, this.worldMapData_0, var1); } } for (var4 = 0; var4 < 64; ++var4) { for (var5 = 0; var5 < 64; ++var5) { - this.method422(var4, var5, this.worldMapData_0, var1, var2); + this.method393(var4, var5, this.worldMapData_0, var1, var2); } } } - @ObfuscatedName("e") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lax;[Llq;Lam;I)V", - garbageValue = "-1865495003" + signature = "(Lay;[Llt;Lat;I)V", + garbageValue = "1350875614" ) - void method421(class40 var1, IndexedSprite[] var2, WorldMapSprite var3) { + void method397(class40 var1, IndexedSprite[] var2, WorldMapSprite var3) { Iterator var4 = this.worldMapData1List.iterator(); WorldMapData_1 var5; @@ -427,7 +420,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.method447(var6, var7, var5, var1); + this.method400(var6, var7, var5, var1); } } } @@ -439,27 +432,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.method422(var6, var7, var5, var1, var2); + this.method393(var6, var7, var5, var1, var2); } } } } - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IILl;Lax;[Llq;I)V", - garbageValue = "36824632" + signature = "(IILw;Lay;[Llt;I)V", + garbageValue = "824370394" ) - void method422(int var1, int var2, AbstractWorldMapData var3, class40 var4, IndexedSprite[] var5) { - this.method427(var1, var2, var3); - this.method413(var1, var2, var3, var5); + void method393(int var1, int var2, AbstractWorldMapData var3, class40 var4, IndexedSprite[] var5) { + this.method493(var1, var2, var3); + this.method402(var1, var2, var3, var5); } - @ObfuscatedName("w") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IILl;Lax;Lam;I)V", - garbageValue = "-472169420" + signature = "(IILw;Lay;Lat;I)V", + garbageValue = "-1871711101" ) @Export("drawTileGround") void drawTileGround(int var1, int var2, AbstractWorldMapData var3, class40 var4, WorldMapSprite var5) { @@ -470,57 +463,160 @@ public class WorldMapRegion { } int var8 = 16711935; + int var9; if (var7 != -1) { - var8 = Tiles.method1060(var7, this.backgroundColor); + int var10 = this.backgroundColor; + FloorOverlayDefinition var12 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var7); + FloorOverlayDefinition var11; + if (var12 != null) { + var11 = var12; + } else { + byte[] var13 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var7); + var12 = new FloorOverlayDefinition(); + if (var13 != null) { + var12.decode(new Buffer(var13), var7); + } + + var12.postDecode(); + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var12, (long)var7); + var11 = var12; + } + + if (var11 == null) { + var9 = var10; + } else if (var11.secondaryRgb >= 0) { + var9 = var11.secondaryRgb | -16777216; + } else if (var11.texture >= 0) { + int var19 = UserComparator7.method3382(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var11.texture), 96); + var9 = Rasterizer3D.Rasterizer3D_colorPalette[var19] | -16777216; + } else if (var11.primaryRgb == 16711935) { + var9 = var10; + } else { + int var14 = var11.hue; + int var15 = var11.saturation; + int var16 = var11.lightness; + if (var16 > 179) { + var15 /= 2; + } + + if (var16 > 192) { + var15 /= 2; + } + + if (var16 > 217) { + var15 /= 2; + } + + if (var16 > 243) { + var15 /= 2; + } + + int var17 = (var15 / 32 << 7) + var16 / 2 + (var14 / 4 << 10); + int var18 = UserComparator7.method3382(var17, 96); + var9 = Rasterizer3D.Rasterizer3D_colorPalette[var18] | -16777216; + } + + var8 = var9; } - if (var7 > -1 && var3.field145[0][var1][var2] == 0) { + if (var7 > -1 && var3.field163[0][var1][var2] == 0) { Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); } else { - int var9 = this.method425(var1, var2, var3, var5); + var9 = this.method401(var1, var2, var3, var5); if (var7 == -1) { Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); } else { - var4.method698(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field145[0][var1][var2], var3.field156[0][var1][var2]); + var4.method707(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field163[0][var1][var2], var3.field159[0][var1][var2]); } } } - @ObfuscatedName("l") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(IILl;Lax;B)V", - garbageValue = "44" + signature = "(IILw;Lay;I)V", + garbageValue = "-1546441711" ) - void method447(int var1, int var2, AbstractWorldMapData var3, class40 var4) { + void method400(int var1, int var2, AbstractWorldMapData var3, class40 var4) { for (int var5 = 1; var5 < var3.planes; ++var5) { int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; if (var6 > -1) { - int var7 = Tiles.method1060(var6, this.backgroundColor); - if (var3.field145[var5][var1][var2] == 0) { + int var8 = this.backgroundColor; + FloorOverlayDefinition var10 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var6); + FloorOverlayDefinition var9; + if (var10 != null) { + var9 = var10; + } else { + byte[] var11 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var6); + var10 = new FloorOverlayDefinition(); + if (var11 != null) { + var10.decode(new Buffer(var11), var6); + } + + var10.postDecode(); + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var10, (long)var6); + var9 = var10; + } + + int var7; + if (var9 == null) { + var7 = var8; + } else if (var9.secondaryRgb >= 0) { + var7 = var9.secondaryRgb | -16777216; + } else if (var9.texture >= 0) { + int var18 = UserComparator7.method3382(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var9.texture), 96); + var7 = Rasterizer3D.Rasterizer3D_colorPalette[var18] | -16777216; + } else if (var9.primaryRgb == 16711935) { + var7 = var8; + } else { + int var12 = var9.hue; + int var13 = var9.saturation; + int var14 = var9.lightness; + if (var14 > 179) { + var13 /= 2; + } + + if (var14 > 192) { + var13 /= 2; + } + + if (var14 > 217) { + var13 /= 2; + } + + if (var14 > 243) { + var13 /= 2; + } + + int var15 = (var13 / 32 << 7) + var14 / 2 + (var12 / 4 << 10); + int var16 = UserComparator7.method3382(var15, 96); + var7 = Rasterizer3D.Rasterizer3D_colorPalette[var16] | -16777216; + } + + if (var3.field163[var5][var1][var2] == 0) { Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); } else { - var4.method698(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field145[var5][var1][var2], var3.field156[var5][var1][var2]); + var4.method707(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field163[var5][var1][var2], var3.field159[var5][var1][var2]); } } } } - @ObfuscatedName("h") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "(IILl;Lam;I)I", - garbageValue = "-1958397304" + signature = "(IILw;Lat;I)I", + garbageValue = "212531607" ) - int method425(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { + int method401(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); } - @ObfuscatedName("v") + @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "(IILl;[Llq;S)V", - garbageValue = "800" + signature = "(IILw;[Llt;I)V", + garbageValue = "-337598152" ) - void method413(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { + void method402(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) { @@ -528,16 +624,20 @@ public class WorldMapRegion { for (int var8 = 0; var8 < var7.length; ++var8) { WorldMapDecoration var9 = var7[var8]; - int var11 = var9.decoration; - boolean var10 = var11 >= WorldMapDecorationType.field2711.id && var11 <= WorldMapDecorationType.field2705.id; - if (var10 || GraphicsObject.method1946(var9.decoration)) { - ObjectDefinition var12 = class215.getObjectDefinition(var9.objectDefinitionId); - if (var12.mapSceneId != -1) { - if (var12.mapSceneId != 46 && var12.mapSceneId != 52) { - var4[var12.mapSceneId].method5979(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); - } else { - var4[var12.mapSceneId].method5979(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); - } + if (!class227.method4110(var9.decoration)) { + int var11 = var9.decoration; + boolean var10 = var11 == WorldMapDecorationType.field2716.id; + if (!var10) { + continue; + } + } + + ObjectDefinition var12 = WallDecoration.getObjectDefinition(var9.objectDefinitionId); + if (var12.mapSceneId != -1) { + if (var12.mapSceneId != 46 && var12.mapSceneId != 52) { + var4[var12.mapSceneId].method6059(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); + } else { + var4[var12.mapSceneId].method6059(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); } } } @@ -546,12 +646,12 @@ public class WorldMapRegion { } - @ObfuscatedName("m") + @ObfuscatedName("at") @ObfuscatedSignature( - signature = "(IILl;B)V", - garbageValue = "100" + signature = "(IILw;B)V", + garbageValue = "55" ) - void method427(int var1, int var2, AbstractWorldMapData var3) { + void method493(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) { @@ -559,48 +659,46 @@ public class WorldMapRegion { for (int var7 = 0; var7 < var6.length; ++var7) { WorldMapDecoration var8 = var6[var7]; - int var10 = var8.decoration; - boolean var9 = var10 >= WorldMapDecorationType.field2701.id && var10 <= WorldMapDecorationType.field2704.id || var10 == WorldMapDecorationType.field2721.id; - if (var9) { - ObjectDefinition var11 = class215.getObjectDefinition(var8.objectDefinitionId); - int var12 = var11.int1 != 0 ? -3407872 : -3355444; - if (var8.decoration == WorldMapDecorationType.field2701.id) { - this.method441(var1, var2, var8.rotation, var12); - } - - if (var8.decoration == WorldMapDecorationType.field2702.id) { - this.method441(var1, var2, var8.rotation, -3355444); - this.method441(var1, var2, var8.rotation + 1, var12); - } - + if (NPCDefinition.method4750(var8.decoration)) { + ObjectDefinition var9 = WallDecoration.getObjectDefinition(var8.objectDefinitionId); + int var10 = var9.int1 != 0 ? -3407872 : -3355444; if (var8.decoration == WorldMapDecorationType.field2704.id) { + this.method398(var1, var2, var8.rotation, var10); + } + + if (var8.decoration == WorldMapDecorationType.field2695.id) { + this.method398(var1, var2, var8.rotation, -3355444); + this.method398(var1, var2, var8.rotation + 1, var10); + } + + if (var8.decoration == WorldMapDecorationType.field2697.id) { if (var8.rotation == 0) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var12); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var10); } if (var8.rotation == 1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2), 1, var12); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2), 1, var10); } if (var8.rotation == 2) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var12); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); } if (var8.rotation == 3) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var12); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); } } - if (var8.decoration == WorldMapDecorationType.field2721.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); + if (var8.decoration == WorldMapDecorationType.field2698.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); } } else { - for (var14 = 0; var14 < this.pixelsPerTile; ++var14) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.pixelsPerTile * var1, var14 + this.pixelsPerTile * (63 - var2), 1, var12); + for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, var12 + this.pixelsPerTile * (63 - var2), 1, var10); } } } @@ -611,10 +709,10 @@ public class WorldMapRegion { } - @ObfuscatedName("o") + @ObfuscatedName("ao") @ObfuscatedSignature( signature = "(IILjava/util/HashSet;II)V", - garbageValue = "-1405499271" + garbageValue = "1064353501" ) @Export("drawNonLinkMapIcons") void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) { @@ -625,15 +723,15 @@ public class WorldMapRegion { while (var7.hasNext()) { Entry var8 = (Entry)var7.next(); Coord var9 = (Coord)var8.getKey(); - int var10 = (int)((float)var1 + (float)var9.x * var5 - var6); - int var11 = (int)((float)(var2 + var4) - var5 * (float)var9.y - 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 = WorldMapData_0.WorldMapElement_get(var12.getElement()); + WorldMapElement var13 = WorldMapSection1.WorldMapElement_get(var12.getElement()); if (!var3.contains(var13.getObjectId())) { - this.method445(var12, var10, var11, var5); + this.method494(var12, var10, var11, var5); } } } @@ -643,15 +741,15 @@ public class WorldMapRegion { @ObfuscatedName("av") @ObfuscatedSignature( signature = "(Ljava/util/HashSet;III)V", - garbageValue = "75297543" + garbageValue = "-664201064" ) - void method515(HashSet var1, int var2, int var3) { + void method405(HashSet var1, int var2, int var3) { Iterator var4 = this.icon0List.iterator(); while (var4.hasNext()) { AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); if (var5.hasValidElement()) { - WorldMapElement var6 = WorldMapData_0.WorldMapElement_get(var5.getElement()); + WorldMapElement var6 = WorldMapSection1.WorldMapElement_get(var5.getElement()); if (var6 != null && var1.contains(var6.getObjectId())) { this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); } @@ -660,10 +758,10 @@ public class WorldMapRegion { } - @ObfuscatedName("am") + @ObfuscatedName("an") @ObfuscatedSignature( - signature = "(Liq;IIIIB)V", - garbageValue = "-101" + signature = "(Liu;IIIIB)V", + garbageValue = "-42" ) @Export("drawBackgroundCircle") void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) { @@ -678,51 +776,51 @@ public class WorldMapRegion { } } - @ObfuscatedName("ai") + @ObfuscatedName("al") @ObfuscatedSignature( - signature = "(Las;IIFI)V", - garbageValue = "-1135746308" + signature = "(Lap;IIFI)V", + garbageValue = "1055388639" ) - void method445(AbstractWorldMapIcon var1, int var2, int var3, float var4) { - WorldMapElement var5 = WorldMapData_0.WorldMapElement_get(var1.getElement()); - this.method432(var5, var2, var3); - this.method433(var1, var5, var2, var3, var4); + void method494(AbstractWorldMapIcon var1, int var2, int var3, float var4) { + WorldMapElement var5 = WorldMapSection1.WorldMapElement_get(var1.getElement()); + this.method475(var5, var2, var3); + this.method409(var1, var5, var2, var3, var4); } - @ObfuscatedName("af") + @ObfuscatedName("as") @ObfuscatedSignature( - signature = "(Liq;III)V", - garbageValue = "86636677" + signature = "(Liu;III)V", + garbageValue = "-746790062" ) - void method432(WorldMapElement var1, int var2, int var3) { + void method475(WorldMapElement var1, int var2, int var3) { Sprite var4 = var1.getSpriteBool(false); if (var4 != null) { - int var5 = this.method435(var4, var1.horizontalAlignment); - int var6 = this.method477(var4, var1.verticalAlignment); + int var5 = this.method411(var4, var1.horizontalAlignment); + int var6 = this.method474(var4, var1.verticalAlignment); var4.drawTransBgAt(var5 + var2, var3 + var6); } } - @ObfuscatedName("az") + @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "(Las;Liq;IIFI)V", - garbageValue = "-1657066614" + signature = "(Lap;Liu;IIFB)V", + garbageValue = "-44" ) - void method433(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { + void method409(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { WorldMapLabel var6 = var1.getLabel(); if (var6 != null) { - if (var6.size.method185(var5)) { + if (var6.size.method167(var5)) { Font var7 = (Font)this.fonts.get(var6.size); - var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field3200, 0, 1, 0, var7.ascent / 2); + var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field3195, 0, 1, 0, var7.ascent / 2); } } } - @ObfuscatedName("aj") + @ObfuscatedName("ap") @ObfuscatedSignature( signature = "(IILjava/util/HashSet;II)V", - garbageValue = "944833799" + garbageValue = "-747150433" ) @Export("drawMapLinks") void drawMapLinks(int var1, int var2, HashSet var3, int var4) { @@ -734,22 +832,22 @@ public class WorldMapRegion { if (var7.hasValidElement()) { int var8 = var7.coord2.x % 64; int var9 = var7.coord2.y % 64; - var7.screenX = (int)((float)var1 + (float)var8 * var5); - var7.screenY = (int)((float)(63 - var9) * var5 + (float)var2); + var7.screenX = (int)((float)var8 * var5 + (float)var1); + var7.screenY = (int)(var5 * (float)(63 - var9) + (float)var2); if (!var3.contains(var7.getElement())) { - this.method445(var7, var7.screenX, var7.screenY, var5); + this.method494(var7, var7.screenX, var7.screenY, var5); } } } } - @ObfuscatedName("an") + @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "(Lls;Lib;B)I", - garbageValue = "-105" + signature = "(Lli;Lie;I)I", + garbageValue = "-1724817993" ) - int method435(Sprite var1, HorizontalAlignment var2) { + int method411(Sprite var1, HorizontalAlignment var2) { switch(var2.value) { case 1: return -var1.subWidth / 2; @@ -760,58 +858,59 @@ public class WorldMapRegion { } } - @ObfuscatedName("at") + @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "(Lls;Lia;I)I", - garbageValue = "2126912618" + signature = "(Lli;Lii;I)I", + garbageValue = "1842119617" ) - int method477(Sprite var1, VerticalAlignment var2) { + int method474(Sprite var1, VerticalAlignment var2) { switch(var2.value) { - case 0: - return -var1.subHeight / 2; case 1: return 0; + case 2: + return -var1.subHeight / 2; default: return -var1.subHeight; } } - @ObfuscatedName("as") + @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "(II)Lai;", - garbageValue = "140578044" + signature = "(II)Lao;", + garbageValue = "1798974751" ) - WorldMapLabel method437(int var1) { - WorldMapElement var2 = WorldMapData_0.WorldMapElement_get(var1); + WorldMapLabel method513(int var1) { + WorldMapElement var2 = WorldMapSection1.WorldMapElement_get(var1); return this.createMapLabel(var2); } - @ObfuscatedName("ak") + @ObfuscatedName("af") @ObfuscatedSignature( - signature = "(Liq;B)Lai;", - garbageValue = "-114" + signature = "(Liu;I)Lao;", + garbageValue = "-353392660" ) @Export("createMapLabel") WorldMapLabel createMapLabel(WorldMapElement var1) { if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { int var3 = var1.textSize; - WorldMapLabelSize[] var4 = WorldMapLabelSize.method190(); - int var5 = 0; + WorldMapLabelSize[] var4 = new WorldMapLabelSize[]{WorldMapLabelSize.WorldMapLabelSize_large, WorldMapLabelSize.WorldMapLabelSize_medium, WorldMapLabelSize.WorldMapLabelSize_small}; + WorldMapLabelSize[] var5 = var4; + int var6 = 0; WorldMapLabelSize var2; while (true) { - if (var5 >= var4.length) { + if (var6 >= var5.length) { var2 = null; break; } - WorldMapLabelSize var6 = var4[var5]; - if (var3 == var6.field105) { - var2 = var6; + WorldMapLabelSize var7 = var5[var6]; + if (var3 == var7.field114) { + var2 = var7; break; } - ++var5; + ++var6; } if (var2 == null) { @@ -821,12 +920,12 @@ public class WorldMapRegion { if (var14 == null) { return null; } else { - int var15 = var14.lineCount(var1.name, 1000000); - String[] var7 = new String[var15]; - var14.breakLines(var1.name, (int[])null, var7); - int var8 = var7.length * var14.ascent / 2; + var6 = var14.lineCount(var1.name, 1000000); + String[] var15 = new String[var6]; + var14.breakLines(var1.name, (int[])null, var15); + int var8 = var15.length * var14.ascent / 2; int var9 = 0; - String[] var10 = var7; + String[] var10 = var15; for (int var11 = 0; var11 < var10.length; ++var11) { String var12 = var10[var11]; @@ -844,12 +943,12 @@ public class WorldMapRegion { } } - @ObfuscatedName("ao") + @ObfuscatedName("ak") @ObfuscatedSignature( signature = "(IIIIII)Ljava/util/List;", - garbageValue = "-1473050198" + garbageValue = "1404508745" ) - List method439(int var1, int var2, int var3, int var4, int var5) { + List method415(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) { @@ -881,10 +980,10 @@ public class WorldMapRegion { } } - @ObfuscatedName("ac") + @ObfuscatedName("ay") @ObfuscatedSignature( signature = "(I)Ljava/util/List;", - garbageValue = "1996494275" + garbageValue = "-977559696" ) @Export("icons") List icons() { @@ -894,12 +993,12 @@ public class WorldMapRegion { return var1; } - @ObfuscatedName("ar") + @ObfuscatedName("ae") @ObfuscatedSignature( signature = "(IIIII)V", - garbageValue = "-1284201635" + garbageValue = "-1630472707" ) - void method441(int var1, int var2, int var3, int var4) { + void method398(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); @@ -919,413 +1018,61 @@ public class WorldMapRegion { } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "723122560" + signature = "([Ljava/lang/CharSequence;IIB)Ljava/lang/String;", + garbageValue = "70" ) - public static int method530(int var0) { - return var0 >> 11 & 63; - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "(ILcr;ZB)I", - garbageValue = "79" - ) - static int method464(int var0, Script var1, boolean var2) { - String var3; - if (var0 == ScriptOpcodes.MES) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - DirectByteArrayCopier.addGameMessage(0, "", var3); - return 1; - } else if (var0 == ScriptOpcodes.ANIM) { - Interpreter.Interpreter_intStackSize -= 2; - FriendsList.performPlayerAnimation(WorldMapIcon_1.localPlayer, Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - return 1; - } else if (var0 == ScriptOpcodes.IF_CLOSE) { - if (!Interpreter.field1072) { - Interpreter.field1074 = true; - } - - return 1; + public static String method515(CharSequence[] var0, int var1, int var2) { + if (var2 == 0) { + return ""; + } else if (var2 == 1) { + CharSequence var3 = var0[var1]; + return var3 == null ? "null" : var3.toString(); } else { - int var10; - if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var10 = 0; - if (TaskHandler.isNumber(var3)) { - var10 = WallDecoration.parseInt(var3); - } + int var8 = var2 + var1; + int var4 = 0; - PacketBufferNode var12 = MenuAction.getPacketBufferNode(ClientPacket.field2202, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeInt(var10); - Client.packetWriter.addNode(var12); - return 1; - } else { - PacketBufferNode var14; - if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var14 = MenuAction.getPacketBufferNode(ClientPacket.field2280, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeByte(var3.length() + 1); - var14.packetBuffer.writeStringCp1252NullTerminated(var3); - Client.packetWriter.addNode(var14); - return 1; - } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var14 = MenuAction.getPacketBufferNode(ClientPacket.field2194, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeByte(var3.length() + 1); - var14.packetBuffer.writeStringCp1252NullTerminated(var3); - Client.packetWriter.addNode(var14); - return 1; + for (int var5 = var1; var5 < var8; ++var5) { + CharSequence var6 = var0[var5]; + if (var6 == null) { + var4 += 4; } else { - String var7; - int var15; - if (var0 == ScriptOpcodes.OPPLAYER) { - var15 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - ModelData0.method3201(var15, var7); - return 1; - } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { - Interpreter.Interpreter_intStackSize -= 3; - var15 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - int var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - Widget var13 = WorldMapElement.getWidget(var9); - clickWidget(var13, var15, var10); - return 1; - } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { - Interpreter.Interpreter_intStackSize -= 2; - var15 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Widget var11 = var2 ? class286.field3623 : class297.field3693; - clickWidget(var11, var15, var10); - return 1; - } else if (var0 == ScriptOpcodes.MOUSECAM) { - FriendSystem.mouseCam = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOffer.clientPreferences.roofsHidden ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { - GrandExchangeOffer.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - GrandExchangeOfferAgeComparator.savePreferences(); - return 1; - } else if (var0 == ScriptOpcodes.OPENURL) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - boolean var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - GameObject.openURL(var3, var4, false); - return 1; - } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { - var15 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var14 = MenuAction.getPacketBufferNode(ClientPacket.field2227, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeShort(var15); - Client.packetWriter.addNode(var14); - return 1; - } else if (var0 == ScriptOpcodes.BUG_REPORT) { - var15 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStackSize -= 2; - var7 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; - String var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; - if (var7.length() > 500) { - return 1; - } else if (var5.length() > 500) { - return 1; - } else { - PacketBufferNode var6 = MenuAction.getPacketBufferNode(ClientPacket.field2232, Client.packetWriter.isaacCipher); - var6.packetBuffer.writeShort(1 + Buddy.stringCp1252NullTerminatedByteSize(var7) + Buddy.stringCp1252NullTerminatedByteSize(var5)); - var6.packetBuffer.writeStringCp1252NullTerminated(var7); - var6.packetBuffer.writeByte(var15); - var6.packetBuffer.writeStringCp1252NullTerminated(var5); - 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) { - SpriteMask.setTapToDrop(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1); - return 1; - } else if (var0 == ScriptOpcodes.GETTAPTODROP) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MouseHandler.getTapToDrop() ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.SETOCULUSORBSPEED) { - 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] = KitDefinition.canvasWidth; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class30.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.field638 = 3; - Client.field786 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - return 1; - } else if (var0 == 3137) { - Client.field638 = 2; - Client.field786 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - return 1; - } else if (var0 == 3138) { - Client.field638 = 0; - return 1; - } else if (var0 == 3139) { - Client.field638 = 1; - return 1; - } else if (var0 == 3140) { - Client.field638 = 3; - Client.field786 = var2 ? class286.field3623.id : class297.field3693.id; - return 1; - } else { - boolean var8; - if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { - var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - GrandExchangeOffer.clientPreferences.hideUsername = var8; - GrandExchangeOfferAgeComparator.savePreferences(); - return 1; - } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOffer.clientPreferences.hideUsername ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { - var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Client.Login_isUsernameRemembered = var8; - if (!var8) { - GrandExchangeOffer.clientPreferences.rememberedUsername = ""; - GrandExchangeOfferAgeComparator.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 == 3145) { - return 1; - } else if (var0 == ScriptOpcodes.SETTITLEMUSICENABLED) { - var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (var8 == GrandExchangeOffer.clientPreferences.titleMusicDisabled) { - GrandExchangeOffer.clientPreferences.titleMusicDisabled = !var8; - GrandExchangeOfferAgeComparator.savePreferences(); - } - - return 1; - } else if (var0 == ScriptOpcodes.GETTITLEMUSICENABLED) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOffer.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] = class43.method758(); - return 1; - } else if (var0 == 3155) { - --Interpreter.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) { - --Interpreter.Interpreter_stringStackSize; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3164) { - --Interpreter.Interpreter_intStackSize; - Interpreter.Interpreter_stringStack[++Interpreter.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[++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[++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 { - return var0 == 3176 ? 1 : 2; - } - } + var4 += var6.length(); } } + + StringBuilder var9 = new StringBuilder(var4); + + for (int var10 = var1; var10 < var8; ++var10) { + CharSequence var7 = var0[var10]; + if (var7 == null) { + var9.append("null"); + } else { + var9.append(var7); + } + } + + return var9.toString(); } } - @ObfuscatedName("iw") + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "([Ljava/lang/String;[SI)V", + garbageValue = "1311099135" + ) + public static void method514(String[] var0, short[] var1) { + UserComparator9.sortItemsByName(var0, var1, 0, var0.length - 1); + } + + @ObfuscatedName("hk") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "34219574" + garbageValue = "260100818" ) - @Export("Widget_runOnTargetLeave") - static void Widget_runOnTargetLeave() { - if (Client.isSpellSelected) { - Widget var0 = ModelData0.getWidgetChild(NetCache.field3162, Client.field816); - if (var0 != null && var0.onTargetLeave != null) { - ScriptEvent var1 = new ScriptEvent(); - var1.widget = var0; - var1.args = var0.onTargetLeave; - class81.runScriptEvent(var1); - } - - Client.isSpellSelected = false; - FriendSystem.invalidateWidget(var0); - } - } - - @ObfuscatedName("jr") - @ObfuscatedSignature( - signature = "(Lhp;III)V", - garbageValue = "404592030" - ) - @Export("clickWidget") - static final void clickWidget(Widget var0, int var1, int var2) { - if (Client.clickedWidget == null && !Client.isMenuOpen) { - if (var0 != null && ServerPacket.method3552(var0) != null) { - Client.clickedWidget = var0; - Client.clickedWidgetParent = ServerPacket.method3552(var0); - Client.widgetClickX = var1; - Client.widgetClickY = var2; - class60.widgetDragDuration = 0; - Client.isDraggingWidget = false; - int var3 = Client.menuOptionsCount - 1; - if (var3 != -1) { - class1.tempMenuAction = new MenuAction(); - class1.tempMenuAction.argument1 = Client.menuArguments1[var3]; - class1.tempMenuAction.argument2 = Client.menuArguments2[var3]; - class1.tempMenuAction.opcode = Client.menuOpcodes[var3]; - class1.tempMenuAction.argument0 = Client.menuIdentifiers[var3]; - class1.tempMenuAction.action = Client.menuActions[var3]; - } - - } - } + @Export("calculateMenuBounds") + static void calculateMenuBounds() { + ScriptEvent.calculateMenuBounds(class173.menuWidth / 2 + FileSystem.menuX, class83.menuY); } } diff --git a/runescape-client/src/main/java/WorldMapSection.java b/runescape-client/src/main/java/WorldMapSection.java index 5c41d3c424..cb09da1d12 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("ac") +@ObfuscatedName("ab") @Implements("WorldMapSection") public interface WorldMapSection { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lav;I)V", - garbageValue = "-1068467910" + signature = "(Lag;S)V", + garbageValue = "32767" ) @Export("expandBounds") void expandBounds(WorldMapArea var1); - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(IIII)Z", - garbageValue = "1014871771" + garbageValue = "950167825" ) @Export("containsCoord") boolean containsCoord(int var1, int var2, int var3); - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(III)Z", - garbageValue = "694688168" + garbageValue = "1510325414" ) @Export("containsPosition") boolean containsPosition(int var1, int var2); - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(IIII)[I", - garbageValue = "-45443461" + garbageValue = "-771447481" ) @Export("getBorderTileLengths") int[] getBorderTileLengths(int var1, int var2, int var3); - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(III)Lhd;", - garbageValue = "1267204541" + signature = "(IIB)Lhj;", + garbageValue = "0" ) @Export("coord") Coord coord(int var1, int var2); - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Lky;I)V", - garbageValue = "1072299144" + signature = "(Lkz;I)V", + garbageValue = "1954302512" ) @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 c3f040cd12..757d9cb614 100644 --- a/runescape-client/src/main/java/WorldMapSection0.java +++ b/runescape-client/src/main/java/WorldMapSection0.java @@ -1,101 +1,108 @@ -import java.applet.Applet; -import java.net.URL; +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 netscape.javascript.JSObject; +import net.runelite.rs.Reflection; -@ObfuscatedName("a") +@ObfuscatedName("r") @Implements("WorldMapSection0") public class WorldMapSection0 implements WorldMapSection { - @ObfuscatedName("qc") + @ObfuscatedName("nk") @ObfuscatedGetter( - intValue = 2121568877 + intValue = 1085609153 ) - static int field129; - @ObfuscatedName("s") + static int field138; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1843368435 + intValue = -1571530289 ) @Export("oldZ") int oldZ; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1967867601 + intValue = -533649473 ) @Export("newZ") int newZ; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 59619681 + intValue = 1995731449 ) @Export("oldX") int oldX; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1129571555 + intValue = 1062766317 ) @Export("oldY") int oldY; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1545521373 + intValue = 808366011 ) @Export("newX") int newX; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1178438045 + intValue = 1027119805 ) @Export("newY") int newY; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1044467109 + intValue = -1967666529 ) @Export("oldChunkXLow") int oldChunkXLow; - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 2073431393 + intValue = -1161504373 ) @Export("oldChunkYLow") int oldChunkYLow; - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1873956173 + intValue = -1572226723 ) @Export("oldChunkXHigh") int oldChunkXHigh; - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -263670183 + intValue = 487863769 ) @Export("oldChunkYHigh") int oldChunkYHigh; - @ObfuscatedName("f") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -631680795 + intValue = -997364423 ) @Export("newChunkXLow") int newChunkXLow; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1516769831 + intValue = 743905469 ) @Export("newChunkYLow") int newChunkYLow; - @ObfuscatedName("r") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1418040295 + intValue = -1996633981 ) @Export("newChunkXHigh") int newChunkXHigh; - @ObfuscatedName("y") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -779321503 + intValue = -2013114443 ) @Export("newChunkYHigh") int newChunkYHigh; @@ -103,10 +110,10 @@ public class WorldMapSection0 implements WorldMapSection { WorldMapSection0() { } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lav;I)V", - garbageValue = "-1068467910" + signature = "(Lag;S)V", + garbageValue = "32767" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { @@ -128,10 +135,10 @@ public class WorldMapSection0 implements WorldMapSection { } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(IIII)Z", - garbageValue = "1014871771" + garbageValue = "950167825" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -142,20 +149,20 @@ public class WorldMapSection0 implements WorldMapSection { } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(III)Z", - garbageValue = "694688168" + garbageValue = "1510325414" ) @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("k") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(IIII)[I", - garbageValue = "-45443461" + garbageValue = "-771447481" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { @@ -167,10 +174,10 @@ public class WorldMapSection0 implements WorldMapSection { } } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(III)Lhd;", - garbageValue = "1267204541" + signature = "(IIB)Lhj;", + garbageValue = "0" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -183,10 +190,10 @@ public class WorldMapSection0 implements WorldMapSection { } } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Lky;I)V", - garbageValue = "1072299144" + signature = "(Lkz;I)V", + garbageValue = "1954302512" ) @Export("read") public void read(Buffer var1) { @@ -207,143 +214,321 @@ public class WorldMapSection0 implements WorldMapSection { this.postRead(); } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "105" + signature = "(I)V", + garbageValue = "-2040631149" ) @Export("postRead") void postRead() { } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "([BIII)Ljava/lang/String;", - garbageValue = "44636829" + signature = "(Lkt;I)V", + garbageValue = "-2023027273" ) - static String method211(byte[] var0, int var1, int var2) { - StringBuilder var3 = new StringBuilder(); + @Export("performReflectionCheck") + public static void performReflectionCheck(PacketBuffer var0) { + ReflectionCheck var1 = (ReflectionCheck)class96.reflectionChecks.last(); + if (var1 != null) { + int var2 = var0.offset; + var0.writeInt(var1.id); - for (int var4 = var1; var4 < var2 + var1; var4 += 3) { - int var5 = var0[var4] & 255; - var3.append(class289.field3631[var5 >>> 2]); - if (var4 < var2 - 1) { - int var6 = var0[var4 + 1] & 255; - var3.append(class289.field3631[(var5 & 3) << 4 | var6 >>> 4]); - if (var4 < var2 - 2) { - int var7 = var0[var4 + 2] & 255; - var3.append(class289.field3631[(var6 & 15) << 2 | var7 >>> 6]).append(class289.field3631[var7 & 63]); + for (int var3 = 0; var3 < var1.size; ++var3) { + if (var1.creationErrors[var3] != 0) { + var0.writeByte(var1.creationErrors[var3]); } else { - var3.append(class289.field3631[(var6 & 15) << 2]).append("="); + 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); + } } - } else { - var3.append(class289.field3631[(var5 & 3) << 4]).append("=="); + } + + var0.writeCrc(var2); + var1.remove(); + } + } + + @ObfuscatedName("ia") + @ObfuscatedSignature( + signature = "(Lhy;III)V", + garbageValue = "-2015033366" + ) + static final void method217(Widget var0, int var1, int var2) { + if (var0.buttonType == 1) { + FontName.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); + } + + String var3; + if (var0.buttonType == 2 && !Client.isSpellSelected) { + var3 = class16.method165(var0); + if (var3 != null) { + FontName.insertMenuItemNoShift(var3, UserComparator7.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); } } - return var3.toString(); - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "956806000" - ) - public static int method215(int var0, int var1) { - int var2; - for (var2 = 0; var1 > 0; --var1) { - var2 = var2 << 1 | var0 & 1; - var0 >>>= 1; + if (var0.buttonType == 3) { + FontName.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); } - return var2; - } + if (var0.buttonType == 4) { + FontName.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); + } - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;ILjava/lang/String;B)Z", - garbageValue = "44" - ) - static boolean method232(String var0, int var1, String var2) { - if (var1 == 0) { - try { - if (!class51.field404.startsWith("win")) { - throw new Exception(); - } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { - throw new Exception(); - } else { - String var11 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; + if (var0.buttonType == 5) { + FontName.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); + } - for (int var4 = 0; var4 < var0.length(); ++var4) { - if (var11.indexOf(var0.charAt(var4)) == -1) { - throw new Exception(); + if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { + FontName.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); + } + + int var4; + int var5; + int var15; + if (var0.type == 2) { + var15 = 0; + + for (var4 = 0; var4 < var0.height; ++var4) { + for (var5 = 0; var5 < var0.width; ++var5) { + int var6 = (var0.paddingX + 32) * var5; + 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; + World.field996 = var0; + if (var0.itemIds[var15] > 0) { + ItemDefinition var8 = Player.ItemDefinition_get(var0.itemIds[var15] - 1); + if (Client.isItemSelected == 1 && MilliClock.method3432(class60.getWidgetClickMask(var0))) { + if (var0.id != MusicPatchPcmStream.selectedItemWidget || var15 != ModelData0.selectedItemSlot) { + FontName.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator7.colorStartTag(16748608) + var8.name, 31, var8.id, var15, var0.id); + } + } else if (Client.isSpellSelected && MilliClock.method3432(class60.getWidgetClickMask(var0))) { + if ((BuddyRankComparator.selectedSpellFlags & 16) == 16) { + FontName.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator7.colorStartTag(16748608) + var8.name, 32, var8.id, var15, var0.id); + } + } else { + String[] var9 = var8.inventoryActions; + int var10 = -1; + boolean var11; + if (Client.shiftClickDrop) { + var11 = Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; + if (var11) { + var10 = var8.getShiftClickIndex(); + } + } + + if (MilliClock.method3432(class60.getWidgetClickMask(var0))) { + for (int var20 = 4; var20 >= 3; --var20) { + if (var10 != var20) { + ScriptEvent.addWidgetItemMenuItem(var0, var8, var15, var20, false); + } + } + } + + int var12 = class60.getWidgetClickMask(var0); + var11 = (var12 >> 31 & 1) != 0; + if (var11) { + FontName.insertMenuItemNoShift("Use", UserComparator7.colorStartTag(16748608) + var8.name, 38, var8.id, var15, var0.id); + } + + Object var10000 = null; + int var13; + if (MilliClock.method3432(class60.getWidgetClickMask(var0))) { + for (var13 = 2; var13 >= 0; --var13) { + if (var10 != var13) { + ScriptEvent.addWidgetItemMenuItem(var0, var8, var15, var13, false); + } + } + + if (var10 >= 0) { + ScriptEvent.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; + } + + FontName.insertMenuItemNoShift(var9[var13], UserComparator7.colorStartTag(16748608) + var8.name, var14, var8.id, var15, var0.id); + } + } + } + + FontName.insertMenuItemNoShift("Examine", UserComparator7.colorStartTag(16748608) + var8.name, 1005, var8.id, var15, var0.id); + } } } - Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); - return true; - } - } catch (Throwable var5) { - return false; - } - } else if (var1 == 1) { - try { - Object var10 = class47.method795(class51.applet, var2, new Object[]{(new URL(class51.applet.getCodeBase(), var0)).toString()}); - return var10 != null; - } catch (Throwable var6) { - return false; - } - } else if (var1 == 2) { - try { - class51.applet.getAppletContext().showDocument(new URL(class51.applet.getCodeBase(), var0), "_blank"); - return true; - } catch (Exception var7) { - return false; - } - } else if (var1 == 3) { - try { - Applet var3 = class51.applet; - JSObject.getWindow(var3).call("loggedout", (Object[])null); - } catch (Throwable var9) { - } - - try { - class51.applet.getAppletContext().showDocument(new URL(class51.applet.getCodeBase(), var0), "_top"); - return true; - } catch (Exception var8) { - return false; - } - } else { - throw new IllegalArgumentException(); - } - } - - @ObfuscatedName("lz") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "905677752" - ) - static void method221() { - Client.packetWriter.addNode(MenuAction.getPacketBufferNode(ClientPacket.field2222, Client.packetWriter.isaacCipher)); - Client.oculusOrbState = 0; - } - - @ObfuscatedName("lo") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "1" - ) - static void method230() { - if (GameObject.field1921 != null) { - Client.field892 = Client.cycle; - GameObject.field1921.method4241(); - - for (int var0 = 0; var0 < Client.players.length; ++var0) { - if (Client.players[var0] != null) { - GameObject.field1921.method4237(PacketWriter.baseX * 64 + (Client.players[var0].x >> 7), RouteStrategy.baseY * 64 + (Client.players[var0].y >> 7)); + ++var15; } } } + if (var0.isIf3) { + if (Client.isSpellSelected) { + var4 = class60.getWidgetClickMask(var0); + boolean var21 = (var4 >> 21 & 1) != 0; + if (var21 && (BuddyRankComparator.selectedSpellFlags & 32) == 32) { + FontName.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); + } + } else { + for (var15 = 9; var15 >= 5; --var15) { + String var16; + if (!class210.method3951(class60.getWidgetClickMask(var0), var15) && var0.onOp == null) { + var16 = null; + } else if (var0.actions != null && var0.actions.length > var15 && var0.actions[var15] != null && var0.actions[var15].trim().length() != 0) { + var16 = var0.actions[var15]; + } else { + var16 = null; + } + + if (var16 != null) { + FontName.insertMenuItemNoShift(var16, var0.dataText, 1007, var15 + 1, var0.childIndex, var0.id); + } + } + + var3 = class16.method165(var0); + if (var3 != null) { + FontName.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); + } + + for (var4 = 4; var4 >= 0; --var4) { + String var17; + if (!class210.method3951(class60.getWidgetClickMask(var0), var4) && var0.onOp == null) { + var17 = null; + } else if (var0.actions != null && var0.actions.length > var4 && var0.actions[var4] != null && var0.actions[var4].trim().length() != 0) { + var17 = var0.actions[var4]; + } else { + var17 = null; + } + + if (var17 != null) { + Decimator.insertMenuItem(var17, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.field2680); + } + } + + var5 = class60.getWidgetClickMask(var0); + boolean var19 = (var5 & 1) != 0; + if (var19) { + FontName.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); + } + } + } + + } + + @ObfuscatedName("jv") + @ObfuscatedSignature( + signature = "(IS)Z", + garbageValue = "250" + ) + static boolean method216(int var0) { + for (int var1 = 0; var1 < Client.field844; ++var1) { + if (Client.field846[var1] == var0) { + return true; + } + } + + return false; } } diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index 4926964134..ccb11edc6a 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -4,71 +4,67 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("at") +@ObfuscatedName("ad") @Implements("WorldMapSection1") public class WorldMapSection1 implements WorldMapSection { - @ObfuscatedName("x") - @Export("SpriteBuffer_pixels") - public static byte[][] SpriteBuffer_pixels; - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "[Lmw;" - ) - @Export("JagexCache_idxFiles") - public static BufferedFile[] JagexCache_idxFiles; - @ObfuscatedName("bk") - @Export("otp") - static String otp; - @ObfuscatedName("de") - @ObfuscatedSignature( - signature = "Lid;" - ) - @Export("archive14") - static Archive archive14; - @ObfuscatedName("gn") + @ObfuscatedName("ra") @ObfuscatedGetter( - intValue = 1628860217 + intValue = -1957533263 ) - static int field283; - @ObfuscatedName("gy") + static int field285; + @ObfuscatedName("cy") + @Export("mouseCam") + static boolean mouseCam; + @ObfuscatedName("ej") @ObfuscatedSignature( - signature = "[Lls;" + signature = "Lio;" ) - @Export("mapMarkerSprites") - static Sprite[] mapMarkerSprites; - @ObfuscatedName("s") + @Export("archive20") + static Archive archive20; + @ObfuscatedName("ek") @ObfuscatedGetter( - intValue = -164716821 + intValue = 1031385521 + ) + @Export("port1") + static int port1; + @ObfuscatedName("gk") + @ObfuscatedGetter( + intValue = -2034428449 + ) + static int field286; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = 1694999719 ) @Export("minPlane") int minPlane; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1156476113 + intValue = 1331792243 ) @Export("planes") int planes; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1419031029 + intValue = -37279275 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 797218073 + intValue = 2016686439 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1475121161 + intValue = -1812547009 ) @Export("regionEndX") int regionEndX; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1969567489 + intValue = 1750083521 ) @Export("regionEndY") int regionEndY; @@ -76,10 +72,10 @@ public class WorldMapSection1 implements WorldMapSection { WorldMapSection1() { } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lav;I)V", - garbageValue = "-1068467910" + signature = "(Lag;S)V", + garbageValue = "32767" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { @@ -101,34 +97,34 @@ public class WorldMapSection1 implements WorldMapSection { } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(IIII)Z", - garbageValue = "1014871771" + garbageValue = "950167825" ) @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 && var3 >> 6 == this.regionStartY; } else { return false; } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(III)Z", - garbageValue = "694688168" + garbageValue = "1510325414" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY; } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(IIII)[I", - garbageValue = "-45443461" + garbageValue = "-771447481" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { @@ -140,10 +136,10 @@ public class WorldMapSection1 implements WorldMapSection { } } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(III)Lhd;", - garbageValue = "1267204541" + signature = "(IIB)Lhj;", + garbageValue = "0" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -156,10 +152,10 @@ public class WorldMapSection1 implements WorldMapSection { } } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Lky;I)V", - garbageValue = "1072299144" + signature = "(Lkz;I)V", + garbageValue = "1954302512" ) @Export("read") public void read(Buffer var1) { @@ -172,56 +168,72 @@ public class WorldMapSection1 implements WorldMapSection { this.postRead(); } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "24" + signature = "(I)V", + garbageValue = "-197052473" ) @Export("postRead") void postRead() { } - @ObfuscatedName("ks") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lhp;B)Z", - garbageValue = "39" + signature = "(II)Liu;", + garbageValue = "837782921" ) - static final boolean method563(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); - } + @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); + } - if (var1 >= 314 && var1 <= 323) { - var2 = (var1 - 314) / 2; - var3 = var1 & 1; - Client.playerAppearance.method3930(var2, var3 == 1); - } + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(III)I", + garbageValue = "544666683" + ) + public static int method539(int var0, int var1) { + int var2; + for (var2 = 0; var1 > 0; --var1) { + var2 = var2 << 1 | var0 & 1; + var0 >>>= 1; + } - if (var1 == 324) { - Client.playerAppearance.changeSex(false); - } + return var2; + } - if (var1 == 325) { - Client.playerAppearance.changeSex(true); - } + @ObfuscatedName("ho") + @ObfuscatedSignature( + signature = "(IIB)V", + garbageValue = "20" + ) + @Export("resumePauseWidget") + static void resumePauseWidget(int var0, int var1) { + PacketBufferNode var2 = MenuAction.getPacketBufferNode(ClientPacket.field2276, Client.packetWriter.isaacCipher); + var2.packetBuffer.writeIntLE16(var0); + var2.packetBuffer.method5500(var1); + Client.packetWriter.addNode(var2); + } - if (var1 == 326) { - PacketBufferNode var4 = MenuAction.getPacketBufferNode(ClientPacket.field2197, Client.packetWriter.isaacCipher); - Client.playerAppearance.write(var4.packetBuffer); - Client.packetWriter.addNode(var4); - return true; - } else { - return false; + @ObfuscatedName("iu") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;Lhy;I)Ljava/lang/String;", + garbageValue = "1800929391" + ) + static String method551(String var0, Widget var1) { + if (var0.indexOf("%") != -1) { + for (int var2 = 1; var2 <= 5; ++var2) { + while (true) { + int var3 = var0.indexOf("%" + var2); + if (var3 == -1) { + break; + } + + var0 = var0.substring(0, var3) + class81.method2032(class286.method5218(var1, var2 - 1)) + var0.substring(var3 + 2); + } } } + + return var0; } } diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index d84a69fd4d..5a821f322a 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -4,168 +4,153 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("m") +@ObfuscatedName("a") @Implements("WorldMapSection2") public class WorldMapSection2 implements WorldMapSection { - @ObfuscatedName("rj") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 148255872 - ) - static int field190; - @ObfuscatedName("qy") - @ObfuscatedGetter( - intValue = -808409095 - ) - static int field191; - @ObfuscatedName("er") - @ObfuscatedGetter( - intValue = 1175996651 - ) - static int field183; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -15494621 + intValue = 1621014075 ) @Export("minPlane") int minPlane; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -608895039 + intValue = 95944325 ) @Export("planes") int planes; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1639169875 + intValue = 328290097 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 360739097 + intValue = -1641271017 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 212769379 + intValue = 116585611 ) @Export("regionEndX") int regionEndX; - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 221192809 + intValue = -711757521 ) @Export("regionEndY") int regionEndY; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 852884703 + intValue = -2106568339 ) - int field185; - @ObfuscatedName("q") + int field188; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1572504287 + intValue = -337977875 ) - int field186; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 1285923191 - ) - int field187; + int field194; @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1597902097 + intValue = -1222985831 ) - int field179; + int field192; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 117453229 + ) + int field197; WorldMapSection2() { } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lav;I)V", - garbageValue = "-1068467910" + signature = "(Lag;S)V", + garbageValue = "32767" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field185) { - var1.regionLowX = this.field185; + if (var1.regionLowX > this.field188) { + var1.regionLowX = this.field188; } - if (var1.regionHighX < this.field187) { - var1.regionHighX = this.field187; + if (var1.regionHighX < this.field192) { + var1.regionHighX = this.field192; } - if (var1.regionLowY > this.field186) { - var1.regionLowY = this.field186; + if (var1.regionLowY > this.field194) { + var1.regionLowY = this.field194; } - if (var1.regionHighY < this.field179) { - var1.regionHighY = this.field179; + if (var1.regionHighY < this.field197) { + var1.regionHighY = this.field197; } } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(IIII)Z", - garbageValue = "1014871771" + garbageValue = "950167825" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.minPlane && var1 < this.planes + this.minPlane) { + if (var1 >= this.minPlane && var1 < this.minPlane + this.planes) { return var2 >> 6 >= this.regionStartX && var2 >> 6 <= this.regionEndX && var3 >> 6 >= this.regionStartY && var3 >> 6 <= this.regionEndY; } else { return false; } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(III)Z", - garbageValue = "694688168" + garbageValue = "1510325414" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >> 6 >= this.field185 && var1 >> 6 <= this.field187 && var2 >> 6 >= this.field186 && var2 >> 6 <= this.field179; + return var1 >> 6 >= this.field188 && var1 >> 6 <= this.field192 && var2 >> 6 >= this.field194 && var2 >> 6 <= this.field197; } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(IIII)[I", - garbageValue = "-45443461" + garbageValue = "-771447481" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { if (!this.containsCoord(var1, var2, var3)) { return null; } else { - int[] var4 = new int[]{this.field185 * 64 - this.regionStartX * 64 + var2, var3 + (this.field186 * 64 - this.regionStartY * 64)}; + int[] var4 = new int[]{this.field188 * 64 - this.regionStartX * 64 + var2, var3 + (this.field194 * 64 - this.regionStartY * 64)}; return var4; } } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(III)Lhd;", - garbageValue = "1267204541" + signature = "(IIB)Lhj;", + garbageValue = "0" ) @Export("coord") public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { return null; } else { - int var3 = this.regionStartX * 64 - this.field185 * 64 + var1; - int var4 = this.regionStartY * 64 - this.field186 * 64 + var2; + int var3 = this.regionStartX * 64 - this.field188 * 64 + var1; + int var4 = this.regionStartY * 64 - this.field194 * 64 + var2; return new Coord(this.minPlane, var3, var4); } } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Lky;I)V", - garbageValue = "1072299144" + signature = "(Lkz;I)V", + garbageValue = "1954302512" ) @Export("read") public void read(Buffer var1) { @@ -175,87 +160,169 @@ public class WorldMapSection2 implements WorldMapSection { this.regionStartY = var1.readUnsignedShort(); this.regionEndX = var1.readUnsignedShort(); this.regionEndY = var1.readUnsignedShort(); - this.field185 = var1.readUnsignedShort(); - this.field186 = var1.readUnsignedShort(); - this.field187 = var1.readUnsignedShort(); - this.field179 = var1.readUnsignedShort(); + this.field188 = var1.readUnsignedShort(); + this.field194 = var1.readUnsignedShort(); + this.field192 = var1.readUnsignedShort(); + this.field197 = var1.readUnsignedShort(); this.postRead(); } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1597340274" + garbageValue = "-1220546976" ) @Export("postRead") void postRead() { } - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "([BIII)Z", - garbageValue = "1296086556" + signature = "(I)I", + garbageValue = "-2084291439" ) - static final boolean method325(byte[] var0, int var1, int var2) { - boolean var3 = true; - Buffer var4 = new Buffer(var0); - int var5 = -1; + public static int method300() { + return ViewportMouse.ViewportMouse_entityCount; + } - label70: - while (true) { - int var6 = var4.method5565(); - if (var6 == 0) { - return var3; - } + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)V", + garbageValue = "542891198" + ) + static final void method283(String var0) { + WorldMapCacheName.addGameMessage(30, "", var0); + } - var5 += var6; - int var7 = 0; - boolean var8 = false; + @ObfuscatedName("fi") + @ObfuscatedSignature( + signature = "(Lbe;B)V", + garbageValue = "-68" + ) + static final void method299(Actor var0) { + int var1 = var0.field963 - Client.cycle; + int var2 = var0.field959 * 128 + var0.size * 64; + int var3 = var0.field961 * 128 + var0.size * 64; + var0.x += (var2 - -78439701 * var0.x) / var1 * 62504387; + var0.y += (var3 - var0.y) / var1; + var0.field975 = 0; + var0.orientation = var0.field965; + } - while (true) { - int var9; - while (!var8) { - var9 = var4.readUShortSmart(); - if (var9 == 0) { - continue label70; + @ObfuscatedName("gp") + @ObfuscatedSignature( + signature = "(IIZI)V", + garbageValue = "882857989" + ) + static final void method301(int var0, int var1, boolean var2) { + if (!var2 || var0 != FloorDecoration.field1585 || ReflectionCheck.field1303 != var1) { + FloorDecoration.field1585 = var0; + ReflectionCheck.field1303 = var1; + WorldMapIcon_0.updateGameState(25); + GZipDecompressor.drawLoadingMessage("Loading - please wait.", true); + int var3 = class4.baseX * 64; + int var4 = ScriptEvent.baseY; + class4.baseX = (var0 - 6) * 8; + ScriptEvent.baseY = (var1 - 6) * 167776904; + int var5 = class4.baseX * 64 - var3; + int var6 = ScriptEvent.baseY - var4; + var3 = class4.baseX * 64; + var4 = ScriptEvent.baseY; + + int var7; + int var9; + int[] var10000; + for (var7 = 0; var7 < 32768; ++var7) { + NPC var8 = Client.npcs[var7]; + if (var8 != null) { + for (var9 = 0; var9 < 10; ++var9) { + var10000 = var8.pathX; + var10000[var9] -= var5; + var10000 = var8.pathY; + var10000[var9] -= var6; } - 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) { - ObjectDefinition var15 = class215.getObjectDefinition(var5); - if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { - if (!var15.needsModelFiles()) { - ++Client.field678; - var3 = false; - } + var8.x -= var5 * -589373056; + var8.y -= var6 * 128; + } + } - var8 = true; + for (var7 = 0; var7 < 2048; ++var7) { + Player var21 = Client.players[var7]; + if (var21 != null) { + for (var9 = 0; var9 < 10; ++var9) { + var10000 = var21.pathX; + var10000[var9] -= var5; + var10000 = var21.pathY; + var10000[var9] -= var6; + } + + var21.x -= var5 * -589373056; + var21.y -= var6 * 128; + } + } + + byte var20 = 0; + byte var18 = 104; + byte var22 = 1; + if (var5 < 0) { + var20 = 103; + var18 = -1; + var22 = -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 != var18; var13 += var22) { + for (var14 = var10; var14 != var11; var14 += var12) { + int var15 = var13 + var5; + int var16 = var14 + var6; + + for (int var17 = 0; var17 < 4; ++var17) { + if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { + Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; + } else { + Client.groundItems[var17][var13][var14] = null; } } } - - var9 = var4.readUShortSmart(); - if (var9 == 0) { - break; - } - - var4.readUnsignedByte(); } + + for (PendingSpawn var19 = (PendingSpawn)Client.pendingSpawns.last(); var19 != null; var19 = (PendingSpawn)Client.pendingSpawns.previous()) { + var19.x -= var5; + var19.y -= var6; + if (var19.x < 0 || var19.y < 0 || var19.x >= 104 || var19.y >= 104) { + var19.remove(); + } + } + + if (Client.destinationX != 0) { + Client.destinationX -= var5; + Client.destinationY -= var6; + } + + Client.soundEffectCount = 0; + Client.isCameraLocked = false; + ScriptFrame.cameraX -= var5 << 7; + class14.cameraZ -= var6 << 7; + SecureRandomFuture.oculusOrbFocalPointX -= var5 << 7; + AbstractByteArrayCopier.oculusOrbFocalPointY -= var6 << 7; + Client.field848 = -1; + Client.graphicsObjects.clear(); + Client.projectiles.clear(); + + for (var14 = 0; var14 < 4; ++var14) { + Client.collisionMaps[var14].clear(); + } + } } - - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1052050737" - ) - @Export("WorldMapElement_clearCached") - public static void WorldMapElement_clearCached() { - WorldMapElement.WorldMapElement_cachedSprites.clear(); - } } diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java index ee560e4b2a..29e6a1e243 100644 --- a/runescape-client/src/main/java/WorldMapSectionType.java +++ b/runescape-client/src/main/java/WorldMapSectionType.java @@ -3,54 +3,42 @@ 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("w") +@ObfuscatedName("k") @Implements("WorldMapSectionType") public enum WorldMapSectionType implements Enumerated { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lw;" + signature = "Lk;" ) @Export("WORLDMAPSECTIONTYPE0") - WORLDMAPSECTIONTYPE0(3, (byte)0), - @ObfuscatedName("j") + WORLDMAPSECTIONTYPE0(2, (byte)0), + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lw;" + signature = "Lk;" ) @Export("WORLDMAPSECTIONTYPE1") - WORLDMAPSECTIONTYPE1(1, (byte)1), - @ObfuscatedName("i") + WORLDMAPSECTIONTYPE1(0, (byte)1), + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lw;" + signature = "Lk;" ) @Export("WORLDMAPSECTIONTYPE2") - WORLDMAPSECTIONTYPE2(0, (byte)2), - @ObfuscatedName("k") + WORLDMAPSECTIONTYPE2(3, (byte)2), + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lw;" + signature = "Lk;" ) @Export("WORLDMAPSECTIONTYPE3") - WORLDMAPSECTIONTYPE3(2, (byte)3); + WORLDMAPSECTIONTYPE3(1, (byte)3); - @ObfuscatedName("qp") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1927510419 - ) - static int field142; - @ObfuscatedName("md") - @ObfuscatedGetter( - intValue = 1020141795 - ) - @Export("selectedSpellFlags") - static int selectedSpellFlags; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -891662365 + intValue = 1030094683 ) @Export("type") final int type; - @ObfuscatedName("n") + @ObfuscatedName("u") @Export("id") final byte id; @@ -59,717 +47,95 @@ public enum WorldMapSectionType implements Enumerated { this.id = var4; } - @ObfuscatedName("j") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-32" + signature = "(I)I", + garbageValue = "-1410702910" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "(ILcr;ZI)I", - garbageValue = "1866050314" - ) - static int method240(int var0, Script var1, boolean var2) { - Widget var3 = WorldMapElement.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapRegion.method530(ParamDefinition.getWidgetClickMask(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[--Interpreter.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; - } - } - - @ObfuscatedName("fv") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "78" + garbageValue = "53" ) - @Export("playPcmPlayers") - static final void playPcmPlayers() { - if (SoundCache.pcmPlayer1 != null) { - SoundCache.pcmPlayer1.run(); - } - - if (MouseRecorder.pcmPlayer0 != null) { - MouseRecorder.pcmPlayer0.run(); - } - - } - - @ObfuscatedName("it") - @ObfuscatedSignature( - signature = "([Lhp;IIIIIIIII)V", - garbageValue = "-67536058" - ) - @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; + public static void method220() { + synchronized(KeyHandler.KeyHandler_instance) { + ++KeyHandler.KeyHandler_idleCycles; + KeyHandler.field381 = KeyHandler.field383; + KeyHandler.field380 = 0; + int var1; + if (KeyHandler.field366 < 0) { + for (var1 = 0; var1 < 112; ++var1) { + KeyHandler.KeyHandler_pressedKeys[var1] = false; } - var10.rootIndex = var11; - var10.cycle = Client.cycle; - if (!var10.isIf3 || !WorldMapRectangle.isComponentHidden(var10)) { - if (var10.contentType > 0) { - WorldMapDecorationType.method4030(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) { - WorldMapIcon_1.field174 = var0; - HealthBarUpdate.field986 = var6; - Tile.field1648 = var7; - continue; - } - - if (Client.isDraggingWidget && Client.field641) { - var15 = MouseHandler.MouseHandler_x; - var16 = MouseHandler.MouseHandler_y; - var15 -= Client.widgetClickX; - var16 -= Client.widgetClickY; - if (var15 < Client.field802) { - var15 = Client.field802; - } - - if (var15 + var10.width > Client.field802 + Client.clickedWidgetParent.width) { - var15 = Client.field802 + Client.clickedWidgetParent.width - var10.width; - } - - if (var16 < Client.field803) { - var16 = Client.field803; - } - - if (var16 + var10.height > Client.field803 + Client.clickedWidgetParent.height) { - var16 = Client.field803 + 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; + KeyHandler.field366 = KeyHandler.field375; + } else { + while (KeyHandler.field375 != KeyHandler.field366) { + var1 = KeyHandler.field369[KeyHandler.field375]; + KeyHandler.field375 = KeyHandler.field375 + 1 & 127; + if (var1 < 0) { + KeyHandler.KeyHandler_pressedKeys[~var1] = false; } 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; - ClientPacket.fontPlain12.drawRightAligned("Fps:" + GameShell.fps, var12 + var10.width, var13, 16776960, -1); - var13 += 15; - Runtime var41 = Runtime.getRuntime(); - var20 = (int)((var41.totalMemory() - var41.freeMemory()) / 1024L); - var21 = 16776960; - if (var20 > 327680 && !Client.isLowDetail) { - var21 = 16711680; - } - - ClientPacket.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); - var13 += 15; - } - continue; - } - - if (var10.contentType == 1337) { - Client.viewportX = var12; - Client.viewportY = var13; - WorldMapElement.drawEntities(var12, var13, var10.width, var10.height); - Client.field703[var10.rootIndex] = true; - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1338) { - TileItemPile.drawMinimap(var10, var12, var13, var11); - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1339) { - SoundCache.drawCompass(var10, var12, var13, var11); - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1400) { - WorldMapCacheName.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); - } - - if (var10.contentType == 1401) { - WorldMapCacheName.worldMap.drawOverview(var12, var13, var10.width, var10.height); - } - - if (var10.contentType == 1402) { - Bounds.loginScreenRunesAnimation.draw(var12, Client.cycle); - } + if (!KeyHandler.KeyHandler_pressedKeys[var1] && KeyHandler.field380 < KeyHandler.field379.length - 1) { + KeyHandler.field379[++KeyHandler.field380 - 1] = var1; } - if (var10.type == 0) { - if (!var10.isIf3 && WorldMapRectangle.isComponentHidden(var10) && var10 != class65.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) { - class2.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - } - - if (Client.isResizable || Client.field830[var11] || Client.gameDrawingMode > 1) { - if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { - HitSplatDefinition.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) { - Sprite var43 = var10.getInventorySprite(var19); - if (var43 != null) { - var43.drawTransBgAt(var22, var23); - } else if (Widget.field2579) { - FriendSystem.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 == class188.dragInventoryWidget && var19 == Client.dragItemSlotSource) { - Sprite var27; - if (Client.isItemSelected == 1 && var19 == class185.selectedItemSlot && var10.id == FontName.selectedItemWidget) { - var27 = UserComparator10.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false); - } else { - var27 = UserComparator10.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); - } - - if (var27 != null) { - if (var10 == class188.dragInventoryWidget && var19 == Client.dragItemSlotSource) { - var24 = MouseHandler.MouseHandler_x - Client.field732; - var25 = MouseHandler.MouseHandler_y - Client.field744; - if (var24 < 5 && var24 > -5) { - var24 = 0; - } - - if (var25 < 5 && var25 > -5) { - var25 = 0; - } - - if (Client.itemDragDuration < 5) { - var24 = 0; - var25 = 0; - } - - var27.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.field879 / 3; - if (var29 > Client.field879 * 10) { - var29 = Client.field879 * 10; - } - - if (var29 > var28.scrollY) { - var29 = var28.scrollY; - } - - var28.scrollY -= var29; - Client.field744 += var29; - FriendSystem.invalidateWidget(var28); - } - - if (var23 + var25 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { - var29 = (var23 + var25 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field879 / 3; - if (var29 > Client.field879 * 10) { - var29 = Client.field879 * 10; - } - - if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { - var29 = var28.scrollHeight - var28.height - var28.scrollY; - } - - var28.scrollY += var29; - Client.field744 -= var29; - FriendSystem.invalidateWidget(var28); - } - } - } else if (var10 == Actor.field978 && var19 == Client.field730) { - var27.drawTransAt(var22, var23, 128); - } else { - var27.drawTransBgAt(var22, var23); - } - } else { - FriendSystem.invalidateWidget(var10); - } - } - } - - ++var19; - } - } - } else if (var10.type == 3) { - if (UserComparator10.runCs1(var10)) { - var19 = var10.color2; - if (var10 == class65.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { - var19 = var10.mouseOverColor2; - } - } else { - var19 = var10.color; - if (var10 == class65.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { - var19 = var10.mouseOverColor; - } - } - - if (var10.fill) { - switch(var10.fillMode.value) { - 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.field2579) { - FriendSystem.invalidateWidget(var10); - } - } else { - String var45 = var10.text; - if (UserComparator10.runCs1(var10)) { - var20 = var10.color2; - if (var10 == class65.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { - var20 = var10.mouseOverColor2; - } - - if (var10.text2.length() > 0) { - var45 = var10.text2; - } - } else { - var20 = var10.color; - if (var10 == class65.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { - var20 = var10.mouseOverColor; - } - } - - if (var10.isIf3 && var10.itemId != -1) { - ItemDefinition var47 = WorldMapData_0.ItemDefinition_get(var10.itemId); - var45 = var47.name; - if (var45 == null) { - var45 = "null"; - } - - if ((var47.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { - var45 = class16.colorStartTag(16748608) + var45 + "" + " " + 'x' + Frames.formatItemStacks(var10.itemQuantity); - } - } - - if (var10 == Client.meslayerContinueWidget) { - var45 = "Please wait..."; - var20 = var10.color; - } - - if (!var10.isIf3) { - var45 = class189.method3597(var45, var10); - } - - var39.drawLines(var45, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); - } - } else if (var10.type == 5) { - Sprite var40; - if (!var10.isIf3) { - var40 = var10.getSprite(UserComparator10.runCs1(var10)); - if (var40 != null) { - var40.drawTransBgAt(var12, var13); - } else if (Widget.field2579) { - FriendSystem.invalidateWidget(var10); - } - } else { - if (var10.itemId != -1) { - var40 = UserComparator10.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); - } else { - var40 = var10.getSprite(false); - } - - if (var40 == null) { - if (Widget.field2579) { - FriendSystem.invalidateWidget(var10); - } - } else { - var20 = var40.width; - var21 = var40.height; - if (!var10.spriteTiling) { - var22 = var10.width * 4096 / var20; - if (var10.spriteAngle != 0) { - var40.method6023(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.method6023(var20 / 2 + var12 + var20 * var24, var21 / 2 + var13 + var25 * var21, var10.spriteAngle, 4096); - } else if (var14 != 0) { - var40.drawTransAt(var12 + var20 * var24, var13 + var25 * var21, 256 - (var14 & 255)); - } else { - var40.drawTransBgAt(var12 + var20 * var24, var13 + var21 * var25); - } - } - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - } - } - } - } else { - ItemDefinition var33; - if (var10.type == 6) { - boolean var36 = UserComparator10.runCs1(var10); - if (var36) { - var20 = var10.sequenceId2; - } else { - var20 = var10.sequenceId; - } - - Model var42 = null; - var22 = 0; - if (var10.itemId != -1) { - var33 = WorldMapData_0.ItemDefinition_get(var10.itemId); - if (var33 != null) { - var33 = var33.getCountObj(var10.itemQuantity); - var42 = var33.getModel(1); - if (var42 != null) { - var42.calculateBoundsCylinder(); - var22 = var42.height / 2; - } else { - FriendSystem.invalidateWidget(var10); - } - } - } else if (var10.modelType == 5) { - if (var10.modelId == 0) { - var42 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); - } else { - var42 = WorldMapIcon_1.localPlayer.getModel(); - } - } else if (var20 == -1) { - var42 = var10.getModel((SequenceDefinition)null, -1, var36, WorldMapIcon_1.localPlayer.appearance); - if (var42 == null && Widget.field2579) { - FriendSystem.invalidateWidget(var10); - } - } else { - SequenceDefinition var46 = Widget.SequenceDefinition_get(var20); - var42 = var10.getModel(var46, var10.modelFrame, var36, WorldMapIcon_1.localPlayer.appearance); - if (var42 == null && Widget.field2579) { - FriendSystem.invalidateWidget(var10); - } - } - - Rasterizer3D.method2929(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 (var42 != null) { - if (!var10.isIf3) { - var42.method2874(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); - } else { - var42.calculateBoundsCylinder(); - if (var10.modelOrthog) { - var42.method2810(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); - } else { - var42.method2874(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.field2579) { - FriendSystem.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 = WorldMapData_0.ItemDefinition_get(var10.itemIds[var20] - 1); - String var31; - if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) { - var31 = class16.colorStartTag(16748608) + var33.name + ""; - } else { - var31 = class16.colorStartTag(16748608) + var33.name + "" + " " + 'x' + Frames.formatItemStacks(var10.itemQuantities[var20]); - } - - var25 = var12 + var22 * (var10.paddingX + 115); - var26 = var21 * (var10.paddingY + 12) + var13; - if (var10.textXAlignment == 0) { - var39.draw(var31, var25, var26, var10.color, var10.textShadowed ? 0 : -1); - } else if (var10.textXAlignment == 1) { - var39.drawCentered(var31, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1); - } else { - var39.drawRightAligned(var31, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1); - } - } - - ++var20; - } - } - } - - if (var10.type == 8 && var10 == WorldMapDecoration.field198 && Client.field774 == Client.field848) { - var19 = 0; - var20 = 0; - Font var32 = ClientPacket.fontPlain12; - String var34 = var10.text; - - String var44; - for (var34 = class189.method3597(var34, var10); var34.length() > 0; var20 = var20 + var32.ascent + 1) { - var24 = var34.indexOf("
"); - if (var24 != -1) { - var44 = var34.substring(0, var24); - var34 = var34.substring(var24 + 4); - } else { - var44 = var34; - var34 = ""; - } - - var25 = var32.stringWidth(var44); - 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 (var19 + var24 > 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); - var34 = var10.text; - var26 = var25 + var32.ascent + 2; - - for (var34 = class189.method3597(var34, var10); var34.length() > 0; var26 = var26 + var32.ascent + 1) { - int var35 = var34.indexOf("
"); - if (var35 != -1) { - var44 = var34.substring(0, var35); - var34 = var34.substring(var35 + 4); - } else { - var44 = var34; - var34 = ""; - } - - var32.draw(var44, var24 + 3, var26, 0, -1); - } - } - - if (var10.type == 9) { - if (var10.field2601) { - 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 { - class195.method3628(var19, var20, var21, var22, var10.color, var10.lineWid); - } - } - } - } - } - } - } + KeyHandler.KeyHandler_pressedKeys[var1] = true; } } } - } + if (KeyHandler.field380 > 0) { + KeyHandler.KeyHandler_idleCycles = 0; + } + + KeyHandler.field383 = KeyHandler.field382; + } } - @ObfuscatedName("jt") + @ObfuscatedName("fr") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1367903694" + signature = "(Liw;IIIB)V", + garbageValue = "3" ) - @Export("Widget_resetModelFrames") - static final void Widget_resetModelFrames(int var0) { - if (Projectile.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("addSequenceSoundEffect") + static void addSequenceSoundEffect(SequenceDefinition var0, int var1, int var2, int var3) { + if (Client.soundEffectCount < 50 && Client.field860 != 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("kb") + @ObfuscatedSignature( + signature = "(IS)V", + garbageValue = "1024" + ) + static void method224(int var0) { + for (IntegerNode var1 = (IntegerNode)Client.widgetClickMasks.first(); var1 != null; var1 = (IntegerNode)Client.widgetClickMasks.next()) { + if ((long)var0 == (var1.key >> 48 & 65535L)) { + var1.remove(); + } + } + + } } diff --git a/runescape-client/src/main/java/WorldMapSprite.java b/runescape-client/src/main/java/WorldMapSprite.java index fa98fb930d..d8b9aeb2b4 100644 --- a/runescape-client/src/main/java/WorldMapSprite.java +++ b/runescape-client/src/main/java/WorldMapSprite.java @@ -1,30 +1,23 @@ import 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("am") +@ObfuscatedName("at") @Implements("WorldMapSprite") public final class WorldMapSprite { - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 877299001 - ) - public static int field222; - @ObfuscatedName("f") + @ObfuscatedName("h") @ObfuscatedSignature( signature = "Lhz;" ) - @Export("Widget_spritesArchive") - static AbstractArchive Widget_spritesArchive; - @ObfuscatedName("dw") + @Export("Widget_fontsArchive") + static AbstractArchive Widget_fontsArchive; + @ObfuscatedName("bk") @ObfuscatedSignature( - signature = "Lid;" + signature = "Lho;" ) - @Export("archive4") - static Archive archive4; - @ObfuscatedName("j") + static ServerBuild field226; + @ObfuscatedName("x") @Export("tileColors") final int[] tileColors; @@ -36,103 +29,123 @@ public final class WorldMapSprite { this.tileColors = var1; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "557817784" + signature = "(IIB)I", + garbageValue = "2" ) @Export("getTileColor") final int getTileColor(int var1, int var2) { return this.tileColors[var2 * 64 + var1]; } - @ObfuscatedName("s") + @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "(I)[Lhv;", - garbageValue = "20035292" + signature = "(ILhj;ZI)V", + garbageValue = "-310129392" ) - public static StudioGame[] method402() { - return new StudioGame[]{StudioGame.game3, StudioGame.stellardawn, StudioGame.runescape, StudioGame.game5, StudioGame.game4, StudioGame.oldscape}; + static void method380(int var0, Coord var1, boolean var2) { + WorldMapArea var3 = class1.getWorldMap().getMapArea(var0); + int var4 = Varps.localPlayer.plane; + int var5 = class4.baseX * 64 + (Varps.localPlayer.x * -78439701 >> 7); + int var6 = (Varps.localPlayer.y >> 7) + ScriptEvent.baseY; + Coord var7 = new Coord(var4, var5, var6); + class1.getWorldMap().method6431(var3, var7, var1, var2); } - @ObfuscatedName("q") + @ObfuscatedName("eh") @ObfuscatedSignature( - signature = "(IIIZII)J", - garbageValue = "-519528973" + signature = "(IB)V", + garbageValue = "79" ) - @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("f") - @ObfuscatedSignature( - signature = "(II)Lee;", - garbageValue = "836090120" - ) - @Export("getFrames") - static Frames getFrames(int var0) { - Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); - if (var1 != null) { - return var1; + @Export("getLoginError") + static void getLoginError(int var0) { + if (var0 == -3) { + Canvas.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); + } else if (var0 == -2) { + Canvas.setLoginResponseString("", "Error connecting to server.", ""); + } else if (var0 == -1) { + Canvas.setLoginResponseString("No response from server.", "Please try using a different world.", ""); + } else if (var0 == 3) { + Login.loginIndex = 3; + Login.field1161 = 1; + } else if (var0 == 4) { + Login.loginIndex = 12; + Login.field1156 = 0; + } else if (var0 == 5) { + Login.field1161 = 2; + Canvas.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) { + Canvas.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); + } else if (var0 == 7) { + Canvas.setLoginResponseString("This world is full.", "Please use a different world.", ""); + } else if (var0 == 8) { + Canvas.setLoginResponseString("Unable to connect.", "Login server offline.", ""); + } else if (var0 == 9) { + Canvas.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); + } else if (var0 == 10) { + Canvas.setLoginResponseString("Unable to connect.", "Bad session id.", ""); + } else if (var0 == 11) { + Canvas.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); + } else if (var0 == 12) { + Canvas.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); + } else if (var0 == 13) { + Canvas.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); + } else if (var0 == 14) { + Canvas.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 16) { + Canvas.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); + } else if (var0 == 17) { + Canvas.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.field1156 = 1; + } else if (var0 == 19) { + Canvas.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); + } else if (var0 == 20) { + Canvas.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); + } else if (var0 == 22) { + Canvas.setLoginResponseString("Malformed login packet.", "Please try again.", ""); + } else if (var0 == 23) { + Canvas.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 24) { + Canvas.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); + } else if (var0 == 25) { + Canvas.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); + } else if (var0 == 26) { + Canvas.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); + } else if (var0 == 27) { + Canvas.setLoginResponseString("", "Service unavailable.", ""); + } else if (var0 == 31) { + Canvas.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) { + Canvas.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) { + Canvas.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); + } else if (var0 == 38) { + Canvas.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 { - AbstractArchive var3 = SequenceDefinition.SequenceDefinition_animationsArchive; - AbstractArchive var4 = SequenceDefinition.SequenceDefinition_skeletonsArchive; - boolean var5 = true; - int[] var6 = var3.getGroupFileIds(var0); - - for (int var7 = 0; var7 < var6.length; ++var7) { - byte[] var8 = var3.getFile(var0, var6[var7]); - if (var8 == null) { - var5 = false; - } else { - int var9 = (var8[0] & 255) << 8 | var8[1] & 255; - byte[] var10 = var4.getFile(var9, 0); - if (var10 == null) { - var5 = false; - } - } + if (var0 == 56) { + Canvas.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); + WorldMapIcon_0.updateGameState(11); + return; } - Frames var2; - if (!var5) { - var2 = null; + if (var0 == 57) { + Canvas.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); + WorldMapIcon_0.updateGameState(11); + return; + } + + if (var0 == 61) { + Login.loginIndex = 7; } else { - try { - var2 = new Frames(var3, var4, var0, false); - } catch (Exception var12) { - var2 = null; - } + Canvas.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); } - - if (var2 != null) { - SequenceDefinition.SequenceDefinition_cachedFrames.put(var2, (long)var0); - } - - return var2; - } - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(III)Z", - garbageValue = "-1767054771" - ) - static final boolean method404(int var0, int var1) { - ObjectDefinition var2 = class215.getObjectDefinition(var0); - if (var1 == 11) { - var1 = 10; } - if (var1 >= 5 && var1 <= 8) { - var1 = 4; - } - - return var2.method4505(var1); + WorldMapIcon_0.updateGameState(10); } } diff --git a/runescape-client/src/main/java/Wrapper.java b/runescape-client/src/main/java/Wrapper.java index 8516b42526..f2b377828b 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("ed") +@ObfuscatedName("ey") @Implements("Wrapper") public abstract class Wrapper extends DualNode { - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("size") final int size; @@ -13,11 +13,11 @@ public abstract class Wrapper extends DualNode { this.size = var1; } - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("get") abstract Object get(); - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("isSoft") abstract boolean isSoft(); } diff --git a/runescape-client/src/main/java/class0.java b/runescape-client/src/main/java/class0.java index 24ae1c9e95..0ff6272479 100644 --- a/runescape-client/src/main/java/class0.java +++ b/runescape-client/src/main/java/class0.java @@ -1,19 +1,19 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("s") +@ObfuscatedName("c") public interface class0 { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/lang/Object;Lky;I)V", - garbageValue = "254789492" + signature = "(Ljava/lang/Object;Lkz;B)V", + garbageValue = "1" ) - void vmethod58(Object var1, Buffer var2); + void vmethod42(Object var1, Buffer var2); - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lky;I)Ljava/lang/Object;", - garbageValue = "1267204541" + signature = "(Lkz;S)Ljava/lang/Object;", + garbageValue = "31810" ) - Object vmethod70(Buffer var1); + Object vmethod41(Buffer var1); } diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index 1d60d2bf5f..d58fde95cf 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -1,324 +1,208 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("j") +@ObfuscatedName("x") final class class1 implements class0 { - @ObfuscatedName("bj") - @ObfuscatedSignature( - signature = "[Llq;" - ) - @Export("worldSelectFlagSprites") - static IndexedSprite[] worldSelectFlagSprites; - @ObfuscatedName("bq") - static String field6; - @ObfuscatedName("iz") - @ObfuscatedGetter( - intValue = 517474423 - ) - @Export("selectedItemId") - static int selectedItemId; - @ObfuscatedName("kp") - @ObfuscatedGetter( - intValue = -333767243 - ) - @Export("menuHeight") - static int menuHeight; - @ObfuscatedName("lk") - @ObfuscatedSignature( - signature = "Lcd;" - ) - @Export("tempMenuAction") - static MenuAction tempMenuAction; + @ObfuscatedName("h") + @Export("Tiles_lightness") + static int[] Tiles_lightness; - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/lang/Object;Lky;I)V", - garbageValue = "254789492" + signature = "(Ljava/lang/Object;Lkz;B)V", + garbageValue = "1" ) - public void vmethod58(Object var1, Buffer var2) { - this.method9((Integer)var1, var2); - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "(Lky;I)Ljava/lang/Object;", - garbageValue = "1267204541" - ) - public Object vmethod70(Buffer var1) { - return var1.readInt(); + public void vmethod42(Object var1, Buffer var2) { + this.method6((Integer)var1, var2); } @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ljava/lang/Integer;Lky;I)V", - garbageValue = "-1964979998" + signature = "(Lkz;S)Ljava/lang/Object;", + garbageValue = "31810" ) - void method9(Integer var1, Buffer var2) { + public Object vmethod41(Buffer var1) { + return var1.readInt(); + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "(Ljava/lang/Integer;Lkz;I)V", + garbageValue = "-1255666144" + ) + void method6(Integer var1, Buffer var2) { var2.writeInt(var1); } - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1888870541" - ) - static void method21(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var1 != null) { - var1.remove(); - } - } - - @ObfuscatedName("fi") + @ObfuscatedName("s") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "1" + garbageValue = "113" ) - static final void method18() { - FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); - KitDefinition.KitDefinition_cached.clear(); - FontName.ObjectDefinition_clearCached(); - ArchiveLoader.NpcDefinition_clearCached(); - TileItemPile.method2700(); - SequenceDefinition.SequenceDefinition_cached.clear(); - SequenceDefinition.SequenceDefinition_cachedFrames.clear(); - TileItem.method2048(); - GrandExchangeOfferUnitPriceComparator.VarbitDefinition_clearCached(); - class51.method846(); - WorldMapData_0.method177(); - InvDefinition.HealthBarDefinition_clearCached(); - StructDefinition.StructDefinition_cached.clear(); - class13.ParamDefinition_clearCached(); - WorldMapSection2.WorldMapElement_clearCached(); - PlayerAppearance.PlayerAppearance_cachedModels.clear(); - GrandExchangeOfferAgeComparator.Widget_clearCached(); - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); - Script.Script_cached.clear(); - Client.archive0.clearFiles(); - class269.archive1.clearFiles(); - UserComparator8.archive3.clearFiles(); - WorldMapSprite.archive4.clearFiles(); - WorldMapDecoration.archive5.clearFiles(); - GrandExchangeEvent.archive6.clearFiles(); - class51.archive7.clearFiles(); - class2.archive8.clearFiles(); - WorldMapDecoration.archive9.clearFiles(); - GameObject.archive10.clearFiles(); - WorldMapRectangle.archive11.clearFiles(); - GameShell.archive12.clearFiles(); + static final void method9() { + WorldMapSection2.method283("You can't add yourself to your own friend list"); } - @ObfuscatedName("fq") + @ObfuscatedName("af") @ObfuscatedSignature( - signature = "(Lbu;II)V", - garbageValue = "504714765" + signature = "(II)I", + garbageValue = "517519928" ) - @Export("calculateActorPosition") - static final void calculateActorPosition(Actor var0, int var1) { - if (var0.field941 > Client.cycle) { - Tiles.method1075(var0); - } else { - int var2; - int var3; - int var4; - int var5; - int var7; - if (var0.field965 >= Client.cycle) { - if (var0.field965 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > Widget.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { - var2 = var0.field965 - var0.field941; - var3 = Client.cycle - var0.field941; - var4 = var0.field960 * 128 + var0.size * -178253824; - var5 = var0.field954 * 128 + var0.size * -178253824; - int var6 = var0.field961 * 128 + var0.size * -178253824; - var7 = var0.field963 * 128 + var0.size * -178253824; - var0.x = (var6 * var3 + var4 * (var2 - var3)) / var2; - var0.y = (var3 * var7 + var5 * (var2 - var3)) / var2; - } + static int method17(int var0) { + return (int)Math.pow(2.0D, (double)(7.0F + (float)var0 / 256.0F)); + } - var0.field976 = 0; - var0.orientation = var0.field966; - var0.rotation = var0.orientation; - } else { - var0.movementSequence = var0.readySequence; - if (var0.pathLength == 0) { - var0.field976 = 0; - } else { - label301: { - if (var0.sequence != -1 && var0.sequenceDelay == 0) { - SequenceDefinition var11 = Widget.SequenceDefinition_get(var0.sequence); - if (var0.field947 > 0 && var11.field3506 == 0) { - ++var0.field976; - break label301; - } + @ObfuscatedName("eg") + @ObfuscatedSignature( + signature = "(I)Lln;", + garbageValue = "524880852" + ) + @Export("getWorldMap") + static WorldMap getWorldMap() { + return GrandExchangeOfferUnitPriceComparator.worldMap; + } - if (var0.field947 <= 0 && var11.field3505 == 0) { - ++var0.field976; - break label301; - } - } + @ObfuscatedName("fy") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1873727163" + ) + static final void method14() { + int var0 = Players.Players_count; + int[] var1 = Players.Players_indices; - var2 = var0.x; - var3 = var0.y; - var4 = var0.pathX[var0.pathLength - 1] * 128 + var0.size * -178253824; - var5 = var0.pathY[var0.pathLength - 1] * 128 + var0.size * -178253824; - if (var2 < var4) { - if (var3 < var5) { - var0.orientation = 1280; - } else if (var3 > var5) { - var0.orientation = 1792; - } else { - var0.orientation = 1536; - } - } else if (var2 > var4) { - if (var3 < var5) { - var0.orientation = 768; - } else if (var3 > var5) { - var0.orientation = 256; - } else { - var0.orientation = 512; - } - } else if (var3 < var5) { - var0.orientation = 1024; - } else if (var3 > var5) { - var0.orientation = 0; - } - - byte var12 = var0.pathTraversed[var0.pathLength - 1]; - if (var4 - var2 <= 256 && var4 - var2 >= -256 && var5 - var3 <= 256 && var5 - var3 >= -256) { - var7 = var0.orientation - var0.rotation & 2047; - if (var7 > 1024) { - var7 -= 2048; - } - - int var8 = var0.walkBackSequence; - if (var7 >= -256 && var7 <= 256) { - var8 = var0.walkSequence; - } else if (var7 >= 256 && var7 < 768) { - var8 = var0.walkRightSequence; - } else if (var7 >= -768 && var7 <= -256) { - var8 = var0.walkLeftSequence; - } - - if (var8 == -1) { - var8 = var0.walkSequence; - } - - var0.movementSequence = var8; - int var9 = 4; - boolean var10 = true; - if (var0 instanceof NPC) { - var10 = ((NPC)var0).definition.isClickable; - } - - if (var10) { - if (var0.rotation != var0.orientation && var0.targetIndex == -1 && var0.field971 != 0) { - var9 = 2; - } - - if (var0.pathLength > 2) { - var9 = 6; - } - - if (var0.pathLength > 3) { - var9 = 8; - } - - if (var0.field976 > 0 && var0.pathLength > 1) { - var9 = 8; - --var0.field976; - } - } else { - if (var0.pathLength > 1) { - var9 = 6; - } - - if (var0.pathLength > 2) { - var9 = 8; - } - - if (var0.field976 > 0 && var0.pathLength > 1) { - var9 = 8; - --var0.field976; - } - } - - if (var12 == 2) { - var9 <<= 1; - } - - if (var9 >= 8 && var0.movementSequence == var0.walkSequence && var0.runSequence != -1) { - var0.movementSequence = var0.runSequence; - } - - if (var4 != var2 || var5 != var3) { - if (var2 < var4) { - var0.x += var9; - if (var0.x > var4) { - var0.x = var4; - } - } else if (var2 > var4) { - var0.x -= var9; - if (var0.x < var4) { - var0.x = var4; - } - } - - if (var3 < var5) { - var0.y += var9; - if (var0.y > var5) { - var0.y = var5; - } - } else if (var3 > var5) { - var0.y -= var9; - if (var0.y < var5) { - var0.y = var5; - } - } - } - - if (var4 == var0.x && var5 == var0.y) { - --var0.pathLength; - if (var0.field947 > 0) { - --var0.field947; - } - } - } else { - var0.x = var4; - var0.y = var5; - --var0.pathLength; - if (var0.field947 > 0) { - --var0.field947; - } - } - } - } + for (int var2 = 0; var2 < var0; ++var2) { + Player var3 = Client.players[var1[var2]]; + if (var3 != null) { + Tile.calculateActorPosition(var3, 1); } } - if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { - var0.sequence = -1; - var0.spotAnimation = -1; - var0.field941 = 0; - var0.field965 = 0; - var0.x = var0.pathX[0] * 128 + var0.size * -178253824; - var0.y = var0.size * -178253824 + var0.pathY[0] * 128; - var0.method1671(); + } + + @ObfuscatedName("hc") + @ObfuscatedSignature( + signature = "(ZLkt;S)V", + garbageValue = "399" + ) + static final void method15(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 var5; + if (var0) { + var5 = var1.readBits(8); + if (var5 > 127) { + var5 -= 256; + } + } else { + var5 = var1.readBits(5); + if (var5 > 15) { + var5 -= 32; + } + } + + int var6 = var1.readBits(1); + int var7 = Client.defaultRotations[var1.readBits(3)]; + if (var3) { + var4.orientation = var4.rotation = var7; + } + + int var8 = var1.readBits(1); + if (var8 == 1) { + Client.field881[++Client.field666 - 1] = var2; + } + + int var9; + if (var0) { + var9 = var1.readBits(8); + if (var9 > 127) { + var9 -= 256; + } + } else { + var9 = var1.readBits(5); + if (var9 > 15) { + var9 -= 32; + } + } + + var4.definition = FontName.getNpcDefinition(var1.readBits(14)); + var4.size = var4.definition.size; + var4.field953 = var4.definition.rotation; + if (var4.field953 == 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.readySequence = var4.definition.readySequence; + var4.turnLeftSequence = var4.definition.turnLeftSequence; + var4.turnRightSequence = var4.definition.turnRightSequence; + var4.method2011(Varps.localPlayer.pathX[0] + var9, Varps.localPlayer.pathY[0] + var5, var6 == 1); + continue; + } + } + + var1.exportIndex(); + return; + } + } + + @ObfuscatedName("iv") + @ObfuscatedSignature( + signature = "(Lhy;IIIIIIB)V", + garbageValue = "-40" + ) + static final void method16(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (Client.field712) { + Client.alternativeScrollbarWidth = 32; + } else { + Client.alternativeScrollbarWidth = 0; } - if (WorldMapIcon_1.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { - var0.sequence = -1; - var0.spotAnimation = -1; - var0.field941 = 0; - var0.field965 = 0; - var0.x = var0.size * -178253824 + var0.pathX[0] * 128; - var0.y = var0.size * -178253824 + var0.pathY[0] * 128; - var0.method1671(); + Client.field712 = false; + int var7; + if (MouseHandler.MouseHandler_currentButton == 1 || !WorldMapSection1.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { + if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { + var0.scrollY -= 4; + WorldMapID.invalidateWidget(var0); + } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { + var0.scrollY += 4; + WorldMapID.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; + WorldMapID.invalidateWidget(var0); + Client.field712 = 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; + WorldMapID.invalidateWidget(var0); + } } - class65.method1178(var0); - GrandExchangeOfferNameComparator.method149(var0); } } diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java index 0508eee623..bc95c20622 100644 --- a/runescape-client/src/main/java/class13.java +++ b/runescape-client/src/main/java/class13.java @@ -1,70 +1,22 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("y") +@ObfuscatedName("s") public class class13 { - @ObfuscatedName("ph") - @Export("ClanChat_inClanChat") - static boolean ClanChat_inClanChat; - @ObfuscatedName("u") - @Export("ArchiveDiskActionHandler_thread") - static Thread ArchiveDiskActionHandler_thread; - @ObfuscatedName("fl") - @ObfuscatedGetter( - intValue = 251089855 - ) - static int field86; - - @ObfuscatedName("u") + @ObfuscatedName("dz") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-2019445380" + signature = "Lio;" ) - @Export("clearItemContainer") - static void clearItemContainer(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var1 != null) { - for (int var2 = 0; var2 < var1.ids.length; ++var2) { - var1.ids[var2] = -1; - var1.quantities[var2] = 0; - } - - } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1076455788" - ) - @Export("ParamDefinition_clearCached") - public static void ParamDefinition_clearCached() { - ParamDefinition.ParamDefinition_cached.clear(); - } + @Export("archive4") + static Archive archive4; @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "1012366175" + signature = "(I)[Lgz;", + garbageValue = "519142630" ) - static final int method162(int var0, int var1) { - int var2 = WorldMapAreaData.method650(var0 - 1, var1 - 1) + WorldMapAreaData.method650(1 + var0, var1 - 1) + WorldMapAreaData.method650(var0 - 1, var1 + 1) + WorldMapAreaData.method650(var0 + 1, var1 + 1); - int var3 = WorldMapAreaData.method650(var0 - 1, var1) + WorldMapAreaData.method650(var0 + 1, var1) + WorldMapAreaData.method650(var0, var1 - 1) + WorldMapAreaData.method650(var0, 1 + var1); - int var4 = WorldMapAreaData.method650(var0, var1); - return var2 / 16 + var3 / 8 + var4 / 4; - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1410119824" - ) - static void method163() { - Login.worldSelectOpen = false; - Login.leftTitleSprite.drawAt(Login.xPadding, 0); - Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - class51.logoSprite.drawAt(Login.xPadding + 382 - class51.logoSprite.subWidth / 2, 18); + static LoginPacket[] method139() { + return new LoginPacket[]{LoginPacket.field2290, LoginPacket.field2288, LoginPacket.field2289, LoginPacket.field2291, LoginPacket.field2295}; } } diff --git a/runescape-client/src/main/java/class14.java b/runescape-client/src/main/java/class14.java index 5756754d01..b250de67e9 100644 --- a/runescape-client/src/main/java/class14.java +++ b/runescape-client/src/main/java/class14.java @@ -1,77 +1,101 @@ +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("p") public class class14 { - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "(CI)B", - garbageValue = "-1488757001" + @ObfuscatedName("g") + @Export("Interpreter_stringLocals") + static String[] Interpreter_stringLocals; + @ObfuscatedName("hs") + @ObfuscatedGetter( + intValue = 887087521 ) - @Export("charToByteCp1252") - public static byte charToByteCp1252(char var0) { - byte var1; - if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) { - var1 = (byte)var0; - } else if (var0 == 8364) { - var1 = -128; - } else if (var0 == 8218) { - var1 = -126; - } else if (var0 == 402) { - var1 = -125; - } else if (var0 == 8222) { - var1 = -124; - } else if (var0 == 8230) { - var1 = -123; - } else if (var0 == 8224) { - var1 = -122; - } else if (var0 == 8225) { - var1 = -121; - } else if (var0 == 710) { - var1 = -120; - } else if (var0 == 8240) { - var1 = -119; - } else if (var0 == 352) { - var1 = -118; - } else if (var0 == 8249) { - var1 = -117; - } else if (var0 == 338) { - var1 = -116; - } else if (var0 == 381) { - var1 = -114; - } else if (var0 == 8216) { - var1 = -111; - } else if (var0 == 8217) { - var1 = -110; - } else if (var0 == 8220) { - var1 = -109; - } else if (var0 == 8221) { - var1 = -108; - } else if (var0 == 8226) { - var1 = -107; - } else if (var0 == 8211) { - var1 = -106; - } else if (var0 == 8212) { - var1 = -105; - } else if (var0 == 732) { - var1 = -104; - } else if (var0 == 8482) { - var1 = -103; - } else if (var0 == 353) { - var1 = -102; - } else if (var0 == 8250) { - var1 = -101; - } else if (var0 == 339) { - var1 = -100; - } else if (var0 == 382) { - var1 = -98; - } else if (var0 == 376) { - var1 = -97; - } else { - var1 = 63; + @Export("cameraZ") + static int cameraZ; + + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "(I)Ljava/lang/String;", + garbageValue = "-284135930" + ) + static String method145() { + String var0 = ""; + + Message var2; + for (Iterator var1 = Messages.Messages_hashTable.iterator(); var1.hasNext(); var0 = var0 + var2.sender + ':' + var2.text + '\n') { + var2 = (Message)var1.next(); + } + + return var0; + } + + @ObfuscatedName("et") + @ObfuscatedSignature( + signature = "(Lio;Ljava/lang/String;I)V", + garbageValue = "1397921952" + ) + static void method142(Archive var0, String var1) { + ArchiveLoader var2 = new ArchiveLoader(var0, var1); + Client.archiveLoaders.add(var2); + Client.field895 += var2.groupCount; + } + + @ObfuscatedName("jw") + @ObfuscatedSignature( + signature = "(Lhy;I)V", + garbageValue = "-1667373140" + ) + static final void method143(Widget var0) { + int var1 = var0.contentType; + if (var1 == 324) { + if (Client.field703 == -1) { + Client.field703 = var0.spriteId2; + Client.field888 = var0.spriteId; + } + + if (Client.playerAppearance.isFemale) { + var0.spriteId2 = Client.field703; + } else { + var0.spriteId2 = Client.field888; + } + + } else if (var1 == 325) { + if (Client.field703 == -1) { + Client.field703 = var0.spriteId2; + Client.field888 = var0.spriteId; + } + + if (Client.playerAppearance.isFemale) { + var0.spriteId2 = Client.field888; + } else { + var0.spriteId2 = Client.field703; + } + + } else if (var1 == 327) { + var0.modelAngleX = 150; + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; + var0.modelType = 5; + var0.modelId = 0; + } else if (var1 == 328) { + var0.modelAngleX = 150; + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; + var0.modelType = 5; + var0.modelId = 1; + } + } + + @ObfuscatedName("ks") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "71" + ) + static void method144() { + if (Client.oculusOrbState == 1) { + Client.field824 = true; } - return var1; } } diff --git a/runescape-client/src/main/java/class146.java b/runescape-client/src/main/java/class146.java index e5ef595047..34991d5e9d 100644 --- a/runescape-client/src/main/java/class146.java +++ b/runescape-client/src/main/java/class146.java @@ -1,7 +1,7 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ek") +@ObfuscatedName("eb") public interface class146 { - @ObfuscatedName("s") - void method3280(Object var1); + @ObfuscatedName("c") + void method3299(Object var1); } diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java index cc1b1d96e2..4028278aff 100644 --- a/runescape-client/src/main/java/class16.java +++ b/runescape-client/src/main/java/class16.java @@ -1,67 +1,149 @@ +import java.awt.image.BufferedImage; +import java.awt.image.PixelGrabber; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.IOException; +import javax.imageio.ImageIO; import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("g") +@ObfuscatedName("i") public class class16 { - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = -2115324593 - ) - public static int field98; - @ObfuscatedName("fk") - @ObfuscatedGetter( - intValue = -713701469 - ) - static int field101; + @ObfuscatedName("x") + @Export("FileSystem_cacheDir") + static File FileSystem_cacheDir; - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)[Lge;", - garbageValue = "1297368600" + signature = "([BI)Lli;", + garbageValue = "509351236" ) - static LoginPacket[] method183() { - return new LoginPacket[]{LoginPacket.field2291, LoginPacket.field2292, LoginPacket.field2289, LoginPacket.field2295, LoginPacket.field2293}; + @Export("convertJpgToSprite") + public static final Sprite convertJpgToSprite(byte[] var0) { + BufferedImage var1 = null; + + try { + var1 = ImageIO.read(new ByteArrayInputStream(var0)); + int var2 = var1.getWidth(); + int var3 = var1.getHeight(); + int[] var4 = new int[var2 * var3]; + PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2); + var5.grabPixels(); + return new Sprite(var4, var2, var3); + } catch (IOException var7) { + } catch (InterruptedException var8) { + } + + return new Sprite(0, 0); } - @ObfuscatedName("j") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lls;IIII)V", - garbageValue = "-1463584611" + signature = "(ILcu;ZI)I", + garbageValue = "443442748" ) - static void method181(Sprite var0, int var1, int var2, int var3) { - WorldMapRegion.WorldMapRegion_cachedSprites.put(var0, ClientPacket.getWorldMapSpriteHash(var1, var2, var3), var0.pixels.length * 4); - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "(II)Ljava/lang/String;", - garbageValue = "-1438659033" - ) - @Export("colorStartTag") - static String colorStartTag(int var0) { - return ""; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "(IB)Lin;", - garbageValue = "91" - ) - public static VarpDefinition method180(int var0) { - VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + static int method162(int var0, Script var1, boolean var2) { + Widget var3 = Player.getWidget(Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]); + if (var0 == ScriptOpcodes.IF_GETSCROLLX) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.scrollX; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.scrollY; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETTEXT) { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3.text; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.scrollWidth; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.scrollHeight; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.modelZoom; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.modelAngleX; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.modelAngleZ; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.modelAngleY; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETTRANSTOP) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.transparencyTop; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETTRANSBOT) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.transparencyBot; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.color; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.color2; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETFILLMODE) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; + return 1; } else { - byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); - var1 = new VarpDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } + return 2; + } + } - VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); - return var1; + @ObfuscatedName("hh") + @ObfuscatedSignature( + signature = "(Lbo;B)V", + garbageValue = "-39" + ) + static final void method164(PendingSpawn var0) { + long var1 = 0L; + int var3 = -1; + int var4 = 0; + int var5 = 0; + if (var0.type == 0) { + var1 = WorldMapIcon_1.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 1) { + var1 = WorldMapIcon_1.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 2) { + var1 = WorldMapIcon_1.scene.getGameObjectTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 3) { + var1 = WorldMapIcon_1.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); + } + + if (var1 != 0L) { + int var6 = WorldMapIcon_1.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); + var3 = SecureRandomFuture.Entity_unpackID(var1); + var4 = var6 & 31; + var5 = var6 >> 6 & 3; + } + + var0.objectId = var3; + var0.field903 = var4; + var0.field900 = var5; + } + + @ObfuscatedName("kf") + @ObfuscatedSignature( + signature = "(Lhy;B)Ljava/lang/String;", + garbageValue = "25" + ) + static String method165(Widget var0) { + if (WorldMapElement.method4390(class60.getWidgetClickMask(var0)) == 0) { + return null; + } else { + return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; } } } diff --git a/runescape-client/src/main/java/class160.java b/runescape-client/src/main/java/class160.java index acaf038fa0..b157fcae53 100644 --- a/runescape-client/src/main/java/class160.java +++ b/runescape-client/src/main/java/class160.java @@ -3,99 +3,81 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fn") +@ObfuscatedName("fr") public enum class160 implements Enumerated { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lfn;" + signature = "Lfr;" ) - field1988(2, 0), - @ObfuscatedName("j") + field1975(1, 0), + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lfn;" + signature = "Lfr;" ) - field1982(1, 1), - @ObfuscatedName("i") + field1972(2, 1), + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lfn;" + signature = "Lfr;" ) - field1984(3, 2), - @ObfuscatedName("k") + field1973(3, 2), + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lfn;" + signature = "Lfr;" ) - field1983(0, 3); + field1974(0, 3); + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 361058639 + ) + @Export("Interpreter_intStackSize") + static int Interpreter_intStackSize; + @ObfuscatedName("d") + static int[][] field1977; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1405442637 + ) + public final int field1978; @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1967639255 - ) - public final int field1986; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -2042694255 + intValue = 1965131589 ) @Export("id") final int id; class160(int var3, int var4) { - this.field1986 = var3; + this.field1978 = var3; this.id = var4; } - @ObfuscatedName("j") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-32" + signature = "(I)I", + garbageValue = "-1410702910" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "1" - ) - @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("u") @ObfuscatedSignature( - signature = "(IIS)I", - garbageValue = "338" + signature = "(IB)I", + garbageValue = "2" ) - static int method3383(int var0, int var1) { - long var2 = (long)((var0 << 16) + var1); - return NetCache.NetCache_currentResponse != null && NetCache.NetCache_currentResponse.key == var2 ? NetCache.NetCache_responseArchiveBuffer.offset * 99 / (NetCache.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding) + 1 : 0; + @Export("Messages_getHistorySize") + static int Messages_getHistorySize(int var0) { + ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); + return var1 == null ? 0 : var1.size(); + } + + @ObfuscatedName("gr") + @ObfuscatedSignature( + signature = "(I)Z", + garbageValue = "-744343031" + ) + static boolean method3419() { + return (Client.drawPlayerNames & 1) != 0; } } diff --git a/runescape-client/src/main/java/class161.java b/runescape-client/src/main/java/class161.java index a608255fcb..f17c0f0385 100644 --- a/runescape-client/src/main/java/class161.java +++ b/runescape-client/src/main/java/class161.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("fc") +@ObfuscatedName("fd") public interface class161 { } diff --git a/runescape-client/src/main/java/class162.java b/runescape-client/src/main/java/class162.java index e57b42347f..805f3c65a8 100644 --- a/runescape-client/src/main/java/class162.java +++ b/runescape-client/src/main/java/class162.java @@ -2,12 +2,36 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fv") +@ObfuscatedName("fe") public class class162 implements class161 { + @ObfuscatedName("bf") + @ObfuscatedSignature( + signature = "[Lli;" + ) + @Export("worldSelectBackSprites") + static Sprite[] worldSelectBackSprites; + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(Lhz;Lhz;Lhz;Lhz;B)V", + garbageValue = "-41" + ) + @Export("Widget_setArchives") + public static void Widget_setArchives(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, AbstractArchive var3) { + ArchiveDiskActionHandler.Widget_archive = var0; + class293.Widget_modelsArchive = var1; + HealthBar.Widget_spritesArchive = var2; + WorldMapSprite.Widget_fontsArchive = var3; + class289.Widget_interfaceComponents = new Widget[ArchiveDiskActionHandler.Widget_archive.getGroupCount()][]; + UserComparator3.Widget_loadedInterfaces = new boolean[ArchiveDiskActionHandler.Widget_archive.getGroupCount()]; + } + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lag;" + signature = "(I)V", + garbageValue = "849753199" ) - @Export("worldMapEvent") - static WorldMapEvent worldMapEvent; + public static void method3424() { + WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); + } } diff --git a/runescape-client/src/main/java/class173.java b/runescape-client/src/main/java/class173.java index 37ace3a2d5..a0630a9d5a 100644 --- a/runescape-client/src/main/java/class173.java +++ b/runescape-client/src/main/java/class173.java @@ -1,38 +1,50 @@ -import java.net.URL; +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("fx") +@ObfuscatedName("fu") public class class173 { - @ObfuscatedName("i") + @ObfuscatedName("t") @Export("directions") - public static int[][] directions; - @ObfuscatedName("k") + static int[][] directions; + @ObfuscatedName("g") @Export("distances") - public static int[][] distances; + static int[][] distances; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -2098626243 + ) + static int field2063; @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1891183659 + intValue = -300293519 ) - public static int field2073; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 783444493 - ) - public static int field2070; - @ObfuscatedName("q") + static int field2068; + @ObfuscatedName("v") @Export("bufferX") - public static int[] bufferX; - @ObfuscatedName("x") + static int[] bufferX; + @ObfuscatedName("d") @Export("bufferY") - public static int[] bufferY; - @ObfuscatedName("ah") - @ObfuscatedGetter( - intValue = -1559987227 + static int[] bufferY; + @ObfuscatedName("dl") + @ObfuscatedSignature( + signature = "Lio;" ) - static int field2079; + @Export("archive2") + static Archive archive2; + @ObfuscatedName("ed") + @ObfuscatedGetter( + intValue = -1734851163 + ) + static int field2069; + @ObfuscatedName("ke") + @ObfuscatedGetter( + intValue = -1496378761 + ) + @Export("menuWidth") + static int menuWidth; static { directions = new int[128][128]; @@ -41,56 +53,48 @@ public class class173 { bufferY = new int[4096]; } - @ObfuscatedName("s") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-146894719" + signature = "(ZI)V", + garbageValue = "-1761278066" ) - @Export("loadWorlds") - static boolean loadWorlds() { - try { - if (IgnoreList.World_request == null) { - IgnoreList.World_request = ScriptEvent.urlRequester.request(new URL(class1.field6)); - } else if (IgnoreList.World_request.isDone()) { - byte[] var0 = IgnoreList.World_request.getResponse(); - Buffer var1 = new Buffer(var0); - var1.readInt(); - World.World_count = var1.readUnsignedShort(); - ChatChannel.World_worlds = new World[World.World_count]; - - World var3; - for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { - var3 = ChatChannel.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(); + public static void method3575(boolean var0) { + if (NetCache.NetCache_socket != null) { + try { + Buffer var1 = new Buffer(4); + var1.writeByte(var0 ? 2 : 3); + var1.writeMedium(0); + NetCache.NetCache_socket.write(var1.array, 0, 4); + } catch (IOException var4) { + try { + NetCache.NetCache_socket.close(); + } catch (Exception var3) { } - Tile.sortWorlds(ChatChannel.World_worlds, 0, ChatChannel.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); - IgnoreList.World_request = null; - return true; + ++NetCache.NetCache_ioExceptions; + NetCache.NetCache_socket = null; } - } catch (Exception var4) { - var4.printStackTrace(); - IgnoreList.World_request = null; - } - return false; + } } - @ObfuscatedName("kw") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(Lhp;I)Ljava/lang/String;", - garbageValue = "1595503156" + signature = "(II)Lev;", + garbageValue = "-691724991" ) - static String method3529(Widget var0) { - if (WorldMapRegion.method530(ParamDefinition.getWidgetClickMask(var0)) == 0) { - return null; + @Export("getFrames") + static Frames getFrames(int var0) { + Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); + if (var1 != null) { + return var1; } else { - return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; + var1 = class51.method852(SequenceDefinition.SequenceDefinition_animationsArchive, SequenceDefinition.SequenceDefinition_skeletonsArchive, var0, false); + if (var1 != null) { + SequenceDefinition.SequenceDefinition_cachedFrames.put(var1, (long)var0); + } + + return var1; } } } diff --git a/runescape-client/src/main/java/class181.java b/runescape-client/src/main/java/class181.java index 91a32c4bed..2911c6240e 100644 --- a/runescape-client/src/main/java/class181.java +++ b/runescape-client/src/main/java/class181.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("fw") +@ObfuscatedName("fo") public interface class181 { } diff --git a/runescape-client/src/main/java/class185.java b/runescape-client/src/main/java/class185.java index 8a4583c041..fa63036b55 100644 --- a/runescape-client/src/main/java/class185.java +++ b/runescape-client/src/main/java/class185.java @@ -3,82 +3,497 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gt") +@ObfuscatedName("gn") public class class185 { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lgt;" - ) - public static final class185 field2301; - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "Lgt;" - ) - public static final class185 field2306; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lgt;" + signature = "Lgn;" ) public static final class185 field2298; - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Lgt;" - ) - public static final class185 field2299; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lgt;" - ) - public static final class185 field2300; - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "Lgt;" - ) - public static final class185 field2304; - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Lgt;" - ) - public static final class185 field2302; - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "Lgt;" - ) - public static final class185 field2297; @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lgt;" + signature = "Lgn;" ) - public static final class185 field2303; + public static final class185 field2300; + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final class185 field2297; + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final class185 field2299; + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final class185 field2304; + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final class185 field2296; + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final class185 field2302; + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final class185 field2301; @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lgt;" + signature = "Lgn;" + ) + public static final class185 field2303; + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "Lgn;" ) public static final class185 field2305; - @ObfuscatedName("ly") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -586438853 + intValue = -1998851903 ) - @Export("selectedItemSlot") - static int selectedItemSlot; + static int field2306; static { - field2301 = new class185(7); - field2306 = new class185(15); - field2298 = new class185(14); + field2298 = new class185(3); + field2300 = new class185(7); + field2297 = new class185(14); field2299 = new class185(6); - field2300 = new class185(4); - field2304 = new class185(5); - field2302 = new class185(2); - field2297 = new class185(3); - field2303 = new class185(5); - field2305 = new class185(4); + field2304 = new class185(4); + field2296 = new class185(15); + field2302 = new class185(5); + field2301 = new class185(4); + field2303 = new class185(2); + field2305 = new class185(5); } @ObfuscatedSignature( signature = "(I)V", - garbageValue = "7" + garbageValue = "3" ) class185(int var1) { } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(IIIIIILep;Lfj;I)V", + garbageValue = "-1241420469" + ) + static final void method3602(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; + } + + ObjectDefinition var8 = WallDecoration.getObjectDefinition(var3); + int var9; + int var10; + if (var4 != 1 && var4 != 3) { + var9 = var8.sizeX; + var10 = var8.sizeY; + } else { + var9 = var8.sizeY; + var10 = var8.sizeX; + } + + int var11; + int var12; + if (var9 + var1 <= 104) { + var11 = (var9 >> 1) + var1; + var12 = (var9 + 1 >> 1) + var1; + } else { + var11 = var1; + var12 = var1 + 1; + } + + int var13; + int var14; + if (var10 + var2 <= 104) { + var13 = (var10 >> 1) + var2; + var14 = var2 + (var10 + 1 >> 1); + } else { + var13 = var2; + var14 = var2 + 1; + } + + int[][] var15 = Tiles.Tiles_heights[var0]; + int var16 = var15[var12][var14] + var15[var11][var14] + var15[var11][var13] + var15[var12][var13] >> 2; + int var17 = (var1 << 7) + (var9 << 6); + int var18 = (var2 << 7) + (var10 << 6); + long var19 = WorldMapIcon_1.calculateTag(var1, var2, 2, var8.int1 == 0, var3); + int var21 = var5 + (var4 << 6); + if (var8.int3 == 1) { + var21 += 256; + } + + int var23; + int var24; + if (var8.hasSound()) { + ObjectSound var22 = new ObjectSound(); + var22.plane = var0; + var22.x = var1 * 128; + var22.y = var2 * 128; + var23 = var8.sizeX; + var24 = var8.sizeY; + if (var4 == 1 || var4 == 3) { + var23 = var8.sizeY; + var24 = var8.sizeX; + } + + var22.field1043 = (var23 + var1) * 128; + var22.field1051 = (var24 + var2) * 128; + var22.soundEffectId = var8.ambientSoundId; + var22.field1039 = var8.int4 * 128; + var22.field1048 = var8.int5; + var22.field1049 = var8.int6; + var22.soundEffectIds = var8.soundEffectIds; + if (var8.transforms != null) { + var22.obj = var8; + var22.set(); + } + + ObjectSound.objectSounds.addFirst(var22); + if (var22.soundEffectIds != null) { + var22.field1042 = var22.field1048 + (int)(Math.random() * (double)(var22.field1049 - var22.field1048)); + } + } + + Object var34; + if (var5 == 22) { + if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { + if (var8.animationId == -1 && var8.transforms == null) { + var34 = var8.getEntity(22, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newFloorDecoration(var0, var1, var2, var16, (Entity)var34, var19, var21); + if (var8.interactType == 1 && var7 != null) { + var7.setBlockedByFloorDec(var1, var2); + } + + } + } else if (var5 != 10 && var5 != 11) { + int[] var10000; + if (var5 >= 12) { + if (var8.animationId == -1 && var8.transforms == null) { + var34 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.method3051(var0, var1, var2, var16, 1, 1, (Entity)var34, 0, var19, var21); + if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { + var10000 = UserComparator3.field1961[var0][var1]; + var10000[var2] |= 2340; + } + + if (var8.interactType != 0 && var7 != null) { + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + } else if (var5 == 0) { + if (var8.animationId == -1 && var8.transforms == null) { + var34 = var8.getEntity(0, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.field480[var4], 0, var19, var21); + if (var4 == 0) { + if (var8.clipped) { + Tiles.field473[var0][var1][var2] = 50; + Tiles.field473[var0][var1][var2 + 1] = 50; + } + + if (var8.modelClipped) { + var10000 = UserComparator3.field1961[var0][var1]; + var10000[var2] |= 585; + } + } else if (var4 == 1) { + if (var8.clipped) { + Tiles.field473[var0][var1][var2 + 1] = 50; + Tiles.field473[var0][var1 + 1][var2 + 1] = 50; + } + + if (var8.modelClipped) { + var10000 = UserComparator3.field1961[var0][var1]; + var10000[var2 + 1] |= 1170; + } + } else if (var4 == 2) { + if (var8.clipped) { + Tiles.field473[var0][var1 + 1][var2] = 50; + Tiles.field473[var0][var1 + 1][var2 + 1] = 50; + } + + if (var8.modelClipped) { + var10000 = UserComparator3.field1961[var0][var1 + 1]; + var10000[var2] |= 585; + } + } else if (var4 == 3) { + if (var8.clipped) { + Tiles.field473[var0][var1][var2] = 50; + Tiles.field473[var0][var1 + 1][var2] = 50; + } + + if (var8.modelClipped) { + var10000 = UserComparator3.field1961[var0][var1]; + var10000[var2] |= 1170; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method3534(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method3057(var0, var1, var2, var8.int2); + } + + } else if (var5 == 1) { + if (var8.animationId == -1 && var8.transforms == null) { + var34 = var8.getEntity(1, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.field481[var4], 0, var19, var21); + if (var8.clipped) { + if (var4 == 0) { + Tiles.field473[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { + Tiles.field473[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { + Tiles.field473[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { + Tiles.field473[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method3534(var1, var2, var5, var4, var8.boolean1); + } + + } else { + int var28; + if (var5 == 2) { + var28 = var4 + 1 & 3; + Object var29; + Object var30; + if (var8.animationId == -1 && var8.transforms == null) { + var29 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); + var30 = var8.getEntity(2, var28, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + var30 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var29, (Entity)var30, Tiles.field480[var4], Tiles.field480[var28], var19, var21); + if (var8.modelClipped) { + if (var4 == 0) { + var10000 = UserComparator3.field1961[var0][var1]; + var10000[var2] |= 585; + var10000 = UserComparator3.field1961[var0][var1]; + var10000[var2 + 1] |= 1170; + } else if (var4 == 1) { + var10000 = UserComparator3.field1961[var0][var1]; + var10000[1 + var2] |= 1170; + var10000 = UserComparator3.field1961[var0][var1 + 1]; + var10000[var2] |= 585; + } else if (var4 == 2) { + var10000 = UserComparator3.field1961[var0][var1 + 1]; + var10000[var2] |= 585; + var10000 = UserComparator3.field1961[var0][var1]; + var10000[var2] |= 1170; + } else if (var4 == 3) { + var10000 = UserComparator3.field1961[var0][var1]; + var10000[var2] |= 1170; + var10000 = UserComparator3.field1961[var0][var1]; + var10000[var2] |= 585; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method3534(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method3057(var0, var1, var2, var8.int2); + } + + } else if (var5 == 3) { + if (var8.animationId == -1 && var8.transforms == null) { + var34 = var8.getEntity(3, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.field481[var4], 0, var19, var21); + if (var8.clipped) { + if (var4 == 0) { + Tiles.field473[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { + Tiles.field473[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { + Tiles.field473[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { + Tiles.field473[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method3534(var1, var2, var5, var4, var8.boolean1); + } + + } else if (var5 == 9) { + if (var8.animationId == -1 && var8.transforms == null) { + var34 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.method3051(var0, var1, var2, var16, 1, 1, (Entity)var34, 0, var19, var21); + if (var8.interactType != 0 && var7 != null) { + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method3057(var0, var1, var2, var8.int2); + } + + } else if (var5 == 4) { + if (var8.animationId == -1 && var8.transforms == null) { + var34 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.field480[var4], 0, 0, 0, var19, var21); + } else { + long var31; + Object var33; + if (var5 == 5) { + var28 = 16; + var31 = var6.getBoundaryObjectTag(var0, var1, var2); + if (0L != var31) { + var28 = WallDecoration.getObjectDefinition(SecureRandomFuture.Entity_unpackID(var31)).int2; + } + + if (var8.animationId == -1 && var8.transforms == null) { + var33 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var33 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)null, Tiles.field480[var4], 0, var28 * Tiles.field482[var4], var28 * Tiles.field487[var4], var19, var21); + } else if (var5 == 6) { + var28 = 8; + var31 = var6.getBoundaryObjectTag(var0, var1, var2); + if (var31 != 0L) { + var28 = WallDecoration.getObjectDefinition(SecureRandomFuture.Entity_unpackID(var31)).int2 / 2; + } + + if (var8.animationId == -1 && var8.transforms == null) { + var33 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); + } else { + var33 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)null, 256, var4, var28 * Tiles.field484[var4], var28 * Tiles.field485[var4], var19, var21); + } else if (var5 == 7) { + var23 = var4 + 2 & 3; + if (var8.animationId == -1 && var8.transforms == null) { + var34 = var8.getEntity(4, var23 + 4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 4, var23 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var34, (Entity)null, 256, var23, 0, 0, var19, var21); + } else if (var5 == 8) { + var28 = 8; + var31 = var6.getBoundaryObjectTag(var0, var1, var2); + if (0L != var31) { + var28 = WallDecoration.getObjectDefinition(SecureRandomFuture.Entity_unpackID(var31)).int2 / 2; + } + + int var27 = var4 + 2 & 3; + Object var26; + if (var8.animationId == -1 && var8.transforms == null) { + var33 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); + var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); + } else { + var33 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)var26, 256, var4, var28 * Tiles.field484[var4], var28 * Tiles.field485[var4], var19, var21); + } + } + } + } else { + if (var8.animationId == -1 && var8.transforms == null) { + var34 = var8.getEntity(10, var4, var15, var17, var16, var18); + } else { + var34 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + if (var34 != null && var6.method3051(var0, var1, var2, var16, var9, var10, (Entity)var34, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { + var23 = 15; + if (var34 instanceof Model) { + var23 = ((Model)var34).method2849() / 4; + if (var23 > 30) { + var23 = 30; + } + } + + for (var24 = 0; var24 <= var9; ++var24) { + for (int var25 = 0; var25 <= var10; ++var25) { + if (var23 > Tiles.field473[var0][var24 + var1][var25 + var2]) { + Tiles.field473[var0][var24 + var1][var25 + var2] = (byte)var23; + } + } + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + } + } + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(B)Lbb;", + garbageValue = "0" + ) + @Export("worldListStart") + static World worldListStart() { + World.World_listCount = 0; + return Frames.getNextWorldListWorld(); + } + + @ObfuscatedName("ex") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-2142685400" + ) + static final void method3607() { + if (Client.logoutTimer > 0) { + class40.method736(); + } else { + Client.timer.method4985(); + WorldMapIcon_0.updateGameState(40); + ArchiveLoader.field512 = Client.packetWriter.getSocket(); + Client.packetWriter.removeSocket(); + } + } } diff --git a/runescape-client/src/main/java/class186.java b/runescape-client/src/main/java/class186.java index 0b5854e3ab..89354e4984 100644 --- a/runescape-client/src/main/java/class186.java +++ b/runescape-client/src/main/java/class186.java @@ -1,9 +1,26 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("go") +@ObfuscatedName("gu") public class class186 { - @ObfuscatedName("ge") - @Export("regions") - static int[] regions; + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(II)Lih;", + garbageValue = "727235164" + ) + public static VarcInt method3609(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.method4394(new Buffer(var2)); + } + + VarcInt.VarcInt_cached.put(var1, (long)var0); + return var1; + } + } } diff --git a/runescape-client/src/main/java/class188.java b/runescape-client/src/main/java/class188.java index 135fbf1b3f..52fe673078 100644 --- a/runescape-client/src/main/java/class188.java +++ b/runescape-client/src/main/java/class188.java @@ -1,52 +1,140 @@ +import java.io.BufferedReader; +import java.io.DataInputStream; +import java.io.PrintWriter; +import java.io.StringReader; +import java.io.StringWriter; +import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gx") +@ObfuscatedName("gl") public class class188 { - @ObfuscatedName("s") - static int[] field2326; - @ObfuscatedName("q") - static byte[][][] field2321; - @ObfuscatedName("jy") - @ObfuscatedSignature( - signature = "Lhp;" - ) - @Export("dragInventoryWidget") - static Widget dragInventoryWidget; + @ObfuscatedName("c") + static int[] field2315; static { new Object(); - field2326 = new int[33]; - field2326[0] = 0; + field2315 = new int[33]; + field2315[0] = 0; int var0 = 2; for (int var1 = 1; var1 < 33; ++var1) { - field2326[var1] = var0 - 1; + field2315[var1] = var0 - 1; var0 += var0; } } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lhz;Lhz;ZLkb;I)V", - garbageValue = "639342200" + signature = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", + garbageValue = "-1657814089" ) - public static void method3589(AbstractArchive var0, AbstractArchive var1, boolean var2, Font var3) { - class65.ItemDefinition_archive = var0; - Frames.ItemDefinition_modelArchive = var1; - UrlRequester.ItemDefinition_inMembersWorld = var2; - MouseRecorder.ItemDefinition_fileCount = class65.ItemDefinition_archive.getGroupFileCount(10); - ArchiveLoader.ItemDefinition_fontPlain11 = var3; + @Export("RunException_sendStackTrace") + public static void RunException_sendStackTrace(String var0, Throwable var1) { + if (var1 != null) { + var1.printStackTrace(); + } else { + try { + String var2 = ""; + if (var1 != null) { + Throwable var4 = var1; + String var5; + if (var1 instanceof RunException) { + RunException var6 = (RunException)var1; + var5 = var6.message + " | "; + var4 = var6.throwable; + } else { + var5 = ""; + } + + StringWriter var18 = new StringWriter(); + PrintWriter var7 = new PrintWriter(var18); + var4.printStackTrace(var7); + var7.close(); + String var8 = var18.toString(); + BufferedReader var9 = new BufferedReader(new StringReader(var8)); + String var10 = var9.readLine(); + + label62: + while (true) { + while (true) { + String var11 = var9.readLine(); + if (var11 == null) { + var5 = var5 + "| " + var10; + var2 = var5; + break label62; + } + + int var12 = var11.indexOf(40); + int var13 = var11.indexOf(41, var12 + 1); + if (var12 >= 0 && var13 >= 0) { + String var14 = var11.substring(var12 + 1, var13); + int var15 = var14.indexOf(".java:"); + if (var15 >= 0) { + var14 = var14.substring(0, var15) + var14.substring(var15 + 5); + var5 = var5 + var14 + ' '; + continue; + } + + var11 = var11.substring(0, var12); + } + + var11 = var11.trim(); + var11 = var11.substring(var11.lastIndexOf(32) + 1); + var11 = var11.substring(var11.lastIndexOf(9) + 1); + var5 = var5 + var11 + ' '; + } + } + } + + 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=" + Skills.field2723 + "&e=" + var2); + DataInputStream var17 = new DataInputStream(var3.openStream()); + var17.read(); + var17.close(); + } catch (Exception var16) { + } + + } } - @ObfuscatedName("f") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "0" + signature = "(Lhz;B)V", + garbageValue = "105" ) - static final boolean method3588() { - return ViewportMouse.ViewportMouse_isInViewport; + public static void method3617(AbstractArchive var0) { + StructDefinition.StructDefinition_archive = var0; + } + + @ObfuscatedName("ib") + @ObfuscatedSignature( + signature = "(IB)Ljava/lang/String;", + garbageValue = "16" + ) + static String method3620(int var0) { + if (var0 < 0) { + return ""; + } else { + return Client.menuTargets[var0].length() > 0 ? Client.menuActions[var0] + " " + Client.menuTargets[var0] : Client.menuActions[var0]; + } } } diff --git a/runescape-client/src/main/java/class189.java b/runescape-client/src/main/java/class189.java index 706571176e..21098721aa 100644 --- a/runescape-client/src/main/java/class189.java +++ b/runescape-client/src/main/java/class189.java @@ -1,316 +1,32 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gw") +@ObfuscatedName("gr") public class class189 { @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 1476121683 - ) - static int field2328; - @ObfuscatedName("r") @ObfuscatedSignature( - signature = "Ldh;" + signature = "Lhz;" ) - @Export("soundCache") - public static SoundCache soundCache; + @Export("HitSplatDefinition_fontsArchive") + static AbstractArchive HitSplatDefinition_fontsArchive; - @ObfuscatedName("i") + @ObfuscatedName("eb") @ObfuscatedSignature( - signature = "(Lkx;I)V", - garbageValue = "1395104322" + signature = "(I)I", + garbageValue = "1691938154" ) - static final void method3594(PacketBuffer var0) { - int var1 = 0; - var0.importIndex(); + static int method3626() { + if (Client.archiveLoaders != null && Client.archiveLoaderArchive < Client.archiveLoaders.size()) { + int var0 = 0; - byte[] var10000; - int var2; - int var3; - int var4; - for (var2 = 0; var2 < Players.Players_count; ++var2) { - var3 = Players.Players_indices[var2]; - if ((Players.field1221[var3] & 1) == 0) { - if (var1 > 0) { - --var1; - var10000 = Players.field1221; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - var4 = var0.readBits(1); - if (var4 == 0) { - var1 = UserComparator9.decode(var0); - var10000 = Players.field1221; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - StudioGame.readPlayerUpdate(var0, var3); - } - } + for (int var1 = 0; var1 <= Client.archiveLoaderArchive; ++var1) { + var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; } - } - var0.exportIndex(); - if (var1 != 0) { - throw new RuntimeException(); + return var0 * 10000 / Client.field895; } else { - var0.importIndex(); - - for (var2 = 0; var2 < Players.Players_count; ++var2) { - var3 = Players.Players_indices[var2]; - if ((Players.field1221[var3] & 1) != 0) { - if (var1 > 0) { - --var1; - var10000 = Players.field1221; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - var4 = var0.readBits(1); - if (var4 == 0) { - var1 = UserComparator9.decode(var0); - var10000 = Players.field1221; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - StudioGame.readPlayerUpdate(var0, var3); - } - } - } - } - - var0.exportIndex(); - if (var1 != 0) { - throw new RuntimeException(); - } else { - var0.importIndex(); - - for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { - var3 = Players.Players_emptyIndices[var2]; - if ((Players.field1221[var3] & 1) != 0) { - if (var1 > 0) { - --var1; - var10000 = Players.field1221; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - var4 = var0.readBits(1); - if (var4 == 0) { - var1 = UserComparator9.decode(var0); - var10000 = Players.field1221; - var10000[var3] = (byte)(var10000[var3] | 2); - } else if (WorldMapLabelSize.updateExternalPlayer(var0, var3)) { - var10000 = Players.field1221; - var10000[var3] = (byte)(var10000[var3] | 2); - } - } - } - } - - var0.exportIndex(); - if (var1 != 0) { - throw new RuntimeException(); - } else { - var0.importIndex(); - - for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { - var3 = Players.Players_emptyIndices[var2]; - if ((Players.field1221[var3] & 1) == 0) { - if (var1 > 0) { - --var1; - var10000 = Players.field1221; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - var4 = var0.readBits(1); - if (var4 == 0) { - var1 = UserComparator9.decode(var0); - var10000 = Players.field1221; - var10000[var3] = (byte)(var10000[var3] | 2); - } else if (WorldMapLabelSize.updateExternalPlayer(var0, var3)) { - var10000 = Players.field1221; - var10000[var3] = (byte)(var10000[var3] | 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.field1221; - var10000[var2] = (byte)(var10000[var2] >> 1); - Player var5 = Client.players[var2]; - if (var5 != null) { - Players.Players_indices[++Players.Players_count - 1] = var2; - } else { - Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var2; - } - } - - } - } - } + return 10000; } } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "1903618093" - ) - public static String method3596(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 = UserComparator8.method3342(var5); - } - - if (Character.isLetter(var5)) { - var3 = 0; - } else if (var5 != '.' && var5 != '?' && var5 != '!') { - if (Character.isSpaceChar(var5)) { - if (var3 != 2) { - var3 = 1; - } - } else { - var3 = 1; - } - } else { - var3 = 2; - } - - var2[var4] = var5; - } - - return new String(var2); - } - - @ObfuscatedName("hw") - @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "638834022" - ) - @Export("updateItemPile") - static final void updateItemPile(int var0, int var1) { - NodeDeque var2 = Client.groundItems[ItemContainer.plane][var0][var1]; - if (var2 == null) { - Player.scene.removeGroundItemPile(ItemContainer.plane, var0, var1); - } else { - long var3 = -99999999L; - TileItem var5 = null; - - TileItem var6; - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { - ItemDefinition var7 = WorldMapData_0.ItemDefinition_get(var6.id); - long var8 = (long)var7.price; - if (var7.isStackable == 1) { - var8 *= (long)(var6.quantity + 1); - } - - if (var8 > var3) { - var3 = var8; - var5 = var6; - } - } - - if (var5 == null) { - Player.scene.removeGroundItemPile(ItemContainer.plane, var0, var1); - } else { - var2.addLast(var5); - TileItem var12 = null; - TileItem var11 = null; - - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { - if (var6.id != var5.id) { - if (var12 == null) { - var12 = var6; - } - - if (var12.id != var6.id && var11 == null) { - var11 = var6; - } - } - } - - long var9 = WorldMapSprite.calculateTag(var0, var1, 3, false, 0); - Player.scene.newGroundItemPile(ItemContainer.plane, var0, var1, GrandExchangeOfferTotalQuantityComparator.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, ItemContainer.plane), var5, var9, var12, var11); - } - } - } - - @ObfuscatedName("is") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;Lhp;B)Ljava/lang/String;", - garbageValue = "0" - ) - static String method3597(String var0, Widget var1) { - if (var0.indexOf("%") != -1) { - for (int var2 = 1; var2 <= 5; ++var2) { - while (true) { - int var3 = var0.indexOf("%" + var2); - if (var3 == -1) { - break; - } - - var0 = var0.substring(0, var3) + GrandExchangeOfferUnitPriceComparator.method127(AbstractByteArrayCopier.method3868(var1, var2 - 1)) + var0.substring(var3 + 2); - } - } - } - - return var0; - } - - @ObfuscatedName("jd") - @ObfuscatedSignature( - signature = "([Lhp;II)V", - garbageValue = "2135074914" - ) - @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) { - UserComparator6.runIntfCloseListeners(var4.group, var1); - } - } - - ScriptEvent var5; - if (var1 == 0 && var3.onDialogAbort != null) { - var5 = new ScriptEvent(); - var5.widget = var3; - var5.args = var3.onDialogAbort; - class81.runScriptEvent(var5); - } - - if (var1 == 1 && var3.onSubChange != null) { - if (var3.childIndex >= 0) { - Widget var6 = WorldMapElement.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; - class81.runScriptEvent(var5); - } - } - } - - } } diff --git a/runescape-client/src/main/java/class191.java b/runescape-client/src/main/java/class191.java index 2b55b00cc2..908a2c2c94 100644 --- a/runescape-client/src/main/java/class191.java +++ b/runescape-client/src/main/java/class191.java @@ -2,65 +2,42 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gr") +@ObfuscatedName("ge") public class class191 { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lgr;" + signature = "Lge;" ) - static final class191 field2347; - @ObfuscatedName("j") + static final class191 field2330; + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lgr;" + signature = "Lge;" ) - static final class191 field2345; - @ObfuscatedName("i") + static final class191 field2331; + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lgr;" + signature = "Lge;" ) - static final class191 field2346; + static final class191 field2337; + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Llt;" + ) + @Export("titlebuttonSprite") + static IndexedSprite titlebuttonSprite; + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "Lli;" + ) + @Export("rightTitleSprite") + static Sprite rightTitleSprite; static { - field2347 = new class191(); - field2345 = new class191(); - field2346 = new class191(); + field2330 = new class191(); + field2331 = new class191(); + field2337 = new class191(); } class191() { } - - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "(I)[Lhh;", - garbageValue = "-1783232348" - ) - @Export("PlayerType_values") - public static PlayerType[] PlayerType_values() { - return new PlayerType[]{PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_ultimateIronman, PlayerType.PlayerType_normal, PlayerType.PlayerType_ironman, PlayerType.PlayerType_playerModerator}; - } - - @ObfuscatedName("kq") - @ObfuscatedSignature( - signature = "(IIIILls;Lhg;B)V", - garbageValue = "34" - ) - @Export("drawSpriteOnMinimap") - static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, Sprite 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.method6020(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/class192.java b/runescape-client/src/main/java/class192.java index 959829aa85..6373222412 100644 --- a/runescape-client/src/main/java/class192.java +++ b/runescape-client/src/main/java/class192.java @@ -1,92 +1,103 @@ +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; import java.util.HashSet; +import java.util.Iterator; import java.util.Set; 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("gm") +@ObfuscatedName("gh") public enum class192 implements Enumerated { - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "Lgm;" - ) - field2360("", 0, new class191[]{class191.field2346}), - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "Lgm;" - ) - field2350("", 1, new class191[]{class191.field2345, class191.field2346}), - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lgm;" - ) - field2363("", 2, new class191[]{class191.field2345, class191.field2347, class191.field2346}), - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Lgm;" - ) - field2361("", 3, new class191[]{class191.field2345}), - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lgm;" - ) - field2367("", 4), - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "Lgm;" - ) - field2351("", 5, new class191[]{class191.field2345, class191.field2346}), - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Lgm;" - ) - field2355("", 6, new class191[]{class191.field2346}), - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "Lgm;" - ) - field2356("", 8, new class191[]{class191.field2345, class191.field2346}), - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lgm;" - ) - field2357("", 9, new class191[]{class191.field2345, class191.field2347}), - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "Lgm;" - ) - field2358("", 10, new class191[]{class191.field2345}), - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Lgm;" - ) - field2359("", 11, new class191[]{class191.field2345}), @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lgh;" ) - field2354("", 12, new class191[]{class191.field2345, class191.field2346}), - @ObfuscatedName("r") + field2345("", 0, new class191[]{class191.field2337}), + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lgm;" + signature = "Lgh;" ) - field2366("", 13, new class191[]{class191.field2345}); + field2338("", 1, new class191[]{class191.field2331, class191.field2337}), + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "Lgh;" + ) + field2343("", 2, new class191[]{class191.field2331, class191.field2330, class191.field2337}), + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "Lgh;" + ) + field2340("", 3, new class191[]{class191.field2331}), + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "Lgh;" + ) + field2339("", 4), + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Lgh;" + ) + field2341("", 5, new class191[]{class191.field2331, class191.field2337}), + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "Lgh;" + ) + field2344("", 6, new class191[]{class191.field2337}), + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "Lgh;" + ) + field2342("", 8, new class191[]{class191.field2331, class191.field2337}), + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "Lgh;" + ) + field2346("", 9, new class191[]{class191.field2331, class191.field2330}), + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "Lgh;" + ) + field2347("", 10, new class191[]{class191.field2331}), + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "Lgh;" + ) + field2348("", 11, new class191[]{class191.field2331}), + @ObfuscatedName("h") + @ObfuscatedSignature( + signature = "Lgh;" + ) + field2349("", 12, new class191[]{class191.field2331, class191.field2337}), + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "Lgh;" + ) + field2350("", 13, new class191[]{class191.field2331}); - @ObfuscatedName("es") - static int[] field2365; - @ObfuscatedName("y") + @ObfuscatedName("px") + @ObfuscatedSignature( + signature = "Lkc;" + ) + @Export("privateChatMode") + static PrivateChatMode privateChatMode; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 100373977 + intValue = 1171442601 ) @Export("id") final int id; @ObfuscatedName("p") final Set field2352; + static { + method3645(); + } + @ObfuscatedSignature( - signature = "(Ljava/lang/String;I[Lgr;)V" + signature = "(Ljava/lang/String;I[Lge;)V" ) class192(String var3, int var4, class191[] var5) { this.field2352 = new HashSet(); @@ -105,402 +116,384 @@ public enum class192 implements Enumerated { this.id = var4; } - @ObfuscatedName("j") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-32" + signature = "(I)I", + garbageValue = "-1410702910" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lhz;I)V", - garbageValue = "-2116157785" + signature = "(Ljava/lang/String;Ljava/lang/String;III)V", + garbageValue = "1615230293" ) - public static void method3614(AbstractArchive var0) { - VarbitDefinition.VarbitDefinition_archive = var0; - } + public static void method3650(String var0, String var1, int var2, int var3) throws IOException { + JagexCache.idxCount = var3; + ViewportMouse.cacheGamebuild = var2; + + try { + NetFileRequest.field3101 = System.getProperty("os.name"); + } catch (Exception var17) { + NetFileRequest.field3101 = "Unknown"; + } + + UserComparator9.field1940 = NetFileRequest.field3101.toLowerCase(); + + try { + Message.userHomeDirectory = System.getProperty("user.home"); + if (Message.userHomeDirectory != null) { + Message.userHomeDirectory = Message.userHomeDirectory + "/"; + } + } catch (Exception var16) { + } + + try { + if (UserComparator9.field1940.startsWith("win")) { + if (Message.userHomeDirectory == null) { + Message.userHomeDirectory = System.getenv("USERPROFILE"); + } + } else if (Message.userHomeDirectory == null) { + Message.userHomeDirectory = System.getenv("HOME"); + } + + if (Message.userHomeDirectory != null) { + Message.userHomeDirectory = Message.userHomeDirectory + "/"; + } + } catch (Exception var15) { + } + + if (Message.userHomeDirectory == null) { + Message.userHomeDirectory = "~/"; + } + + GrandExchangeOfferWorldComparator.field30 = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", Message.userHomeDirectory, "/tmp/", ""}; + NetFileRequest.field3096 = new String[]{".jagex_cache_" + ViewportMouse.cacheGamebuild, ".file_store_" + ViewportMouse.cacheGamebuild}; + int var12 = 0; + + label101: + while (var12 < 4) { + InvDefinition.cacheDir = Entity.getCacheDir(var0, var1, var12); + if (!InvDefinition.cacheDir.exists()) { + InvDefinition.cacheDir.mkdirs(); + } + + File[] var5 = InvDefinition.cacheDir.listFiles(); + if (var5 == null) { + break; + } + + File[] var6 = var5; + int var7 = 0; + + while (true) { + if (var7 >= var6.length) { + break label101; + } + + File var8 = var6[var7]; + + boolean var9; + try { + RandomAccessFile var10 = new RandomAccessFile(var8, "rw"); + int var11 = var10.read(); + var10.seek(0L); + var10.write(var11); + var10.seek(0L); + var10.close(); + var9 = true; + } catch (Exception var14) { + var9 = false; + } + + if (!var9) { + ++var12; + break; + } + + ++var7; + } + } + + File var4 = InvDefinition.cacheDir; + class16.FileSystem_cacheDir = var4; + if (!class16.FileSystem_cacheDir.exists()) { + throw new RuntimeException(""); + } else { + FileSystem.FileSystem_hasPermissions = true; + MenuAction.method2034(); + JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(class226.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); + JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(class226.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); + DevicePcmPlayerProvider.JagexCache_idxFiles = new BufferedFile[JagexCache.idxCount]; + + for (int var13 = 0; var13 < JagexCache.idxCount; ++var13) { + DevicePcmPlayerProvider.JagexCache_idxFiles[var13] = new BufferedFile(new AccessFile(class226.getFile("main_file_cache.idx" + var13), "rw", 1048576L), 6000, 0); + } - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-140231108" - ) - public static void method3617() { - synchronized(MouseHandler.MouseHandler_instance) { - MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; - MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; - MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; - MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; - MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; - MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; - MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; - MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; - MouseHandler.MouseHandler_lastButtonVolatile = 0; } } - @ObfuscatedName("am") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(ILcr;ZI)I", - garbageValue = "-2145329463" + signature = "(Lhz;Lhz;Lhz;Lgt;I)Z", + garbageValue = "1011116785" ) - static int method3616(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.FRIEND_COUNT) { - if (class32.friendSystem.field1045 == 0) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -2; - } else if (class32.friendSystem.field1045 == 1) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class32.friendSystem.friendsList.getSize(); + @Export("setAudioArchives") + public static boolean setAudioArchives(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, MidiPcmStream var3) { + class197.musicPatchesArchive = var0; + class197.musicSamplesArchive = var1; + class197.soundEffectsArchive = var2; + class197.midiPcmStream = var3; + return true; + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(I)[Lgh;", + garbageValue = "2139380672" + ) + static class192[] method3645() { + return new class192[]{field2343, field2338, field2344, field2342, field2348, field2347, field2349, field2345, field2339, field2350, field2341, field2346, field2340}; + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(Lkt;II)V", + garbageValue = "2114066034" + ) + @Export("updatePlayers") + static final void updatePlayers(PacketBuffer var0, int var1) { + int var2 = var0.offset; + Players.Players_pendingUpdateCount = 0; + int var3 = 0; + var0.importIndex(); + + byte[] var10000; + int var4; + int var5; + int var6; + for (var4 = 0; var4 < Players.Players_count; ++var4) { + var5 = Players.Players_indices[var4]; + if ((Players.field1217[var5] & 1) == 0) { + if (var3 > 0) { + --var3; + var10000 = Players.field1217; + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + var6 = var0.readBits(1); + if (var6 == 0) { + var3 = class43.decode(var0); + var10000 = Players.field1217; + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + ArchiveLoader.readPlayerUpdate(var0, var5); + } + } } + } - return 1; + var0.exportIndex(); + if (var3 != 0) { + throw new RuntimeException(); } else { - int var3; - if (var0 == ScriptOpcodes.FRIEND_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (class32.friendSystem.method1773() && var3 >= 0 && var3 < class32.friendSystem.friendsList.getSize()) { - Friend var8 = (Friend)class32.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] = ""; - } + var0.importIndex(); - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (class32.friendSystem.method1773() && var3 >= 0 && var3 < class32.friendSystem.friendsList.getSize()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)class32.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 (class32.friendSystem.method1773() && var3 >= 0 && var3 < class32.friendSystem.friendsList.getSize()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)class32.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[--Interpreter.Interpreter_stringStackSize]; - int var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - WorldMapRectangle.method281(var5, var6); - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_ADD) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - class32.friendSystem.addFriend(var5); - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_DEL) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - class32.friendSystem.removeFriend(var5); - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_ADD) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - class32.friendSystem.addIgnore(var5); - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_DEL) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - class32.friendSystem.removeIgnore(var5); - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_TEST) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var5 = NetSocket.method3489(var5); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class32.friendSystem.isFriended(new Username(var5, FontName.loginType), false) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { - if (Client.clanChat != null) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Client.clanChat.name; + for (var4 = 0; var4 < Players.Players_count; ++var4) { + var5 = Players.Players_indices[var4]; + if ((Players.field1217[var5] & 1) != 0) { + if (var3 > 0) { + --var3; + var10000 = Players.field1217; + var10000[var5] = (byte)(var10000[var5] | 2); } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { - if (Client.clanChat != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.clanChat.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 (Client.clanChat != null && var3 < Client.clanChat.getSize()) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Client.clanChat.get(var3).getUsername().getName(); - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (Client.clanChat != null && var3 < Client.clanChat.getSize()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Client.clanChat.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 (Client.clanChat != null && var3 < Client.clanChat.getSize()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Client.clanChat.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] = Client.clanChat != null ? Client.clanChat.minKick : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - WorldMapCacheName.clanKickUser(var5); - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.clanChat != null ? Client.clanChat.rank : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - class227.Clan_joinChat(var5); - return 1; - } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { - Tiles.Clan_leaveChat(); - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { - if (!class32.friendSystem.method1773()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class32.friendSystem.ignoreList.getSize(); - } - - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (class32.friendSystem.method1773() && var3 >= 0 && var3 < class32.friendSystem.ignoreList.getSize()) { - Ignored var4 = (Ignored)class32.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 = NetSocket.method3489(var5); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class32.friendSystem.isIgnored(new Username(var5, FontName.loginType)) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (Client.clanChat != null && var3 < Client.clanChat.getSize() && Client.clanChat.get(var3).getUsername().equals(WorldMapIcon_1.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 (Client.clanChat != null && Client.clanChat.owner != null) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Client.clanChat.owner; - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (Client.clanChat != null && var3 < Client.clanChat.getSize() && ((ClanMate)Client.clanChat.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) { - class32.friendSystem.friendsList.removeComparator(); - return 1; - } else { - boolean var7; - if (var0 == 3629) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class32.friendSystem.friendsList.addComparator(new UserComparator1(var7)); - return 1; - } else if (var0 == 3630) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class32.friendSystem.friendsList.addComparator(new UserComparator2(var7)); - return 1; - } else if (var0 == 3631) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class32.friendSystem.friendsList.addComparator(new UserComparator3(var7)); - return 1; - } else if (var0 == 3632) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class32.friendSystem.friendsList.addComparator(new UserComparator4(var7)); - return 1; - } else if (var0 == 3633) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class32.friendSystem.friendsList.addComparator(new UserComparator5(var7)); - return 1; - } else if (var0 == 3634) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class32.friendSystem.friendsList.addComparator(new UserComparator6(var7)); - return 1; - } else if (var0 == 3635) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class32.friendSystem.friendsList.addComparator(new UserComparator7(var7)); - return 1; - } else if (var0 == 3636) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class32.friendSystem.friendsList.addComparator(new UserComparator8(var7)); - return 1; - } else if (var0 == 3637) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class32.friendSystem.friendsList.addComparator(new UserComparator9(var7)); - return 1; - } else if (var0 == 3638) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class32.friendSystem.friendsList.addComparator(new UserComparator10(var7)); - return 1; - } else if (var0 == 3639) { - class32.friendSystem.friendsList.sort(); - return 1; - } else if (var0 == 3640) { - class32.friendSystem.ignoreList.removeComparator(); - return 1; - } else if (var0 == 3641) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class32.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); - return 1; - } else if (var0 == 3642) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class32.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); - return 1; - } else if (var0 == 3643) { - class32.friendSystem.ignoreList.sort(); - return 1; - } else if (var0 == 3644) { - if (Client.clanChat != null) { - Client.clanChat.removeComparator(); - } - - return 1; - } else if (var0 == 3645) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (Client.clanChat != null) { - Client.clanChat.addComparator(new UserComparator1(var7)); - } - - return 1; - } else if (var0 == 3646) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (Client.clanChat != null) { - Client.clanChat.addComparator(new UserComparator2(var7)); - } - - return 1; - } else if (var0 == 3647) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (Client.clanChat != null) { - Client.clanChat.addComparator(new UserComparator3(var7)); - } - - return 1; - } else if (var0 == 3648) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (Client.clanChat != null) { - Client.clanChat.addComparator(new UserComparator4(var7)); - } - - return 1; - } else if (var0 == 3649) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (Client.clanChat != null) { - Client.clanChat.addComparator(new UserComparator5(var7)); - } - - return 1; - } else if (var0 == 3650) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (Client.clanChat != null) { - Client.clanChat.addComparator(new UserComparator6(var7)); - } - - return 1; - } else if (var0 == 3651) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (Client.clanChat != null) { - Client.clanChat.addComparator(new UserComparator7(var7)); - } - - return 1; - } else if (var0 == 3652) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (Client.clanChat != null) { - Client.clanChat.addComparator(new UserComparator8(var7)); - } - - return 1; - } else if (var0 == 3653) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (Client.clanChat != null) { - Client.clanChat.addComparator(new UserComparator9(var7)); - } - - return 1; - } else if (var0 == 3654) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (Client.clanChat != null) { - Client.clanChat.addComparator(new UserComparator10(var7)); - } - - return 1; - } else if (var0 == 3655) { - if (Client.clanChat != null) { - Client.clanChat.sort(); - } - - return 1; - } else if (var0 == 3656) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class32.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); - return 1; - } else if (var0 == 3657) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (Client.clanChat != null) { - Client.clanChat.addComparator(new BuddyRankComparator(var7)); - } - - return 1; + var6 = var0.readBits(1); + if (var6 == 0) { + var3 = class43.decode(var0); + var10000 = Players.field1217; + var10000[var5] = (byte)(var10000[var5] | 2); } else { - return 2; + ArchiveLoader.readPlayerUpdate(var0, var5); } } + } + } + + var0.exportIndex(); + if (var3 != 0) { + throw new RuntimeException(); + } else { + var0.importIndex(); + + for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { + var5 = Players.Players_emptyIndices[var4]; + if ((Players.field1217[var5] & 1) != 0) { + if (var3 > 0) { + --var3; + var10000 = Players.field1217; + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + var6 = var0.readBits(1); + if (var6 == 0) { + var3 = class43.decode(var0); + var10000 = Players.field1217; + var10000[var5] = (byte)(var10000[var5] | 2); + } else if (Message.updateExternalPlayer(var0, var5)) { + var10000 = Players.field1217; + var10000[var5] = (byte)(var10000[var5] | 2); + } + } + } + } + + var0.exportIndex(); + if (var3 != 0) { + throw new RuntimeException(); } else { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (Client.clanChat != null && var3 < Client.clanChat.getSize() && ((ClanMate)Client.clanChat.get(var3)).isIgnored()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + var0.importIndex(); + + for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { + var5 = Players.Players_emptyIndices[var4]; + if ((Players.field1217[var5] & 1) == 0) { + if (var3 > 0) { + --var3; + var10000 = Players.field1217; + var10000[var5] = (byte)(var10000[var5] | 2); + } else { + var6 = var0.readBits(1); + if (var6 == 0) { + var3 = class43.decode(var0); + var10000 = Players.field1217; + var10000[var5] = (byte)(var10000[var5] | 2); + } else if (Message.updateExternalPlayer(var0, var5)) { + var10000 = Players.field1217; + var10000[var5] = (byte)(var10000[var5] | 2); + } + } + } } - return 1; + var0.exportIndex(); + if (var3 != 0) { + throw new RuntimeException(); + } else { + Players.Players_count = 0; + Players.Players_emptyIdxCount = 0; + + for (var4 = 1; var4 < 2048; ++var4) { + var10000 = Players.field1217; + var10000[var4] = (byte)(var10000[var4] >> 1); + Player var7 = Client.players[var4]; + if (var7 != null) { + Players.Players_indices[++Players.Players_count - 1] = var4; + } else { + Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var4; + } + } + + InterfaceParent.method1123(var0); + if (var0.offset - var2 != var1) { + throw new RuntimeException(var0.offset - var2 + " " + var1); + } + } } } } } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-2000673999" + ) + static void method3648() { + Iterator var0 = Messages.Messages_hashTable.iterator(); + + while (var0.hasNext()) { + Message var1 = (Message)var0.next(); + var1.clearIsFromFriend(); + } + + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1282270167" + ) + @Export("SpriteBuffer_clear") + public static void SpriteBuffer_clear() { + class325.SpriteBuffer_xOffsets = null; + SecureRandomCallable.SpriteBuffer_yOffsets = null; + class325.SpriteBuffer_spriteWidths = null; + SoundSystem.SpriteBuffer_spriteHeights = null; + class325.SpriteBuffer_spritePalette = null; + InvDefinition.SpriteBuffer_pixels = null; + } + + @ObfuscatedName("fd") + @ObfuscatedSignature( + signature = "(IIIS)V", + garbageValue = "-8359" + ) + @Export("queueSoundEffect") + static void queueSoundEffect(int var0, int var1, int var2) { + if (Client.soundEffectVolume != 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("it") + @ObfuscatedSignature( + signature = "(Lhy;IIZB)V", + garbageValue = "75" + ) + @Export("alignWidgetSize") + static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { + int var4 = var0.width; + int var5 = var0.height; + if (var0.widthAlignment == 0) { + var0.width = var0.rawWidth; + } else if (var0.widthAlignment == 1) { + var0.width = var1 - var0.rawWidth; + } else if (var0.widthAlignment == 2) { + var0.width = var0.rawWidth * var1 >> 14; + } + + if (var0.heightAlignment == 0) { + var0.height = var0.rawHeight; + } else if (var0.heightAlignment == 1) { + var0.height = var2 - var0.rawHeight; + } else if (var0.heightAlignment == 2) { + var0.height = var2 * var0.rawHeight >> 14; + } + + if (var0.widthAlignment == 4) { + var0.width = var0.field2632 * var0.height / var0.field2556; + } + + if (var0.heightAlignment == 4) { + var0.height = var0.field2556 * var0.width / var0.field2632; + } + + 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/class195.java b/runescape-client/src/main/java/class195.java index 945675d8d2..05556affde 100644 --- a/runescape-client/src/main/java/class195.java +++ b/runescape-client/src/main/java/class195.java @@ -1,130 +1,71 @@ -import java.awt.Component; import java.util.HashMap; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gc") +@ObfuscatedName("go") public class class195 { - @ObfuscatedName("bs") - @ObfuscatedSignature( - signature = "Llq;" - ) - static IndexedSprite field2368; + @ObfuscatedName("ak") + @Export("null_string") + protected static String null_string; static { new HashMap(); } - @ObfuscatedName("s") - static double method3623(double var0, double var2, double var4) { - double var8 = (var0 - var2) / var4; - double var6 = Math.exp(-var8 * var8 / 2.0D) / Math.sqrt(6.283185307179586D); - return var6 / var4; + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(B)[Lga;", + garbageValue = "-55" + ) + @Export("ServerPacket_values") + public static ServerPacket[] ServerPacket_values() { + return new ServerPacket[]{ServerPacket.field2141, ServerPacket.field2113, ServerPacket.field2122, ServerPacket.field2120, ServerPacket.field2100, ServerPacket.field2101, ServerPacket.field2102, ServerPacket.field2103, ServerPacket.field2104, ServerPacket.field2162, ServerPacket.field2118, ServerPacket.field2107, ServerPacket.field2108, ServerPacket.field2109, ServerPacket.field2110, ServerPacket.field2111, ServerPacket.field2112, ServerPacket.field2098, ServerPacket.field2105, ServerPacket.field2135, ServerPacket.field2134, ServerPacket.field2117, ServerPacket.field2181, ServerPacket.field2119, ServerPacket.field2099, ServerPacket.field2121, ServerPacket.field2096, ServerPacket.field2123, ServerPacket.field2116, ServerPacket.field2137, ServerPacket.field2126, ServerPacket.field2127, ServerPacket.field2142, ServerPacket.field2115, ServerPacket.field2130, ServerPacket.field2168, ServerPacket.field2132, ServerPacket.field2133, ServerPacket.field2131, ServerPacket.field2158, ServerPacket.field2136, ServerPacket.field2182, ServerPacket.field2138, ServerPacket.field2164, ServerPacket.field2172, ServerPacket.field2125, ServerPacket.field2129, ServerPacket.field2106, ServerPacket.field2144, ServerPacket.field2145, ServerPacket.field2146, ServerPacket.field2143, ServerPacket.field2128, ServerPacket.field2149, ServerPacket.field2150, ServerPacket.field2151, ServerPacket.field2152, ServerPacket.field2153, ServerPacket.field2154, ServerPacket.field2124, ServerPacket.field2156, ServerPacket.field2157, ServerPacket.field2147, ServerPacket.field2159, ServerPacket.field2160, ServerPacket.field2161, ServerPacket.field2148, ServerPacket.field2163, ServerPacket.field2155, ServerPacket.field2165, ServerPacket.field2166, ServerPacket.field2167, ServerPacket.field2139, ServerPacket.field2169, ServerPacket.field2170, ServerPacket.field2171, ServerPacket.field2097, ServerPacket.field2173, ServerPacket.field2174, ServerPacket.field2175, ServerPacket.field2176, ServerPacket.field2177, ServerPacket.field2178, ServerPacket.field2179, ServerPacket.field2180, ServerPacket.field2140}; } - @ObfuscatedName("s") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "-1990458984" + signature = "(II)Liq;", + garbageValue = "2111185945" ) - static final void method3627(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) { - class188.field2321[0][var5][var4] = 127; - if (var0 == var5 && var5 > 0) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; - } - - if (var5 == var0 + var2 && var5 < 103) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; - } - - if (var4 == var1 && var4 > 0) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1]; - } - - if (var4 == var3 + var1 && var4 < 103) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; - } - } - } - } - - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "(Ljava/lang/Throwable;Ljava/lang/String;)Lmv;" - ) - @Export("newRunException") - public static RunException newRunException(Throwable var0, String var1) { - RunException var2; - if (var0 instanceof RunException) { - var2 = (RunException)var0; - var2.message = var2.message + ' ' + var1; + @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 { - var2 = new RunException(var0, var1); - } - - return var2; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "(Ljava/awt/Component;S)V", - garbageValue = "24303" - ) - static void method3629(Component var0) { - var0.removeMouseListener(MouseHandler.MouseHandler_instance); - var0.removeMouseMotionListener(MouseHandler.MouseHandler_instance); - var0.removeFocusListener(MouseHandler.MouseHandler_instance); - MouseHandler.MouseHandler_currentButtonVolatile = 0; - } - - @ObfuscatedName("im") - @ObfuscatedSignature( - signature = "(IIIIIII)V", - garbageValue = "-963502803" - ) - static final void method3628(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; + byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); + var1 = new KitDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); } - int var13 = var5 * var12 >> 17; - int var14 = var5 * var12 + 1 >> 17; - int var15 = var5 * var11 >> 17; - int var16 = var5 * var11 + 1 >> 17; - var0 -= Rasterizer2D.Rasterizer2D_xClipStart; - var1 -= Rasterizer2D.Rasterizer2D_yClipStart; - int var17 = var0 + var13; - int var18 = var0 - var14; - int var19 = var0 + var6 - var14; - int var20 = var0 + var6 + var13; - int var21 = var15 + var1; - int var22 = var1 - var16; - int var23 = var7 + var1 - var16; - int var24 = var7 + var15 + var1; - Rasterizer3D.method2933(var17, var18, var19); - Rasterizer3D.method2936(var21, var22, var23, var17, var18, var19, var4); - Rasterizer3D.method2933(var17, var19, var20); - Rasterizer3D.method2936(var21, var23, var24, var17, var19, var20, var4); + KitDefinition.KitDefinition_cached.put(var1, (long)var0); + return var1; } } + + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "2" + ) + public static void method3663() { + VarpDefinition.VarpDefinition_cached.clear(); + } + + @ObfuscatedName("kt") + @ObfuscatedSignature( + signature = "(Lkz;IB)V", + garbageValue = "4" + ) + static void method3664(Buffer var0, int var1) { + byte[] var2 = var0.array; + if (Client.randomDatData == null) { + Client.randomDatData = new byte[24]; + } + + class300.writeRandomDat(var2, var1, Client.randomDatData, 0, 24); + class49.method828(var0, var1); + } } diff --git a/runescape-client/src/main/java/class197.java b/runescape-client/src/main/java/class197.java index a1edbca037..616a48bf17 100644 --- a/runescape-client/src/main/java/class197.java +++ b/runescape-client/src/main/java/class197.java @@ -3,77 +3,105 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gi") +@ObfuscatedName("gv") public class class197 { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "Lhz;" ) @Export("musicPatchesArchive") public static AbstractArchive musicPatchesArchive; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "Lhz;" ) @Export("musicSamplesArchive") public static AbstractArchive musicSamplesArchive; - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "Lhz;" ) @Export("soundEffectsArchive") public static AbstractArchive soundEffectsArchive; - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lgp;" + signature = "Lgt;" ) @Export("midiPcmStream") public static MidiPcmStream midiPcmStream; - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1319916027 + intValue = 1354024537 ) - public static int field2378; - @ObfuscatedName("t") + public static int field2376; + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Lhz;" + ) + @Export("musicTrackArchive") + public static AbstractArchive musicTrackArchive; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -2004813651 + intValue = -497843855 ) @Export("musicTrackGroupId") public static int musicTrackGroupId; - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1949584783 + intValue = -393064307 ) @Export("musicTrackFileId") public static int musicTrackFileId; - @ObfuscatedName("ea") + @ObfuscatedName("fk") @ObfuscatedSignature( - signature = "Lkp;" + signature = "Lkf;" ) - @Export("spriteIds") - static GraphicsDefaults spriteIds; + @Export("fontPlain12") + static Font fontPlain12; + @ObfuscatedName("gz") + @Export("regions") + static int[] regions; static { - field2378 = 0; + field2376 = 0; } - @ObfuscatedName("y") + @ObfuscatedName("iq") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "2056468523" + signature = "([Lhy;Lhy;ZI)V", + garbageValue = "-974819502" ) - static final int method3645(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; - } + @Export("revalidateWidgetScroll") + static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { + int var3 = var1.scrollWidth != 0 ? var1.scrollWidth : var1.width; + int var4 = var1.scrollHeight != 0 ? var1.scrollHeight : var1.height; + class80.resizeInterface(var0, var1.id, var3, var4, var2); + if (var1.children != null) { + class80.resizeInterface(var1.children, var1.id, var3, var4, var2); + } - return (var0 & 65408) + var1; + InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); + if (var5 != null) { + Occluder.resizeComponents(var5.group, var3, var4, var2); + } + + if (var1.contentType == 1337) { + } + + } + + @ObfuscatedName("kd") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)V", + garbageValue = "1549074319" + ) + @Export("clanKickUser") + static final void clanKickUser(String var0) { + if (GrandExchangeOfferUnitPriceComparator.clanChat != null) { + PacketBufferNode var1 = MenuAction.getPacketBufferNode(ClientPacket.field2218, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(Varcs.stringCp1252NullTerminatedByteSize(var0)); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); } } } diff --git a/runescape-client/src/main/java/class2.java b/runescape-client/src/main/java/class2.java index 538ca2c5dd..8af583c136 100644 --- a/runescape-client/src/main/java/class2.java +++ b/runescape-client/src/main/java/class2.java @@ -1,121 +1,70 @@ -import java.security.SecureRandom; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("i") +@ObfuscatedName("t") final class class2 implements class0 { - @ObfuscatedName("sl") + @ObfuscatedName("bj") @ObfuscatedSignature( - signature = "Lt;" + signature = "Llt;" ) - @Export("grandExchangeEvents") - static GrandExchangeEvents grandExchangeEvents; - @ObfuscatedName("du") - @ObfuscatedSignature( - signature = "Lid;" - ) - @Export("archive8") - static Archive archive8; - @ObfuscatedName("ed") - @Export("secureRandom") - static SecureRandom secureRandom; + @Export("worldSelectLeftSprite") + static IndexedSprite worldSelectLeftSprite; - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/lang/Object;Lky;I)V", - garbageValue = "254789492" + signature = "(Ljava/lang/Object;Lkz;B)V", + garbageValue = "1" ) - public void vmethod58(Object var1, Buffer var2) { - this.method38((Long)var1, var2); - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "(Lky;I)Ljava/lang/Object;", - garbageValue = "1267204541" - ) - public Object vmethod70(Buffer var1) { - return var1.readLong(); + public void vmethod42(Object var1, Buffer var2) { + this.method20((Long)var1, var2); } @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ljava/lang/Long;Lky;B)V", - garbageValue = "6" + signature = "(Lkz;S)Ljava/lang/Object;", + garbageValue = "31810" ) - void method38(Long var1, Buffer var2) { + public Object vmethod41(Buffer var1) { + return var1.readLong(); + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "(Ljava/lang/Long;Lkz;B)V", + garbageValue = "3" + ) + void method20(Long var1, Buffer var2) { var2.writeLong(var1); } - @ObfuscatedName("i") + @ObfuscatedName("gn") @ObfuscatedSignature( - signature = "(I)Lgq;", - garbageValue = "-764914873" + signature = "(ZI)V", + garbageValue = "291099501" ) - public static PacketBufferNode method29() { - PacketBufferNode var0 = Buffer.method5567(); - var0.clientPacket = null; - var0.clientPacketLength = 0; - var0.packetBuffer = new PacketBuffer(5000); - return var0; - } + @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 * -78439701 >> 7; + int var4 = var2.y >> 7; + if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { + if (var2.size == 1 && (var2.x * -78439701 & 127) == 64 && (var2.y & 127) == 64) { + if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { + continue; + } - @ObfuscatedName("ff") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1255572967" - ) - static final void method31() { - if (Client.logoutTimer > 0) { - class65.method1182(); - } else { - Client.timer.method4898(); - FloorDecoration.updateGameState(40); - Bounds.field3845 = Client.packetWriter.getSocket(); - Client.packetWriter.removeSocket(); - } - } + Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; + } - @ObfuscatedName("ig") - @ObfuscatedSignature( - signature = "(IIIIIIIII)V", - garbageValue = "742937665" - ) - @Export("drawWidgets") - static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (Projectile.loadInterface(var0)) { - WorldMapIcon_1.field174 = null; - WorldMapSectionType.drawInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); - if (WorldMapIcon_1.field174 != null) { - WorldMapSectionType.drawInterface(WorldMapIcon_1.field174, -1412584499, var1, var2, var3, var4, HealthBarUpdate.field986, Tile.field1648, var7); - WorldMapIcon_1.field174 = null; - } - - } else { - if (var7 != -1) { - Client.field703[var7] = true; - } else { - for (int var8 = 0; var8 < 100; ++var8) { - Client.field703[var8] = true; + long var5 = WorldMapIcon_1.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); + var2.playerCycle = Client.cycle; + WorldMapIcon_1.scene.drawEntity(MouseRecorder.plane, var2.x * -78439701, var2.y, WorldMapAreaData.getTileHeight(var2.x * -78439701 + (var2.size * 64 - 64), var2.size * 64 - 64 + var2.y, MouseRecorder.plane), var2.size * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); } } - - } - } - - @ObfuscatedName("jg") - @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "361090625" - ) - static boolean method40(int var0) { - for (int var1 = 0; var1 < Client.field677; ++var1) { - if (Client.field815[var1] == var0) { - return true; - } } - return false; } } diff --git a/runescape-client/src/main/java/class208.java b/runescape-client/src/main/java/class208.java index 3ee8d0d59e..1d7604dbf5 100644 --- a/runescape-client/src/main/java/class208.java +++ b/runescape-client/src/main/java/class208.java @@ -1,57 +1,11 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hc") +@ObfuscatedName("hh") public class class208 { - @ObfuscatedName("i") + @ObfuscatedName("eq") @ObfuscatedGetter( - intValue = -1981461029 + intValue = -1589464149 ) - @Export("RunException_revision") - public static int RunException_revision; - - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "(IS)I", - garbageValue = "10000" - ) - @Export("getVarbit") - public static int getVarbit(int var0) { - VarbitDefinition var2 = (VarbitDefinition)VarbitDefinition.VarbitDefinition_cached.get((long)var0); - VarbitDefinition var1; - if (var2 != null) { - var1 = var2; - } else { - byte[] var7 = VarbitDefinition.VarbitDefinition_archive.takeFile(14, var0); - var2 = new VarbitDefinition(); - if (var7 != null) { - var2.decode(new Buffer(var7)); - } - - VarbitDefinition.VarbitDefinition_cached.put(var2, (long)var0); - var1 = var2; - } - - int var3 = var1.baseVar; - int var4 = var1.startBit; - int var5 = var1.endBit; - int var6 = Varps.Varps_masks[var5 - var4]; - return Varps.Varps_main[var3] >> var4 & var6; - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - signature = "(ILhd;ZI)V", - garbageValue = "-1500859521" - ) - static void method3893(int var0, Coord var1, boolean var2) { - WorldMapArea var3 = LoginScreenAnimation.getWorldMap().getMapArea(var0); - int var4 = WorldMapIcon_1.localPlayer.plane; - int var5 = PacketWriter.baseX * 64 + (WorldMapIcon_1.localPlayer.x >> 7); - int var6 = RouteStrategy.baseY * 64 + (WorldMapIcon_1.localPlayer.y >> 7); - Coord var7 = new Coord(var4, var5, var6); - LoginScreenAnimation.getWorldMap().method6199(var3, var7, var1, var2); - } + static int field2475; } diff --git a/runescape-client/src/main/java/class210.java b/runescape-client/src/main/java/class210.java index 20a7b5b9ce..69ce1ffdb8 100644 --- a/runescape-client/src/main/java/class210.java +++ b/runescape-client/src/main/java/class210.java @@ -2,14 +2,96 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("he") +@ObfuscatedName("hd") public class class210 { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lhr;" + signature = "Lhq;" ) @Export("huffman") public static Huffman huffman; - @ObfuscatedName("n") - static byte[][][] field2492; + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(III)Z", + garbageValue = "-1407150141" + ) + public static boolean method3951(int var0, int var1) { + return (var0 >> var1 + 1 & 1) != 0; + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "(Ljava/lang/CharSequence;II[BII)I", + garbageValue = "1570390476" + ) + @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; + } } diff --git a/runescape-client/src/main/java/class215.java b/runescape-client/src/main/java/class215.java index f00c27b530..6433c08354 100644 --- a/runescape-client/src/main/java/class215.java +++ b/runescape-client/src/main/java/class215.java @@ -2,50 +2,27 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hw") +@ObfuscatedName("hm") public class class215 { - @ObfuscatedName("s") - public static final short[] field2529; - @ObfuscatedName("j") - public static final short[][] field2531; - @ObfuscatedName("i") - public static final short[] field2528; - @ObfuscatedName("k") - public static final short[][] field2527; + @ObfuscatedName("c") + public static final short[] field2518; + @ObfuscatedName("x") + public static final short[][] field2519; + @ObfuscatedName("t") + public static final short[] field2520; + @ObfuscatedName("g") + public static final short[][] field2521; + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "Lkf;" + ) + @Export("ItemDefinition_fontPlain11") + static Font ItemDefinition_fontPlain11; static { - field2529 = new short[]{6798, 8741, 25238, 4626, 4550}; - field2531 = 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}}; - field2528 = new short[]{-10304, 9104, -1, -1, -1}; - field2527 = 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("s") - @ObfuscatedSignature( - signature = "(II)Lik;", - garbageValue = "-850772358" - ) - @Export("getObjectDefinition") - public static ObjectDefinition getObjectDefinition(int var0) { - ObjectDefinition var1 = (ObjectDefinition)ObjectDefinition.ObjectDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = ObjectDefinition.ObjectDefinition_archive.takeFile(6, var0); - var1 = new ObjectDefinition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - if (var1.isSolid) { - var1.interactType = 0; - var1.boolean1 = false; - } - - ObjectDefinition.ObjectDefinition_cached.put(var1, (long)var0); - return var1; - } + field2518 = new short[]{6798, 8741, 25238, 4626, 4550}; + field2519 = 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}}; + field2520 = new short[]{-10304, 9104, -1, -1, -1}; + field2521 = new short[][]{{6554, 115, 10304, 28, 5702, 7756, 5681, 4510, -31835, 22437, 2859, -11339, 16, 5157, 10446, 3658, -27314, -21965, 472, 580, 784, 21966, 28950, -15697, -14002}, {9104, 10275, 7595, 3610, 7975, 8526, 918, -26734, 24466, 10145, -6882, 5027, 1457, 16565, -30545, 25486, 24, 5392, 10429, 3673, -27335, -21957, 192, 687, 412, 21821, 28835, -15460, -14019}, new short[0], new short[0], new short[0]}; } } diff --git a/runescape-client/src/main/java/class216.java b/runescape-client/src/main/java/class216.java new file mode 100644 index 0000000000..bcfdcd50f8 --- /dev/null +++ b/runescape-client/src/main/java/class216.java @@ -0,0 +1,125 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; + +@ObfuscatedName("hp") +public class class216 { + @ObfuscatedName("ja") + @ObfuscatedSignature( + signature = "Ldt;" + ) + @Export("textureProvider") + static TextureProvider textureProvider; + + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "(ILcu;ZI)I", + garbageValue = "-1625750481" + ) + static int method4015(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var3 = Player.getWidget(Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]); + } else { + var3 = var2 ? UserComparator9.field1941 : MidiPcmStream.field2410; + } + + String var4 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + int[] var5 = null; + if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { + int var6 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + if (var6 > 0) { + for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]) { + } + } + + var4 = var4.substring(0, var4.length() - 1); + } + + Object[] var8 = new Object[var4.length() + 1]; + + int var7; + for (var7 = var8.length - 1; var7 >= 1; --var7) { + if (var4.charAt(var7 - 1) == 's') { + var8[var7] = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + } else { + var8[var7] = new Integer(Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]); + } + } + + var7 = Interpreter.Interpreter_intStack[--class160.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.field2655 = var8; + } else { + if (var0 != ScriptOpcodes.CC_SETONRESIZE) { + return 2; + } + + var3.onResize = var8; + } + + var3.hasListener = true; + return 1; + } +} diff --git a/runescape-client/src/main/java/class218.java b/runescape-client/src/main/java/class218.java index 886092c601..eb1bf145b3 100644 --- a/runescape-client/src/main/java/class218.java +++ b/runescape-client/src/main/java/class218.java @@ -1,42 +1,291 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("hk") +@ObfuscatedName("hs") public class class218 { - @ObfuscatedName("j") + @ObfuscatedName("rr") @ObfuscatedSignature( - signature = "(CB)Z", - garbageValue = "0" + signature = "Lbc;" ) - public static boolean method4019(char var0) { - if ((var0 <= 0 || var0 >= 128) && (var0 < 160 || var0 > 255)) { - if (var0 != 0) { - char[] var1 = class287.cp1252AsciiExtension; + @Export("friendSystem") + public static FriendSystem friendSystem; - for (int var2 = 0; var2 < var1.length; ++var2) { - char var3 = var1[var2]; - if (var0 == var3) { - return true; - } - } + @ObfuscatedName("ap") + @ObfuscatedSignature( + signature = "(ILcu;ZB)I", + garbageValue = "4" + ) + static int method4091(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.publicChatMode; + return 1; + } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { + class160.Interpreter_intStackSize -= 3; + Client.publicChatMode = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + class192.privateChatMode = GameObject.method3263(Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]); + if (class192.privateChatMode == null) { + class192.privateChatMode = PrivateChatMode.field3786; } - return false; + Client.tradeChatMode = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 2]; + PacketBufferNode var18 = MenuAction.getPacketBufferNode(ClientPacket.field2241, Client.packetWriter.isaacCipher); + var18.packetBuffer.writeByte(Client.publicChatMode); + var18.packetBuffer.writeByte(class192.privateChatMode.field3787); + var18.packetBuffer.writeByte(Client.tradeChatMode); + Client.packetWriter.addNode(var18); + return 1; } else { - return true; + String var3; + int var4; + if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { + var3 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + class160.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + int var5 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + PacketBufferNode var6 = MenuAction.getPacketBufferNode(ClientPacket.field2249, Client.packetWriter.isaacCipher); + var6.packetBuffer.writeByte(Varcs.stringCp1252NullTerminatedByteSize(var3) + 2); + var6.packetBuffer.writeStringCp1252NullTerminated(var3); + var6.packetBuffer.writeByte(var4 - 1); + var6.packetBuffer.writeByte(var5); + Client.packetWriter.addNode(var6); + return 1; + } else { + int var10; + if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { + class160.Interpreter_intStackSize -= 2; + var10 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + Message var15 = TileItemPile.Messages_getByChannelAndID(var10, var4); + if (var15 != null) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var15.count; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var15.cycle; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var15.sender != null ? var15.sender : ""; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var15.prefix != null ? var15.prefix : ""; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var15.text != null ? var15.text : ""; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var15.isFromFriend() ? 1 : (var15.isFromIgnored() ? 2 : 0); + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { + var10 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Message var16 = WorldMapData_0.Messages_getMessage(var10); + if (var16 != null) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var16.type; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var16.cycle; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var16.sender != null ? var16.sender : ""; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var16.prefix != null ? var16.prefix : ""; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var16.text != null ? var16.text : ""; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var16.isFromFriend() ? 1 : (var16.isFromIgnored() ? 2 : 0); + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { + if (class192.privateChatMode == null) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = class192.privateChatMode.field3787; + } + + return 1; + } else if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { + var3 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + String var14 = var3.toLowerCase(); + byte var17 = 0; + if (var14.startsWith("yellow:")) { + var17 = 0; + var3 = var3.substring("yellow:".length()); + } else if (var14.startsWith("red:")) { + var17 = 1; + var3 = var3.substring("red:".length()); + } else if (var14.startsWith("green:")) { + var17 = 2; + var3 = var3.substring("green:".length()); + } else if (var14.startsWith("cyan:")) { + var17 = 3; + var3 = var3.substring("cyan:".length()); + } else if (var14.startsWith("purple:")) { + var17 = 4; + var3 = var3.substring("purple:".length()); + } else if (var14.startsWith("white:")) { + var17 = 5; + var3 = var3.substring("white:".length()); + } else if (var14.startsWith("flash1:")) { + var17 = 6; + var3 = var3.substring("flash1:".length()); + } else if (var14.startsWith("flash2:")) { + var17 = 7; + var3 = var3.substring("flash2:".length()); + } else if (var14.startsWith("flash3:")) { + var17 = 8; + var3 = var3.substring("flash3:".length()); + } else if (var14.startsWith("glow1:")) { + var17 = 9; + var3 = var3.substring("glow1:".length()); + } else if (var14.startsWith("glow2:")) { + var17 = 10; + var3 = var3.substring("glow2:".length()); + } else if (var14.startsWith("glow3:")) { + var17 = 11; + var3 = var3.substring("glow3:".length()); + } else if (class43.clientLanguage != Language.Language_EN) { + if (var14.startsWith("yellow:")) { + var17 = 0; + var3 = var3.substring("yellow:".length()); + } else if (var14.startsWith("red:")) { + var17 = 1; + var3 = var3.substring("red:".length()); + } else if (var14.startsWith("green:")) { + var17 = 2; + var3 = var3.substring("green:".length()); + } else if (var14.startsWith("cyan:")) { + var17 = 3; + var3 = var3.substring("cyan:".length()); + } else if (var14.startsWith("purple:")) { + var17 = 4; + var3 = var3.substring("purple:".length()); + } else if (var14.startsWith("white:")) { + var17 = 5; + var3 = var3.substring("white:".length()); + } else if (var14.startsWith("flash1:")) { + var17 = 6; + var3 = var3.substring("flash1:".length()); + } else if (var14.startsWith("flash2:")) { + var17 = 7; + var3 = var3.substring("flash2:".length()); + } else if (var14.startsWith("flash3:")) { + var17 = 8; + var3 = var3.substring("flash3:".length()); + } else if (var14.startsWith("glow1:")) { + var17 = 9; + var3 = var3.substring("glow1:".length()); + } else if (var14.startsWith("glow2:")) { + var17 = 10; + var3 = var3.substring("glow2:".length()); + } else if (var14.startsWith("glow3:")) { + var17 = 11; + var3 = var3.substring("glow3:".length()); + } + } + + var14 = var3.toLowerCase(); + byte var7 = 0; + if (var14.startsWith("wave:")) { + var7 = 1; + var3 = var3.substring("wave:".length()); + } else if (var14.startsWith("wave2:")) { + var7 = 2; + var3 = var3.substring("wave2:".length()); + } else if (var14.startsWith("shake:")) { + var7 = 3; + var3 = var3.substring("shake:".length()); + } else if (var14.startsWith("scroll:")) { + var7 = 4; + var3 = var3.substring("scroll:".length()); + } else if (var14.startsWith("slide:")) { + var7 = 5; + var3 = var3.substring("slide:".length()); + } else if (Language.Language_EN != class43.clientLanguage) { + if (var14.startsWith("wave:")) { + var7 = 1; + var3 = var3.substring("wave:".length()); + } else if (var14.startsWith("wave2:")) { + var7 = 2; + var3 = var3.substring("wave2:".length()); + } else if (var14.startsWith("shake:")) { + var7 = 3; + var3 = var3.substring("shake:".length()); + } else if (var14.startsWith("scroll:")) { + var7 = 4; + var3 = var3.substring("scroll:".length()); + } else if (var14.startsWith("slide:")) { + var7 = 5; + var3 = var3.substring("slide:".length()); + } + } + + PacketBufferNode var8 = MenuAction.getPacketBufferNode(ClientPacket.field2278, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeByte(0); + int var9 = var8.packetBuffer.offset; + var8.packetBuffer.writeByte(var4); + var8.packetBuffer.writeByte(var17); + var8.packetBuffer.writeByte(var7); + World.method1755(var8.packetBuffer, var3); + var8.packetBuffer.writeLengthByte(var8.packetBuffer.offset - var9); + Client.packetWriter.addNode(var8); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { + TextureProvider.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[TextureProvider.Interpreter_stringStackSize]; + String var12 = Interpreter.Interpreter_stringStack[TextureProvider.Interpreter_stringStackSize + 1]; + PacketBufferNode var11 = MenuAction.getPacketBufferNode(ClientPacket.field2208, Client.packetWriter.isaacCipher); + var11.packetBuffer.writeShort(0); + int var13 = var11.packetBuffer.offset; + var11.packetBuffer.writeStringCp1252NullTerminated(var3); + World.method1755(var11.packetBuffer, var12); + var11.packetBuffer.writeLengthShort(var11.packetBuffer.offset - var13); + Client.packetWriter.addNode(var11); + return 1; + } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { + if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.tradeChatMode; + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { + var10 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = class160.Messages_getHistorySize(var10); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { + var10 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = WorldMapManager.Messages_getNextChatID(var10); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { + var10 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = GrandExchangeOfferOwnWorldComparator.Messages_getLastChatID(var10); + return 1; + } else if (var0 == ScriptOpcodes.DOCHEAT) { + var3 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + Tiles.doCheat(var3); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { + Client.field778 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize].toLowerCase().trim(); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = Client.field778; + return 1; + } else if (var0 == 5023) { + var3 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + System.out.println(var3); + return 1; + } else { + return 2; + } + } else { + if (Varps.localPlayer != null && Varps.localPlayer.username != null) { + var3 = Varps.localPlayer.username.getName(); + } else { + var3 = ""; + } + + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3; + return 1; + } + } } } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-617749686" - ) - @Export("ViewportMouse_unpackX") - public static int ViewportMouse_unpackX(int var0) { - long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; - int var1 = (int)(var2 >>> 0 & 127L); - return var1; - } } diff --git a/runescape-client/src/main/java/class219.java b/runescape-client/src/main/java/class219.java index 98b78c1573..1b16fc8988 100644 --- a/runescape-client/src/main/java/class219.java +++ b/runescape-client/src/main/java/class219.java @@ -1,78 +1,13 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hj") +@ObfuscatedName("hf") public class class219 { - @ObfuscatedName("i") + @ObfuscatedName("dy") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;IZI)Z", - garbageValue = "418860931" + signature = "Lks;" ) - static boolean method4022(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 = var10 + var5 * var1; - if (var9 / var1 != var5) { - return false; - } - - var5 = var9; - var4 = true; - } - - return var4; - } else { - throw new IllegalArgumentException("" + var1); - } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-62" - ) - static void method4021() { - Messages.Messages_channels.clear(); - Messages.Messages_hashTable.clear(); - Messages.Messages_queue.clear(); - Messages.Messages_count = 0; - } + @Export("js5Socket") + static AbstractSocket js5Socket; } diff --git a/runescape-client/src/main/java/class222.java b/runescape-client/src/main/java/class222.java index 3a8c22d3f8..db0098b29a 100644 --- a/runescape-client/src/main/java/class222.java +++ b/runescape-client/src/main/java/class222.java @@ -1,22 +1,31 @@ +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hm") +@ObfuscatedName("hk") public class class222 { - @ObfuscatedName("jg") - @ObfuscatedSignature( - signature = "Lhp;" + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 1751013611 ) - static Widget field2730; + static int field2726; + @ObfuscatedName("f") + @ObfuscatedGetter( + intValue = -1104641647 + ) + static int field2724; + @ObfuscatedName("au") + @ObfuscatedGetter( + intValue = -653819607 + ) + static int field2729; - @ObfuscatedName("n") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(ZZI)I", - garbageValue = "49519186" + signature = "(II)Z", + garbageValue = "-617072385" ) - public static int method4035(boolean var0, boolean var1) { - byte var2 = 0; - int var3 = var2 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount; - return var3; + public static boolean method4101(int var0) { + return (var0 >> 20 & 1) != 0; } } diff --git a/runescape-client/src/main/java/class223.java b/runescape-client/src/main/java/class223.java index 6d5fe85f7a..675e58a904 100644 --- a/runescape-client/src/main/java/class223.java +++ b/runescape-client/src/main/java/class223.java @@ -1,27 +1,56 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hq") +@ObfuscatedName("hr") public class class223 { - @ObfuscatedName("hz") + @ObfuscatedName("fs") @ObfuscatedSignature( - signature = "(IIIIB)V", - garbageValue = "4" + signature = "(Lhy;III)V", + garbageValue = "1135716702" ) - static void method4036(int var0, int var1, int var2, int var3) { - Widget var4 = ModelData0.getWidgetChild(var0, var1); - if (var4 != null && var4.onTargetEnter != null) { - ScriptEvent var5 = new ScriptEvent(); - var5.widget = var4; - var5.args = var4.onTargetEnter; - class81.runScriptEvent(var5); - } + @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 || !WorldMapSection1.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { + SpriteMask var3 = var0.getSpriteMask(true); + if (var3 == null) { + return; + } - Client.field736 = var3; - Client.isSpellSelected = true; - NetCache.field3162 = var0; - Client.field816 = var1; - WorldMapSectionType.selectedSpellFlags = var2; - FriendSystem.invalidateWidget(var4); + int var4 = MouseHandler.MouseHandler_lastPressedX - var1; + int var5 = MouseHandler.MouseHandler_lastPressedY - var2; + if (var3.contains(var4, var5)) { + var4 -= var3.width / 2; + var5 -= var3.height / 2; + int var6 = Client.camAngleY & 2047; + int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; + int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; + int var9 = var8 * var4 + var7 * var5 >> 11; + int var10 = var8 * var5 - var7 * var4 >> 11; + int var11 = Varps.localPlayer.x * -78439701 + var9 >> 7; + int var12 = Varps.localPlayer.y - var10 >> 7; + PacketBufferNode var13 = MenuAction.getPacketBufferNode(ClientPacket.field2245, Client.packetWriter.isaacCipher); + var13.packetBuffer.writeByte(18); + var13.packetBuffer.method5491(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); + var13.packetBuffer.writeShort(var12 + ScriptEvent.baseY); + var13.packetBuffer.writeShort(class4.baseX * 64 + var11); + 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(Varps.localPlayer.x * -78439701); + var13.packetBuffer.writeShort(Varps.localPlayer.y); + var13.packetBuffer.writeByte(63); + Client.packetWriter.addNode(var13); + Client.destinationX = var11; + Client.destinationY = var12; + } + } + + } } } diff --git a/runescape-client/src/main/java/class225.java b/runescape-client/src/main/java/class225.java index 3d10e85b81..ebc749f26e 100644 --- a/runescape-client/src/main/java/class225.java +++ b/runescape-client/src/main/java/class225.java @@ -1,84 +1,69 @@ -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("ho") +@ObfuscatedName("hb") public class class225 { - @ObfuscatedName("t") - @Export("SpriteBuffer_spriteHeights") - public static int[] SpriteBuffer_spriteHeights; - - @ObfuscatedName("ax") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "793886120" + signature = "(IB)Liv;", + garbageValue = "-97" ) - @Export("getGcDuration") - protected static int getGcDuration() { - int var0 = 0; - if (GrandExchangeEvent.garbageCollector == null || !GrandExchangeEvent.garbageCollector.isValid()) { - try { - Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); - - while (var1.hasNext()) { - GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); - if (var2.isValid()) { - GrandExchangeEvent.garbageCollector = var2; - GameShell.garbageCollectorLastCheckTimeMs = -1L; - GameShell.garbageCollectorLastCollectionTime = -1L; - } - } - } catch (Throwable var11) { - } - } - - if (GrandExchangeEvent.garbageCollector != null) { - long var9 = SequenceDefinition.method4686(); - long var3 = GrandExchangeEvent.garbageCollector.getCollectionTime(); - if (GameShell.garbageCollectorLastCollectionTime != -1L) { - long var5 = var3 - GameShell.garbageCollectorLastCollectionTime; - long var7 = var9 - GameShell.garbageCollectorLastCheckTimeMs; - if (var7 != 0L) { - var0 = (int)(100L * var5 / var7); - } + @Export("StructDefinition_getStructDefinition") + public static StructDefinition StructDefinition_getStructDefinition(int var0) { + StructDefinition var1 = (StructDefinition)StructDefinition.StructDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = StructDefinition.StructDefinition_archive.takeFile(34, var0); + var1 = new StructDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); } - GameShell.garbageCollectorLastCollectionTime = var3; - GameShell.garbageCollectorLastCheckTimeMs = var9; + var1.postDecode(); + StructDefinition.StructDefinition_cached.put(var1, (long)var0); + return var1; } - - return var0; } - @ObfuscatedName("if") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(III)Ljava/lang/String;", - garbageValue = "1269667837" + signature = "(I)V", + garbageValue = "-1647752784" ) - @Export("getLevelColorString") - static final String getLevelColorString(int var0, int var1) { - int var2 = var1 - var0; - if (var2 < -9) { - return class16.colorStartTag(0xff0000); - } else if (var2 < -6) { - return class16.colorStartTag(0xff3000); - } else if (var2 < -3) { - return class16.colorStartTag(0xff7000); - } else if (var2 < 0) { - return class16.colorStartTag(0xffb000); - } else if (var2 > 9) { - return class16.colorStartTag(0x00ff00); - } else if (var2 > 6) { - return class16.colorStartTag(0x40ff00); - } else if (var2 > 3) { - return class16.colorStartTag(0x80ff00); - } else if (var2 > 0) { - return class16.colorStartTag(0xc0ff00); - } else { - return class16.colorStartTag(0xffff00); + static final void method4105() { + if (!ViewportMouse.ViewportMouse_false0) { + int var0 = Scene.Scene_cameraPitchSine; + int var1 = Scene.Scene_cameraPitchCosine; + int var2 = Scene.Scene_cameraYawSine; + int var3 = Scene.Scene_cameraYawCosine; + byte var4 = 50; + short var5 = 3500; + int var6 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var4 / Rasterizer3D.Rasterizer3D_zoom; + int var7 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var4 / Rasterizer3D.Rasterizer3D_zoom; + int var8 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var5 / Rasterizer3D.Rasterizer3D_zoom; + int var9 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var5 / Rasterizer3D.Rasterizer3D_zoom; + int var10 = Rasterizer3D.method2983(var7, var4, var1, var0); + int var11 = Rasterizer3D.method3000(var7, var4, var1, var0); + var7 = var10; + var10 = Rasterizer3D.method2983(var9, var5, var1, var0); + int var12 = Rasterizer3D.method3000(var9, var5, var1, var0); + var9 = var10; + var10 = Rasterizer3D.method3026(var6, var11, var3, var2); + var11 = Rasterizer3D.method2964(var6, var11, var3, var2); + var6 = var10; + var10 = Rasterizer3D.method3026(var8, var12, var3, var2); + var12 = Rasterizer3D.method2964(var8, var12, var3, var2); + ViewportMouse.field1711 = (var10 + var6) / 2; + Ignored.field3577 = (var9 + var7) / 2; + class222.field2726 = (var12 + var11) / 2; + class4.field20 = (var10 - var6) / 2; + ViewportMouse.field1712 = (var9 - var7) / 2; + ServerBuild.field3079 = (var12 - var11) / 2; + ArchiveLoader.field510 = Math.abs(class4.field20); + GrandExchangeOfferUnitPriceComparator.field75 = Math.abs(ViewportMouse.field1712); + class222.field2724 = Math.abs(ServerBuild.field3079); } } } diff --git a/runescape-client/src/main/java/class226.java b/runescape-client/src/main/java/class226.java new file mode 100644 index 0000000000..2d20c77fbd --- /dev/null +++ b/runescape-client/src/main/java/class226.java @@ -0,0 +1,226 @@ +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("hv") +public class class226 { + @ObfuscatedName("bs") + @ObfuscatedSignature( + signature = "[Llt;" + ) + @Export("worldSelectStars") + static IndexedSprite[] worldSelectStars; + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)Ljava/io/File;", + garbageValue = "-1604203626" + ) + @Export("getFile") + static File getFile(String var0) { + if (!FileSystem.FileSystem_hasPermissions) { + throw new RuntimeException(""); + } else { + File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); + if (var1 != null) { + return var1; + } else { + File var2 = new File(class16.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("l") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "1" + ) + public static void method4108() { + class197.midiPcmStream.clear(); + class197.field2376 = 1; + class197.musicTrackArchive = null; + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "1401808695" + ) + @Export("clearItemContainer") + static void clearItemContainer(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var1 != null) { + for (int var2 = 0; var2 < var1.ids.length; ++var2) { + var1.ids[var2] = -1; + var1.quantities[var2] = 0; + } + + } + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + signature = "(ILcu;ZB)I", + garbageValue = "1" + ) + static int method4109(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.CLIENTCLOCK) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.cycle; + return 1; + } else { + int var3; + int var4; + if (var0 == ScriptOpcodes.INV_GETOBJ) { + class160.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = MusicPatch.method3877(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INV_GETNUM) { + class160.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Varcs.ItemContainer_getCount(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INV_TOTAL) { + class160.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = PendingSpawn.method1683(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INV_SIZE) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Players.getInvDefinition(var3).size; + return 1; + } else if (var0 == ScriptOpcodes.STAT) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; + return 1; + } else if (var0 == ScriptOpcodes.STAT_BASE) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.levels[var3]; + return 1; + } else if (var0 == ScriptOpcodes.STAT_XP) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.experience[var3]; + return 1; + } else { + int var5; + if (var0 == ScriptOpcodes.COORD) { + var3 = MouseRecorder.plane; + var4 = class4.baseX * 64 + (Varps.localPlayer.x * -78439701 >> 7); + var5 = (Varps.localPlayer.y >> 7) + ScriptEvent.baseY; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); + return 1; + } else if (var0 == ScriptOpcodes.COORDX) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; + return 1; + } else if (var0 == ScriptOpcodes.COORDZ) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 >> 28; + return 1; + } else if (var0 == ScriptOpcodes.COORDY) { + var3 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3 & 16383; + return 1; + } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { + class160.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = MusicPatch.method3877(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { + class160.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Varcs.ItemContainer_getCount(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { + class160.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = PendingSpawn.method1683(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { + if (Client.staffModLevel >= 2) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.staffModLevel; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.REBOOTTIMER) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.rebootTimer; + return 1; + } else if (var0 == ScriptOpcodes.MAP_WORLD) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.worldId; + return 1; + } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.runEnergy; + return 1; + } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.weight; + return 1; + } else if (var0 == ScriptOpcodes.PLAYERMOD) { + if (Client.playerMod) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDFLAGS) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.worldProperties; + return 1; + } else if (var0 == ScriptOpcodes.MOVECOORD) { + class160.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 2]; + int var6 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 3]; + var3 += var4 << 14; + var3 += var5 << 28; + var3 += var6; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3; + return 1; + } else { + return 2; + } + } + } + } +} diff --git a/runescape-client/src/main/java/class227.java b/runescape-client/src/main/java/class227.java index 36d714de6a..476595074a 100644 --- a/runescape-client/src/main/java/class227.java +++ b/runescape-client/src/main/java/class227.java @@ -2,44 +2,42 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hu") +@ObfuscatedName("hn") public final class class227 { - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lln;ILjava/lang/String;B)Ljava/lang/String;", - garbageValue = "-102" + signature = "(I)[Llq;", + garbageValue = "1253106160" ) - static String method4041(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; - } + @Export("FillMode_values") + public static FillMode[] FillMode_values() { + return new FillMode[]{FillMode.SOLID, FillMode.field3852, FillMode.field3855}; } - @ObfuscatedName("k") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(II)Lbi;", - garbageValue = "-93383433" + signature = "(II)Z", + garbageValue = "1135145838" ) - @Export("Messages_getMessage") - static Message Messages_getMessage(int var0) { - return (Message)Messages.Messages_hashTable.get((long)var0); + public static boolean method4110(int var0) { + return var0 >= WorldMapDecorationType.field2714.id && var0 <= WorldMapDecorationType.field2715.id; } - @ObfuscatedName("kn") + @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "1725811836" + signature = "(Ldg;I)V", + garbageValue = "574899" ) - @Export("Clan_joinChat") - static final void Clan_joinChat(String var0) { - if (!var0.equals("")) { - PacketBufferNode var1 = MenuAction.getPacketBufferNode(ClientPacket.field2263, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); + @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); + } + } } diff --git a/runescape-client/src/main/java/class237.java b/runescape-client/src/main/java/class237.java index 8fbaf986c0..a6a4a97594 100644 --- a/runescape-client/src/main/java/class237.java +++ b/runescape-client/src/main/java/class237.java @@ -1,129 +1,118 @@ +import java.awt.Component; 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("ic") +@ObfuscatedName("ir") public class class237 { - @ObfuscatedName("x") - static int[] field3171; - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("spriteMap") final HashMap spriteMap; - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Llh;" + signature = "Llr;" ) @Export("bounds") Bounds bounds; - @ObfuscatedName("i") - int[] field3168; - @ObfuscatedName("k") - int[] field3170; - @ObfuscatedName("u") + @ObfuscatedName("t") + int[] field3163; + @ObfuscatedName("g") + int[] field3164; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -719138889 + intValue = -73461123 ) - int field3169; + int field3165; public class237() { this.spriteMap = new HashMap(); this.bounds = new Bounds(0, 0); - this.field3168 = new int[2048]; - this.field3170 = new int[2048]; - this.field3169 = 0; - field3171 = new int[2000]; - int var1 = 0; - int var2 = 240; - - int var4; - for (byte var3 = 12; var1 < 16; var2 -= var3) { - var4 = Decimator.method2452((double)((float)var2 / 360.0F), 0.9998999834060669D, (double)(0.425F * (float)var1 / 16.0F + 0.075F)); - field3171[var1] = var4; - ++var1; - } - - var2 = 48; - - for (int var6 = var2 / 6; var1 < field3171.length; var2 -= var6) { - var4 = var1 * 2; - - for (int var5 = Decimator.method2452((double)((float)var2 / 360.0F), 0.9998999834060669D, 0.5D); var1 < var4 && var1 < field3171.length; ++var1) { - field3171[var1] = var5; - } - } - + this.field3163 = new int[2048]; + this.field3164 = new int[2048]; + this.field3165 = 0; + MidiPcmStream.method3769(); } - @ObfuscatedName("s") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "62" + signature = "(II)V", + garbageValue = "-350747484" ) - void method4238(int var1) { + void method4311(int var1) { int var2 = var1 * 2 + 1; - double[] var3 = Entity.method3211(0.0D, (double)((float)var1 / 3.0F), var1); - double var4 = var3[var1] * var3[var1]; - int[] var6 = new int[var2 * var2]; - boolean var7 = false; + double var4 = (double)((float)var1 / 3.0F); + int var6 = var1 * 2 + 1; + double[] var7 = new double[var6]; + int var8 = -var1; - for (int var8 = 0; var8 < var2; ++var8) { - for (int var9 = 0; var9 < var2; ++var9) { - int var10 = var6[var9 + var8 * var2] = (int)(var3[var9] * var3[var8] / var4 * 256.0D); - if (!var7 && var10 > 0) { - var7 = true; + for (int var9 = 0; var8 <= var1; ++var9) { + var7[var9] = GameShell.method1020((double)var8, 0.0D, var4); + ++var8; + } + + double[] var14 = var7; + double var15 = var7[var1] * var7[var1]; + int[] var17 = new int[var2 * var2]; + boolean var10 = false; + + for (int var11 = 0; var11 < var2; ++var11) { + for (int var12 = 0; var12 < var2; ++var12) { + int var13 = var17[var12 + var11 * var2] = (int)(var14[var12] * var14[var11] / var15 * 256.0D); + if (!var10 && var13 > 0) { + var10 = true; } } } - Sprite var11 = new Sprite(var6, var2, var2); - this.spriteMap.put(var1, var11); + Sprite var18 = new Sprite(var17, var2, var2); + this.spriteMap.put(var1, var18); } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(II)Lls;", - garbageValue = "-588854887" + signature = "(II)Lli;", + garbageValue = "-1078597763" ) - Sprite method4240(int var1) { + Sprite method4293(int var1) { if (!this.spriteMap.containsKey(var1)) { - this.method4238(var1); + this.method4311(var1); } return (Sprite)this.spriteMap.get(var1); } - @ObfuscatedName("i") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "64" + signature = "(III)V", + garbageValue = "2019840424" ) - public final void method4237(int var1, int var2) { - if (this.field3169 < this.field3168.length) { - this.field3168[this.field3169] = var1; - this.field3170[this.field3169] = var2; - ++this.field3169; + public final void method4319(int var1, int var2) { + if (this.field3165 < this.field3163.length) { + this.field3163[this.field3165] = var1; + this.field3164[this.field3165] = var2; + ++this.field3165; } } - @ObfuscatedName("k") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-516549049" + garbageValue = "1110307323" ) - public final void method4241() { - this.field3169 = 0; + public final void method4295() { + this.field3165 = 0; } @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(IILls;FB)V", - garbageValue = "20" + signature = "(IILli;FI)V", + garbageValue = "-1921897333" ) - public final void method4242(int var1, int var2, Sprite var3, float var4) { + public final void method4296(int var1, int var2, Sprite var3, float var4) { int var5 = (int)(var4 * 18.0F); - Sprite var6 = this.method4240(var5); + Sprite var6 = this.method4293(var5); int var7 = var5 * 2 + 1; Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); Bounds var9 = new Bounds(0, 0); @@ -133,14 +122,14 @@ public class class237 { int var10; int var11; int var12; - for (var10 = 0; var10 < this.field3169; ++var10) { - var11 = this.field3168[var10]; - var12 = this.field3170[var10]; + for (var10 = 0; var10 < this.field3165; ++var10) { + var11 = this.field3163[var10]; + var12 = this.field3164[var10]; int var13 = (int)(var4 * (float)(var11 - var1)) - var5; int var14 = (int)((float)var3.subHeight - (float)(var12 - var2) * var4) - var5; this.bounds.setLow(var13, var14); - this.bounds.method5846(var8, var9); - this.method4243(var6, var3, var9); + this.bounds.method5948(var8, var9); + this.method4297(var6, var3, var9); } System.nanoTime(); @@ -154,11 +143,11 @@ public class class237 { if (var11 <= 0) { var3.pixels[var10] = -16777216; } else { - if (var11 > field3171.length) { - var11 = field3171.length; + if (var11 > GrandExchangeOffer.field67.length) { + var11 = GrandExchangeOffer.field67.length; } - var12 = field3171[var11 - 1]; + var12 = GrandExchangeOffer.field67[var11 - 1]; var3.pixels[var10] = -16777216 | var12; } } @@ -167,12 +156,12 @@ public class class237 { System.nanoTime(); } - @ObfuscatedName("n") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lls;Lls;Llh;I)V", - garbageValue = "2027026702" + signature = "(Lli;Lli;Llr;I)V", + garbageValue = "-1641281756" ) - void method4243(Sprite var1, Sprite var2, Bounds var3) { + void method4297(Sprite var1, Sprite var2, Bounds var3) { if (var3.highX != 0 && var3.highY != 0) { int var4 = 0; int var5 = 0; @@ -200,4 +189,15 @@ public class class237 { } } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(Ljava/awt/Component;B)V", + garbageValue = "1" + ) + static void method4317(Component var0) { + var0.setFocusTraversalKeysEnabled(false); + var0.addKeyListener(KeyHandler.KeyHandler_instance); + var0.addFocusListener(KeyHandler.KeyHandler_instance); + } } diff --git a/runescape-client/src/main/java/class247.java b/runescape-client/src/main/java/class247.java index 373e772166..a6def1681d 100644 --- a/runescape-client/src/main/java/class247.java +++ b/runescape-client/src/main/java/class247.java @@ -1,23 +1,22 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("it") +@ObfuscatedName("if") public class class247 { - @ObfuscatedName("qw") - @ObfuscatedSignature( - signature = "Ldb;" - ) - @Export("decimator") - static Decimator decimator; - - @ObfuscatedName("i") + @ObfuscatedName("gm") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1267026427" + garbageValue = "-197171985" ) - @Export("WorldMapRegion_clearCachedSprites") - static void WorldMapRegion_clearCachedSprites() { - WorldMapRegion.WorldMapRegion_cachedSprites.clear(); + static final void method4484() { + for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var0.hitpoints == -1) { + var0.delay = 0; + class16.method164(var0); + } else { + var0.remove(); + } + } + } } diff --git a/runescape-client/src/main/java/class266.java b/runescape-client/src/main/java/class266.java deleted file mode 100644 index 1e05ea6f31..0000000000 --- a/runescape-client/src/main/java/class266.java +++ /dev/null @@ -1,40 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; - -@ObfuscatedName("jh") -public class class266 { - @ObfuscatedName("s") - @Export("base37DecodeLong") - public static String base37DecodeLong(long var0) { - if (var0 > 0L && var0 < 6582952005840035281L) { - if (0L == var0 % 37L) { - return null; - } else { - int var2 = 0; - - for (long var3 = var0; 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 = class288.base37Table[(int)(var6 - 37L * var0)]; - if (var8 == '_') { - int var9 = var5.length() - 1; - var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); - var8 = 160; - } - } - - var5.reverse(); - var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); - return var5.toString(); - } - } else { - return null; - } - } -} diff --git a/runescape-client/src/main/java/class267.java b/runescape-client/src/main/java/class267.java new file mode 100644 index 0000000000..dca9e78196 --- /dev/null +++ b/runescape-client/src/main/java/class267.java @@ -0,0 +1,11 @@ +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("js") +public class class267 { + @ObfuscatedName("ai") + @ObfuscatedGetter( + intValue = 1020468275 + ) + static int field3524; +} diff --git a/runescape-client/src/main/java/class268.java b/runescape-client/src/main/java/class268.java index 4b0d0e5ece..0fc5200302 100644 --- a/runescape-client/src/main/java/class268.java +++ b/runescape-client/src/main/java/class268.java @@ -1,63 +1,30 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("jy") +@ObfuscatedName("jr") public class class268 { - @ObfuscatedName("w") + @ObfuscatedName("ka") @ObfuscatedSignature( - signature = "(ILcr;ZI)I", - garbageValue = "1046379510" + signature = "(I)V", + garbageValue = "-1779178582" ) - static int method4893(int var0, Script var1, boolean var2) { - Widget var3 = WorldMapElement.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[++Interpreter.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_GETTRANSTOP) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyTop; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETTRANSBOT) { - 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 == ScriptOpcodes.IF_GETFILLMODE) { - 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 { - return 2; + static void method4967() { + if (Client.field824 && Varps.localPlayer != null) { + int var0 = Varps.localPlayer.pathX[0]; + int var1 = Varps.localPlayer.pathY[0]; + if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) { + return; + } + + SecureRandomFuture.oculusOrbFocalPointX = Varps.localPlayer.x * -78439701; + int var2 = WorldMapAreaData.getTileHeight(Varps.localPlayer.x * -78439701, Varps.localPlayer.y, MouseRecorder.plane) - Client.camFollowHeight * 172735687; + if (var2 < class65.field580 * 1615694975) { + class65.field580 = var2 * -59362433; + } + + AbstractByteArrayCopier.oculusOrbFocalPointY = Varps.localPlayer.y; + Client.field824 = false; } + } } diff --git a/runescape-client/src/main/java/class269.java b/runescape-client/src/main/java/class269.java deleted file mode 100644 index b35ec954fc..0000000000 --- a/runescape-client/src/main/java/class269.java +++ /dev/null @@ -1,60 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("jg") -public class class269 { - @ObfuscatedName("dx") - @ObfuscatedSignature( - signature = "Lid;" - ) - @Export("archive1") - static Archive archive1; - - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "([BIIIIIII[Lfm;I)V", - garbageValue = "-1620940742" - ) - static final void method4894(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 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 + ReflectionCheck.method2213(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; - } - - class30.loadTerrain(var21, var1, var15, var3 + var17, 0, 0, var7); - } else { - class30.loadTerrain(var21, 0, -1, -1, 0, 0, 0); - } - } - } - } - - } -} diff --git a/runescape-client/src/main/java/class270.java b/runescape-client/src/main/java/class270.java index 2ee2ef9e84..bc225add95 100644 --- a/runescape-client/src/main/java/class270.java +++ b/runescape-client/src/main/java/class270.java @@ -1,23 +1,13 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ji") +@ObfuscatedName("jc") public class class270 { - @ObfuscatedName("j") + @ObfuscatedName("gi") @ObfuscatedSignature( - signature = "(II)Lkk;", - garbageValue = "-1980425423" + signature = "[Lli;" ) - public static PrivateChatMode method4895(int var0) { - PrivateChatMode[] var1 = AbstractSocket.ChatMode_values(); - - for (int var2 = 0; var2 < var1.length; ++var2) { - PrivateChatMode var3 = var1[var2]; - if (var0 == var3.field3791) { - return var3; - } - } - - return null; - } + @Export("crossSprites") + static Sprite[] crossSprites; } diff --git a/runescape-client/src/main/java/class286.java b/runescape-client/src/main/java/class286.java index a08a0e4cc4..a8c3973c10 100644 --- a/runescape-client/src/main/java/class286.java +++ b/runescape-client/src/main/java/class286.java @@ -1,93 +1,198 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ks") +@ObfuscatedName("kg") public class class286 { - @ObfuscatedName("y") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Lhp;" + signature = "(CLgf;I)I", + garbageValue = "-641630421" ) - static Widget field3623; + @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; + } - @ObfuscatedName("av") + if (var0 == 241 && var1 == Language.Language_ES) { + var2 = 1762; + } + + return var2; + } + + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(ILcr;ZI)I", - garbageValue = "-2004076029" + signature = "(I)V", + garbageValue = "1454751170" ) - static int method5166(int var0, Script var1, boolean var2) { - int var3; - int var4; - int var6; - if (var0 == ScriptOpcodes.ENUM_STRING) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - EnumDefinition var5 = MenuAction.getEnum(var3); - if (var5.outputType != 's') { - } + static void method5221() { + ItemContainer.itemContainers = new NodeHashTable(32); + } - for (var6 = 0; var6 < var5.outputCount; ++var6) { - if (var4 == var5.keys[var6]) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.strVals[var6]; - var5 = null; - break; - } - } + @ObfuscatedName("id") + @ObfuscatedSignature( + signature = "(Lhy;II)I", + garbageValue = "520473491" + ) + static final int method5218(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; - if (var5 != null) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.defaultStr; - } + while (true) { + int var6 = var2[var4++]; + int var7 = 0; + byte var8 = 0; + if (var6 == 0) { + return var3; + } - return 1; - } else if (var0 != ScriptOpcodes.ENUM) { - if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - EnumDefinition var10 = MenuAction.getEnum(var3); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var10.size(); - return 1; - } else { - return 2; - } - } else { - Interpreter.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - int var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - EnumDefinition var7 = MenuAction.getEnum(var9); - if (var3 == var7.inputType && var4 == var7.outputType) { - for (int var8 = 0; var8 < var7.outputCount; ++var8) { - if (var6 == var7.keys[var8]) { - if (var4 == 115) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.strVals[var8]; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.intVals[var8]; + 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 = Player.getWidget(var9); + var11 = var2[var4++]; + if (var11 != -1 && (!Player.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 = Varps.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 = Player.getWidget(var9); + var11 = var2[var4++]; + if (var11 != -1 && (!Player.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 = WorldMapCacheName.getVarbit(var9); + } + + if (var6 == 15) { + var8 = 1; + } + + if (var6 == 16) { + var8 = 2; + } + + if (var6 == 17) { + var8 = 3; + } + + if (var6 == 18) { + var7 = class4.baseX * 64 + (Varps.localPlayer.x * -78439701 >> 7); + } + + if (var6 == 19) { + var7 = ScriptEvent.baseY + (Varps.localPlayer.y >> 7); + } + + if (var6 == 20) { + var7 = var2[var4++]; + } + + if (var8 == 0) { + if (var5 == 0) { + var3 += var7; } - var7 = null; - break; - } - } + if (var5 == 1) { + var3 -= var7; + } - if (var7 != null) { - if (var4 == 115) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.defaultStr; + if (var5 == 2 && var7 != 0) { + var3 /= var7; + } + + if (var5 == 3) { + var3 *= var7; + } + + var5 = 0; } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.defaultInt; + var5 = var8; } } - - return 1; - } else { - if (var4 == 115) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "null"; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; + } catch (Exception var14) { + return -1; } + } else { + return -2; } } } diff --git a/runescape-client/src/main/java/class287.java b/runescape-client/src/main/java/class287.java index 91228b6ebe..cbb7e0d5d5 100644 --- a/runescape-client/src/main/java/class287.java +++ b/runescape-client/src/main/java/class287.java @@ -1,11 +1,18 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kj") +@ObfuscatedName("kd") public class class287 { - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("cp1252AsciiExtension") public static final char[] cp1252AsciiExtension; + @ObfuscatedName("gs") + @ObfuscatedSignature( + signature = "[Llt;" + ) + @Export("mapSceneSprites") + static IndexedSprite[] mapSceneSprites; static { cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; diff --git a/runescape-client/src/main/java/class288.java b/runescape-client/src/main/java/class288.java index 0001c7ca37..134f17b852 100644 --- a/runescape-client/src/main/java/class288.java +++ b/runescape-client/src/main/java/class288.java @@ -1,20 +1,20 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("kt") +@ObfuscatedName("kr") public final class class288 { - @ObfuscatedName("s") + @ObfuscatedName("c") @Export("base37Table") - public static final char[] base37Table; - @ObfuscatedName("j") - static long[] field3629; + static final char[] base37Table; + @ObfuscatedName("x") + static long[] field3622; 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'}; - field3629 = new long[12]; + field3622 = new long[12]; - for (int var0 = 0; var0 < field3629.length; ++var0) { - field3629[var0] = (long)Math.pow(37.0D, (double)var0); + for (int var0 = 0; var0 < field3622.length; ++var0) { + field3622[var0] = (long)Math.pow(37.0D, (double)var0); } } diff --git a/runescape-client/src/main/java/class289.java b/runescape-client/src/main/java/class289.java index bbc7f03ba4..caa508602f 100644 --- a/runescape-client/src/main/java/class289.java +++ b/runescape-client/src/main/java/class289.java @@ -1,89 +1,97 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kc") +@ObfuscatedName("kh") public class class289 { - @ObfuscatedName("s") - static char[] field3631; + @ObfuscatedName("c") + public static char[] field3626; + @ObfuscatedName("x") + static char[] field3628; + @ObfuscatedName("t") + static char[] field3627; + @ObfuscatedName("g") + static int[] field3629; @ObfuscatedName("j") - static char[] field3630; - @ObfuscatedName("i") - static char[] field3632; - @ObfuscatedName("k") - static int[] field3633; + @ObfuscatedSignature( + signature = "[[Lhy;" + ) + @Export("Widget_interfaceComponents") + public static Widget[][] Widget_interfaceComponents; static { - field3631 = new char[64]; + field3626 = new char[64]; int var0; for (var0 = 0; var0 < 26; ++var0) { - field3631[var0] = (char)(var0 + 65); + field3626[var0] = (char)(var0 + 65); } for (var0 = 26; var0 < 52; ++var0) { - field3631[var0] = (char)(var0 + 97 - 26); + field3626[var0] = (char)(var0 + 97 - 26); } for (var0 = 52; var0 < 62; ++var0) { - field3631[var0] = (char)(var0 + 48 - 52); + field3626[var0] = (char)(var0 + 48 - 52); } - field3631[62] = '+'; - field3631[63] = '/'; - field3630 = new char[64]; + field3626[62] = '+'; + field3626[63] = '/'; + field3628 = new char[64]; for (var0 = 0; var0 < 26; ++var0) { - field3630[var0] = (char)(var0 + 65); + field3628[var0] = (char)(var0 + 65); } for (var0 = 26; var0 < 52; ++var0) { - field3630[var0] = (char)(var0 + 97 - 26); + field3628[var0] = (char)(var0 + 97 - 26); } for (var0 = 52; var0 < 62; ++var0) { - field3630[var0] = (char)(var0 + 48 - 52); + field3628[var0] = (char)(var0 + 48 - 52); } - field3630[62] = '*'; - field3630[63] = '-'; - field3632 = new char[64]; + field3628[62] = '*'; + field3628[63] = '-'; + field3627 = new char[64]; for (var0 = 0; var0 < 26; ++var0) { - field3632[var0] = (char)(var0 + 65); + field3627[var0] = (char)(var0 + 65); } for (var0 = 26; var0 < 52; ++var0) { - field3632[var0] = (char)(var0 + 97 - 26); + field3627[var0] = (char)(var0 + 97 - 26); } for (var0 = 52; var0 < 62; ++var0) { - field3632[var0] = (char)(var0 + 48 - 52); + field3627[var0] = (char)(var0 + 48 - 52); } - field3632[62] = '-'; - field3632[63] = '_'; - field3633 = new int[128]; + field3627[62] = '-'; + field3627[63] = '_'; + field3629 = new int[128]; - for (var0 = 0; var0 < field3633.length; ++var0) { - field3633[var0] = -1; + for (var0 = 0; var0 < field3629.length; ++var0) { + field3629[var0] = -1; } for (var0 = 65; var0 <= 90; ++var0) { - field3633[var0] = var0 - 65; + field3629[var0] = var0 - 65; } for (var0 = 97; var0 <= 122; ++var0) { - field3633[var0] = var0 - 97 + 26; + field3629[var0] = var0 - 97 + 26; } for (var0 = 48; var0 <= 57; ++var0) { - field3633[var0] = var0 - 48 + 52; + field3629[var0] = var0 - 48 + 52; } - int[] var2 = field3633; - field3633[43] = 62; + int[] var2 = field3629; + field3629[43] = 62; var2[42] = 62; - int[] var1 = field3633; - field3633[47] = 63; + int[] var1 = field3629; + field3629[47] = 63; var1[45] = 63; } } diff --git a/runescape-client/src/main/java/class290.java b/runescape-client/src/main/java/class290.java deleted file mode 100644 index 86e968ecff..0000000000 --- a/runescape-client/src/main/java/class290.java +++ /dev/null @@ -1,27 +0,0 @@ -import java.io.File; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("kq") -public final class class290 { - @ObfuscatedName("k") - @Export("JagexCache_locationFile") - static File JagexCache_locationFile; - - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "(Lhz;II)Z", - garbageValue = "-691629841" - ) - @Export("SpriteBuffer_bufferFileFlat") - public static boolean SpriteBuffer_bufferFileFlat(AbstractArchive var0, int var1) { - byte[] var2 = var0.takeFileFlat(var1); - if (var2 == null) { - return false; - } else { - Player.SpriteBuffer_decode(var2); - return true; - } - } -} diff --git a/runescape-client/src/main/java/class293.java b/runescape-client/src/main/java/class293.java index c5682ebdb3..ea95317664 100644 --- a/runescape-client/src/main/java/class293.java +++ b/runescape-client/src/main/java/class293.java @@ -2,12 +2,21 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kf") +@ObfuscatedName("kj") public class class293 { - @ObfuscatedName("sx") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Lkv;" + signature = "Lhz;" ) - @Export("masterDisk") - static ArchiveDisk masterDisk; + @Export("Widget_modelsArchive") + static AbstractArchive Widget_modelsArchive; + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(Lhz;B)V", + garbageValue = "97" + ) + public static void method5298(AbstractArchive var0) { + VarcInt.VarcInt_archive = var0; + } } diff --git a/runescape-client/src/main/java/class296.java b/runescape-client/src/main/java/class296.java index ba9318a03e..260caeac1b 100644 --- a/runescape-client/src/main/java/class296.java +++ b/runescape-client/src/main/java/class296.java @@ -1,16 +1,43 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kn") +@ObfuscatedName("km") public final class class296 { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedGetter( - longValue = 6466484190389842591L + longValue = -8842260306920147949L ) - static long field3688; - @ObfuscatedName("j") + static long field3680; + @ObfuscatedName("x") @ObfuscatedGetter( - longValue = -5796014573830238981L + longValue = 5493991192687993425L ) - static long field3689; + static long field3681; + + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-227117259" + ) + @Export("savePreferences") + static void savePreferences() { + AccessFile var0 = null; + + try { + var0 = GrandExchangeOfferUnitPriceComparator.getPreferencesFile("", class43.field359.name, true); + Buffer var1 = Actor.clientPreferences.toBuffer(); + var0.write(var1.array, 0, var1.offset); + } catch (Exception var3) { + } + + try { + if (var0 != null) { + var0.closeSync(true); + } + } catch (Exception var2) { + } + + } } diff --git a/runescape-client/src/main/java/class297.java b/runescape-client/src/main/java/class297.java index 55f8487e1a..b25245c82d 100644 --- a/runescape-client/src/main/java/class297.java +++ b/runescape-client/src/main/java/class297.java @@ -2,17 +2,23 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ke") +@ObfuscatedName("kv") public class class297 { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "Lhz;" ) - @Export("KitDefinition_archive") - public static AbstractArchive KitDefinition_archive; - @ObfuscatedName("r") + @Export("VarpDefinition_archive") + public static AbstractArchive VarpDefinition_archive; + + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lhp;" + signature = "(B)V", + garbageValue = "0" ) - static Widget field3693; + public static void method5410() { + HitSplatDefinition.HitSplatDefinition_cached.clear(); + HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); + HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); + } } diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java index 0080b2a895..7a88681dea 100644 --- a/runescape-client/src/main/java/class3.java +++ b/runescape-client/src/main/java/class3.java @@ -1,189 +1,129 @@ -import java.io.DataInputStream; -import java.net.MalformedURLException; -import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("k") +@ObfuscatedName("g") public class class3 implements Enumerated { - @ObfuscatedName("qt") - @ObfuscatedGetter( - intValue = 112869376 - ) - static int field24; - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lk;" + signature = "Lg;" ) - static final class3 field19; - @ObfuscatedName("j") + public static final class3 field13; + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Lk;" + signature = "Lg;" ) - static final class3 field14; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lk;" - ) - static final class3 field15; - @ObfuscatedName("f") - @Export("Tiles_saturation") - static int[] Tiles_saturation; - @ObfuscatedName("ay") - @Export("hasFocus") - protected static boolean hasFocus; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 244177539 - ) - final int field16; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 950508435 - ) - public final int field18; - @ObfuscatedName("n") - public final Class field29; + public static final class3 field7; @ObfuscatedName("t") @ObfuscatedSignature( - signature = "Ls;" + signature = "Lg;" ) - public final class0 field13; - - static { - field19 = new class3(2, 0, Integer.class, new class1()); - field14 = new class3(0, 1, Long.class, new class2()); - field15 = new class3(1, 2, String.class, new class4()); - } - - @ObfuscatedSignature( - signature = "(IILjava/lang/Class;Ls;)V" + public static final class3 field10; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 1439803863 ) - class3(int var1, int var2, Class var3, class0 var4) { - this.field16 = var1; - this.field18 = var2; - this.field29 = var3; - this.field13 = var4; - } - + final int field9; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = 115854395 + ) + public final int field12; + @ObfuscatedName("u") + public final Class field11; @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-32" + signature = "Lc;" + ) + public final class0 field8; + + static { + field13 = new class3(2, 0, Integer.class, new class1()); + field7 = new class3(0, 1, Long.class, new class2()); + field10 = new class3(1, 2, String.class, new class4()); + } + + @ObfuscatedSignature( + signature = "(IILjava/lang/Class;Lc;)V" + ) + class3(int var1, int var2, Class var3, class0 var4) { + this.field9 = var1; + this.field12 = var2; + this.field11 = var3; + this.field8 = var4; + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "-1410702910" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field18; - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(Lky;I)Ljava/lang/Object;", - garbageValue = "982910801" - ) - public Object method43(Buffer var1) { - return this.field13.vmethod70(var1); - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", - garbageValue = "1743466142" - ) - @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 = WallDecoration.shortenStackTrace(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=" + class208.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + GZipDecompressor.field4007 + "&e=" + var2); - DataInputStream var4 = new DataInputStream(var3.openStream()); - var4.read(); - var4.close(); - } catch (Exception var5) { - } - - } - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "(B)[Lk;", - garbageValue = "-69" - ) - public static class3[] method44() { - return new class3[]{field15, field19, field14}; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)Z", - garbageValue = "-1165508811" - ) - @Export("isValidURL") - static boolean isValidURL(String var0) { - if (var0 == null) { - return false; - } else { - try { - new URL(var0); - return true; - } catch (MalformedURLException var2) { - return false; - } - } + return this.field12; } @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "68" + signature = "(Lkz;I)Ljava/lang/Object;", + garbageValue = "-1191567390" ) - static final void method53() { - Object var10000 = null; - String var0 = "Your friend list is full. Max of 200 for free users, and 400 for members"; - DirectByteArrayCopier.addGameMessage(30, "", var0); + public Object method37(Buffer var1) { + return this.field8.vmethod41(var1); } - @ObfuscatedName("kz") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1569353890" + garbageValue = "1891869764" ) - @Export("FriendSystem_invalidateFriends") - static final void FriendSystem_invalidateFriends() { - for (int var0 = 0; var0 < Players.Players_count; ++var0) { - Player var1 = Client.players[Players.Players_indices[var0]]; - var1.clearIsFriend(); + static void method38() { + if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { + KeyHandler.KeyHandler_keyCodes[186] = 57; + KeyHandler.KeyHandler_keyCodes[187] = 27; + KeyHandler.KeyHandler_keyCodes[188] = 71; + KeyHandler.KeyHandler_keyCodes[189] = 26; + KeyHandler.KeyHandler_keyCodes[190] = 72; + KeyHandler.KeyHandler_keyCodes[191] = 73; + KeyHandler.KeyHandler_keyCodes[192] = 58; + KeyHandler.KeyHandler_keyCodes[219] = 42; + KeyHandler.KeyHandler_keyCodes[220] = 74; + KeyHandler.KeyHandler_keyCodes[221] = 43; + KeyHandler.KeyHandler_keyCodes[222] = 59; + KeyHandler.KeyHandler_keyCodes[223] = 28; + } else { + KeyHandler.KeyHandler_keyCodes[44] = 71; + KeyHandler.KeyHandler_keyCodes[45] = 26; + KeyHandler.KeyHandler_keyCodes[46] = 72; + KeyHandler.KeyHandler_keyCodes[47] = 73; + KeyHandler.KeyHandler_keyCodes[59] = 57; + KeyHandler.KeyHandler_keyCodes[61] = 27; + KeyHandler.KeyHandler_keyCodes[91] = 42; + KeyHandler.KeyHandler_keyCodes[92] = 74; + KeyHandler.KeyHandler_keyCodes[93] = 43; + KeyHandler.KeyHandler_keyCodes[192] = 28; + KeyHandler.KeyHandler_keyCodes[222] = 58; + KeyHandler.KeyHandler_keyCodes[520] = 59; } - LoginScreenAnimation.method1758(); - if (Client.clanChat != null) { - Client.clanChat.clearFriends(); + } + + @ObfuscatedName("kx") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1992850918" + ) + static void method30() { + if (MenuAction.field1133 != null) { + Client.field892 = Client.cycle; + MenuAction.field1133.method4295(); + + for (int var0 = 0; var0 < Client.players.length; ++var0) { + if (Client.players[var0] != null) { + MenuAction.field1133.method4319(class4.baseX * 64 + (Client.players[var0].x * -78439701 >> 7), ScriptEvent.baseY + (Client.players[var0].y >> 7)); + } + } } } diff --git a/runescape-client/src/main/java/class30.java b/runescape-client/src/main/java/class30.java index 1290b21fde..0a2c03f742 100644 --- a/runescape-client/src/main/java/class30.java +++ b/runescape-client/src/main/java/class30.java @@ -3,461 +3,90 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("az") +@ObfuscatedName("an") public class class30 { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Laz;" + signature = "Lan;" ) - static final class30 field251; - @ObfuscatedName("j") + static final class30 field253; + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Laz;" + signature = "Lan;" ) - static final class30 field250; - @ObfuscatedName("m") + static final class30 field254; + @ObfuscatedName("l") + static byte[][][] field257; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -2137893013 - ) - @Export("canvasHeight") - public static int canvasHeight; - @ObfuscatedName("fj") - @ObfuscatedSignature( - signature = "Lkb;" - ) - @Export("fontPlain11") - static Font fontPlain11; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -1891025063 + intValue = 1770534385 ) @Export("value") final int value; static { - field251 = new class30(0); - field250 = new class30(1); + field253 = new class30(0); + field254 = new class30(1); } class30(int var1) { this.value = var1; } - @ObfuscatedName("j") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IIII)Lcr;", - garbageValue = "-1455468639" + signature = "(II)Lis;", + garbageValue = "-97932043" ) - @Export("getWorldMapScript") - static Script getWorldMapScript(int var0, int var1, int var2) { - int var3 = ReflectionCheck.method2212(var1, var0); - Script var5 = (Script)Script.Script_cached.get((long)(var3 << 16)); - Script var4; - if (var5 != null) { - var4 = var5; + public static VarpDefinition method518(int var0) { + VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; } else { - String var6 = String.valueOf(var3); - int var7 = GameShell.archive12.getGroupId(var6); - if (var7 == -1) { - var4 = null; - } else { - label55: { - byte[] var8 = GameShell.archive12.takeFileFlat(var7); - if (var8 != null) { - if (var8.length <= 1) { - var4 = null; - break label55; - } - - var5 = DesktopPlatformInfoProvider.newScript(var8); - if (var5 != null) { - Script.Script_cached.put(var5, (long)(var3 << 16)); - var4 = var5; - break label55; - } - } - - var4 = null; - } - } - } - - if (var4 != null) { - return var4; - } else { - int var12 = (var2 + 40000 << 8) + var0; - Script var14 = (Script)Script.Script_cached.get((long)(var12 << 16)); - Script var13; - if (var14 != null) { - var13 = var14; - } else { - String var9 = String.valueOf(var12); - int var10 = GameShell.archive12.getGroupId(var9); - if (var10 == -1) { - var13 = null; - } else { - byte[] var11 = GameShell.archive12.takeFileFlat(var10); - if (var11 != null) { - if (var11.length <= 1) { - var13 = null; - return var13 != null ? var13 : null; - } - - var14 = DesktopPlatformInfoProvider.newScript(var11); - if (var14 != null) { - Script.Script_cached.put(var14, (long)(var12 << 16)); - var13 = var14; - return var13 != null ? var13 : null; - } - } - - var13 = null; - } + byte[] var2 = class297.VarpDefinition_archive.takeFile(16, var0); + var1 = new VarpDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); } - return var13 != null ? var13 : null; + VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); + return var1; } } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lkx;II)V", - garbageValue = "1722384398" + signature = "(III)V", + garbageValue = "-2099290439" ) - @Export("updatePlayers") - static final void updatePlayers(PacketBuffer var0, int var1) { - int var2 = var0.offset; - Players.Players_pendingUpdateCount = 0; - class189.method3594(var0); + @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 var3 = 0; var3 < Players.Players_pendingUpdateCount; ++var3) { - int var4 = Players.Players_pendingUpdateIndices[var3]; - Player var5 = Client.players[var4]; - int var6 = var0.readUnsignedByte(); - if ((var6 & 8) != 0) { - var6 += var0.readUnsignedByte() << 8; - } - - byte var7 = -1; - int var8; - int var9; - int var11; - int var12; - int var15; - if ((var6 & 64) != 0) { - var8 = var0.method5436(); - int var10; - int var13; - int var14; - if (var8 > 0) { - for (var9 = 0; var9 < var8; ++var9) { - var11 = -1; - var12 = -1; - var13 = -1; - var10 = var0.readUShortSmart(); - if (var10 == 32767) { - var10 = var0.readUShortSmart(); - var12 = var0.readUShortSmart(); - var11 = var0.readUShortSmart(); - var13 = var0.readUShortSmart(); - } else if (var10 != 32766) { - var12 = var0.readUShortSmart(); - } else { - var10 = -1; - } - - var14 = var0.readUShortSmart(); - var5.addHitSplat(var10, var12, var11, var13, Client.cycle, var14); - } - } - - var9 = var0.readUnsignedByteNegate(); - if (var9 > 0) { - for (var10 = 0; var10 < var9; ++var10) { - var11 = var0.readUShortSmart(); - var12 = var0.readUShortSmart(); - if (var12 != 32767) { - var13 = var0.readUShortSmart(); - var14 = var0.method5436(); - var15 = var12 > 0 ? var0.readUnsignedByte() : var14; - var5.addHealthBar(var11, Client.cycle, var12, var13, var14, var15); - } else { - var5.removeHealthBar(var11); - } - } - } - } - - if ((var6 & 512) != 0) { - var5.spotAnimation = var0.method5447(); - var8 = var0.method5455(); - var5.heightOffset = var8 >> 16; - var5.field958 = (var8 & 65535) + Client.cycle; - var5.spotAnimationFrame = 0; - var5.spotAnimationFrameCycle = 0; - if (var5.field958 > Client.cycle) { - var5.spotAnimationFrame = -1; - } - - if (var5.spotAnimation == 65535) { - var5.spotAnimation = -1; - } - } - - if ((var6 & 4096) != 0) { - var7 = var0.method5616(); - } - - if ((var6 & 1024) != 0) { - var5.field960 = var0.method5441(); - var5.field954 = var0.method5616(); - var5.field961 = var0.method5616(); - var5.field963 = var0.method5441(); - var5.field941 = var0.method5446() + Client.cycle; - var5.field965 = var0.method5445() + Client.cycle; - var5.field966 = var0.readUnsignedShort(); - if (var5.field614) { - var5.field960 += var5.tileX; - var5.field954 += var5.tileY; - var5.field961 += var5.tileX; - var5.field963 += var5.tileY; - var5.pathLength = 0; - } else { - var5.field960 += var5.pathX[0]; - var5.field954 += var5.pathY[0]; - var5.field961 += var5.pathX[0]; - var5.field963 += var5.pathY[0]; - var5.pathLength = 1; - } - - var5.field947 = 0; - } - - if ((var6 & 32) != 0) { - var5.overheadText = var0.readStringCp1252NullTerminated(); - if (var5.overheadText.charAt(0) == '~') { - var5.overheadText = var5.overheadText.substring(1); - DirectByteArrayCopier.addGameMessage(2, var5.username.getName(), var5.overheadText); - } else if (var5 == WorldMapIcon_1.localPlayer) { - DirectByteArrayCopier.addGameMessage(2, var5.username.getName(), var5.overheadText); - } - - var5.isAutoChatting = false; - var5.overheadTextColor = 0; - var5.overheadTextEffect = 0; - var5.overheadTextCyclesRemaining = 150; - } - - if ((var6 & 4) != 0) { - var5.field946 = var0.method5445(); - if (var5.pathLength == 0) { - var5.orientation = var5.field946; - var5.field946 = -1; - } - } - - if ((var6 & 1) != 0) { - var8 = var0.method5438(); - byte[] var16 = new byte[var8]; - Buffer var17 = new Buffer(var16); - var0.method5457(var16, 0, var8); - Players.field1219[var4] = var17; - var5.read(var17); - } - - if ((var6 & 2) != 0) { - var5.targetIndex = var0.method5446(); - if (var5.targetIndex == 65535) { - var5.targetIndex = -1; - } - } - - if ((var6 & 2048) != 0) { - Players.field1230[var4] = var0.method5616(); - } - - if ((var6 & 16) != 0) { - var8 = var0.method5446(); - PlayerType var22 = (PlayerType)FriendSystem.findEnumerated(class191.PlayerType_values(), var0.readUnsignedByte()); - boolean var20 = var0.readUnsignedByteNegate() == 1; - var11 = var0.readUnsignedByte(); - var12 = var0.offset; - if (var5.username != null && var5.appearance != null) { - boolean var21 = false; - if (var22.isUser && class32.friendSystem.isIgnored(var5.username)) { - var21 = true; - } - - if (!var21 && Client.field737 == 0 && !var5.isHidden) { - Players.field1233.offset = 0; - var0.readBytes(Players.field1233.array, 0, var11); - Players.field1233.offset = 0; - String var18 = AbstractFont.escapeBrackets(class189.method3596(class51.method845(Players.field1233))); - var5.overheadText = var18.trim(); - var5.overheadTextColor = var8 >> 8; - var5.overheadTextEffect = var8 & 255; - var5.overheadTextCyclesRemaining = 150; - var5.isAutoChatting = var20; - var5.field926 = var5 != WorldMapIcon_1.localPlayer && var22.isUser && "" != Client.field668 && var18.toLowerCase().indexOf(Client.field668) == -1; - if (var22.isPrivileged) { - var15 = var20 ? 91 : 1; - } else { - var15 = var20 ? 90 : 2; - } - - if (var22.modIcon * 714577229 != -1) { - DirectByteArrayCopier.addGameMessage(var15, AbstractWorldMapData.method278(var22.modIcon * 714577229) + var5.username.getName(), var18); - } else { - DirectByteArrayCopier.addGameMessage(var15, var5.username.getName(), var18); - } - } - } - - var0.offset = var12 + var11; - } - - if ((var6 & 256) != 0) { - for (var8 = 0; var8 < 3; ++var8) { - var5.actions[var8] = var0.readStringCp1252NullTerminated(); - } - } - - if ((var6 & 128) != 0) { - var8 = var0.readUnsignedShort(); - if (var8 == 65535) { - var8 = -1; - } - - var9 = var0.readUnsignedByte(); - FriendsList.performPlayerAnimation(var5, var8, var9); - } - - if (var5.field614) { - if (var7 == 127) { - var5.resetPath(var5.tileX, var5.tileY); - } else { - byte var19; - if (var7 != -1) { - var19 = var7; - } else { - var19 = Players.field1230[var4]; - } - - var5.method1190(var5.tileX, var5.tileY, var19); - } + 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; } } - if (var0.offset - var2 != var1) { - throw new RuntimeException(var0.offset - var2 + " " + var1); - } + World.World_sortOption1 = var2; + World.World_sortOption2 = var3; + AbstractWorldMapData.sortWorlds(World.World_worlds, 0, World.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); } - @ObfuscatedName("k") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lky;IIIIIII)V", - garbageValue = "-260324496" + signature = "(II)[B", + garbageValue = "945536192" ) - @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) { - Tiles.Tiles_heights[0][var2][var3] = -GrandExchangeOfferTotalQuantityComparator.method101(var2 + 932731 + var4, 556238 + var3 + var5) * 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) { - AccessFile.field4061[var1][var2][var3] = var0.readByte(); - class210.field2492[var1][var2][var3] = (byte)((var7 - 2) / 4); - Tiles.field475[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); - } else if (var7 <= 81) { - Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); - } else { - Tiles.field485[var1][var2][var3] = (byte)(var7 - 81); - } - } - } else { - while (true) { - var7 = var0.readUnsignedByte(); - if (var7 == 0) { - break; - } - - if (var7 == 1) { - var0.readUnsignedByte(); - break; - } - - if (var7 <= 49) { - var0.readUnsignedByte(); - } - } - } - - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "(Lhz;Ljava/lang/String;Ljava/lang/String;B)[Lls;", - garbageValue = "0" - ) - public static Sprite[] method535(AbstractArchive var0, String var1, String var2) { - int var3 = var0.getGroupId(var1); - int var4 = var0.getFileId(var3, var2); - return WorldMapID.SpriteBuffer_getSpriteArray(var0, var3, var4); - } - - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(Lhp;II)V", - garbageValue = "543273081" - ) - @Export("Widget_setKeyIgnoreHeld") - static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { - if (var0.field2631 == null) { - throw new RuntimeException(); - } else { - if (var0.field2685 == null) { - var0.field2685 = new int[var0.field2631.length]; - } - - var0.field2685[var1] = Integer.MAX_VALUE; - } - } - - @ObfuscatedName("hb") - @ObfuscatedSignature( - signature = "(III)Lfq;", - garbageValue = "1874659122" - ) - static RouteStrategy method536(int var0, int var1) { - Client.field684.approxDestinationX = var0; - Client.field684.approxDestinationY = var1; - Client.field684.approxDestinationSizeX = 1; - Client.field684.approxDestinationSizeY = 1; - return Client.field684; + @Export("ByteArrayPool_getArray") + public static synchronized byte[] ByteArrayPool_getArray(int var0) { + return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); } } diff --git a/runescape-client/src/main/java/class300.java b/runescape-client/src/main/java/class300.java index 2436676727..afd2369cca 100644 --- a/runescape-client/src/main/java/class300.java +++ b/runescape-client/src/main/java/class300.java @@ -1,9 +1,9 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("kd") +@ObfuscatedName("kp") public class class300 { - @ObfuscatedName("s") + @ObfuscatedName("c") @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 class300 { } - @ObfuscatedName("d") + @ObfuscatedName("z") @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/class312.java b/runescape-client/src/main/java/class312.java index 9efe7092ae..ad15dde796 100644 --- a/runescape-client/src/main/java/class312.java +++ b/runescape-client/src/main/java/class312.java @@ -2,172 +2,79 @@ 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("lz") +@ObfuscatedName("lo") public enum class312 implements Enumerated { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Llz;" + signature = "Llo;" ) - field3810(5, 0), - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "Llz;" - ) - field3811(1, 1), - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Llz;" - ) - field3813(3, 2), - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Llz;" - ) - field3812(7, 3), - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Llz;" - ) - field3816(4, 4), - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "Llz;" - ) - field3814(2, 5), - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Llz;" - ) - field3815(0, 6), - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "Llz;" - ) - field3809(8, 7), + field3805(0, 0), @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Llz;" + signature = "Llo;" ) - field3817(6, 8); - + field3806(1, 1), + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "Llo;" + ) + field3807(4, 2), + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "Llo;" + ) + field3808(6, 3), + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "Llo;" + ) + field3809(3, 4), + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Llo;" + ) + field3811(7, 5), + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "Llo;" + ) + field3810(2, 6), + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "Llo;" + ) + field3812(5, 7), @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 956871945 + @ObfuscatedSignature( + signature = "Llo;" ) - final int field3818; - @ObfuscatedName("f") + field3813(8, 8); + + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 424280785 + intValue = 2054486073 + ) + final int field3814; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -625169807 ) @Export("id") final int id; class312(int var3, int var4) { - this.field3818 = var3; + this.field3814 = var3; this.id = var4; } - @ObfuscatedName("j") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-32" + signature = "(I)I", + garbageValue = "-1410702910" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(IIII)V", - garbageValue = "-204174785" - ) - static final void method5787(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("y") - @ObfuscatedSignature( - signature = "(ILcr;ZI)I", - garbageValue = "808433154" - ) - static int method5788(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? class286.field3623 : class297.field3693; - 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[++Interpreter.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_GETTRANSTOP) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyTop; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETTRANSBOT) { - 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 == ScriptOpcodes.CC_GETFILLMODE) { - 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 { - return 2; - } - } } diff --git a/runescape-client/src/main/java/class319.java b/runescape-client/src/main/java/class319.java index 3e78a3e42d..818d16ef7d 100644 --- a/runescape-client/src/main/java/class319.java +++ b/runescape-client/src/main/java/class319.java @@ -1,11 +1,13 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; @ObfuscatedName("lp") public class class319 { - @ObfuscatedName("e") + @ObfuscatedName("hf") @ObfuscatedGetter( - intValue = -2101643419 + intValue = 977386879 ) - static int field3846; + @Export("cameraPitch") + static int cameraPitch; } diff --git a/runescape-client/src/main/java/class32.java b/runescape-client/src/main/java/class32.java index d9a4ee52a9..35ec4069d8 100644 --- a/runescape-client/src/main/java/class32.java +++ b/runescape-client/src/main/java/class32.java @@ -2,427 +2,137 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("an") +@ObfuscatedName("as") public class class32 { - @ObfuscatedName("rh") + @ObfuscatedName("sf") @ObfuscatedSignature( - signature = "Lba;" + signature = "Lla;" ) - @Export("friendSystem") - public static FriendSystem friendSystem; - @ObfuscatedName("gi") + @Export("platformInfo") + static PlatformInfo platformInfo; + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lls;" + signature = "Lae;" ) - @Export("compass") - static Sprite compass; + @Export("worldMapEvent") + static WorldMapEvent worldMapEvent; + @ObfuscatedName("lb") + @ObfuscatedSignature( + signature = "Lhy;" + ) + @Export("mousedOverWidgetIf1") + static Widget mousedOverWidgetIf1; - @ObfuscatedName("k") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "64" + signature = "(Lkz;IIIIIIS)V", + garbageValue = "128" ) - public static void method543() { - while (true) { - ArchiveDiskAction var0; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - var0 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); + @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) { + Tiles.Tiles_heights[0][var2][var3] = -MusicPatchNode.method3811(var4 + 932731 + var2, 556238 + var3 + var5) * 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) { + class30.field257[var1][var2][var3] = var0.readByte(); + Tiles.field477[var1][var2][var3] = (byte)((var7 - 2) / 4); + HealthBar.field1089[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); + } else if (var7 <= 81) { + Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); + } else { + Tiles.field476[var1][var2][var3] = (byte)(var7 - 81); + } } + } else { + while (true) { + var7 = var0.readUnsignedByte(); + if (var7 == 0) { + break; + } - if (var0 == null) { - return; + if (var7 == 1) { + var0.readUnsignedByte(); + break; + } + + if (var7 <= 49) { + var0.readUnsignedByte(); + } } - - var0.archive.load(var0.archiveDisk, (int)var0.key, var0.data, false); } + } - @ObfuscatedName("t") + @ObfuscatedName("jf") @ObfuscatedSignature( - signature = "(IIIIIILea;Lfm;I)V", - garbageValue = "-1690999410" + signature = "([Lhy;IB)V", + garbageValue = "63" ) - static final void method544(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; - } - - ObjectDefinition var8 = class215.getObjectDefinition(var3); - int var9; - int var10; - if (var4 != 1 && var4 != 3) { - var9 = var8.sizeX; - var10 = var8.sizeY; - } else { - var9 = var8.sizeY; - var10 = var8.sizeX; - } - - int var11; - int var12; - if (var9 + var1 <= 104) { - var11 = (var9 >> 1) + var1; - var12 = (var9 + 1 >> 1) + var1; - } else { - var11 = var1; - var12 = var1 + 1; - } - - int var13; - int var14; - if (var10 + var2 <= 104) { - var13 = (var10 >> 1) + var2; - var14 = var2 + (var10 + 1 >> 1); - } else { - var13 = var2; - var14 = var2 + 1; - } - - int[][] var15 = Tiles.Tiles_heights[var0]; - int var16 = var15[var11][var13] + var15[var12][var13] + var15[var11][var14] + var15[var12][var14] >> 2; - int var17 = (var1 << 7) + (var9 << 6); - int var18 = (var2 << 7) + (var10 << 6); - long var19 = WorldMapSprite.calculateTag(var1, var2, 2, var8.int1 == 0, var3); - int var21 = var5 + (var4 << 6); - if (var8.int3 == 1) { - var21 += 256; - } - - int var23; - int var24; - if (var8.hasSound()) { - ObjectSound var22 = new ObjectSound(); - var22.plane = var0; - var22.x = var1 * 128; - var22.y = var2 * 128; - var23 = var8.sizeX; - var24 = var8.sizeY; - if (var4 == 1 || var4 == 3) { - var23 = var8.sizeY; - var24 = var8.sizeX; - } - - var22.field1052 = (var23 + var1) * 128; - var22.field1053 = (var24 + var2) * 128; - var22.soundEffectId = var8.ambientSoundId; - var22.field1054 = var8.int4 * 128; - var22.field1057 = var8.int5; - var22.field1058 = var8.int6; - var22.soundEffectIds = var8.soundEffectIds; - if (var8.transforms != null) { - var22.obj = var8; - var22.set(); - } - - ObjectSound.objectSounds.addFirst(var22); - if (var22.soundEffectIds != null) { - var22.field1056 = var22.field1057 + (int)(Math.random() * (double)(var22.field1058 - var22.field1057)); - } - } - - Object var34; - if (var5 == 22) { - if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { - if (var8.animationId == -1 && var8.transforms == null) { - var34 = var8.getEntity(22, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + @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); } - var6.newFloorDecoration(var0, var1, var2, var16, (Entity)var34, var19, var21); - if (var8.interactType == 1 && var7 != null) { - var7.setBlockedByFloorDec(var1, var2); - } - - } - } else if (var5 != 10 && var5 != 11) { - int[] var10000; - if (var5 >= 12) { - if (var8.animationId == -1 && var8.transforms == null) { - var34 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.method3013(var0, var1, var2, var16, 1, 1, (Entity)var34, 0, var19, var21); - if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { - var10000 = Tiles.field483[var0][var1]; - var10000[var2] |= 2340; - } - - if (var8.interactType != 0 && var7 != null) { - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - } else if (var5 == 0) { - if (var8.animationId == -1 && var8.transforms == null) { - var34 = var8.getEntity(0, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.field479[var4], 0, var19, var21); - if (var4 == 0) { - if (var8.clipped) { - class188.field2321[var0][var1][var2] = 50; - class188.field2321[var0][var1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = Tiles.field483[var0][var1]; - var10000[var2] |= 585; - } - } else if (var4 == 1) { - if (var8.clipped) { - class188.field2321[var0][var1][var2 + 1] = 50; - class188.field2321[var0][var1 + 1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = Tiles.field483[var0][var1]; - var10000[1 + var2] |= 1170; - } - } else if (var4 == 2) { - if (var8.clipped) { - class188.field2321[var0][var1 + 1][var2] = 50; - class188.field2321[var0][var1 + 1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = Tiles.field483[var0][var1 + 1]; - var10000[var2] |= 585; - } - } else if (var4 == 3) { - if (var8.clipped) { - class188.field2321[var0][var1][var2] = 50; - class188.field2321[var0][var1 + 1][var2] = 50; - } - - if (var8.modelClipped) { - var10000 = Tiles.field483[var0][var1]; - var10000[var2] |= 1170; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3495(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method3026(var0, var1, var2, var8.int2); - } - - } else if (var5 == 1) { - if (var8.animationId == -1 && var8.transforms == null) { - var34 = var8.getEntity(1, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.field480[var4], 0, var19, var21); - if (var8.clipped) { - if (var4 == 0) { - class188.field2321[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { - class188.field2321[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { - class188.field2321[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { - class188.field2321[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3495(var1, var2, var5, var4, var8.boolean1); - } - - } else { - int var28; - if (var5 == 2) { - var28 = var4 + 1 & 3; - Object var29; - Object var30; - if (var8.animationId == -1 && var8.transforms == null) { - var29 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); - var30 = var8.getEntity(2, var28, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); - var30 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var29, (Entity)var30, Tiles.field479[var4], Tiles.field479[var28], var19, var21); - if (var8.modelClipped) { - if (var4 == 0) { - var10000 = Tiles.field483[var0][var1]; - var10000[var2] |= 585; - var10000 = Tiles.field483[var0][var1]; - var10000[1 + var2] |= 1170; - } else if (var4 == 1) { - var10000 = Tiles.field483[var0][var1]; - var10000[var2 + 1] |= 1170; - var10000 = Tiles.field483[var0][var1 + 1]; - var10000[var2] |= 585; - } else if (var4 == 2) { - var10000 = Tiles.field483[var0][var1 + 1]; - var10000[var2] |= 585; - var10000 = Tiles.field483[var0][var1]; - var10000[var2] |= 1170; - } else if (var4 == 3) { - var10000 = Tiles.field483[var0][var1]; - var10000[var2] |= 1170; - var10000 = Tiles.field483[var0][var1]; - var10000[var2] |= 585; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3495(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method3026(var0, var1, var2, var8.int2); - } - - } else if (var5 == 3) { - if (var8.animationId == -1 && var8.transforms == null) { - var34 = var8.getEntity(3, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.field480[var4], 0, var19, var21); - if (var8.clipped) { - if (var4 == 0) { - class188.field2321[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { - class188.field2321[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { - class188.field2321[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { - class188.field2321[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3495(var1, var2, var5, var4, var8.boolean1); - } - - } else if (var5 == 9) { - if (var8.animationId == -1 && var8.transforms == null) { - var34 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.method3013(var0, var1, var2, var16, 1, 1, (Entity)var34, 0, var19, var21); - if (var8.interactType != 0 && var7 != null) { - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method3026(var0, var1, var2, var8.int2); - } - - } else if (var5 == 4) { - if (var8.animationId == -1 && var8.transforms == null) { - var34 = var8.getEntity(4, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.field479[var4], 0, 0, 0, var19, var21); - } else { - long var31; - Object var33; - if (var5 == 5) { - var28 = 16; - var31 = var6.getBoundaryObjectTag(var0, var1, var2); - if (0L != var31) { - var28 = class215.getObjectDefinition(BoundaryObject.Entity_unpackID(var31)).int2; - } - - if (var8.animationId == -1 && var8.transforms == null) { - var33 = var8.getEntity(4, var4, var15, var17, var16, var18); - } else { - var33 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)null, Tiles.field479[var4], 0, var28 * Tiles.field481[var4], var28 * Tiles.field482[var4], var19, var21); - } else if (var5 == 6) { - var28 = 8; - var31 = var6.getBoundaryObjectTag(var0, var1, var2); - if (var31 != 0L) { - var28 = class215.getObjectDefinition(BoundaryObject.Entity_unpackID(var31)).int2 / 2; - } - - if (var8.animationId == -1 && var8.transforms == null) { - var33 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); - } else { - var33 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)null, 256, var4, var28 * Tiles.field478[var4], var28 * Tiles.field484[var4], var19, var21); - } else if (var5 == 7) { - var23 = var4 + 2 & 3; - if (var8.animationId == -1 && var8.transforms == null) { - var34 = var8.getEntity(4, var23 + 4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 4, var23 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var34, (Entity)null, 256, var23, 0, 0, var19, var21); - } else if (var5 == 8) { - var28 = 8; - var31 = var6.getBoundaryObjectTag(var0, var1, var2); - if (var31 != 0L) { - var28 = class215.getObjectDefinition(BoundaryObject.Entity_unpackID(var31)).int2 / 2; - } - - int var27 = var4 + 2 & 3; - Object var26; - if (var8.animationId == -1 && var8.transforms == null) { - var33 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); - var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); - } else { - var33 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); - var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)var26, 256, var4, var28 * Tiles.field478[var4], var28 * Tiles.field484[var4], var19, var21); - } - } - } - } else { - if (var8.animationId == -1 && var8.transforms == null) { - var34 = var8.getEntity(10, var4, var15, var17, var16, var18); - } else { - var34 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - if (var34 != null && var6.method3013(var0, var1, var2, var16, var9, var10, (Entity)var34, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { - var23 = 15; - if (var34 instanceof Model) { - var23 = ((Model)var34).method2839() / 4; - if (var23 > 30) { - var23 = 30; - } - } - - for (var24 = 0; var24 <= var9; ++var24) { - for (int var25 = 0; var25 <= var10; ++var25) { - if (var23 > class188.field2321[var0][var24 + var1][var25 + var2]) { - class188.field2321[var0][var24 + var1][var25 + var2] = (byte)var23; - } - } + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); + if (var4 != null) { + WorldMapRectangle.runIntfCloseListeners(var4.group, var1); } } - if (var8.interactType != 0 && var7 != null) { - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + ScriptEvent var5; + if (var1 == 0 && var3.onDialogAbort != null) { + var5 = new ScriptEvent(); + var5.widget = var3; + var5.args = var3.onDialogAbort; + SecureRandomFuture.runScriptEvent(var5); } + if (var1 == 1 && var3.onSubChange != null) { + if (var3.childIndex >= 0) { + Widget var6 = Player.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; + SecureRandomFuture.runScriptEvent(var5); + } } } + } } diff --git a/runescape-client/src/main/java/class325.java b/runescape-client/src/main/java/class325.java index 49a0edb9cf..ed284de696 100644 --- a/runescape-client/src/main/java/class325.java +++ b/runescape-client/src/main/java/class325.java @@ -1,59 +1,34 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ld") +@ObfuscatedName("lg") public class class325 { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 262273775 + intValue = 243189555 ) @Export("SpriteBuffer_spriteCount") - public static int SpriteBuffer_spriteCount; - @ObfuscatedName("i") + static int SpriteBuffer_spriteCount; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 5051811 + intValue = 1019350203 + ) + @Export("SpriteBuffer_spriteWidth") + public static int SpriteBuffer_spriteWidth; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 633563737 ) @Export("SpriteBuffer_spriteHeight") public static int SpriteBuffer_spriteHeight; - @ObfuscatedName("k") + @ObfuscatedName("g") @Export("SpriteBuffer_xOffsets") public static int[] SpriteBuffer_xOffsets; @ObfuscatedName("u") - @Export("SpriteBuffer_yOffsets") - public static int[] SpriteBuffer_yOffsets; - @ObfuscatedName("n") @Export("SpriteBuffer_spriteWidths") public static int[] SpriteBuffer_spriteWidths; - @ObfuscatedName("q") + @ObfuscatedName("v") @Export("SpriteBuffer_spritePalette") public static int[] SpriteBuffer_spritePalette; - - @ObfuscatedName("fy") - @ObfuscatedSignature( - signature = "(Lij;IIII)V", - garbageValue = "1165848534" - ) - @Export("addSequenceSoundEffect") - static void addSequenceSoundEffect(SequenceDefinition var0, int var1, int var2, int var3) { - if (Client.soundEffectCount < 50 && Client.field860 != 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/class336.java b/runescape-client/src/main/java/class336.java index 7e976a2bb4..60011af53f 100644 --- a/runescape-client/src/main/java/class336.java +++ b/runescape-client/src/main/java/class336.java @@ -1,20 +1,28 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lr") +@ObfuscatedName("lk") public class class336 { - @ObfuscatedName("d") - static final int[] field4022; - @ObfuscatedName("f") - static final int[] field4015; + @ObfuscatedName("z") + static final int[] field4016; + @ObfuscatedName("n") + static final int[] field4020; + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "Lkz;" + ) + @Export("NetCache_responseArchiveBuffer") + public static Buffer NetCache_responseArchiveBuffer; static { - field4022 = new int[2048]; - field4015 = new int[2048]; + field4016 = new int[2048]; + field4020 = new int[2048]; double var0 = 0.0030679615757712823D; for (int var2 = 0; var2 < 2048; ++var2) { - field4022[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2)); - field4015[var2] = (int)(65536.0D * Math.cos(var0 * (double)var2)); + field4016[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2)); + field4020[var2] = (int)(65536.0D * Math.cos(var0 * (double)var2)); } } diff --git a/runescape-client/src/main/java/class338.java b/runescape-client/src/main/java/class338.java index 22839c8d05..a5c63d0872 100644 --- a/runescape-client/src/main/java/class338.java +++ b/runescape-client/src/main/java/class338.java @@ -1,14 +1,14 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("mj") +@ObfuscatedName("ml") public class class338 { - @ObfuscatedName("i") - static final char[] field4038; - @ObfuscatedName("k") - static final char[] field4035; + @ObfuscatedName("t") + public static final char[] field4037; + @ObfuscatedName("g") + public static final char[] field4038; static { - field4038 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; - field4035 = new char[]{'[', ']', '#'}; + field4037 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; + field4038 = new char[]{'[', ']', '#'}; } } diff --git a/runescape-client/src/main/java/class339.java b/runescape-client/src/main/java/class339.java deleted file mode 100644 index 8c7795c4a2..0000000000 --- a/runescape-client/src/main/java/class339.java +++ /dev/null @@ -1,13 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("md") -public class class339 { - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "Lhz;" - ) - @Export("ParamDefinition_archive") - public static AbstractArchive ParamDefinition_archive; -} diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index b92cbb5059..69f48b22f2 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -1,159 +1,143 @@ -import java.io.File; -import java.io.IOException; import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("u") +@ObfuscatedName("l") final class class4 implements class0 { - @ObfuscatedName("x") - static int[][] field31; - @ObfuscatedName("au") - @Export("null_string") - protected static String null_string; - - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "(Ljava/lang/Object;Lky;I)V", - garbageValue = "254789492" + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -142539597 ) - public void vmethod58(Object var1, Buffer var2) { - this.method57((String)var1, var2); + static int field20; + @ObfuscatedName("az") + @ObfuscatedGetter( + intValue = -587969877 + ) + static int field17; + @ObfuscatedName("bi") + @ObfuscatedSignature( + signature = "Lll;" + ) + @Export("loginType") + static LoginType loginType; + @ObfuscatedName("fv") + @ObfuscatedGetter( + intValue = 583721997 + ) + @Export("baseX") + static int baseX; + @ObfuscatedName("jr") + @ObfuscatedSignature( + signature = "Lhy;" + ) + @Export("dragInventoryWidget") + static Widget dragInventoryWidget; + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(Ljava/lang/Object;Lkz;B)V", + garbageValue = "1" + ) + public void vmethod42(Object var1, Buffer var2) { + this.method44((String)var1, var2); } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lky;I)Ljava/lang/Object;", - garbageValue = "1267204541" + signature = "(Lkz;S)Ljava/lang/Object;", + garbageValue = "31810" ) - public Object vmethod70(Buffer var1) { + public Object vmethod41(Buffer var1) { return var1.readStringCp1252NullTerminated(); } - @ObfuscatedName("x") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Lky;I)V", - garbageValue = "779729893" + signature = "(Ljava/lang/String;Lkz;I)V", + garbageValue = "442520806" ) - void method57(String var1, Buffer var2) { + void method44(String var1, Buffer var2) { var2.writeStringCp1252NullTerminated(var1); } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;IB)Ljava/io/File;", - garbageValue = "-122" + signature = "(Lhz;II)Lgc;", + garbageValue = "531775240" ) - @Export("getCacheDir") - public static File getCacheDir(String var0, String var1, int var2) { - String var3 = var2 == 0 ? "" : "" + var2; - class290.JagexCache_locationFile = new File(FontName.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var3 + ".dat"); - String var4 = null; - String var5 = null; - boolean var6 = false; - File var22; - if (class290.JagexCache_locationFile.exists()) { - try { - AccessFile var7 = new AccessFile(class290.JagexCache_locationFile, "rw", 10000L); + static MusicPatch method47(AbstractArchive var0, int var1) { + byte[] var2 = var0.takeFileFlat(var1); + return var2 == null ? null : new MusicPatch(var2); + } - Buffer var8; - 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(); - } + @ObfuscatedName("gd") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "2058959697" + ) + static final void method48(int var0) { + int[] var1 = class60.sceneMinimapSprite.pixels; + int var2 = var1.length; + + int var3; + for (var3 = 0; var3 < var2; ++var3) { + var1[var3] = 0; + } + + int var4; + int var5; + for (var3 = 1; var3 < 103; ++var3) { + var4 = (103 - var3) * 2048 + 24628; + + for (var5 = 1; var5 < 103; ++var5) { + if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { + WorldMapIcon_1.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3); } - var8.offset = 0; - var9 = var8.readUnsignedByte(); - if (var9 < 1 || var9 > 3) { - throw new IOException("" + var9); + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { + WorldMapIcon_1.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3); } - int var10 = 0; - if (var9 > 1) { - var10 = var8.readUnsignedByte(); - } - - if (var9 <= 2) { - var4 = var8.readStringCp1252NullCircumfixed(); - if (var10 == 1) { - var5 = var8.readStringCp1252NullCircumfixed(); - } - } else { - var4 = var8.readCESU8(); - if (var10 == 1) { - var5 = var8.readCESU8(); - } - } - - var7.close(); - } catch (IOException var20) { - var20.printStackTrace(); + var4 += 4; } + } - if (var4 != null) { - var22 = new File(var4); - if (!var22.exists()) { - var4 = null; + var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); + var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; + class60.sceneMinimapSprite.setRaster(); + + int var6; + for (var5 = 1; var5 < 103; ++var5) { + for (var6 = 1; var6 < 103; ++var6) { + if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { + EnumDefinition.drawObject(var0, var6, var5, var3, var4); } - } - if (var4 != null) { - var22 = new File(var4, "test.dat"); - if (!GameShell.testReadWritePermissions(var22, true)) { - var4 = null; + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { + EnumDefinition.drawObject(var0 + 1, var6, var5, var3, var4); } } } - if (var4 == null && var2 == 0) { - label123: - for (int var15 = 0; var15 < Login.field1181.length; ++var15) { - for (int var16 = 0; var16 < GrandExchangeEvent.field47.length; ++var16) { - File var17 = new File(GrandExchangeEvent.field47[var16] + Login.field1181[var15] + File.separatorChar + var0 + File.separatorChar); - if (var17.exists() && GameShell.testReadWritePermissions(new File(var17, "test.dat"), true)) { - var4 = var17.toString(); - var6 = true; - break label123; + Client.mapIconCount = 0; + + for (var5 = 0; var5 < 104; ++var5) { + for (var6 = 0; var6 < 104; ++var6) { + long var7 = WorldMapIcon_1.scene.getFloorDecorationTag(MouseRecorder.plane, var5, var6); + if (var7 != 0L) { + int var9 = SecureRandomFuture.Entity_unpackID(var7); + int var10 = WallDecoration.getObjectDefinition(var9).mapIconId; + if (var10 >= 0) { + Client.mapIcons[Client.mapIconCount] = WorldMapSection1.WorldMapElement_get(var10).getSpriteBool(false); + Client.mapIconXs[Client.mapIconCount] = var5; + Client.mapIconYs[Client.mapIconCount] = var6; + ++Client.mapIconCount; } } } } - if (var4 == null) { - var4 = FontName.userHomeDirectory + File.separatorChar + "jagexcache" + var3 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; - var6 = true; - } - - if (var5 != null) { - File var21 = new File(var5); - var22 = new File(var4); - - try { - File[] var23 = var21.listFiles(); - File[] var18 = var23; - - for (int var11 = 0; var11 < var18.length; ++var11) { - File var12 = var18[var11]; - File var13 = new File(var22, var12.getName()); - boolean var14 = var12.renameTo(var13); - if (!var14) { - throw new IOException(); - } - } - } catch (Exception var19) { - var19.printStackTrace(); - } - - var6 = true; - } - - if (var6) { - MouseHandler.method1041(new File(var4), (File)null); - } - - return new File(var4); + DevicePcmPlayerProvider.rasterProvider.apply(); } } diff --git a/runescape-client/src/main/java/class40.java b/runescape-client/src/main/java/class40.java index 47a78da4da..ba4cb61aa0 100644 --- a/runescape-client/src/main/java/class40.java +++ b/runescape-client/src/main/java/class40.java @@ -2,34 +2,21 @@ 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("ax") +@ObfuscatedName("ay") public class class40 { - @ObfuscatedName("b") + @ObfuscatedName("re") @ObfuscatedGetter( - intValue = -1461963795 + intValue = 697703808 ) - static int field330; - @ObfuscatedName("dl") - @ObfuscatedSignature( - signature = "Lid;" - ) - @Export("archive18") - static Archive archive18; - @ObfuscatedName("hb") + static int field334; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -2115409067 - ) - @Export("cameraYaw") - static int cameraYaw; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 1389839029 + intValue = -1312373259 ) @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("j") + @ObfuscatedName("x") @Export("tileTemplates") byte[][][] tileTemplates; @@ -37,25 +24,25 @@ public class class40 { this.pixelsPerTile = var1; } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(IIIIIIIII)V", - garbageValue = "-1961040387" + garbageValue = "-288061828" ) - void method698(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + void method707(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.method686(var8, var7); - var7 = this.method699(var7); + var8 = this.method708(var8, var7); + var7 = this.method720(var7); Rasterizer2D.Rasterizer2D_drawGradientPixels(var1, var2, var5, var6, var3, var4, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); } } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "61" + signature = "(III)I", + garbageValue = "-1246935327" ) - int method686(int var1, int var2) { + int method708(int var1, int var2) { if (var2 == 9) { var1 = var1 + 1 & 3; } @@ -71,12 +58,12 @@ public class class40 { return var1; } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-1503564944" + signature = "(IB)I", + garbageValue = "-99" ) - int method699(int var1) { + int method720(int var1) { if (var1 != 9 && var1 != 10) { return var1 == 11 ? 8 : var1; } else { @@ -84,10 +71,10 @@ public class class40 { } } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1489798244" + signature = "(B)V", + garbageValue = "43" ) @Export("init") void init() { @@ -104,10 +91,10 @@ public class class40 { } } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1799961229" + garbageValue = "1944668937" ) @Export("init0") void init0() { @@ -171,10 +158,10 @@ public class class40 { this.tileTemplates[0][3] = var1; } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "20" + signature = "(I)V", + garbageValue = "-1965093636" ) @Export("init1") void init1() { @@ -242,10 +229,10 @@ public class class40 { this.tileTemplates[1][3] = var1; } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1663362252" + signature = "(B)V", + garbageValue = "-102" ) @Export("init2") void init2() { @@ -309,10 +296,10 @@ public class class40 { this.tileTemplates[2][3] = var1; } - @ObfuscatedName("q") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "17" + signature = "(S)V", + garbageValue = "12394" ) @Export("init3") void init3() { @@ -376,10 +363,10 @@ public class class40 { this.tileTemplates[3][3] = var1; } - @ObfuscatedName("x") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "20" + signature = "(I)V", + garbageValue = "-1949991875" ) @Export("init4") void init4() { @@ -443,10 +430,10 @@ public class class40 { this.tileTemplates[4][3] = var1; } - @ObfuscatedName("d") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-781295717" + garbageValue = "-2049205254" ) @Export("init5") void init5() { @@ -512,10 +499,10 @@ public class class40 { this.tileTemplates[5][3] = var1; } - @ObfuscatedName("f") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "-13800" + signature = "(B)V", + garbageValue = "42" ) @Export("init6") void init6() { @@ -581,10 +568,10 @@ public class class40 { this.tileTemplates[6][3] = var1; } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1592731249" + garbageValue = "-1882268812" ) @Export("init7") void init7() { @@ -650,43 +637,82 @@ public class class40 { this.tileTemplates[7][3] = var1; } - @ObfuscatedName("u") - public static int method729(long var0) { - return (int)(var0 >>> 14 & 3L); - } - - @ObfuscatedName("g") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(ILcr;ZI)I", - garbageValue = "-1563998621" + signature = "(IIIB)I", + garbageValue = "82" ) - static int method728(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? class286.field3623 : class297.field3693; - if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapRegion.method530(ParamDefinition.getWidgetClickMask(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; - } + public static int method735(int var0, int var1, int var2) { + var2 &= 3; + if (var2 == 0) { + return var0; + } else if (var2 == 1) { + return var1; } 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[++Interpreter.Interpreter_stringStackSize - 1] = var3.actions[var4]; - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - } - - return 1; + return var2 == 2 ? 7 - var0 : 7 - var1; } } + + @ObfuscatedName("eu") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1745602668" + ) + static final void method736() { + Client.packetWriter.close(); + MouseRecorder.method1139(); + GrandExchangeOfferWorldComparator.method62(); + KitDefinition.KitDefinition_cached.clear(); + ObjectDefinition.ObjectDefinition_cached.clear(); + ObjectDefinition.ObjectDefinition_cachedModelData.clear(); + ObjectDefinition.ObjectDefinition_cachedEntities.clear(); + ObjectDefinition.ObjectDefinition_cachedModels.clear(); + NPCDefinition.NpcDefinition_cached.clear(); + NPCDefinition.NpcDefinition_cachedModels.clear(); + ItemDefinition.ItemDefinition_cached.clear(); + ItemDefinition.ItemDefinition_cachedModels.clear(); + ItemDefinition.ItemDefinition_cachedSprites.clear(); + SequenceDefinition.SequenceDefinition_cached.clear(); + SequenceDefinition.SequenceDefinition_cachedFrames.clear(); + SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); + SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); + VarbitDefinition.VarbitDefinition_cached.clear(); + class195.method3663(); + class297.method5410(); + UserComparator3.HealthBarDefinition_clearCached(); + StructDefinition.StructDefinition_cached.clear(); + ParamDefinition.ParamDefinition_cached.clear(); + Canvas.WorldMapElement_clearCached(); + PlayerAppearance.PlayerAppearance_cachedModels.clear(); + 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(); + ScriptEvent.archive0.clearFiles(); + GrandExchangeOffer.archive1.clearFiles(); + WorldMapData_0.archive3.clearFiles(); + class13.archive4.clearFiles(); + Timer.archive5.clearFiles(); + WorldMapDecoration.archive6.clearFiles(); + class49.archive7.clearFiles(); + WorldMapDecoration.archive8.clearFiles(); + WorldMapData_0.archive9.clearFiles(); + FontName.archive10.clearFiles(); + ArchiveDisk.archive11.clearFiles(); + Message.archive12.clearFiles(); + WorldMapIcon_1.scene.clear(); + + for (int var0 = 0; var0 < 4; ++var0) { + Client.collisionMaps[var0].clear(); + } + + System.gc(); + WallDecoration.method3256(2); + Client.field857 = -1; + Client.field746 = false; + Widget.method4074(); + WorldMapIcon_0.updateGameState(10); + } } diff --git a/runescape-client/src/main/java/class42.java b/runescape-client/src/main/java/class42.java index 6f67d109b2..2499612ead 100644 --- a/runescape-client/src/main/java/class42.java +++ b/runescape-client/src/main/java/class42.java @@ -1,231 +1,216 @@ -import java.io.File; -import java.io.RandomAccessFile; +import java.awt.Desktop; +import java.awt.Image; +import java.awt.Desktop.Action; +import java.net.URI; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("aa") +@ObfuscatedName("ah") public class class42 implements WorldMapSection { - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 1666489589 + @ObfuscatedName("f") + @Export("Tiles_hueMultiplier") + static int[] Tiles_hueMultiplier; + @ObfuscatedName("ap") + static Image field358; + @ObfuscatedName("gb") + @ObfuscatedSignature( + signature = "[Lli;" ) - int field339; - @ObfuscatedName("j") + @Export("mapDotSprites") + static Sprite[] mapDotSprites; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1652591349 + intValue = 114988403 ) - int field347; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -1779565127 - ) - int field340; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -1405698939 - ) - int field341; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -141873597 - ) - int field342; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 1429308519 - ) - int field343; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -1809931073 - ) - int field338; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 267647381 - ) - int field345; + int field351; @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1741854477 + intValue = -1866285667 ) int field346; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -358829747 + ) + int field347; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 158528351 + ) + int field357; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1099424901 + ) + int field349; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 255034921 + ) + int field350; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 1506534569 + ) + int field348; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 560033955 + ) + int field352; @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1323811143 + intValue = -2075605251 ) - int field344; + int field353; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 68781873 + ) + int field354; class42() { } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lav;I)V", - garbageValue = "-1068467910" + signature = "(Lag;S)V", + garbageValue = "32767" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field342) { - var1.regionLowX = this.field342; + if (var1.regionLowX > this.field349) { + var1.regionLowX = this.field349; } - if (var1.regionHighX < this.field342) { - var1.regionHighX = this.field342; + if (var1.regionHighX < this.field349) { + var1.regionHighX = this.field349; } - if (var1.regionLowY > this.field343) { - var1.regionLowY = this.field343; + if (var1.regionLowY > this.field350) { + var1.regionLowY = this.field350; } - if (var1.regionHighY < this.field343) { - var1.regionHighY = this.field343; + if (var1.regionHighY < this.field350) { + var1.regionHighY = this.field350; } } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(IIII)Z", - garbageValue = "1014871771" + garbageValue = "950167825" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.field339 && var1 < this.field339 + this.field347) { - return var2 >= (this.field340 << 6) + (this.field338 << 3) && var2 <= (this.field340 << 6) + (this.field338 << 3) + 7 && var3 >= (this.field341 << 6) + (this.field345 << 3) && var3 <= (this.field341 << 6) + (this.field345 << 3) + 7; + if (var1 >= this.field351 && var1 < this.field346 + this.field351) { + return var2 >= (this.field347 << 6) + (this.field348 << 3) && var2 <= (this.field347 << 6) + (this.field348 << 3) + 7 && var3 >= (this.field357 << 6) + (this.field352 << 3) && var3 <= (this.field357 << 6) + (this.field352 << 3) + 7; } else { return false; } } - @ObfuscatedName("i") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(III)Z", - garbageValue = "694688168" + garbageValue = "1510325414" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >= (this.field342 << 6) + (this.field346 << 3) && var1 <= (this.field342 << 6) + (this.field346 << 3) + 7 && var2 >= (this.field343 << 6) + (this.field344 << 3) && var2 <= (this.field343 << 6) + (this.field344 << 3) + 7; + return var1 >= (this.field349 << 6) + (this.field353 << 3) && var1 <= (this.field349 << 6) + (this.field353 << 3) + 7 && var2 >= (this.field350 << 6) + (this.field354 << 3) && var2 <= (this.field350 << 6) + (this.field354 << 3) + 7; } - @ObfuscatedName("k") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(IIII)[I", - garbageValue = "-45443461" + garbageValue = "-771447481" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { if (!this.containsCoord(var1, var2, var3)) { return null; } else { - int[] var4 = new int[]{this.field342 * 64 - this.field340 * 64 + var2 + (this.field346 * 8 - this.field338 * 8), var3 + (this.field343 * 64 - this.field341 * 64) + (this.field344 * 8 - this.field345 * 8)}; + int[] var4 = new int[]{this.field349 * 64 - this.field347 * 64 + var2 + (this.field353 * 8 - this.field348 * 8), var3 + (this.field350 * 64 - this.field357 * 64) + (this.field354 * 8 - this.field352 * 8)}; return var4; } } - @ObfuscatedName("u") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(III)Lhd;", - garbageValue = "1267204541" + signature = "(IIB)Lhj;", + garbageValue = "0" ) @Export("coord") public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { return null; } else { - int var3 = this.field340 * 64 - this.field342 * 64 + (this.field338 * 8 - this.field346 * 8) + var1; - int var4 = this.field341 * 64 - this.field343 * 64 + var2 + (this.field345 * 8 - this.field344 * 8); - return new Coord(this.field339, var3, var4); + int var3 = this.field347 * 64 - this.field349 * 64 + (this.field348 * 8 - this.field353 * 8) + var1; + int var4 = this.field357 * 64 - this.field350 * 64 + var2 + (this.field352 * 8 - this.field354 * 8); + return new Coord(this.field351, var3, var4); } } - @ObfuscatedName("n") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Lky;I)V", - garbageValue = "1072299144" + signature = "(Lkz;I)V", + garbageValue = "1954302512" ) @Export("read") public void read(Buffer var1) { - this.field339 = var1.readUnsignedByte(); - this.field347 = var1.readUnsignedByte(); - this.field340 = var1.readUnsignedShort(); - this.field338 = var1.readUnsignedByte(); - this.field341 = var1.readUnsignedShort(); - this.field345 = var1.readUnsignedByte(); - this.field342 = var1.readUnsignedShort(); + this.field351 = var1.readUnsignedByte(); this.field346 = var1.readUnsignedByte(); - this.field343 = var1.readUnsignedShort(); - this.field344 = var1.readUnsignedByte(); - this.method738(); + this.field347 = var1.readUnsignedShort(); + this.field348 = var1.readUnsignedByte(); + this.field357 = var1.readUnsignedShort(); + this.field352 = var1.readUnsignedByte(); + this.field349 = var1.readUnsignedShort(); + this.field353 = var1.readUnsignedByte(); + this.field350 = var1.readUnsignedShort(); + this.field354 = var1.readUnsignedByte(); + this.method745(); } - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1792228112" + garbageValue = "-563197042" ) - void method738() { + void method745() { } - @ObfuscatedName("s") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)Ljava/io/File;", - garbageValue = "-44" + signature = "(Ljava/lang/String;ZLjava/lang/String;ZB)V", + garbageValue = "-124" ) - @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; - + static void method754(String var0, boolean var1, String var2, boolean var3) { + if (var1) { + if (!var3 && Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { 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(); + Desktop.getDesktop().browse(new URI(var0)); + return; + } catch (Exception var5) { } } + + if (class51.field406.startsWith("win") && !var3) { + FontName.method5292(var0, 0); + return; + } + + if (class51.field406.startsWith("mac")) { + ReflectionCheck.method2261(var0, 1, var2); + return; + } + + FontName.method5292(var0, 2); + } else { + FontName.method5292(var0, 3); } - } - @ObfuscatedName("d") - static final void method752(long var0) { - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var0; - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "1" - ) - public static void method753() { - ItemDefinition.ItemDefinition_cachedSprites.clear(); } } diff --git a/runescape-client/src/main/java/class43.java b/runescape-client/src/main/java/class43.java index 884e2ebafe..edcafd9a9e 100644 --- a/runescape-client/src/main/java/class43.java +++ b/runescape-client/src/main/java/class43.java @@ -3,126 +3,54 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ap") +@ObfuscatedName("aa") public final class class43 { - @ObfuscatedName("i") + @ObfuscatedName("bu") @ObfuscatedSignature( - signature = "Lhz;" + signature = "Lht;" ) - @Export("HitSplatDefinition_fontsArchive") - public static AbstractArchive HitSplatDefinition_fontsArchive; - @ObfuscatedName("fp") + static StudioGame field359; + @ObfuscatedName("bm") @ObfuscatedSignature( - signature = "Lkb;" + signature = "Lgf;" ) - @Export("fontBold12") - static Font fontBold12; - @ObfuscatedName("hj") + @Export("clientLanguage") + static Language clientLanguage; + @ObfuscatedName("ce") @ObfuscatedGetter( - intValue = -340073235 + intValue = 121062689 ) - @Export("cameraPitch") - static int cameraPitch; + public static int field361; - @ObfuscatedName("s") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IB)Lix;", - garbageValue = "-106" + signature = "(Lkt;I)I", + garbageValue = "-1826944981" ) - @Export("StructDefinition_getStructDefinition") - public static StructDefinition StructDefinition_getStructDefinition(int var0) { - StructDefinition var1 = (StructDefinition)StructDefinition.StructDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + @Export("decode") + static int decode(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 { - byte[] var2 = StructDefinition.StructDefinition_archive.takeFile(34, var0); - var1 = new StructDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - StructDefinition.StructDefinition_cached.put(var1, (long)var0); - return var1; + var2 = var0.readBits(11); } + + return var2; } - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "(Ljava/lang/Object;ZI)[B", - garbageValue = "1018664493" - ) - @Export("serialize") - public static byte[] serialize(Object var0, boolean var1) { - if (var0 == null) { - return null; - } else if (var0 instanceof byte[]) { - byte[] var6 = (byte[])((byte[])var0); - if (var1) { - int var4 = var6.length; - byte[] var5 = new byte[var4]; - System.arraycopy(var6, 0, var5, 0, var4); - return var5; - } else { - return var6; - } - } else if (var0 instanceof AbstractByteArrayCopier) { - AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; - return var2.get(); - } else { - throw new IllegalArgumentException(); - } - } - - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "1698401174" - ) - static int method761(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("es") + @ObfuscatedName("fw") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1409120987" + garbageValue = "-980502076" ) - static int method758() { - if (Client.archiveLoaders != null && Client.archiveLoaderArchive < Client.archiveLoaders.size()) { - int var0 = 0; - - for (int var1 = 0; var1 <= Client.archiveLoaderArchive; ++var1) { - var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; - } - - return var0 * 10000 / Client.field895; - } else { - return 10000; - } - } - - @ObfuscatedName("kf") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "16" - ) - static final void method759() { - Client.field629 = Client.cycleCntr; + @Export("getWindowedMode") + static int getWindowedMode() { + return Client.isResizable ? 2 : 1; } } diff --git a/runescape-client/src/main/java/class47.java b/runescape-client/src/main/java/class47.java index e03efdc354..129793d0b5 100644 --- a/runescape-client/src/main/java/class47.java +++ b/runescape-client/src/main/java/class47.java @@ -3,23 +3,14 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import netscape.javascript.JSObject; -@ObfuscatedName("al") +@ObfuscatedName("az") public class class47 { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Ljava/applet/Applet;Ljava/lang/String;B)V", - garbageValue = "16" + signature = "(Ljava/applet/Applet;Ljava/lang/String;I)Ljava/lang/Object;", + garbageValue = "606173703" ) - public static void method796(Applet var0, String var1) throws Throwable { - JSObject.getWindow(var0).eval(var1); - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "(Ljava/applet/Applet;Ljava/lang/String;[Ljava/lang/Object;I)Ljava/lang/Object;", - garbageValue = "-2054466950" - ) - public static Object method795(Applet var0, String var1, Object[] var2) throws Throwable { - return JSObject.getWindow(var0).call(var1, var2); + public static Object method812(Applet var0, String var1) throws Throwable { + return JSObject.getWindow(var0).call(var1, (Object[])null); } } diff --git a/runescape-client/src/main/java/class49.java b/runescape-client/src/main/java/class49.java index 196abf1d2f..dc660676f5 100644 --- a/runescape-client/src/main/java/class49.java +++ b/runescape-client/src/main/java/class49.java @@ -1,125 +1,295 @@ +import java.util.Date; import javax.imageio.ImageIO; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ab") +@ObfuscatedName("am") public class class49 { - @ObfuscatedName("r") - @Export("Tiles_hueMultiplier") - static int[] Tiles_hueMultiplier; + @ObfuscatedName("dt") + @ObfuscatedSignature( + signature = "Lio;" + ) + @Export("archive7") + static Archive archive7; + @ObfuscatedName("ec") + @ObfuscatedSignature( + signature = "Lio;" + ) + @Export("archive17") + static Archive archive17; static { ImageIO.setUseCache(false); } - @ObfuscatedName("s") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1821509751" + signature = "(Lhz;IIIZI)V", + garbageValue = "-120471549" ) - static void method810() { - for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var0.obj != null) { - var0.set(); + public static void method826(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { + class197.field2376 = 1; + class197.musicTrackArchive = var0; + class197.musicTrackGroupId = var1; + class197.musicTrackFileId = var2; + Canvas.field395 = var3; + MouseRecorder.musicTrackBoolean = var4; + ModelData0.field1833 = 10000; + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "(IIB)Lhy;", + garbageValue = "8" + ) + @Export("getWidgetChild") + public static Widget getWidgetChild(int var0, int var1) { + Widget var2 = Player.getWidget(var0); + if (var1 == -1) { + return var2; + } else { + return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; + } + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "(Lkz;IB)V", + garbageValue = "-1" + ) + public static void method828(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) { } } } - @ObfuscatedName("ar") + @ObfuscatedName("as") @ObfuscatedSignature( - signature = "(ILcr;ZI)I", - garbageValue = "1937427319" + signature = "(ILcu;ZI)I", + garbageValue = "-164032917" ) - static int method811(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { - Interpreter.Interpreter_intStackSize -= 2; - Client.field873 = (short)BZip2State.method5664(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]); - if (Client.field873 <= 0) { - Client.field873 = 256; - } - - Client.field822 = (short)BZip2State.method5664(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - if (Client.field822 <= 0) { - Client.field822 = 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.field795 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - if (Client.field795 <= 0) { - Client.field795 = 1; - } - - Client.field661 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - if (Client.field661 <= 0) { - Client.field661 = 32767; - } else if (Client.field661 < Client.field795) { - Client.field661 = Client.field795; - } - - Client.field652 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - if (Client.field652 <= 0) { - Client.field652 = 1; - } - - Client.field791 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - if (Client.field791 <= 0) { - Client.field791 = 32767; - } else if (Client.field791 < Client.field652) { - Client.field791 = Client.field652; - } - - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { - if (Client.viewportWidget != null) { - LoginScreenAnimation.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] = ChatChannel.method2165(Client.field873); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ChatChannel.method2165(Client.field822); - 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] = KitDefinition.canvasWidth; - return 1; - } else if (var0 == 6223) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class30.canvasHeight; + static int method829(int var0, Script var1, boolean var2) { + String var3; + int var4; + if (var0 == ScriptOpcodes.APPEND_NUM) { + var3 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3 + var4; return 1; } else { - return 2; + String var9; + if (var0 == ScriptOpcodes.APPEND) { + TextureProvider.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[TextureProvider.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[TextureProvider.Interpreter_stringStackSize + 1]; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3 + var9; + return 1; + } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { + var3 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3 + Skeleton.intToString(var4, true); + return 1; + } else if (var0 == ScriptOpcodes.LOWERCASE) { + var3 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3.toLowerCase(); + return 1; + } else { + int var6; + int var10; + if (var0 == ScriptOpcodes.FROMDATE) { + var10 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + long var11 = (11745L + (long)var10) * 86400000L; + Interpreter.Interpreter_calendar.setTime(new Date(var11)); + var6 = Interpreter.Interpreter_calendar.get(5); + int var16 = Interpreter.Interpreter_calendar.get(2); + int var8 = Interpreter.Interpreter_calendar.get(1); + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var16] + "-" + var8; + return 1; + } else if (var0 != ScriptOpcodes.TEXT_GENDER) { + if (var0 == ScriptOpcodes.TOSTRING) { + var10 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = Integer.toString(var10); + return 1; + } else if (var0 == ScriptOpcodes.COMPARE) { + TextureProvider.Interpreter_stringStackSize -= 2; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = GameShell.method951(MenuAction.compareStrings(Interpreter.Interpreter_stringStack[TextureProvider.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[TextureProvider.Interpreter_stringStackSize + 1], class43.clientLanguage)); + return 1; + } else { + int var5; + byte[] var13; + Font var14; + if (var0 == ScriptOpcodes.PARAHEIGHT) { + var3 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + class160.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + var13 = TextureProvider.archive13.takeFile(var5, 0); + var14 = new Font(var13); + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var14.lineCount(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.PARAWIDTH) { + var3 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + class160.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + var13 = TextureProvider.archive13.takeFile(var5, 0); + var14 = new Font(var13); + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var14.lineWidth(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { + TextureProvider.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[TextureProvider.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[TextureProvider.Interpreter_stringStackSize + 1]; + if (Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize] == 1) { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3; + } else { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var9; + } + + return 1; + } else if (var0 == ScriptOpcodes.ESCAPE) { + var3 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); + return 1; + } else if (var0 == ScriptOpcodes.APPEND_CHAR) { + var3 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3 + (char)var4; + return 1; + } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { + var10 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = MusicPatchNode2.isCharPrintable((char)var10) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { + var10 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = HealthBar.isAlphaNumeric((char)var10) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { + var10 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Client.isCharAlphabetic((char)var10) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { + var10 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = Actor.isDigit((char)var10) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.STRING_LENGTH) { + var3 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + if (var3 != null) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.length(); + } else { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.SUBSTRING) { + var3 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + class160.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[class160.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3.substring(var4, var5); + return 1; + } else if (var0 == ScriptOpcodes.REMOVETAGS) { + var3 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + StringBuilder var17 = new StringBuilder(var3.length()); + boolean var15 = false; + + for (var6 = 0; var6 < var3.length(); ++var6) { + char var7 = var3.charAt(var6); + if (var7 == '<') { + var15 = true; + } else if (var7 == '>') { + var15 = false; + } else if (!var15) { + var17.append(var7); + } + } + + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var17.toString(); + return 1; + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { + var3 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.indexOf(var4); + return 1; + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { + TextureProvider.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[TextureProvider.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[TextureProvider.Interpreter_stringStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.indexOf(var9, var5); + return 1; + } else if (var0 == ScriptOpcodes.UPPERCASE) { + var3 = Interpreter.Interpreter_stringStack[--TextureProvider.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3.toUpperCase(); + return 1; + } else { + return 2; + } + } + } else { + TextureProvider.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[TextureProvider.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[TextureProvider.Interpreter_stringStackSize + 1]; + if (Varps.localPlayer.appearance != null && Varps.localPlayer.appearance.isFemale) { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var9; + } else { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3; + } + + return 1; + } + } + } + } + + @ObfuscatedName("ja") + @ObfuscatedSignature( + signature = "(Lhy;S)Z", + garbageValue = "1376" + ) + static final boolean method825(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.method3983(var2, var3 == 1); + } + + if (var1 == 324) { + Client.playerAppearance.changeSex(false); + } + + if (var1 == 325) { + Client.playerAppearance.changeSex(true); + } + + if (var1 == 326) { + PacketBufferNode var4 = MenuAction.getPacketBufferNode(ClientPacket.field2263, 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/class51.java b/runescape-client/src/main/java/class51.java index 68faa2d364..dc5ef058ca 100644 --- a/runescape-client/src/main/java/class51.java +++ b/runescape-client/src/main/java/class51.java @@ -2,152 +2,224 @@ import java.applet.Applet; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ae") +@ObfuscatedName("au") public class class51 { - @ObfuscatedName("s") + @ObfuscatedName("qv") + @ObfuscatedSignature( + signature = "Lcq;" + ) + @Export("pcmStreamMixer") + static PcmStreamMixer pcmStreamMixer; + @ObfuscatedName("c") @Export("applet") - static Applet applet; - @ObfuscatedName("j") - static String field404; + public static Applet applet; @ObfuscatedName("x") + public static String field406; + @ObfuscatedName("av") + @Export("fontHelvetica13") + static java.awt.Font fontHelvetica13; + @ObfuscatedName("ad") + static String field405; + @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "Llq;" + signature = "Llr;" ) - @Export("logoSprite") - static IndexedSprite logoSprite; - @ObfuscatedName("dt") - @ObfuscatedSignature( - signature = "Lid;" - ) - @Export("archive7") - static Archive archive7; + static Bounds field411; static { applet = null; - field404 = ""; + field406 = ""; } - @ObfuscatedName("j") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lky;I)Ljava/lang/String;", - garbageValue = "700500119" + signature = "(Lhz;Lhz;IZB)Lev;", + garbageValue = "-39" ) - public static String method845(Buffer var0) { - String var1; - try { - int var2 = var0.readUShortSmart(); - if (var2 > 32767) { - var2 = 32767; - } + public static Frames method852(AbstractArchive var0, AbstractArchive var1, int var2, boolean var3) { + boolean var4 = true; + int[] var5 = var0.getGroupFileIds(var2); - byte[] var3 = new byte[var2]; - var0.offset += class210.huffman.decompress(var0.array, var0.offset, var3, 0, var2); - String var4 = ViewportMouse.decodeStringCp1252(var3, 0, var2); - var1 = var4; - } catch (Exception var6) { - var1 = "Cabbage"; + 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; + } + } } - return var1; + if (!var4) { + return null; + } else { + try { + return new Frames(var0, var1, var2, var3); + } catch (Exception var11) { + return null; + } + } + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-159620801" + ) + public static void method860() { + class96.reflectionChecks = new IterableNodeDeque(); + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "(Ljava/lang/CharSequence;IZI)I", + garbageValue = "1374783193" + ) + @Export("parseIntCustomRadix") + static int parseIntCustomRadix(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 = var10 + var5 * var1; + 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("u") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1490418351" + signature = "([BIII)Ljava/lang/String;", + garbageValue = "-2138724395" ) - public static void method846() { - VarpDefinition.VarpDefinition_cached.clear(); - } + @Export("decodeStringCp1252") + public static String decodeStringCp1252(byte[] var0, int var1, int var2) { + char[] var3 = new char[var2]; + int var4 = 0; - @ObfuscatedName("ag") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "949644202" - ) - @Export("runWidgetOnLoadListener") - static void runWidgetOnLoadListener(int var0) { - if (var0 != -1) { - if (Projectile.loadInterface(var0)) { - Widget[] var1 = Widget.Widget_interfaceComponents[var0]; - - for (int var2 = 0; var2 < var1.length; ++var2) { - Widget var3 = var1[var2]; - if (var3.onLoad != null) { - ScriptEvent var4 = new ScriptEvent(); - var4.widget = var3; - var4.args = var3.onLoad; - WorldMapIcon_1.runScript(var4, 5000000); + for (int var5 = 0; var5 < var2; ++var5) { + int var6 = var0[var5 + var1] & 255; + if (var6 != 0) { + if (var6 >= 128 && var6 < 160) { + char var7 = class287.cp1252AsciiExtension[var6 - 128]; + if (var7 == 0) { + var7 = '?'; } + + var6 = var7; } + var3[var4++] = (char)var6; } } + + return new String(var3, 0, var4); + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + signature = "(ILcu;ZB)I", + garbageValue = "10" + ) + static int method861(int var0, Script var1, boolean var2) { + Widget var3 = Player.getWidget(Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]); + if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { + Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = WorldMapElement.method4390(class60.getWidgetClickMask(var3)); + return 1; + } else if (var0 != ScriptOpcodes.IF_GETOP) { + if (var0 == ScriptOpcodes.IF_GETOPBASE) { + if (var3.dataText == null) { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3.dataText; + } + + return 1; + } else { + return 2; + } + } else { + int var4 = Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]; + --var4; + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3.actions[var4]; + } else { + Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } } - @ObfuscatedName("ie") + @ObfuscatedName("kh") @ObfuscatedSignature( - signature = "(Lbd;IIII)V", - garbageValue = "-500711697" + signature = "(B)V", + garbageValue = "0" ) - @Export("addPlayerToMenu") - static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { - if (WorldMapIcon_1.localPlayer != var0) { - if (Client.menuOptionsCount < 400) { - String var4; - if (var0.skillLevel == 0) { - var4 = var0.actions[0] + var0.username + var0.actions[1] + class225.getLevelColorString(var0.combatLevel, WorldMapIcon_1.localPlayer.combatLevel) + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; - } else { - var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; - } - - int var5; - if (Client.isItemSelected == 1) { - WorldMapData_0.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class16.colorStartTag(16777215) + var4, 14, var1, var2, var3); - } else if (Client.isSpellSelected) { - if ((WorldMapSectionType.selectedSpellFlags & 8) == 8) { - WorldMapData_0.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class16.colorStartTag(16777215) + var4, 15, var1, var2, var3); - } - } else { - for (var5 = 7; var5 >= 0; --var5) { - if (Client.playerMenuActions[var5] != null) { - short var6 = 0; - if (Client.playerMenuActions[var5].equalsIgnoreCase("Attack")) { - if (AttackOption.AttackOption_hidden == Client.playerAttackOption) { - continue; - } - - if (Client.playerAttackOption == AttackOption.AttackOption_alwaysRightClick || AttackOption.AttackOption_dependsOnCombatLevels == Client.playerAttackOption && var0.combatLevel > WorldMapIcon_1.localPlayer.combatLevel) { - var6 = 2000; - } - - if (WorldMapIcon_1.localPlayer.team != 0 && var0.team != 0) { - if (var0.team == WorldMapIcon_1.localPlayer.team) { - var6 = 2000; - } else { - var6 = 0; - } - } - } else if (Client.playerOptionsPriorities[var5]) { - var6 = 2000; - } - - boolean var7 = false; - int var8 = Client.playerMenuOpcodes[var5] + var6; - WorldMapData_0.insertMenuItemNoShift(Client.playerMenuActions[var5], class16.colorStartTag(16777215) + var4, var8, var1, var2, var3); - } - } - } - - for (var5 = 0; var5 < Client.menuOptionsCount; ++var5) { - if (Client.menuOpcodes[var5] == 23) { - Client.menuTargets[var5] = class16.colorStartTag(16777215) + var4; - break; - } - } - - } - } + @Export("Clan_leaveChat") + static final void Clan_leaveChat() { + PacketBufferNode var0 = MenuAction.getPacketBufferNode(ClientPacket.field2252, Client.packetWriter.isaacCipher); + var0.packetBuffer.writeByte(0); + Client.packetWriter.addNode(var0); } } diff --git a/runescape-client/src/main/java/class60.java b/runescape-client/src/main/java/class60.java index f0e8a64a3e..7710c7926a 100644 --- a/runescape-client/src/main/java/class60.java +++ b/runescape-client/src/main/java/class60.java @@ -1,49 +1,72 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bj") +@ObfuscatedName("bm") public class class60 { - @ObfuscatedName("ng") - @ObfuscatedGetter( - intValue = -2116581745 - ) - @Export("widgetDragDuration") - static int widgetDragDuration; - @ObfuscatedName("bj") + @ObfuscatedName("pg") @ObfuscatedSignature( - signature = "Lgk;" + signature = "Lli;" ) - @Export("clientLanguage") - static Language clientLanguage; + @Export("sceneMinimapSprite") + static Sprite sceneMinimapSprite; - @ObfuscatedName("j") + @ObfuscatedName("hv") @ObfuscatedSignature( - signature = "(IB)[B", - garbageValue = "73" + signature = "(ILjava/lang/String;I)V", + garbageValue = "1939345864" ) - @Export("ByteArrayPool_getArray") - public static synchronized byte[] ByteArrayPool_getArray(int var0) { - return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); + static void method1122(int var0, String var1) { + int var2 = Players.Players_count; + int[] var3 = Players.Players_indices; + boolean var4 = false; + Username var5 = new Username(var1, class4.loginType); + + for (int var6 = 0; var6 < var2; ++var6) { + Player var7 = Client.players[var3[var6]]; + if (var7 != null && var7 != Varps.localPlayer && var7.username != null && var7.username.equals(var5)) { + PacketBufferNode var8; + if (var0 == 1) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2237, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5500(var3[var6]); + var8.packetBuffer.method5566(0); + Client.packetWriter.addNode(var8); + } else if (var0 == 4) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2248, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeByte(0); + var8.packetBuffer.method5500(var3[var6]); + Client.packetWriter.addNode(var8); + } else if (var0 == 6) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2250, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5502(var3[var6]); + var8.packetBuffer.method5491(0); + Client.packetWriter.addNode(var8); + } else if (var0 == 7) { + var8 = MenuAction.getPacketBufferNode(ClientPacket.field2268, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5491(0); + var8.packetBuffer.method5500(var3[var6]); + Client.packetWriter.addNode(var8); + } + + var4 = true; + break; + } + } + + if (!var4) { + WorldMapCacheName.addGameMessage(4, "", "Unable to find " + var1); + } + } - @ObfuscatedName("u") + @ObfuscatedName("kn") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "2044529336" + signature = "(Lhy;S)I", + garbageValue = "-12983" ) - public static void method1122() { - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { - if (ArchiveDiskActionHandler.field3124 != 0) { - ArchiveDiskActionHandler.field3124 = 1; - - try { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); - } catch (InterruptedException var3) { - } - } - - } + @Export("getWidgetClickMask") + static int getWidgetClickMask(Widget var0) { + IntegerNode var1 = (IntegerNode)Client.widgetClickMasks.get(((long)var0.id << 32) + (long)var0.childIndex); + return var1 != null ? var1.integer : var0.clickMask; } } diff --git a/runescape-client/src/main/java/class65.java b/runescape-client/src/main/java/class65.java index cb20b2707e..b3c3e4d49b 100644 --- a/runescape-client/src/main/java/class65.java +++ b/runescape-client/src/main/java/class65.java @@ -3,322 +3,189 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bf") +@ObfuscatedName("bd") public class class65 extends RouteStrategy { - @ObfuscatedName("n") + @ObfuscatedName("rl") + @ObfuscatedGetter( + intValue = 502905585 + ) + static int field581; + @ObfuscatedName("u") @ObfuscatedSignature( signature = "Lhz;" ) @Export("ItemDefinition_archive") static AbstractArchive ItemDefinition_archive; - @ObfuscatedName("ff") - @ObfuscatedGetter( - longValue = 1031701328747955581L - ) - static long field586; - @ObfuscatedName("lw") - @ObfuscatedSignature( - signature = "Lhp;" - ) - @Export("mousedOverWidgetIf1") - static Widget mousedOverWidgetIf1; + @ObfuscatedName("ht") + static int field580; class65() { } - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IIILfm;I)Z", - garbageValue = "1325675955" + signature = "(IIILfj;I)Z", + garbageValue = "2030512647" ) @Export("hasArrived") - public boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) { + protected boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) { return var2 == super.approxDestinationX && var3 == super.approxDestinationY; } - @ObfuscatedName("j") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "1096051399" + signature = "(Llj;III)I", + garbageValue = "1086795116" ) - @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; - } + static int method1177(IterableNodeHashTable var0, int var1, int var2) { + if (var0 == null) { + return var2; + } else { + IntegerNode var3 = (IntegerNode)var0.get((long)var1); + return var3 == null ? var2 : var3.integer; } - - World.World_sortOption1 = var2; - World.World_sortOption2 = var3; - Tile.sortWorlds(ChatChannel.World_worlds, 0, ChatChannel.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); } - @ObfuscatedName("c") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "29" + signature = "(IIIII)I", + garbageValue = "1745774438" ) - static final int method1180() { - return ViewportMouse.ViewportMouse_x; + static final int method1171(int var0, int var1, int var2, int var3) { + int var4 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var2 * 1024 / var3] >> 1; + return ((65536 - var4) * var0 >> 16) + (var4 * var1 >> 16); } - @ObfuscatedName("c") + @ObfuscatedName("je") @ObfuscatedSignature( - signature = "(Lbl;I)V", - garbageValue = "-138729150" + signature = "(Lhy;IIIB)V", + garbageValue = "85" ) - @Export("changeWorld") - static void changeWorld(World var0) { - if (var0.isMembersOnly() != Client.isMembersWorld) { - Client.isMembersWorld = var0.isMembersOnly(); - boolean var1 = var0.isMembersOnly(); - if (var1 != UrlRequester.ItemDefinition_inMembersWorld) { - TileItemPile.method2700(); - UrlRequester.ItemDefinition_inMembersWorld = var1; - } - } + @Export("drawMinimap") + static final void drawMinimap(Widget var0, int var1, int var2, int var3) { + ModelData0.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 = Varps.localPlayer.x * -78439701 / 32 + 48; + int var7 = 464 - Varps.localPlayer.y / 32; + class60.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); - NetFileRequest.worldHost = var0.host; - Client.worldId = var0.id; - Client.worldProperties = var0.properties; - WorldMapRectangle.port1 = Client.gameBuild == 0 ? 43594 : var0.id + 40000; - FloorDecoration.port2 = Client.gameBuild == 0 ? 443 : var0.id + 50000; - SecureRandomCallable.port3 = WorldMapRectangle.port1; - } - - @ObfuscatedName("fz") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-87" - ) - static final void method1182() { - Client.packetWriter.close(); - class1.method18(); - Player.scene.clear(); - - for (int var0 = 0; var0 < 4; ++var0) { - Client.collisionMaps[var0].clear(); - } - - System.gc(); - DevicePcmPlayerProvider.method793(2); - Client.field857 = -1; - Client.field858 = false; - - for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var1.stream1 != null) { - IgnoreList.pcmStreamMixer.removeSubStream(var1.stream1); - var1.stream1 = null; - } - - if (var1.stream2 != null) { - IgnoreList.pcmStreamMixer.removeSubStream(var1.stream2); - var1.stream2 = null; - } - } - - ObjectSound.objectSounds.clear(); - FloorDecoration.updateGameState(10); - } - - @ObfuscatedName("fa") - @ObfuscatedSignature( - signature = "(Lbu;I)V", - garbageValue = "-554160740" - ) - static final void method1178(Actor var0) { - if (var0.field971 != 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]; + int var8; + int var9; + int var10; + for (var8 = 0; var8 < Client.mapIconCount; ++var8) { + var9 = Client.mapIconXs[var8] * 4 + 2 - Varps.localPlayer.x * -78439701 / 32; + var10 = Client.mapIconYs[var8] * 4 + 2 - Varps.localPlayer.y / 32; + ChatChannel.drawSpriteOnMinimap(var1, var2, var9, var10, Client.mapIcons[var8], var4); } - 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.field946 != -1 && (var0.pathLength == 0 || var0.field976 > 0)) { - var0.orientation = var0.field946; - var0.field946 = -1; - } - - int var4 = var0.orientation - var0.rotation & 2047; - if (var4 == 0 && var0.false0) { - var0.targetIndex = -1; - var0.false0 = false; - } - - if (var4 != 0) { - ++var0.field970; - boolean var6; - if (var4 > 1024) { - var0.rotation -= var0.field971; - var6 = true; - if (var4 < var0.field971 || var4 > 2048 - var0.field971) { - var0.rotation = var0.orientation; - var6 = false; - } - - if (var0.movementSequence == var0.readySequence && (var0.field970 > 25 || var6)) { - if (var0.turnLeftSequence != -1) { - var0.movementSequence = var0.turnLeftSequence; - } else { - var0.movementSequence = var0.walkSequence; - } - } - } else { - var0.rotation += var0.field971; - var6 = true; - if (var4 < var0.field971 || var4 > 2048 - var0.field971) { - var0.rotation = var0.orientation; - var6 = false; - } - - if (var0.readySequence == var0.movementSequence && (var0.field970 > 25 || var6)) { - if (var0.turnRightSequence != -1) { - var0.movementSequence = var0.turnRightSequence; - } else { - var0.movementSequence = var0.walkSequence; + int var11; + int var12; + for (var8 = 0; var8 < 104; ++var8) { + for (var9 = 0; var9 < 104; ++var9) { + NodeDeque var15 = Client.groundItems[MouseRecorder.plane][var8][var9]; + if (var15 != null) { + var11 = var8 * 4 + 2 - Varps.localPlayer.x * -78439701 / 32; + var12 = var9 * 4 + 2 - Varps.localPlayer.y / 32; + ChatChannel.drawSpriteOnMinimap(var1, var2, var11, var12, class42.mapDotSprites[0], var4); } } } - var0.rotation &= 2047; + for (var8 = 0; var8 < Client.npcCount; ++var8) { + NPC var16 = Client.npcs[Client.npcIndices[var8]]; + if (var16 != null && var16.isVisible()) { + NPCDefinition var18 = var16.definition; + if (var18 != null && var18.transforms != null) { + var18 = var18.transform(); + } + + if (var18 != null && var18.drawMapDot && var18.isInteractable) { + var11 = var16.x * -78439701 / 32 - Varps.localPlayer.x * -78439701 / 32; + var12 = var16.y / 32 - Varps.localPlayer.y / 32; + ChatChannel.drawSpriteOnMinimap(var1, var2, var11, var12, class42.mapDotSprites[1], var4); + } + } + } + + var8 = Players.Players_count; + int[] var19 = Players.Players_indices; + + for (var10 = 0; var10 < var8; ++var10) { + Player var17 = Client.players[var19[var10]]; + if (var17 != null && var17.isVisible() && !var17.isHidden && var17 != Varps.localPlayer) { + var12 = var17.x * -78439701 / 32 - Varps.localPlayer.x * -78439701 / 32; + int var13 = var17.y / 32 - Varps.localPlayer.y / 32; + boolean var14 = false; + if (Varps.localPlayer.team != 0 && var17.team != 0 && var17.team == Varps.localPlayer.team) { + var14 = true; + } + + if (var17.isFriend()) { + ChatChannel.drawSpriteOnMinimap(var1, var2, var12, var13, class42.mapDotSprites[3], var4); + } else if (var14) { + ChatChannel.drawSpriteOnMinimap(var1, var2, var12, var13, class42.mapDotSprites[4], var4); + } else if (var17.isClanMember()) { + ChatChannel.drawSpriteOnMinimap(var1, var2, var12, var13, class42.mapDotSprites[5], var4); + } else { + ChatChannel.drawSpriteOnMinimap(var1, var2, var12, var13, class42.mapDotSprites[2], var4); + } + } + } + + if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { + if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { + NPC var20 = Client.npcs[Client.hintArrowNpcIndex]; + if (var20 != null) { + var11 = var20.x * -78439701 / 32 - Varps.localPlayer.x * -78439701 / 32; + var12 = var20.y / 32 - Varps.localPlayer.y / 32; + AttackOption.worldToMinimap(var1, var2, var11, var12, WorldMapLabelSize.mapMarkerSprites[1], var4); + } + } + + if (Client.hintArrowType == 2) { + var10 = Client.hintArrowX * 4 - class4.baseX * 256 + 2 - Varps.localPlayer.x * -78439701 / 32; + var11 = Client.hintArrowY * 4 - ScriptEvent.baseY * 2082609860 + 2 - Varps.localPlayer.y / 32; + AttackOption.worldToMinimap(var1, var2, var10, var11, WorldMapLabelSize.mapMarkerSprites[1], var4); + } + + if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { + Player var21 = Client.players[Client.hintArrowPlayerIndex]; + if (var21 != null) { + var11 = var21.x * -78439701 / 32 - Varps.localPlayer.x * -78439701 / 32; + var12 = var21.y / 32 - Varps.localPlayer.y / 32; + AttackOption.worldToMinimap(var1, var2, var11, var12, WorldMapLabelSize.mapMarkerSprites[1], var4); + } + } + } + + if (Client.destinationX != 0) { + var10 = Client.destinationX * 4 + 2 - Varps.localPlayer.x * -78439701 / 32; + var11 = Client.destinationY * 4 + 2 - Varps.localPlayer.y / 32; + ChatChannel.drawSpriteOnMinimap(var1, var2, var10, var11, WorldMapLabelSize.mapMarkerSprites[0], var4); + } + + if (!Varps.localPlayer.isHidden) { + Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215); + } } else { - var0.field970 = 0; + Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); } + Client.field828[var3] = true; } } - @ObfuscatedName("il") + @ObfuscatedName("kg") @ObfuscatedSignature( - signature = "(Lii;IIII)V", - garbageValue = "-973844145" + signature = "(I)V", + garbageValue = "96843493" ) - @Export("addNpcToMenu") - static final void addNpcToMenu(NPCDefinition 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; - if (var0.combatLevel != 0) { - var4 = var4 + class225.getLevelColorString(var0.combatLevel, WorldMapIcon_1.localPlayer.combatLevel) + " " + " (" + "level-" + var0.combatLevel + ")"; - } - - if (var0.isFollower && Client.followerOpsLowPriority) { - WorldMapData_0.insertMenuItemNoShift("Examine", class16.colorStartTag(16776960) + var4, 1003, var1, var2, var3); - } - - if (Client.isItemSelected == 1) { - WorldMapData_0.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class16.colorStartTag(16776960) + var4, 7, var1, var2, var3); - } else if (Client.isSpellSelected) { - if ((WorldMapSectionType.selectedSpellFlags & 2) == 2) { - WorldMapData_0.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class16.colorStartTag(16776960) + var4, 8, var1, var2, var3); - } - } else { - int var5 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 0; - String[] var6 = var0.actions; - int var7; - int var8; - if (var6 != null) { - for (var7 = 4; var7 >= 0; --var7) { - if (var6[var7] != null && !var6[var7].equalsIgnoreCase("Attack")) { - var8 = 0; - if (var7 == 0) { - var8 = var5 + 9; - } - - if (var7 == 1) { - var8 = var5 + 10; - } - - if (var7 == 2) { - var8 = var5 + 11; - } - - if (var7 == 3) { - var8 = var5 + 12; - } - - if (var7 == 4) { - var8 = var5 + 13; - } - - WorldMapData_0.insertMenuItemNoShift(var6[var7], class16.colorStartTag(16776960) + var4, var8, var1, var2, var3); - } - } - } - - if (var6 != null) { - for (var7 = 4; var7 >= 0; --var7) { - if (var6[var7] != null && var6[var7].equalsIgnoreCase("Attack")) { - short var9 = 0; - if (AttackOption.AttackOption_hidden != Client.npcAttackOption) { - if (AttackOption.AttackOption_alwaysRightClick == Client.npcAttackOption || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > WorldMapIcon_1.localPlayer.combatLevel) { - var9 = 2000; - } - - var8 = 0; - if (var7 == 0) { - var8 = var9 + 9; - } - - if (var7 == 1) { - var8 = var9 + 10; - } - - if (var7 == 2) { - var8 = var9 + 11; - } - - if (var7 == 3) { - var8 = var9 + 12; - } - - if (var7 == 4) { - var8 = var9 + 13; - } - - WorldMapData_0.insertMenuItemNoShift(var6[var7], class16.colorStartTag(16776960) + var4, var8, var1, var2, var3); - } - } - } - } - - if (!var0.isFollower || !Client.followerOpsLowPriority) { - WorldMapData_0.insertMenuItemNoShift("Examine", class16.colorStartTag(16776960) + var4, 1003, var1, var2, var3); - } - } - - } - } - } - } + static final void method1176() { + Client.field816 = Client.cycleCntr; + InterfaceParent.ClanChat_inClanChat = true; } } diff --git a/runescape-client/src/main/java/class80.java b/runescape-client/src/main/java/class80.java index 940d5a0735..f7c8a424ae 100644 --- a/runescape-client/src/main/java/class80.java +++ b/runescape-client/src/main/java/class80.java @@ -3,87 +3,78 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ck") +@ObfuscatedName("ch") public class class80 { + @ObfuscatedName("or") + @ObfuscatedSignature( + signature = "Lfa;" + ) + @Export("mouseWheel") + static MouseWheel mouseWheel; + @ObfuscatedName("l") + static final BigInteger field1105; @ObfuscatedName("u") - static final BigInteger field1108; - @ObfuscatedName("n") - static final BigInteger field1110; + static final BigInteger field1106; static { - field1108 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); - field1110 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); + field1105 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); + field1106 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); } @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lhp;I[B[BI)V", - garbageValue = "-1438393709" + signature = "(CB)Z", + garbageValue = "-11" ) - @Export("Widget_setKey") - static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { - if (var0.field2631 == null) { - if (var2 == null) { - return; - } + public static boolean method2029(char var0) { + if ((var0 <= 0 || var0 >= 128) && (var0 < 160 || var0 > 255)) { + if (var0 != 0) { + char[] var1 = class287.cp1252AsciiExtension; - var0.field2631 = new byte[11][]; - var0.field2622 = new byte[11][]; - var0.field2623 = new int[11]; - var0.field2581 = new int[11]; - } - - var0.field2631[var1] = var2; - if (var2 != null) { - var0.field2620 = true; - } else { - var0.field2620 = false; - - for (int var4 = 0; var4 < var0.field2631.length; ++var4) { - if (var0.field2631[var4] != null) { - var0.field2620 = true; - break; + for (int var2 = 0; var2 < var1.length; ++var2) { + char var3 = var1[var2]; + if (var0 == var3) { + return true; + } } } - } - var0.field2622[var1] = var3; + return false; + } else { + return true; + } } - @ObfuscatedName("gw") + @ObfuscatedName("if") @ObfuscatedSignature( - signature = "(Lbd;ZB)V", - garbageValue = "1" + signature = "([Lhy;IIIZI)V", + garbageValue = "982619045" ) - @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.readySequence == var0.movementSequence) { - var0.isUnanimated = true; - } + @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) { + class192.alignWidgetSize(var6, var2, var3, var4); + WorldMapEvent.alignWidgetPosition(var6, var2, var3); + if (var6.scrollX > var6.scrollWidth - var6.width) { + var6.scrollX = var6.scrollWidth - var6.width; + } - int var2 = var0.x >> 7; - int var3 = var0.y >> 7; - if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { - long var4 = WorldMapSprite.calculateTag(0, 0, 0, false, var0.index); - if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { - var0.isUnanimated = false; - var0.tileHeight = GrandExchangeOfferTotalQuantityComparator.getTileHeight(var0.x, var0.y, ItemContainer.plane); - var0.playerCycle = Client.cycle; - Player.scene.addNullableObject(ItemContainer.plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.field603, var0.field604, var0.field616, var0.field606); - } else { - if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { - if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { - return; - } + if (var6.scrollX < 0) { + var6.scrollX = 0; + } - Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; - } + if (var6.scrollY > var6.scrollHeight - var6.height) { + var6.scrollY = var6.scrollHeight - var6.height; + } - var0.tileHeight = GrandExchangeOfferTotalQuantityComparator.getTileHeight(var0.x, var0.y, ItemContainer.plane); - var0.playerCycle = Client.cycle; - Player.scene.drawEntity(ItemContainer.plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); + if (var6.scrollY < 0) { + var6.scrollY = 0; + } + + if (var6.type == 0) { + class197.revalidateWidgetScroll(var0, var6, var4); } } } diff --git a/runescape-client/src/main/java/class81.java b/runescape-client/src/main/java/class81.java index b48b10ccdf..c4ec2cf0b9 100644 --- a/runescape-client/src/main/java/class81.java +++ b/runescape-client/src/main/java/class81.java @@ -4,13 +4,22 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("cc") public class class81 { - @ObfuscatedName("s") + @ObfuscatedName("qg") @ObfuscatedSignature( - signature = "(Lby;I)V", - garbageValue = "1766301676" + signature = "Lde;" ) - @Export("runScriptEvent") - public static void runScriptEvent(ScriptEvent var0) { - WorldMapIcon_1.runScript(var0, 500000); + @Export("decimator") + static Decimator decimator; + @ObfuscatedName("bg") + @Export("otp") + static String otp; + + @ObfuscatedName("ic") + @ObfuscatedSignature( + signature = "(II)Ljava/lang/String;", + garbageValue = "910653188" + ) + static final String method2032(int var0) { + return var0 < 999999999 ? Integer.toString(var0) : "*"; } } diff --git a/runescape-client/src/main/java/class83.java b/runescape-client/src/main/java/class83.java index 82840dc188..cb307e965d 100644 --- a/runescape-client/src/main/java/class83.java +++ b/runescape-client/src/main/java/class83.java @@ -1,106 +1,76 @@ -import java.io.IOException; import java.math.BigInteger; import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cf") +@ObfuscatedName("cr") public class class83 { - @ObfuscatedName("s") - static final BigInteger field1138; - @ObfuscatedName("j") - static final BigInteger field1137; @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Llq;" + static final BigInteger field1142; + @ObfuscatedName("x") + static final BigInteger field1139; + @ObfuscatedName("kc") + @ObfuscatedGetter( + intValue = 2081723437 ) - static IndexedSprite field1136; + @Export("menuY") + static int menuY; + @ObfuscatedName("lk") + @ObfuscatedGetter( + intValue = 670190247 + ) + static int field1138; static { - field1138 = new BigInteger("10001", 16); - field1137 = new BigInteger("83ff79a3e258b99ead1a70e1049883e78e513c4cdec538d8da9483879a9f81689c0c7d146d7b82b52d05cf26132b1cda5930eeef894e4ccf3d41eebc3aabe54598c4ca48eb5a31d736bfeea17875a35558b9e3fcd4aebe2a9cc970312a477771b36e173dc2ece6001ab895c553e2770de40073ea278026f36961c94428d8d7db", 16); + field1142 = new BigInteger("10001", 16); + field1139 = new BigInteger("f8a2c48a898ebf7a2a5069193f0c6798757879d298af09a6fa94e569d45b09f67aeef8e6bb8a61650d597c743104fdef7d07b24af92df6be995877e9a7dd6a630d3e62c14e70427b959ff70735f96135d73434e73aabbd6aa8cf0b97dae7e2b6b70e646ff550b0ad8a4d8d18675714e5228b026d85e8f2f24607ba69d7404571", 16); } - @ObfuscatedName("i") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lkg;ZI)V", - garbageValue = "-1903041730" + signature = "(II)Liw;", + garbageValue = "-2100671163" ) - @Export("NetCache_connect") - public static void NetCache_connect(AbstractSocket var0, boolean var1) { - if (NetCache.NetCache_socket != null) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var6) { + @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)); } - NetCache.NetCache_socket = null; + var1.postDecode(); + SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); + return var1; } + } - NetCache.NetCache_socket = var0; - NPC.method1977(var1); - NetCache.NetCache_responseHeaderBuffer.offset = 0; - NetCache.NetCache_currentResponse = null; - NetCache.NetCache_responseArchiveBuffer = null; - NetCache.field3156 = 0; - - while (true) { - NetFileRequest var2 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); - if (var2 == null) { - while (true) { - var2 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); - if (var2 == null) { - if (NetCache.field3159 != 0) { - try { - Buffer var7 = new Buffer(4); - var7.writeByte(4); - var7.writeByte(NetCache.field3159); - var7.writeShort(0); - NetCache.NetCache_socket.write(var7.array, 0, 4); - } catch (IOException var5) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var4) { - } - - ++NetCache.NetCache_ioExceptions; - NetCache.NetCache_socket = null; - } - } - - NetCache.NetCache_loadTime = 0; - NetCache.field3145 = SequenceDefinition.method4686(); - return; - } - - NetCache.NetCache_pendingWritesQueue.addLast(var2); - NetCache.NetCache_pendingWrites.put(var2, var2.key); - ++NetCache.NetCache_pendingWritesCount; - --NetCache.NetCache_pendingResponsesCount; + @ObfuscatedName("jh") + @ObfuscatedSignature( + signature = "(Lhy;III)V", + garbageValue = "858308141" + ) + @Export("clickWidget") + static final void clickWidget(Widget var0, int var1, int var2) { + if (Client.clickedWidget == null && !Client.isMenuOpen) { + if (var0 != null && WorldMapLabel.method382(var0) != null) { + Client.clickedWidget = var0; + Client.clickedWidgetParent = WorldMapLabel.method382(var0); + Client.widgetClickX = var1; + Client.widgetClickY = var2; + ArchiveLoader.widgetDragDuration = 0; + Client.isDraggingWidget = false; + int var3 = WorldMapCacheName.getNewestMenuIdx(); + if (var3 != -1) { + UserComparator3.method3399(var3); } + } - - NetCache.NetCache_pendingPriorityWrites.put(var2, var2.key); - ++NetCache.NetCache_pendingPriorityWritesCount; - --NetCache.NetCache_pendingPriorityResponsesCount; } } - - @ObfuscatedName("fd") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1982108989" - ) - static final void method1997(int var0) { - class65.method1182(); - switch(var0) { - case 1: - PendingSpawn.method1661(); - break; - case 2: - Login.loginIndex = 24; - GrandExchangeOfferOwnWorldComparator.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); - } - - } } diff --git a/runescape-client/src/main/java/class96.java b/runescape-client/src/main/java/class96.java index 8d66b8bc25..1fd6b364b8 100644 --- a/runescape-client/src/main/java/class96.java +++ b/runescape-client/src/main/java/class96.java @@ -1,42 +1,53 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cz") +@ObfuscatedName("ci") public class class96 { - @ObfuscatedName("s") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Ljp;" + signature = "Ljd;" ) @Export("reflectionChecks") public static IterableNodeDeque reflectionChecks; - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "Llq;" - ) - static IndexedSprite field1303; - @ObfuscatedName("kk") - @ObfuscatedGetter( - intValue = -894552657 - ) - @Export("menuY") - static int menuY; static { reflectionChecks = new IterableNodeDeque(); } - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(II)Ljava/lang/String;", - garbageValue = "-1331218775" + signature = "(I[BLkx;I)V", + garbageValue = "188105448" ) - static final String method2201(int var0) { - if (var0 < 100000) { - return "" + var0 + ""; - } else { - return var0 < 10000000 ? "" + var0 / 1000 + "K" + "" : "" + var0 / 1000000 + "M" + ""; + static void method2259(int var0, byte[] var1, ArchiveDisk var2) { + ArchiveDiskAction var3 = new ArchiveDiskAction(); + var3.type = 0; + var3.key = (long)var0; + var3.data = var1; + var3.archiveDisk = var2; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); + } + + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { + if (ArchiveDiskActionHandler.field3126 == 0) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); + } + + ArchiveDiskActionHandler.field3126 = 600; } } + + @ObfuscatedName("ki") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "1927050446" + ) + static void method2258(int var0) { + Client.oculusOrbState = var0; + } }