From 655106b9dffdb637fb394b884b8a1fa82943e9cf Mon Sep 17 00:00:00 2001 From: ThatGamerBlue Date: Thu, 18 Jun 2020 12:15:38 +0100 Subject: [PATCH] chore: rev 190 --- buildSrc/src/main/kotlin/Dependencies.kt | 4 +- .../src/main/java/AbstractArchive.java | 328 +- .../main/java/AbstractByteArrayCopier.java | 835 +- .../src/main/java/AbstractFont.java | 134 +- .../src/main/java/AbstractRasterProvider.java | 30 +- .../src/main/java/AbstractSocket.java | 65 +- .../src/main/java/AbstractSound.java | 4 +- .../src/main/java/AbstractUserComparator.java | 165 +- .../src/main/java/AbstractWorldMapData.java | 484 +- .../src/main/java/AbstractWorldMapIcon.java | 159 +- .../src/main/java/AccessFile.java | 44 +- runescape-client/src/main/java/Actor.java | 448 +- runescape-client/src/main/java/Animation.java | 72 +- .../main/java/ApproximateRouteStrategy.java | 228 +- runescape-client/src/main/java/Archive.java | 236 +- .../src/main/java/ArchiveDisk.java | 98 +- .../src/main/java/ArchiveDiskAction.java | 159 +- .../main/java/ArchiveDiskActionHandler.java | 148 +- .../src/main/java/ArchiveLoader.java | 305 +- .../src/main/java/AttackOption.java | 213 +- .../src/main/java/AudioFilter.java | 116 +- .../src/main/java/BZip2Decompressor.java | 68 +- .../src/main/java/BZip2State.java | 151 +- .../src/main/java/BoundaryObject.java | 529 +- runescape-client/src/main/java/Bounds.java | 90 +- runescape-client/src/main/java/Buddy.java | 143 +- .../src/main/java/BuddyRankComparator.java | 33 +- runescape-client/src/main/java/Buffer.java | 725 +- .../src/main/java/BufferedFile.java | 124 +- .../src/main/java/BufferedNetSocket.java | 42 +- .../src/main/java/BufferedSink.java | 40 +- .../src/main/java/BufferedSource.java | 50 +- .../src/main/java/ByteArrayNode.java | 4 +- .../src/main/java/ByteArrayPool.java | 79 +- runescape-client/src/main/java/Calendar.java | 75 +- runescape-client/src/main/java/Canvas.java | 284 +- .../src/main/java/ChatChannel.java | 127 +- runescape-client/src/main/java/ClanChat.java | 196 +- runescape-client/src/main/java/ClanMate.java | 49 +- runescape-client/src/main/java/Client.java | 7264 +++++++++-------- .../src/main/java/ClientPacket.java | 1355 ++- .../src/main/java/ClientPreferences.java | 152 +- runescape-client/src/main/java/Clock.java | 105 +- .../src/main/java/CollisionMap.java | 108 +- runescape-client/src/main/java/Coord.java | 332 +- runescape-client/src/main/java/Decimator.java | 227 +- .../src/main/java/DefaultsGroup.java | 19 +- .../src/main/java/DemotingHashTable.java | 38 +- .../java/DesktopPlatformInfoProvider.java | 135 +- .../src/main/java/DevicePcmPlayer.java | 63 +- .../main/java/DevicePcmPlayerProvider.java | 200 +- .../src/main/java/DirectByteArrayCopier.java | 33 +- .../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 | 265 +- runescape-client/src/main/java/Entity.java | 320 +- .../src/main/java/EnumDefinition.java | 82 +- .../src/main/java/Enumerated.java | 8 +- .../main/java/EvictingDualNodeHashTable.java | 40 +- .../src/main/java/FaceNormal.java | 167 +- .../src/main/java/FileSystem.java | 49 +- .../src/main/java/FloorDecoration.java | 52 +- .../src/main/java/FloorOverlayDefinition.java | 120 +- .../main/java/FloorUnderlayDefinition.java | 161 +- runescape-client/src/main/java/Font.java | 6 +- runescape-client/src/main/java/FontName.java | 225 +- runescape-client/src/main/java/Fonts.java | 36 +- runescape-client/src/main/java/Frames.java | 236 +- runescape-client/src/main/java/Friend.java | 54 +- .../src/main/java/FriendLoginUpdate.java | 120 +- .../src/main/java/FriendSystem.java | 244 +- .../src/main/java/FriendsList.java | 54 +- .../src/main/java/GZipDecompressor.java | 22 +- runescape-client/src/main/java/GameBuild.java | 101 +- .../src/main/java/GameObject.java | 372 +- runescape-client/src/main/java/GameShell.java | 638 +- .../src/main/java/GrandExchangeEvent.java | 1162 +-- .../src/main/java/GrandExchangeEvents.java | 127 +- .../src/main/java/GrandExchangeOffer.java | 417 +- .../java/GrandExchangeOfferAgeComparator.java | 1304 +-- .../GrandExchangeOfferNameComparator.java | 582 +- .../GrandExchangeOfferOwnWorldComparator.java | 156 +- ...dExchangeOfferTotalQuantityComparator.java | 212 +- ...GrandExchangeOfferUnitPriceComparator.java | 215 +- .../GrandExchangeOfferWorldComparator.java | 266 +- .../src/main/java/GraphicsDefaults.java | 134 +- .../src/main/java/GraphicsObject.java | 139 +- runescape-client/src/main/java/HealthBar.java | 706 +- .../src/main/java/HealthBarDefinition.java | 151 +- .../src/main/java/HealthBarUpdate.java | 45 +- .../src/main/java/HitSplatDefinition.java | 364 +- .../src/main/java/HorizontalAlignment.java | 67 +- runescape-client/src/main/java/Huffman.java | 268 +- .../src/main/java/IgnoreList.java | 425 +- runescape-client/src/main/java/Ignored.java | 36 +- .../src/main/java/IndexedSprite.java | 32 +- .../src/main/java/Instrument.java | 80 +- .../src/main/java/IntHashTable.java | 12 +- .../src/main/java/IntegerNode.java | 4 +- .../src/main/java/InterfaceParent.java | 170 +- .../src/main/java/Interpreter.java | 184 +- .../src/main/java/InvDefinition.java | 282 +- .../src/main/java/IsaacCipher.java | 61 +- .../src/main/java/ItemContainer.java | 184 +- .../src/main/java/ItemDefinition.java | 336 +- .../src/main/java/IterableDualNodeQueue.java | 36 +- .../java/IterableDualNodeQueueIterator.java | 24 +- .../src/main/java/IterableNodeDeque.java | 126 +- .../IterableNodeDequeDescendingIterator.java | 38 +- .../src/main/java/IterableNodeHashTable.java | 36 +- .../java/IterableNodeHashTableIterator.java | 54 +- .../src/main/java/JagexCache.java | 110 +- .../src/main/java/KeyHandler.java | 682 +- .../src/main/java/KitDefinition.java | 233 +- runescape-client/src/main/java/Language.java | 528 +- runescape-client/src/main/java/Link.java | 12 +- runescape-client/src/main/java/LinkDeque.java | 22 +- runescape-client/src/main/java/Login.java | 367 +- .../src/main/java/LoginPacket.java | 90 +- .../src/main/java/LoginScreenAnimation.java | 668 +- runescape-client/src/main/java/LoginType.java | 108 +- .../src/main/java/MenuAction.java | 75 +- runescape-client/src/main/java/Message.java | 360 +- runescape-client/src/main/java/Messages.java | 106 +- .../src/main/java/MidiFileReader.java | 96 +- .../src/main/java/MidiPcmStream.java | 1066 +-- .../src/main/java/MilliClock.java | 306 +- runescape-client/src/main/java/ModeWhere.java | 268 +- runescape-client/src/main/java/Model.java | 852 +- runescape-client/src/main/java/ModelData.java | 352 +- .../src/main/java/ModelData0.java | 105 +- .../src/main/java/MouseHandler.java | 493 +- .../src/main/java/MouseRecorder.java | 924 +-- .../src/main/java/MouseWheel.java | 6 +- .../src/main/java/MouseWheelHandler.java | 20 +- .../src/main/java/MusicPatch.java | 539 +- .../src/main/java/MusicPatchNode.java | 375 +- .../src/main/java/MusicPatchNode2.java | 194 +- .../src/main/java/MusicPatchPcmStream.java | 254 +- .../src/main/java/MusicTrack.java | 24 +- runescape-client/src/main/java/NPC.java | 183 +- .../src/main/java/NPCDefinition.java | 368 +- runescape-client/src/main/java/NanoClock.java | 45 +- runescape-client/src/main/java/NetCache.java | 219 +- .../src/main/java/NetFileRequest.java | 60 +- runescape-client/src/main/java/NetSocket.java | 209 +- runescape-client/src/main/java/Node.java | 14 +- runescape-client/src/main/java/NodeDeque.java | 48 +- .../src/main/java/NodeHashTable.java | 34 +- .../src/main/java/ObjectDefinition.java | 475 +- .../src/main/java/ObjectNode.java | 4 +- .../src/main/java/ObjectSound.java | 150 +- runescape-client/src/main/java/Occluder.java | 163 +- .../src/main/java/PacketBuffer.java | 469 +- .../src/main/java/PacketBufferNode.java | 100 +- .../src/main/java/PacketWriter.java | 163 +- .../src/main/java/ParamDefinition.java | 65 +- runescape-client/src/main/java/PcmPlayer.java | 325 +- runescape-client/src/main/java/PcmStream.java | 36 +- .../src/main/java/PcmStreamMixer.java | 136 +- .../src/main/java/PcmStreamMixerListener.java | 12 +- .../src/main/java/PendingSpawn.java | 142 +- .../src/main/java/PlatformInfo.java | 293 +- .../src/main/java/PlatformInfoProvider.java | 8 +- runescape-client/src/main/java/Player.java | 397 +- .../src/main/java/PlayerAppearance.java | 608 +- .../src/main/java/PlayerProvider.java | 8 +- .../src/main/java/PlayerType.java | 117 +- runescape-client/src/main/java/Players.java | 95 +- .../src/main/java/PrivateChatMode.java | 52 +- .../src/main/java/Projectile.java | 164 +- .../src/main/java/RasterProvider.java | 32 +- .../src/main/java/Rasterizer2D.java | 62 +- .../src/main/java/Rasterizer3D.java | 598 +- .../src/main/java/RawPcmStream.java | 1108 +-- runescape-client/src/main/java/RawSound.java | 20 +- .../src/main/java/ReflectionCheck.java | 103 +- .../src/main/java/RouteStrategy.java | 82 +- .../src/main/java/RunException.java | 21 +- runescape-client/src/main/java/Scene.java | 708 +- runescape-client/src/main/java/Script.java | 57 +- .../src/main/java/ScriptEvent.java | 191 +- .../src/main/java/ScriptFrame.java | 216 +- .../src/main/java/SecureRandomCallable.java | 371 +- .../src/main/java/SecureRandomFuture.java | 288 +- .../src/main/java/SequenceDefinition.java | 217 +- .../src/main/java/ServerPacket.java | 1031 ++- runescape-client/src/main/java/Skeleton.java | 95 +- runescape-client/src/main/java/Skills.java | 38 +- .../src/main/java/SoftWrapper.java | 8 +- .../src/main/java/SoundCache.java | 944 +-- .../src/main/java/SoundEffect.java | 24 +- .../src/main/java/SoundEnvelope.java | 34 +- .../src/main/java/SoundSystem.java | 89 +- .../main/java/SpotAnimationDefinition.java | 117 +- runescape-client/src/main/java/Sprite.java | 116 +- .../src/main/java/SpriteMask.java | 114 +- runescape-client/src/main/java/Strings.java | 79 +- .../src/main/java/StructDefinition.java | 247 +- .../src/main/java/StudioGame.java | 745 +- runescape-client/src/main/java/Task.java | 18 +- .../src/main/java/TaskHandler.java | 499 +- runescape-client/src/main/java/Texture.java | 138 +- .../src/main/java/TextureLoader.java | 26 +- .../src/main/java/TextureProvider.java | 331 +- runescape-client/src/main/java/Tile.java | 333 +- runescape-client/src/main/java/TileItem.java | 122 +- .../src/main/java/TileItemPile.java | 307 +- runescape-client/src/main/java/TileModel.java | 70 +- runescape-client/src/main/java/TilePaint.java | 82 +- runescape-client/src/main/java/Tiles.java | 1025 ++- runescape-client/src/main/java/Timer.java | 929 ++- runescape-client/src/main/java/TriBool.java | 177 +- .../src/main/java/UrlRequest.java | 85 +- .../src/main/java/UrlRequester.java | 185 +- runescape-client/src/main/java/User.java | 100 +- .../src/main/java/UserComparator1.java | 14 +- .../src/main/java/UserComparator10.java | 52 +- .../src/main/java/UserComparator2.java | 134 +- .../src/main/java/UserComparator3.java | 170 +- .../src/main/java/UserComparator4.java | 147 +- .../src/main/java/UserComparator5.java | 128 +- .../src/main/java/UserComparator6.java | 49 +- .../src/main/java/UserComparator7.java | 99 +- .../src/main/java/UserComparator8.java | 142 +- .../src/main/java/UserComparator9.java | 220 +- runescape-client/src/main/java/UserList.java | 400 +- runescape-client/src/main/java/Username.java | 216 +- runescape-client/src/main/java/Usernamed.java | 8 +- .../src/main/java/VarbitDefinition.java | 91 +- runescape-client/src/main/java/VarcInt.java | 58 +- runescape-client/src/main/java/Varcs.java | 354 +- .../src/main/java/VarpDefinition.java | 55 +- runescape-client/src/main/java/Varps.java | 31 +- .../src/main/java/VertexNormal.java | 61 +- .../src/main/java/VerticalAlignment.java | 114 +- .../src/main/java/ViewportMouse.java | 178 +- .../src/main/java/VorbisCodebook.java | 74 +- .../src/main/java/VorbisFloor.java | 156 +- .../src/main/java/VorbisMapping.java | 10 +- .../src/main/java/VorbisResidue.java | 26 +- .../src/main/java/VorbisSample.java | 384 +- .../src/main/java/WallDecoration.java | 174 +- runescape-client/src/main/java/Widget.java | 1065 +-- runescape-client/src/main/java/World.java | 696 +- runescape-client/src/main/java/WorldMap.java | 681 +- .../src/main/java/WorldMapArchiveLoader.java | 47 +- .../src/main/java/WorldMapArea.java | 265 +- .../src/main/java/WorldMapAreaData.java | 165 +- .../src/main/java/WorldMapCacheName.java | 153 +- .../src/main/java/WorldMapData_0.java | 118 +- .../src/main/java/WorldMapData_1.java | 644 +- .../src/main/java/WorldMapDecoration.java | 143 +- .../src/main/java/WorldMapDecorationType.java | 825 +- .../src/main/java/WorldMapElement.java | 252 +- .../src/main/java/WorldMapEvent.java | 856 +- .../src/main/java/WorldMapID.java | 244 +- .../src/main/java/WorldMapIcon_0.java | 517 +- .../src/main/java/WorldMapIcon_1.java | 201 +- .../src/main/java/WorldMapLabel.java | 681 +- .../src/main/java/WorldMapLabelSize.java | 357 +- .../src/main/java/WorldMapManager.java | 233 +- .../src/main/java/WorldMapRectangle.java | 315 +- .../src/main/java/WorldMapRegion.java | 778 +- .../src/main/java/WorldMapScaleHandler.java | 110 +- .../src/main/java/WorldMapSection.java | 36 +- .../src/main/java/WorldMapSection0.java | 1231 ++- .../src/main/java/WorldMapSection1.java | 772 +- .../src/main/java/WorldMapSection2.java | 186 +- .../src/main/java/WorldMapSection3.java | 370 +- .../src/main/java/WorldMapSectionType.java | 207 +- .../src/main/java/WorldMapSprite.java | 175 +- runescape-client/src/main/java/Wrapper.java | 8 +- runescape-client/src/main/java/class0.java | 22 +- runescape-client/src/main/java/class1.java | 550 +- runescape-client/src/main/java/class10.java | 34 +- runescape-client/src/main/java/class105.java | 123 +- runescape-client/src/main/java/class11.java | 2 +- runescape-client/src/main/java/class12.java | 8 +- runescape-client/src/main/java/class13.java | 386 +- runescape-client/src/main/java/class155.java | 6 +- runescape-client/src/main/java/class169.java | 182 +- runescape-client/src/main/java/class170.java | 2 +- runescape-client/src/main/java/class171.java | 28 +- runescape-client/src/main/java/class182.java | 41 +- runescape-client/src/main/java/class190.java | 2 +- runescape-client/src/main/java/class194.java | 112 +- runescape-client/src/main/java/class195.java | 92 +- runescape-client/src/main/java/class197.java | 76 +- runescape-client/src/main/java/class198.java | 22 +- runescape-client/src/main/java/class2.java | 218 +- runescape-client/src/main/java/class200.java | 68 +- runescape-client/src/main/java/class204.java | 97 +- runescape-client/src/main/java/class206.java | 81 +- runescape-client/src/main/java/class217.java | 115 +- runescape-client/src/main/java/class219.java | 82 +- runescape-client/src/main/java/class22.java | 652 +- runescape-client/src/main/java/class224.java | 221 +- runescape-client/src/main/java/class225.java | 25 + runescape-client/src/main/java/class227.java | 48 +- runescape-client/src/main/java/class228.java | 93 +- runescape-client/src/main/java/class23.java | 890 +- runescape-client/src/main/java/class231.java | 89 +- runescape-client/src/main/java/class232.java | 36 +- runescape-client/src/main/java/class234.java | 29 +- runescape-client/src/main/java/class235.java | 63 + runescape-client/src/main/java/class236.java | 130 +- runescape-client/src/main/java/class237.java | 445 +- runescape-client/src/main/java/class247.java | 260 +- runescape-client/src/main/java/class25.java | 263 +- runescape-client/src/main/java/class257.java | 46 +- runescape-client/src/main/java/class276.java | 16 - runescape-client/src/main/java/class277.java | 50 +- runescape-client/src/main/java/class278.java | 26 +- runescape-client/src/main/java/class279.java | 9 + runescape-client/src/main/java/class280.java | 123 +- runescape-client/src/main/java/class296.java | 40 +- runescape-client/src/main/java/class297.java | 43 +- runescape-client/src/main/java/class298.java | 58 +- runescape-client/src/main/java/class299.java | 174 +- runescape-client/src/main/java/class3.java | 337 +- runescape-client/src/main/java/class300.java | 21 - runescape-client/src/main/java/class303.java | 35 +- runescape-client/src/main/java/class306.java | 16 +- runescape-client/src/main/java/class307.java | 250 + runescape-client/src/main/java/class310.java | 6 +- runescape-client/src/main/java/class322.java | 89 +- runescape-client/src/main/java/class329.java | 29 +- runescape-client/src/main/java/class332.java | 108 +- runescape-client/src/main/java/class335.java | 25 +- runescape-client/src/main/java/class336.java | 16 +- runescape-client/src/main/java/class346.java | 12 +- runescape-client/src/main/java/class348.java | 28 +- runescape-client/src/main/java/class349.java | 19 + runescape-client/src/main/java/class39.java | 416 +- runescape-client/src/main/java/class4.java | 641 +- runescape-client/src/main/java/class41.java | 741 +- runescape-client/src/main/java/class5.java | 18 +- runescape-client/src/main/java/class52.java | 147 +- runescape-client/src/main/java/class56.java | 12 +- runescape-client/src/main/java/class58.java | 111 +- runescape-client/src/main/java/class6.java | 40 +- runescape-client/src/main/java/class60.java | 396 +- runescape-client/src/main/java/class69.java | 138 +- runescape-client/src/main/java/class7.java | 239 +- runescape-client/src/main/java/class8.java | 186 +- runescape-client/src/main/java/class89.java | 301 +- runescape-client/src/main/java/class9.java | 716 +- runescape-client/src/main/java/class90.java | 60 +- runescape-client/src/main/java/class92.java | 294 +- 351 files changed, 41484 insertions(+), 41558 deletions(-) create mode 100644 runescape-client/src/main/java/class225.java create mode 100644 runescape-client/src/main/java/class235.java delete mode 100644 runescape-client/src/main/java/class276.java create mode 100644 runescape-client/src/main/java/class279.java delete mode 100644 runescape-client/src/main/java/class300.java create mode 100644 runescape-client/src/main/java/class307.java create mode 100644 runescape-client/src/main/java/class349.java diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 8c2372e7c7..704f7e3027 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -27,8 +27,8 @@ object ProjectVersions { const val launcherVersion = "2.2.0" const val rlVersion = "1.6.19" - const val openosrsVersion = "3.3.7" + const val openosrsVersion = "3.3.8" - const val rsversion = 189 + const val rsversion = 190 const val cacheversion = 165 } diff --git a/runescape-client/src/main/java/AbstractArchive.java b/runescape-client/src/main/java/AbstractArchive.java index c6e18850d6..6420592024 100644 --- a/runescape-client/src/main/java/AbstractArchive.java +++ b/runescape-client/src/main/java/AbstractArchive.java @@ -4,81 +4,81 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iy") +@ObfuscatedName("ic") @Implements("AbstractArchive") public abstract class AbstractArchive { - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Lmw;" + signature = "Lmu;" ) @Export("gzipDecompressor") static GZipDecompressor gzipDecompressor; - @ObfuscatedName("a") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1088785149 + intValue = -1465326177 ) - static int field3143; - @ObfuscatedName("m") + static int field3177; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1667499623 + intValue = 307318581 ) @Export("groupCount") int groupCount; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("groupIds") int[] groupIds; - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("groupNameHashes") int[] groupNameHashes; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lmj;" + signature = "Lmh;" ) @Export("groupNameHashTable") IntHashTable groupNameHashTable; - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("groupCrcs") int[] groupCrcs; - @ObfuscatedName("q") + @ObfuscatedName("n") @Export("groupVersions") int[] groupVersions; - @ObfuscatedName("z") + @ObfuscatedName("u") @Export("fileCounts") int[] fileCounts; - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("fileIds") int[][] fileIds; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("fileNameHashes") int[][] fileNameHashes; - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "[Lmj;" + signature = "[Lmh;" ) @Export("fileNameHashTables") IntHashTable[] fileNameHashTables; - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("groups") Object[] groups; - @ObfuscatedName("n") + @ObfuscatedName("c") @Export("files") Object[][] files; - @ObfuscatedName("h") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1296799789 + intValue = 981186733 ) @Export("hash") public int hash; - @ObfuscatedName("g") + @ObfuscatedName("r") @Export("releaseGroups") boolean releaseGroups; - @ObfuscatedName("i") + @ObfuscatedName("s") @Export("shallowFiles") boolean shallowFiles; static { gzipDecompressor = new GZipDecompressor(); - field3143 = 0; + field3177 = 0; } AbstractArchive(boolean var1, boolean var2) { @@ -86,15 +86,15 @@ public abstract class AbstractArchive { this.shallowFiles = var2; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "([BI)V", - garbageValue = "32768" + signature = "([BB)V", + garbageValue = "-101" ) @Export("decodeIndex") void decodeIndex(byte[] var1) { - this.hash = GrandExchangeOfferUnitPriceComparator.method225(var1, var1.length); - Buffer var2 = new Buffer(class217.decompressBytes(var1)); + this.hash = FloorOverlayDefinition.method4936(var1, var1.length); + Buffer var2 = new Buffer(Coord.decompressBytes(var1)); int var3 = var2.readUnsignedByte(); if (var3 >= 5 && var3 <= 7) { if (var3 >= 6) { @@ -103,7 +103,7 @@ public abstract class AbstractArchive { int var4 = var2.readUnsignedByte(); if (var3 >= 7) { - this.groupCount = var2.method5778(); + this.groupCount = var2.method5733(); } else { this.groupCount = var2.readUnsignedShort(); } @@ -114,7 +114,7 @@ public abstract class AbstractArchive { int var7; if (var3 >= 7) { for (var7 = 0; var7 < this.groupCount; ++var7) { - this.groupIds[var7] = var5 += var2.method5778(); + this.groupIds[var7] = var5 += var2.method5733(); if (this.groupIds[var7] > var6) { var6 = this.groupIds[var7]; } @@ -170,7 +170,7 @@ public abstract class AbstractArchive { this.fileIds[var8] = new int[var9]; for (var11 = 0; var11 < var9; ++var11) { - var12 = this.fileIds[var8][var11] = var5 += var2.method5778(); + var12 = this.fileIds[var8][var11] = var5 += var2.method5733(); if (var12 > var10) { var10 = var12; } @@ -219,29 +219,29 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "-11" + signature = "(II)V", + garbageValue = "479482423" ) @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IIB)[B", - garbageValue = "-30" + signature = "(III)[B", + garbageValue = "1860640327" ) @Export("takeFile") public byte[] takeFile(int var1, int var2) { return this.takeFileEncrypted(var1, var2, (int[])null); } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(II[II)[B", - garbageValue = "688237624" + garbageValue = "-1226634846" ) @Export("takeFileEncrypted") public byte[] takeFileEncrypted(int var1, int var2, int[] var3) { @@ -257,7 +257,7 @@ public abstract class AbstractArchive { } } - byte[] var5 = class39.method644(this.files[var1][var2], false); + byte[] var5 = FloorUnderlayDefinition.method4613(this.files[var1][var2], false); if (this.shallowFiles) { this.files[var1][var2] = null; } @@ -268,10 +268,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(III)Z", - garbageValue = "1871586288" + garbageValue = "1957538709" ) @Export("tryLoadFile") public boolean tryLoadFile(int var1, int var2) { @@ -289,12 +289,12 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "-700946668" + garbageValue = "-2058273834" ) - public boolean method4251(int var1) { + public boolean method4359(int var1) { if (this.files.length == 1) { return this.tryLoadFile(0, var1); } else if (this.files[var1].length == 1) { @@ -304,10 +304,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "-74" + signature = "(II)Z", + garbageValue = "1896348837" ) @Export("tryLoadGroup") public boolean tryLoadGroup(int var1) { @@ -319,10 +319,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "2004742407" + signature = "(B)Z", + garbageValue = "0" ) @Export("isFullyLoaded") public boolean isFullyLoaded() { @@ -341,20 +341,20 @@ public abstract class AbstractArchive { return var1; } - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "9" + signature = "(II)I", + garbageValue = "-1350822089" ) @Export("groupLoadPercent") int groupLoadPercent(int var1) { return this.groups[var1] != null ? 100 : 0; } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(II)[B", - garbageValue = "-197924565" + garbageValue = "1718789334" ) @Export("takeFileFlat") public byte[] takeFileFlat(int var1) { @@ -367,10 +367,10 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(III)[B", - garbageValue = "1361179955" + garbageValue = "490044156" ) @Export("getFile") public byte[] getFile(int var1, int var2) { @@ -386,17 +386,17 @@ public abstract class AbstractArchive { } } - byte[] var4 = class39.method644(this.files[var1][var2], false); + byte[] var4 = FloorUnderlayDefinition.method4613(this.files[var1][var2], false); return var4; } else { return null; } } - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(IB)[B", - garbageValue = "100" + signature = "(II)[B", + garbageValue = "1362853135" ) @Export("getFileFlat") public byte[] getFileFlat(int var1) { @@ -409,49 +409,49 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "-42" + signature = "(II)V", + garbageValue = "-1560066319" ) @Export("loadGroup") void loadGroup(int var1) { } - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(II)[I", - garbageValue = "1090009385" + signature = "(IB)[I", + garbageValue = "-56" ) @Export("getGroupFileIds") public int[] getGroupFileIds(int var1) { return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; } - @ObfuscatedName("h") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "60" + signature = "(II)I", + garbageValue = "-888140327" ) @Export("getGroupFileCount") public int getGroupFileCount(int var1) { return this.files[var1].length; } - @ObfuscatedName("g") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-30" + signature = "(I)I", + garbageValue = "-763058439" ) @Export("getGroupCount") public int getGroupCount() { return this.files.length; } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "504262227" + garbageValue = "-1760033757" ) @Export("clearGroups") public void clearGroups() { @@ -461,10 +461,10 @@ public abstract class AbstractArchive { } - @ObfuscatedName("a") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-1058828801" + garbageValue = "-546235261" ) @Export("clearFilesGroup") public void clearFilesGroup(int var1) { @@ -474,10 +474,10 @@ public abstract class AbstractArchive { } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "3" + garbageValue = "1" ) @Export("clearFiles") public void clearFiles() { @@ -491,10 +491,10 @@ public abstract class AbstractArchive { } - @ObfuscatedName("c") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I[II)Z", - garbageValue = "1499207460" + garbageValue = "-1692394825" ) @Export("buildFiles") boolean buildFiles(int var1, int[] var2) { @@ -518,14 +518,14 @@ public abstract class AbstractArchive { } else { byte[] var21; if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { - var21 = class39.method644(this.groups[var1], false); + var21 = FloorUnderlayDefinition.method4613(this.groups[var1], false); } else { - var21 = class39.method644(this.groups[var1], true); + var21 = FloorUnderlayDefinition.method4613(this.groups[var1], true); Buffer var8 = new Buffer(var21); var8.xteaDecrypt(var2, 5, var8.array.length); } - byte[] var25 = class217.decompressBytes(var21); + byte[] var25 = Coord.decompressBytes(var21); if (this.releaseGroups) { this.groups[var1] = null; } @@ -535,7 +535,7 @@ public abstract class AbstractArchive { int var9 = var25.length; --var9; var10 = var25[var9] & 255; - var9 -= var3 * var10 * 4; + var9 -= var10 * var3 * 4; Buffer var11 = new Buffer(var25); int[] var12 = new int[var3]; var11.offset = var9; @@ -551,10 +551,10 @@ public abstract class AbstractArchive { } } - byte[][] var23 = new byte[var3][]; + byte[][] var22 = new byte[var3][]; for (var14 = 0; var14 < var3; ++var14) { - var23[var14] = new byte[var12[var14]]; + var22[var14] = new byte[var12[var14]]; var12[var14] = 0; } @@ -567,7 +567,7 @@ public abstract class AbstractArchive { for (var17 = 0; var17 < var3; ++var17) { var16 += var11.readInt(); - System.arraycopy(var25, var14, var23[var17], var12[var17], var16); + System.arraycopy(var25, var14, var22[var17], var12[var17], var16); var12[var17] += var16; var14 += var16; } @@ -576,7 +576,7 @@ public abstract class AbstractArchive { for (var15 = 0; var15 < var3; ++var15) { if (!this.shallowFiles) { var17 = var4[var15]; - byte[] var19 = var23[var15]; + byte[] var19 = var22[var15]; Object var18; if (var19 == null) { var18 = null; @@ -590,7 +590,7 @@ public abstract class AbstractArchive { var5[var17] = var18; } else { - var5[var4[var15]] = var23[var15]; + var5[var4[var15]] = var22[var15]; } } } else if (!this.shallowFiles) { @@ -616,109 +616,189 @@ public abstract class AbstractArchive { } } - @ObfuscatedName("f") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Ljava/lang/String;S)I", - garbageValue = "-10732" + signature = "(Ljava/lang/String;I)I", + garbageValue = "-1113782685" ) @Export("getGroupId") public int getGroupId(String var1) { var1 = var1.toLowerCase(); - return this.groupNameHashTable.get(HealthBarDefinition.hashString(var1)); + return this.groupNameHashTable.get(class219.hashString(var1)); } - @ObfuscatedName("ae") + @ObfuscatedName("ah") @ObfuscatedSignature( signature = "(ILjava/lang/String;I)I", - garbageValue = "374626728" + garbageValue = "1362853135" ) @Export("getFileId") public int getFileId(int var1, String var2) { var2 = var2.toLowerCase(); - return this.fileNameHashTables[var1].get(HealthBarDefinition.hashString(var2)); + return this.fileNameHashTables[var1].get(class219.hashString(var2)); } - @ObfuscatedName("an") + @ObfuscatedName("ai") @ObfuscatedSignature( signature = "(Ljava/lang/String;Ljava/lang/String;I)Z", - garbageValue = "1971024882" + garbageValue = "-1310066556" ) @Export("isValidFileName") public boolean isValidFileName(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(HealthBarDefinition.hashString(var1)); + int var3 = this.groupNameHashTable.get(class219.hashString(var1)); if (var3 < 0) { return false; } else { - int var4 = this.fileNameHashTables[var3].get(HealthBarDefinition.hashString(var2)); + int var4 = this.fileNameHashTables[var3].get(class219.hashString(var2)); return var4 >= 0; } } - @ObfuscatedName("ai") + @ObfuscatedName("ao") @ObfuscatedSignature( signature = "(Ljava/lang/String;Ljava/lang/String;I)[B", - garbageValue = "-1226254785" + garbageValue = "-222408314" ) @Export("takeFileByNames") public byte[] takeFileByNames(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(HealthBarDefinition.hashString(var1)); - int var4 = this.fileNameHashTables[var3].get(HealthBarDefinition.hashString(var2)); + int var3 = this.groupNameHashTable.get(class219.hashString(var1)); + int var4 = this.fileNameHashTables[var3].get(class219.hashString(var2)); return this.takeFile(var3, var4); } - @ObfuscatedName("ap") + @ObfuscatedName("ae") @ObfuscatedSignature( signature = "(Ljava/lang/String;Ljava/lang/String;I)Z", - garbageValue = "-612487532" + garbageValue = "-778364429" ) @Export("tryLoadFileByNames") public boolean tryLoadFileByNames(String var1, String var2) { var1 = var1.toLowerCase(); var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(HealthBarDefinition.hashString(var1)); - int var4 = this.fileNameHashTables[var3].get(HealthBarDefinition.hashString(var2)); + int var3 = this.groupNameHashTable.get(class219.hashString(var1)); + int var4 = this.fileNameHashTables[var3].get(class219.hashString(var2)); return this.tryLoadFile(var3, var4); } - @ObfuscatedName("ab") + @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "(Ljava/lang/String;S)Z", - garbageValue = "5353" + signature = "(Ljava/lang/String;B)Z", + garbageValue = "-81" ) @Export("tryLoadGroupByName") public boolean tryLoadGroupByName(String var1) { var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(HealthBarDefinition.hashString(var1)); + int var2 = this.groupNameHashTable.get(class219.hashString(var1)); return this.tryLoadGroup(var2); } - @ObfuscatedName("ar") + @ObfuscatedName("ag") @ObfuscatedSignature( signature = "(Ljava/lang/String;I)V", - garbageValue = "904314096" + garbageValue = "-1143877885" ) @Export("loadRegionFromName") public void loadRegionFromName(String var1) { var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(HealthBarDefinition.hashString(var1)); + int var2 = this.groupNameHashTable.get(class219.hashString(var1)); if (var2 >= 0) { this.loadRegionFromGroup(var2); } } - @ObfuscatedName("af") + @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)I", - garbageValue = "-63" + signature = "(Ljava/lang/String;I)I", + garbageValue = "-252379742" ) @Export("groupLoadPercentByName") public int groupLoadPercentByName(String var1) { var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(HealthBarDefinition.hashString(var1)); + int var2 = this.groupNameHashTable.get(class219.hashString(var1)); return this.groupLoadPercent(var2); } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(Lkn;IIIIIII)V", + garbageValue = "-1571118584" + ) + @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] = -PacketBufferNode.method3750(var4 + var2 + 932731, var3 + 556238 + 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) { + Tiles.field524[var1][var2][var3] = var0.readByte(); + Tiles.field525[var1][var2][var3] = (byte)((var7 - 2) / 4); + WorldMapLabel.field269[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); + } else if (var7 <= 81) { + Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); + } else { + Tiles.field530[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("gr") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "682759182" + ) + static final int method4411() { + if (NetSocket.clientPreferences.roofsHidden) { + return TileItemPile.Client_plane; + } else { + int var0 = Language.getTileHeight(MouseHandler.cameraX, ObjectSound.cameraZ, TileItemPile.Client_plane); + return var0 - WorldMapSection3.cameraY < 800 && (Tiles.Tiles_renderFlags[TileItemPile.Client_plane][MouseHandler.cameraX >> 7][ObjectSound.cameraZ >> 7] & 4) != 0 ? TileItemPile.Client_plane : 3; + } + } } diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java index aeac519b39..48516bc317 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java @@ -3,850 +3,25 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hi") +@ObfuscatedName("hq") @Implements("AbstractByteArrayCopier") public abstract class AbstractByteArrayCopier { AbstractByteArrayCopier() { } - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)[B", - garbageValue = "1422436059" + garbageValue = "300747627" ) @Export("get") abstract byte[] get(); - @ObfuscatedName("d") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "([BB)V", - garbageValue = "0" + garbageValue = "92" ) @Export("set") public abstract void set(byte[] var1); - - @ObfuscatedName("gv") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZI)V", - garbageValue = "-411552883" - ) - @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 = WorldMapData_0.fontPlain12.lineWidth(var0, 250); - int var6 = WorldMapData_0.fontPlain12.lineCount(var0, 250) * 13; - Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var2 + var6, 0); - Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var6 + var2, 16777215); - WorldMapData_0.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); - int var7 = var3 - var2; - int var8 = var4 - var2; - int var9 = var2 + var5 + var2; - int var10 = var2 + var6 + var2; - - for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { - if (Client.rootWidgetWidths[var11] + Client.rootWidgetXs[var11] > var7 && Client.rootWidgetXs[var11] < var9 + var7 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var10 + var8) { - Client.field679[var11] = true; - } - } - - if (var1) { - class206.rasterProvider.drawFull(0, 0); - } else { - WorldMapScaleHandler.method848(var3, var4, var5, var6); - } - - } - } - - @ObfuscatedName("hn") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1582432822" - ) - static void method4023() { - Client.menuOptionsCount = 0; - Client.isMenuOpen = false; - } - - @ObfuscatedName("ij") - @ObfuscatedSignature( - signature = "(IIIILjava/lang/String;Ljava/lang/String;III)V", - garbageValue = "2048227519" - ) - @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 = FaceNormal.getPacketBufferNode(ClientPacket.field2240, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5610(Client.selectedItemSlot); - var8.packetBuffer.writeShortLE(WorldMapSection2.selectedItemWidget); - var8.packetBuffer.method5609(class89.baseY + var1); - var8.packetBuffer.method5609(var0 + class69.baseX); - var8.packetBuffer.method5609(var3); - var8.packetBuffer.method5609(FaceNormal.selectedItemId); - var8.packetBuffer.method5727(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - 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 = FaceNormal.getPacketBufferNode(ClientPacket.field2252, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); - var8.packetBuffer.writeInt(class7.selectedSpellWidget); - var8.packetBuffer.method5610(var3); - var8.packetBuffer.method5609(class89.baseY + var1); - var8.packetBuffer.method5602(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5609(var0 + class69.baseX); - 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 = FaceNormal.getPacketBufferNode(ClientPacket.field2221, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5602(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeIntME(var0 + class69.baseX); - var8.packetBuffer.method5609(var3); - var8.packetBuffer.method5609(class89.baseY + var1); - 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 = FaceNormal.getPacketBufferNode(ClientPacket.field2243, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.writeIntME(var0 + class69.baseX); - var8.packetBuffer.writeIntME(class89.baseY + var1); - var8.packetBuffer.method5724(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 = FaceNormal.getPacketBufferNode(ClientPacket.field2296, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5610(var0 + class69.baseX); - var8.packetBuffer.writeIntME(class89.baseY + var1); - var8.packetBuffer.method5727(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5610(var3); - 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 = FaceNormal.getPacketBufferNode(ClientPacket.field2288, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5610(var3); - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShort(var0 + class69.baseX); - var8.packetBuffer.method5609(class89.baseY + var1); - Client.packetWriter.addNode(var8); - } else { - PacketBufferNode var9; - NPC var13; - if (var2 == 7) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = FaceNormal.getPacketBufferNode(ClientPacket.field2237, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(Client.selectedItemSlot); - var9.packetBuffer.writeShort(FaceNormal.selectedItemId); - var9.packetBuffer.writeInt(WorldMapSection2.selectedItemWidget); - var9.packetBuffer.method5727(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5609(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 = FaceNormal.getPacketBufferNode(ClientPacket.field2271, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5602(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeInt(class7.selectedSpellWidget); - var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); - var9.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 9) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = FaceNormal.getPacketBufferNode(ClientPacket.field2263, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5609(var3); - var9.packetBuffer.method5724(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 = FaceNormal.getPacketBufferNode(ClientPacket.field2211, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(var3); - var9.packetBuffer.method5724(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 = FaceNormal.getPacketBufferNode(ClientPacket.field2277, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5610(var3); - var9.packetBuffer.method5724(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 = FaceNormal.getPacketBufferNode(ClientPacket.field2219, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5602(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5609(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 13) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = FaceNormal.getPacketBufferNode(ClientPacket.field2303, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeShort(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 = FaceNormal.getPacketBufferNode(ClientPacket.field2225, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5610(FaceNormal.selectedItemId); - var9.packetBuffer.method5610(var3); - var9.packetBuffer.method5727(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeIntME(Client.selectedItemSlot); - var9.packetBuffer.writeInt(WorldMapSection2.selectedItemWidget); - 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 = FaceNormal.getPacketBufferNode(ClientPacket.field2300, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(var3); - var9.packetBuffer.method5617(class7.selectedSpellWidget); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5610(Client.selectedSpellChildIndex); - 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 = FaceNormal.getPacketBufferNode(ClientPacket.field2302, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5610(FaceNormal.selectedItemId); - var8.packetBuffer.writeIntME(var3); - var8.packetBuffer.method5724(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShortLE(WorldMapSection2.selectedItemWidget); - var8.packetBuffer.writeIntME(var0 + class69.baseX); - var8.packetBuffer.writeIntME(Client.selectedItemSlot); - var8.packetBuffer.method5609(class89.baseY + 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 = FaceNormal.getPacketBufferNode(ClientPacket.field2233, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5724(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5609(var3); - var8.packetBuffer.writeIntME(Client.selectedSpellChildIndex); - var8.packetBuffer.writeShort(class89.baseY + var1); - var8.packetBuffer.method5617(class7.selectedSpellWidget); - var8.packetBuffer.writeIntME(var0 + class69.baseX); - 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 = FaceNormal.getPacketBufferNode(ClientPacket.field2287, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(var3); - var8.packetBuffer.writeIntME(var0 + class69.baseX); - var8.packetBuffer.method5609(class89.baseY + var1); - var8.packetBuffer.method5724(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 = FaceNormal.getPacketBufferNode(ClientPacket.field2286, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(class89.baseY + var1); - var8.packetBuffer.method5610(var0 + class69.baseX); - var8.packetBuffer.method5727(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var8); - } else if (var2 == 20) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2275, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5609(var0 + class69.baseX); - var8.packetBuffer.method5610(class89.baseY + var1); - var8.packetBuffer.writeIntME(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 = FaceNormal.getPacketBufferNode(ClientPacket.field2227, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5609(var3); - var8.packetBuffer.method5609(var0 + class69.baseX); - var8.packetBuffer.method5610(class89.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 = FaceNormal.getPacketBufferNode(ClientPacket.field2235, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.method5610(class89.baseY + var1); - var8.packetBuffer.method5727(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5610(var0 + class69.baseX); - Client.packetWriter.addNode(var8); - } else if (var2 == 23) { - if (Client.isMenuOpen) { - GrandExchangeOfferWorldComparator.scene.setViewportWalking(); - } else { - GrandExchangeOfferWorldComparator.scene.menuOpen(ScriptEvent.Client_plane, var0, var1, true); - } - } else { - PacketBufferNode var10; - Widget var16; - if (var2 == 24) { - var16 = MusicPatchNode.getWidget(var1); - boolean var11 = true; - if (var16.contentType > 0) { - var11 = WorldMapSectionType.method344(var16); - } - - if (var11) { - var10 = FaceNormal.getPacketBufferNode(ClientPacket.field2231, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var10); - } - } else { - if (var2 == 25) { - var16 = GrandExchangeOfferUnitPriceComparator.getWidgetChild(var1, var0); - if (var16 != null) { - GrandExchangeOffer.Widget_runOnTargetLeave(); - WorldMapData_1.selectSpell(var1, var0, WorldMapRectangle.method388(ScriptEvent.getWidgetClickMask(var16)), var16.itemId); - Client.isItemSelected = 0; - Client.selectedSpellActionName = PrivateChatMode.method5965(var16); - if (Client.selectedSpellActionName == null) { - Client.selectedSpellActionName = "null"; - } - - if (var16.isIf3) { - Client.selectedSpellName = var16.dataText + class297.colorStartTag(16777215); - } else { - Client.selectedSpellName = class297.colorStartTag(65280) + var16.spellName + class297.colorStartTag(16777215); - } - } - - return; - } - - if (var2 == 26) { - class227.method4184(); - } else { - int var12; - Widget var14; - if (var2 == 28) { - var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2231, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var8); - var14 = MusicPatchNode.getWidget(var1); - if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { - var12 = var14.cs1Instructions[0][1]; - Varps.Varps_main[var12] = 1 - Varps.Varps_main[var12]; - class22.changeGameOptions(var12); - } - } else if (var2 == 29) { - var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2231, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var8); - var14 = MusicPatchNode.getWidget(var1); - if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { - var12 = var14.cs1Instructions[0][1]; - if (Varps.Varps_main[var12] != var14.cs1ComparisonValues[0]) { - Varps.Varps_main[var12] = var14.cs1ComparisonValues[0]; - class22.changeGameOptions(var12); - } - } - } else if (var2 == 30) { - if (Client.meslayerContinueWidget == null) { - class58.resumePauseWidget(var1, var0); - Client.meslayerContinueWidget = GrandExchangeOfferUnitPriceComparator.getWidgetChild(var1, var0); - ItemContainer.invalidateWidget(Client.meslayerContinueWidget); - } - } else if (var2 == 31) { - var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2305, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(var1); - var8.packetBuffer.writeIntME(Client.selectedItemSlot); - var8.packetBuffer.method5644(WorldMapSection2.selectedItemWidget); - var8.packetBuffer.method5610(var0); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.method5610(FaceNormal.selectedItemId); - Client.packetWriter.addNode(var8); - Client.field786 = 0; - WorldMapID.field307 = MusicPatchNode.getWidget(var1); - Client.field880 = var0; - } else if (var2 == 32) { - var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2228, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5609(Client.selectedSpellChildIndex); - var8.packetBuffer.method5644(class7.selectedSpellWidget); - var8.packetBuffer.method5610(var3); - var8.packetBuffer.method5610(var0); - var8.packetBuffer.method5644(var1); - Client.packetWriter.addNode(var8); - Client.field786 = 0; - WorldMapID.field307 = MusicPatchNode.getWidget(var1); - Client.field880 = var0; - } else if (var2 == 33) { - var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2292, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5609(var3); - var8.packetBuffer.method5617(var1); - var8.packetBuffer.writeShort(var0); - Client.packetWriter.addNode(var8); - Client.field786 = 0; - WorldMapID.field307 = MusicPatchNode.getWidget(var1); - Client.field880 = var0; - } else if (var2 == 34) { - var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2265, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.method5610(var3); - var8.packetBuffer.writeIntME(var0); - Client.packetWriter.addNode(var8); - Client.field786 = 0; - WorldMapID.field307 = MusicPatchNode.getWidget(var1); - Client.field880 = var0; - } else if (var2 == 35) { - var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2268, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.method5609(var3); - var8.packetBuffer.writeShort(var0); - Client.packetWriter.addNode(var8); - Client.field786 = 0; - WorldMapID.field307 = MusicPatchNode.getWidget(var1); - Client.field880 = var0; - } else if (var2 == 36) { - var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2208, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5609(var0); - var8.packetBuffer.method5617(var1); - var8.packetBuffer.method5609(var3); - Client.packetWriter.addNode(var8); - Client.field786 = 0; - WorldMapID.field307 = MusicPatchNode.getWidget(var1); - Client.field880 = var0; - } else if (var2 == 37) { - var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2244, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(var0); - var8.packetBuffer.method5644(var1); - var8.packetBuffer.method5610(var3); - Client.packetWriter.addNode(var8); - Client.field786 = 0; - WorldMapID.field307 = MusicPatchNode.getWidget(var1); - Client.field880 = var0; - } else { - if (var2 == 38) { - GrandExchangeOffer.Widget_runOnTargetLeave(); - var16 = MusicPatchNode.getWidget(var1); - Client.isItemSelected = 1; - Client.selectedItemSlot = var0; - WorldMapSection2.selectedItemWidget = var1; - FaceNormal.selectedItemId = var3; - ItemContainer.invalidateWidget(var16); - Client.selectedItemName = class297.colorStartTag(16748608) + AbstractWorldMapData.ItemDefinition_get(var3).name + class297.colorStartTag(16777215); - if (Client.selectedItemName == null) { - Client.selectedItemName = "null"; - } - - return; - } - - if (var2 == 39) { - var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2258, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.method5609(var0); - var8.packetBuffer.method5617(var1); - Client.packetWriter.addNode(var8); - Client.field786 = 0; - WorldMapID.field307 = MusicPatchNode.getWidget(var1); - Client.field880 = var0; - } else if (var2 == 40) { - var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2276, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(var1); - var8.packetBuffer.writeIntME(var3); - var8.packetBuffer.writeShort(var0); - Client.packetWriter.addNode(var8); - Client.field786 = 0; - WorldMapID.field307 = MusicPatchNode.getWidget(var1); - Client.field880 = var0; - } else if (var2 == 41) { - var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2285, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5609(var0); - var8.packetBuffer.method5644(var1); - var8.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var8); - Client.field786 = 0; - WorldMapID.field307 = MusicPatchNode.getWidget(var1); - Client.field880 = var0; - } else if (var2 == 42) { - var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2299, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.method5610(var0); - var8.packetBuffer.method5610(var3); - Client.packetWriter.addNode(var8); - Client.field786 = 0; - WorldMapID.field307 = MusicPatchNode.getWidget(var1); - Client.field880 = var0; - } else if (var2 == 43) { - var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2238, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(var0); - var8.packetBuffer.method5617(var1); - var8.packetBuffer.writeIntME(var3); - Client.packetWriter.addNode(var8); - Client.field786 = 0; - WorldMapID.field307 = MusicPatchNode.getWidget(var1); - Client.field880 = 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 = FaceNormal.getPacketBufferNode(ClientPacket.field2267, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeIntME(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 45) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = FaceNormal.getPacketBufferNode(ClientPacket.field2232, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5610(var3); - var9.packetBuffer.method5727(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 46) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = FaceNormal.getPacketBufferNode(ClientPacket.field2266, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5727(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 47) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = FaceNormal.getPacketBufferNode(ClientPacket.field2282, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(var3); - var9.packetBuffer.method5602(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 = FaceNormal.getPacketBufferNode(ClientPacket.field2254, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5727(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeShort(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 = FaceNormal.getPacketBufferNode(ClientPacket.field2250, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5724(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeIntME(var3); - 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 = FaceNormal.getPacketBufferNode(ClientPacket.field2301, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeShort(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 = FaceNormal.getPacketBufferNode(ClientPacket.field2247, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var9); - } - } else { - label662: { - if (var2 != 57) { - if (var2 == 58) { - var16 = GrandExchangeOfferUnitPriceComparator.getWidgetChild(var1, var0); - if (var16 != null) { - var9 = FaceNormal.getPacketBufferNode(ClientPacket.field2272, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5610(Client.field837); - var9.packetBuffer.method5610(Client.selectedSpellChildIndex); - var9.packetBuffer.writeIntME(var0); - var9.packetBuffer.method5609(var16.itemId); - var9.packetBuffer.writeInt(class7.selectedSpellWidget); - var9.packetBuffer.method5644(var1); - Client.packetWriter.addNode(var9); - } - break label662; - } - - if (var2 == 1001) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2274, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(var3); - var8.packetBuffer.method5609(var0 + class69.baseX); - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShort(class89.baseY + var1); - Client.packetWriter.addNode(var8); - break label662; - } - - if (var2 == 1002) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2284, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5610(var3); - Client.packetWriter.addNode(var8); - break label662; - } - - 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 = FaceNormal.getPacketBufferNode(ClientPacket.field2242, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeIntME(var17.id); - Client.packetWriter.addNode(var10); - } - } - break label662; - } - - if (var2 == 1004) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2294, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5610(var3); - Client.packetWriter.addNode(var8); - break label662; - } - - if (var2 == 1005) { - var16 = MusicPatchNode.getWidget(var1); - if (var16 != null && var16.itemQuantities[var0] >= 100000) { - Skeleton.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + AbstractWorldMapData.ItemDefinition_get(var3).name); - } else { - var9 = FaceNormal.getPacketBufferNode(ClientPacket.field2294, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5610(var3); - Client.packetWriter.addNode(var9); - } - - Client.field786 = 0; - WorldMapID.field307 = MusicPatchNode.getWidget(var1); - Client.field880 = var0; - break label662; - } - - if (var2 != 1007) { - if (var2 == 1009 || var2 == 1011 || var2 == 1010 || var2 == 1008 || var2 == 1012) { - GrandExchangeOfferAgeComparator.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); - } - break label662; - } - } - - var16 = GrandExchangeOfferUnitPriceComparator.getWidgetChild(var1, var0); - if (var16 != null) { - ClientPacket.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); - } - } - } - } - } - } - } - } - } - - if (Client.isItemSelected != 0) { - Client.isItemSelected = 0; - ItemContainer.invalidateWidget(MusicPatchNode.getWidget(WorldMapSection2.selectedItemWidget)); - } - - if (Client.isSpellSelected) { - GrandExchangeOffer.Widget_runOnTargetLeave(); - } - - if (WorldMapID.field307 != null && Client.field786 == 0) { - ItemContainer.invalidateWidget(WorldMapID.field307); - } - - } } diff --git a/runescape-client/src/main/java/AbstractFont.java b/runescape-client/src/main/java/AbstractFont.java index c4832bb477..39d5f18f12 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("kh") +@ObfuscatedName("ka") @Implements("AbstractFont") public abstract class AbstractFont extends Rasterizer2D { - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "[Lle;" + signature = "[Llh;" ) @Export("AbstractFont_modIconSprites") public static IndexedSprite[] AbstractFont_modIconSprites; - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("AbstractFont_strike") static int AbstractFont_strike; - @ObfuscatedName("n") + @ObfuscatedName("c") @Export("AbstractFont_underline") static int AbstractFont_underline; - @ObfuscatedName("u") + @ObfuscatedName("h") @Export("AbstractFont_previousShadow") static int AbstractFont_previousShadow; - @ObfuscatedName("h") + @ObfuscatedName("k") @Export("AbstractFont_shadow") static int AbstractFont_shadow; - @ObfuscatedName("g") + @ObfuscatedName("r") @Export("AbstractFont_previousColor") static int AbstractFont_previousColor; - @ObfuscatedName("i") + @ObfuscatedName("s") @Export("AbstractFont_color") static int AbstractFont_color; - @ObfuscatedName("a") + @ObfuscatedName("v") @Export("AbstractFont_alpha") static int AbstractFont_alpha; - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("AbstractFont_justificationTotal") static int AbstractFont_justificationTotal; - @ObfuscatedName("l") + @ObfuscatedName("e") @Export("AbstractFont_justificationCurrent") static int AbstractFont_justificationCurrent; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("AbstractFont_random") static Random AbstractFont_random; - @ObfuscatedName("o") + @ObfuscatedName("t") @Export("AbstractFont_lines") static String[] AbstractFont_lines; - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("pixels") byte[][] pixels; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("advances") int[] advances; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("widths") int[] widths; - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("heights") int[] heights; - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("leftBearings") int[] leftBearings; - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("topBearings") int[] topBearings; - @ObfuscatedName("q") + @ObfuscatedName("n") @Export("ascent") public int ascent; - @ObfuscatedName("z") + @ObfuscatedName("u") @Export("maxAscent") public int maxAscent; - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("maxDescent") public int maxDescent; - @ObfuscatedName("s") + @ObfuscatedName("w") @Export("kerning") byte[] kerning; @@ -123,15 +123,15 @@ public abstract class AbstractFont extends Rasterizer2D { this.readMetrics(var1); } - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("drawGlyph") abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6); - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("drawGlyphAlpha") abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7); - @ObfuscatedName("t") + @ObfuscatedName("y") @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)method5478(var11, var12, var4, this.advances, var10, var13, var8); + this.kerning[var8 + (var13 << 8)] = (byte)method5603(var11, var12, var4, this.advances, var10, var13, var8); } } } @@ -204,17 +204,17 @@ public abstract class AbstractFont extends Rasterizer2D { } - @ObfuscatedName("s") + @ObfuscatedName("h") @Export("charWidth") int charWidth(char var1) { if (var1 == 160) { var1 = ' '; } - return this.advances[TaskHandler.charToByteCp1252(var1) & 255]; + return this.advances[UserComparator3.charToByteCp1252(var1) & 255]; } - @ObfuscatedName("p") + @ObfuscatedName("k") @Export("stringWidth") public int stringWidth(String var1) { if (var1 == null) { @@ -256,7 +256,7 @@ public abstract class AbstractFont extends Rasterizer2D { } if (var2 == -1) { - var4 += this.advances[(char)(TaskHandler.charToByteCp1252(var6) & 255)]; + var4 += this.advances[(char)(UserComparator3.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("n") + @ObfuscatedName("r") @Export("breakLines") public int breakLines(String var1, int[] var2, String[] var3) { if (var1 == null) { @@ -375,7 +375,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("u") + @ObfuscatedName("d") @Export("lineWidth") public int lineWidth(String var1, int var2) { int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines); @@ -391,13 +391,13 @@ public abstract class AbstractFont extends Rasterizer2D { return var4; } - @ObfuscatedName("h") + @ObfuscatedName("e") @Export("lineCount") public int lineCount(String var1, int var2) { return this.breakLines(var1, new int[]{var2}, AbstractFont_lines); } - @ObfuscatedName("i") + @ObfuscatedName("t") @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("a") + @ObfuscatedName("x") @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("o") + @ObfuscatedName("ah") @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("c") + @ObfuscatedName("ai") @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("f") + @ObfuscatedName("ao") @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) { @@ -510,7 +510,7 @@ public abstract class AbstractFont extends Rasterizer2D { } } - @ObfuscatedName("an") + @ObfuscatedName("ax") @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("ai") + @ObfuscatedName("ag") @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("ap") + @ObfuscatedName("ab") @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("ab") + @ObfuscatedName("am") @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("ar") + @ObfuscatedName("ak") @Export("decodeTag") void decodeTag(String var1) { try { - int var2; - String var3; if (var1.startsWith("col=")) { - var3 = var1.substring(4); - var2 = class105.parseIntCustomRadix(var3, 16, true); - AbstractFont_color = var2; + AbstractFont_color = Username.method5398(var1.substring(4), 16); } else if (var1.equals("/col")) { AbstractFont_color = AbstractFont_previousColor; } else if (var1.startsWith("str=")) { - var3 = var1.substring(4); - var2 = class105.parseIntCustomRadix(var3, 16, true); - AbstractFont_strike = var2; + AbstractFont_strike = Username.method5398(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 = class105.parseIntCustomRadix(var3, 16, true); - AbstractFont_underline = var2; + AbstractFont_underline = Username.method5398(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 = class105.parseIntCustomRadix(var3, 16, true); - AbstractFont_shadow = var2; + AbstractFont_shadow = Username.method5398(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("ad") @Export("calculateLineJustification") void calculateLineJustification(String var1, int var2) { int var3 = 0; @@ -649,7 +639,7 @@ public abstract class AbstractFont extends Rasterizer2D { } - @ObfuscatedName("at") + @ObfuscatedName("as") @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)(TaskHandler.charToByteCp1252(var1.charAt(var6)) & 255); + char var7 = (char)(UserComparator3.charToByteCp1252(var1.charAt(var6)) & 255); if (var7 == '<') { var4 = var6; } else { @@ -738,7 +728,7 @@ public abstract class AbstractFont extends Rasterizer2D { } - @ObfuscatedName("as") + @ObfuscatedName("ar") @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)(TaskHandler.charToByteCp1252(var1.charAt(var9)) & 255); + char var10 = (char)(UserComparator3.charToByteCp1252(var1.charAt(var9)) & 255); if (var10 == '<') { var6 = var9; } else { @@ -856,8 +846,8 @@ public abstract class AbstractFont extends Rasterizer2D { } - @ObfuscatedName("e") - static int method5478(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) { + @ObfuscatedName("c") + static int method5603(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("l") @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("am") + @ObfuscatedName("ap") @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("au") + @ObfuscatedName("al") @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("ao") + @ObfuscatedName("an") @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("aq") + @ObfuscatedName("ac") @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 22c26c67c1..fd53cae232 100644 --- a/runescape-client/src/main/java/AbstractRasterProvider.java +++ b/runescape-client/src/main/java/AbstractRasterProvider.java @@ -4,23 +4,21 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lj") +@ObfuscatedName("lo") @Implements("AbstractRasterProvider") public abstract class AbstractRasterProvider { - @ObfuscatedName("a") - public static String[] field3871; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("pixels") public int[] pixels; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 2037520285 + intValue = 1291852267 ) @Export("width") public int width; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -645523785 + intValue = -1133589313 ) @Export("height") public int height; @@ -28,26 +26,26 @@ public abstract class AbstractRasterProvider { protected AbstractRasterProvider() { } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "1321130014" + signature = "(IIB)V", + garbageValue = "-5" ) @Export("drawFull") public abstract void drawFull(int var1, int var2); - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IIIIS)V", - garbageValue = "32475" + signature = "(IIIII)V", + garbageValue = "-1334771637" ) @Export("draw") public abstract void draw(int var1, int var2, int var3, int var4); - @ObfuscatedName("i") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1783812684" + garbageValue = "25855118" ) @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 7cd736fbc1..40b7d650f2 100644 --- a/runescape-client/src/main/java/AbstractSocket.java +++ b/runescape-client/src/main/java/AbstractSocket.java @@ -4,88 +4,57 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lt") +@ObfuscatedName("lj") @Implements("AbstractSocket") public abstract class AbstractSocket { protected AbstractSocket() { } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "7" + signature = "(I)V", + garbageValue = "-768493590" ) @Export("close") public abstract void close(); - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1436175029" + signature = "(B)I", + garbageValue = "-8" ) @Export("readUnsignedByte") public abstract int readUnsignedByte() throws IOException; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "195119972" + garbageValue = "-1942767880" ) @Export("available") public abstract int available() throws IOException; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "0" + signature = "(II)Z", + garbageValue = "1355091335" ) @Export("isAvailable") public abstract boolean isAvailable(int var1) throws IOException; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "([BIIB)I", - garbageValue = "33" + garbageValue = "37" ) @Export("read") public abstract int read(byte[] var1, int var2, int var3) throws IOException; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "([BIII)V", - garbageValue = "-2040746201" + signature = "([BIIB)V", + garbageValue = "-105" ) @Export("write") public abstract void write(byte[] var1, int var2, int var3) throws IOException; - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "-842833143" - ) - public static final void method5886(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("ke") - @ObfuscatedSignature( - signature = "(Lhe;IIIB)V", - garbageValue = "7" - ) - @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) { - ChatChannel.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/AbstractSound.java b/runescape-client/src/main/java/AbstractSound.java index 8ba4d7daca..342c7204ff 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("df") +@ObfuscatedName("dy") @Implements("AbstractSound") public abstract class AbstractSound extends Node { - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("position") int position; diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java index 9886e2b12b..a42cc6e53f 100644 --- a/runescape-client/src/main/java/AbstractUserComparator.java +++ b/runescape-client/src/main/java/AbstractUserComparator.java @@ -1,27 +1,30 @@ 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("js") +@ObfuscatedName("jk") @Implements("AbstractUserComparator") public abstract class AbstractUserComparator implements Comparator { - @ObfuscatedName("k") - @Export("Interpreter_intLocals") - static int[] Interpreter_intLocals; - @ObfuscatedName("m") + @ObfuscatedName("ix") + @ObfuscatedGetter( + intValue = -1488914561 + ) + @Export("selectedItemWidget") + static int selectedItemWidget; + @ObfuscatedName("o") @Export("nextComparator") Comparator nextComparator; protected AbstractUserComparator() { } - @ObfuscatedName("v") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Ljava/util/Comparator;I)V", - garbageValue = "747268472" + signature = "(Ljava/util/Comparator;S)V", + garbageValue = "-28900" ) @Export("addComparator") final void addComparator(Comparator var1) { @@ -33,10 +36,10 @@ public abstract class AbstractUserComparator implements Comparator { } - @ObfuscatedName("z") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(Ljd;Ljd;I)I", - garbageValue = "1451673304" + signature = "(Ljf;Ljf;I)I", + garbageValue = "864234218" ) @Export("compareUser") protected final int compareUser(User var1, User var2) { @@ -46,142 +49,4 @@ public abstract class AbstractUserComparator implements Comparator { public boolean equals(Object var1) { return super.equals(var1); } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "-729583156" - ) - static int method5119(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] = ModeWhere - .method3761(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] = PacketBufferNode.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] = AttackOption.method2157(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INV_SIZE) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class231.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 = ScriptEvent.Client_plane; - var4 = (ByteArrayPool.localPlayer.x >> 7) + class69.baseX; - var5 = (ByteArrayPool.localPlayer.y >> 7) + class89.baseY; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); - return 1; - } else if (var0 == ScriptOpcodes.COORDX) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; - return 1; - } else if (var0 == ScriptOpcodes.COORDZ) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 >> 28; - return 1; - } else if (var0 == ScriptOpcodes.COORDY) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & 16383; - return 1; - } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ModeWhere - .method3761(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] = PacketBufferNode.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] = AttackOption.method2157(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; - } - } - } - } } diff --git a/runescape-client/src/main/java/AbstractWorldMapData.java b/runescape-client/src/main/java/AbstractWorldMapData.java index 5c17d81d7f..5b2abd5753 100644 --- a/runescape-client/src/main/java/AbstractWorldMapData.java +++ b/runescape-client/src/main/java/AbstractWorldMapData.java @@ -1,123 +1,113 @@ -import java.util.Date; +import java.awt.Component; import java.util.LinkedList; import 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("ab") +@ObfuscatedName("ax") @Implements("AbstractWorldMapData") public abstract class AbstractWorldMapData { - @ObfuscatedName("qb") - @ObfuscatedSignature( - signature = "Ldw;" - ) - @Export("pcmPlayer1") - static PcmPlayer pcmPlayer1; - @ObfuscatedName("c") - @Export("userHomeDirectory") - public static String userHomeDirectory; - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1424511881 + intValue = 1613993877 ) @Export("regionXLow") int regionXLow; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -338405967 + intValue = -341048683 ) @Export("regionYLow") int regionYLow; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -407468573 + intValue = -718032253 ) @Export("regionX") int regionX; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -62405571 + intValue = -2006912863 ) @Export("regionY") int regionY; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 594626733 + intValue = -1970114381 ) @Export("minPlane") int minPlane; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 275280081 + intValue = -352793185 ) @Export("planes") int planes; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1377406919 + intValue = 449340635 ) @Export("groupId") int groupId; - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -687693039 + intValue = 1711100227 ) @Export("fileId") int fileId; - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("floorUnderlayIds") short[][][] floorUnderlayIds; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("floorOverlayIds") short[][][] floorOverlayIds; - @ObfuscatedName("s") - byte[][][] field205; - @ObfuscatedName("p") - byte[][][] field206; - @ObfuscatedName("n") + @ObfuscatedName("w") + byte[][][] field185; + @ObfuscatedName("y") + byte[][][] field175; + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "[[[[Lal;" + signature = "[[[[Lak;" ) @Export("decorations") WorldMapDecoration[][][][] decorations; - @ObfuscatedName("u") - boolean field210; @ObfuscatedName("h") - boolean field209; + boolean field188; + @ObfuscatedName("k") + boolean field179; AbstractWorldMapData() { this.groupId = -1; this.fileId = -1; new LinkedList(); - this.field210 = false; - this.field209 = false; + this.field188 = false; + this.field179 = false; } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkb;B)V", - garbageValue = "-78" + signature = "(Lkn;I)V", + garbageValue = "-1774414997" ) @Export("readGeography") abstract void readGeography(Buffer var1); - @ObfuscatedName("q") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-2034466824" + garbageValue = "923610125" ) @Export("isFullyLoaded") boolean isFullyLoaded() { - return this.field210 && this.field209; + return this.field188 && this.field179; } - @ObfuscatedName("z") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(Liy;I)V", - garbageValue = "-1013927348" + signature = "(Lic;S)V", + garbageValue = "19318" ) @Export("loadGeography") void loadGeography(AbstractArchive var1) { @@ -125,53 +115,53 @@ public abstract class AbstractWorldMapData { byte[] var2 = var1.takeFile(this.groupId, this.fileId); if (var2 != null) { this.readGeography(new Buffer(var2)); - this.field210 = true; - this.field209 = true; + this.field188 = true; + this.field179 = true; } } } - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "778691024" + garbageValue = "1097959131" ) @Export("reset") void reset() { this.floorUnderlayIds = null; this.floorOverlayIds = null; - this.field205 = null; - this.field206 = null; + this.field185 = null; + this.field175 = null; this.decorations = null; - this.field210 = false; - this.field209 = false; + this.field188 = false; + this.field179 = false; } - @ObfuscatedName("e") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(IILkb;B)V", - garbageValue = "20" + signature = "(IILkn;I)V", + garbageValue = "929230318" ) @Export("readTile") void readTile(int var1, int var2, Buffer var3) { int var4 = var3.readUnsignedByte(); if (var4 != 0) { if ((var4 & 1) != 0) { - this.method355(var1, var2, var3, var4); + this.method319(var1, var2, var3, var4); } else { - this.method372(var1, var2, var3, var4); + this.method320(var1, var2, var3, var4); } } } - @ObfuscatedName("s") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(IILkb;IB)V", - garbageValue = "-123" + signature = "(IILkn;II)V", + garbageValue = "1830113999" ) - void method355(int var1, int var2, Buffer var3, int var4) { + void method319(int var1, int var2, Buffer var3, int var4) { boolean var5 = (var4 & 2) != 0; if (var5) { this.floorOverlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); @@ -180,12 +170,12 @@ public abstract class AbstractWorldMapData { this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); } - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IILkb;II)V", - garbageValue = "-1501964087" + signature = "(IILkn;IB)V", + garbageValue = "73" ) - void method372(int var1, int var2, Buffer var3, int var4) { + void method320(int var1, int var2, Buffer var3, int var4) { int var5 = ((var4 & 24) >> 3) + 1; boolean var6 = (var4 & 2) != 0; boolean var7 = (var4 & 4) != 0; @@ -201,8 +191,8 @@ public abstract class AbstractWorldMapData { if (var10 != 0) { this.floorOverlayIds[var9][var1][var2] = (short)var10; var11 = var3.readUnsignedByte(); - this.field205[var9][var1][var2] = (byte)(var11 >> 2); - this.field206[var9][var1][var2] = (byte)(var11 & 3); + this.field185[var9][var1][var2] = (byte)(var11 >> 2); + this.field175[var9][var1][var2] = (byte)(var11 & 3); } } } @@ -214,7 +204,7 @@ public abstract class AbstractWorldMapData { WorldMapDecoration[] var14 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9]; for (var11 = 0; var11 < var9; ++var11) { - int var12 = var3.method5591(); + int var12 = var3.method5843(); int var13 = var3.readUnsignedByte(); var14[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); } @@ -224,349 +214,55 @@ public abstract class AbstractWorldMapData { } - @ObfuscatedName("n") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-1491010463" + signature = "(B)I", + garbageValue = "3" ) @Export("getRegionX") int getRegionX() { return this.regionX; } - @ObfuscatedName("u") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-1765071550" + signature = "(B)I", + garbageValue = "-4" ) @Export("getRegionY") int getRegionY() { return this.regionY; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IB)Ljx;", - garbageValue = "86" + signature = "(Ljava/awt/Component;I)V", + garbageValue = "-1541126292" ) - @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 = PrivateChatMode.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 (!class169.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 = IgnoreList.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; - } + static void method342(Component var0) { + var0.addMouseListener(MouseHandler.MouseHandler_instance); + var0.addMouseMotionListener(MouseHandler.MouseHandler_instance); + var0.addFocusListener(MouseHandler.MouseHandler_instance); } - @ObfuscatedName("at") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "99208963" + signature = "(I)V", + garbageValue = "2015859206" ) - static int method384(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 + class280.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 = 86400000L * (11745L + (long)var10); - 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] = class227.method4200(Huffman.compareStrings(Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1], IgnoreList.clientLanguage)); - return 1; - } 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 = NPC.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 = NPC.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; - } - - 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] = ArchiveLoader.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] = AbstractWorldMapIcon.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] = World.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] = PcmPlayer.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; - } else { - return 2; - } - } - } else { - Interpreter.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1]; - if (ByteArrayPool.localPlayer.appearance != null && ByteArrayPool.localPlayer.appearance.isFemale) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9; - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3; - } - - return 1; - } - } - } + public static void method343() { + HealthBarDefinition.HealthBarDefinition_cached.clear(); + HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); } - @ObfuscatedName("ao") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "1350082309" + signature = "(I)V", + garbageValue = "324919704" ) - static int method380(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { - Interpreter.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - int var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - if (!Client.isCameraLocked) { - Client.camAngleX = var3; - Client.camAngleY = var4; - } - - return 1; - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camAngleX; - return 1; - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camAngleY; - return 1; - } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var3 < 0) { - var3 = 0; - } - - Client.camFollowHeight = var3; - return 1; - } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camFollowHeight; - return 1; - } else { - return 2; - } - } - - @ObfuscatedName("ip") - @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "112" - ) - static final int method381() { - return Client.menuOptionsCount - 1; - } - - @ObfuscatedName("js") - @ObfuscatedSignature( - signature = "(IIII)Lbm;", - garbageValue = "-1715974914" - ) - static final InterfaceParent method382(int var0, int var1, int var2) { - InterfaceParent var3 = new InterfaceParent(); - var3.group = var1; - var3.type = var2; - Client.interfaceParents.put(var3, (long)var0); - class4.Widget_resetModelFrames(var1); - Widget var4 = MusicPatchNode.getWidget(var0); - ItemContainer.invalidateWidget(var4); - if (Client.meslayerContinueWidget != null) { - ItemContainer.invalidateWidget(Client.meslayerContinueWidget); - Client.meslayerContinueWidget = null; - } - - ChatChannel.method2354(); - MouseHandler.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var0 >> 16], var4, false); - WorldMapSectionType.runWidgetOnLoadListener(var1); - if (Client.rootInterface != -1) { - class198.runIntfCloseListeners(Client.rootInterface, 1); - } - - return var3; - } - - @ObfuscatedName("kf") - @ObfuscatedSignature( - signature = "(Lhe;I)Z", - garbageValue = "-1425924887" - ) - @Export("isComponentHidden") - static boolean isComponentHidden(Widget var0) { - return var0.isHidden; + static final void method328() { + Object var10000 = null; + String var0 = "Your friend list is full. Max of 200 for free users, and 400 for members"; + ObjectSound.addGameMessage(30, "", var0); } } diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index 7faa6bb917..ffd647d076 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -4,114 +4,84 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ax") +@ObfuscatedName("af") @Implements("AbstractWorldMapIcon") public abstract class AbstractWorldMapIcon { - @ObfuscatedName("sq") - @ObfuscatedGetter( - intValue = -1106675929 - ) - @Export("foundItemIndex") - static int foundItemIndex; - @ObfuscatedName("dx") + @ObfuscatedName("es") @ObfuscatedSignature( - signature = "Lih;" + signature = "Lig;" ) - @Export("archive6") - static Archive archive6; - @ObfuscatedName("dy") + @Export("archive17") + static Archive archive17; + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lih;" - ) - @Export("archive7") - static Archive archive7; - @ObfuscatedName("fp") - @ObfuscatedSignature( - signature = "Lfr;" - ) - @Export("socketTask") - static Task socketTask; - @ObfuscatedName("la") - @ObfuscatedSignature( - signature = "Lci;" - ) - @Export("tempMenuAction") - static MenuAction tempMenuAction; - @ObfuscatedName("my") - @ObfuscatedGetter( - intValue = 468589673 - ) - @Export("selectedSpellFlags") - static int selectedSpellFlags; - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "Lhj;" + signature = "Lhg;" ) @Export("coord2") public final Coord coord2; - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lhj;" + signature = "Lhg;" ) @Export("coord1") public final Coord coord1; - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1506769643 + intValue = -702767977 ) @Export("screenX") int screenX; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -896182235 + intValue = 2041834837 ) @Export("screenY") int screenY; @ObfuscatedSignature( - signature = "(Lhj;Lhj;)V" + signature = "(Lhg;Lhg;)V" ) AbstractWorldMapIcon(Coord var1, Coord var2) { this.coord1 = var1; this.coord2 = var2; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "16" + garbageValue = "0" ) @Export("getElement") public abstract int getElement(); - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)Lau;", - garbageValue = "2077771117" + signature = "(B)Lar;", + garbageValue = "35" ) @Export("getLabel") abstract WorldMapLabel getLabel(); - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "650401890" + garbageValue = "1804331962" ) @Export("getSubWidth") abstract int getSubWidth(); - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1828864081" + garbageValue = "-1265869629" ) @Export("getSubHeight") abstract int getSubHeight(); - @ObfuscatedName("a") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(III)Z", - garbageValue = "-57056512" + garbageValue = "422348755" ) @Export("fitsScreen") boolean fitsScreen(int var1, int var2) { @@ -122,40 +92,41 @@ public abstract class AbstractWorldMapIcon { } } - @ObfuscatedName("o") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(S)Z", - garbageValue = "-32437" + signature = "(I)Z", + garbageValue = "807957820" ) @Export("hasValidElement") boolean hasValidElement() { return this.getElement() >= 0; } - @ObfuscatedName("c") + @ObfuscatedName("ah") @ObfuscatedSignature( signature = "(III)Z", - garbageValue = "1127928990" + garbageValue = "872444562" ) @Export("elementFitsScreen") boolean elementFitsScreen(int var1, int var2) { if (!this.hasValidElement()) { return false; } else { - WorldMapElement var3 = class25.WorldMapElement_get(this.getElement()); + WorldMapElement var3 = Client.WorldMapElement_get(this.getElement()); int var4 = this.getSubWidth(); int var5 = this.getSubHeight(); switch(var3.horizontalAlignment.value) { case 0: - if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) { - return false; - } - break; - case 1: if (var1 >= this.screenX && var1 < var4 + this.screenX) { break; } + return false; + case 1: + if (var1 >= this.screenX - var4 / 2 && var1 <= var4 / 2 + this.screenX) { + break; + } + return false; case 2: if (var1 <= this.screenX - var4 || var1 > this.screenX) { @@ -165,17 +136,18 @@ public abstract class AbstractWorldMapIcon { switch(var3.verticalAlignment.value) { case 0: - if (var2 <= this.screenY - var5 || var2 > this.screenY) { - return false; + if (var2 >= this.screenY && var2 < var5 + this.screenY) { + break; } - break; + + return false; case 1: if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) { return false; } break; case 2: - if (var2 < this.screenY || var2 >= var5 + this.screenY) { + if (var2 <= this.screenY - var5 || var2 > this.screenY) { return false; } } @@ -184,10 +156,10 @@ public abstract class AbstractWorldMapIcon { } } - @ObfuscatedName("f") + @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(III)Z", - garbageValue = "-411865092" + signature = "(IIB)Z", + garbageValue = "1" ) @Export("labelFitsScreen") boolean labelFitsScreen(int var1, int var2) { @@ -195,19 +167,46 @@ public abstract class AbstractWorldMapIcon { if (var3 == null) { return false; } else if (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX) { - return var2 >= this.screenY && var2 <= this.screenY + var3.height; + return var2 >= this.screenY && var2 <= var3.height + this.screenY; } else { return false; } } - @ObfuscatedName("t") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(CB)Z", - garbageValue = "0" + signature = "(I)V", + garbageValue = "-288699605" ) - @Export("isAlphaNumeric") - public static boolean isAlphaNumeric(char var0) { - return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; + public static void method687() { + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { + if (ArchiveDiskActionHandler.field3181 != 0) { + ArchiveDiskActionHandler.field3181 = 1; + + try { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); + } catch (InterruptedException var3) { + } + } + + } + } + + @ObfuscatedName("fk") + @ObfuscatedSignature( + signature = "(IIII)V", + garbageValue = "-886030498" + ) + @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; + } + } } diff --git a/runescape-client/src/main/java/AccessFile.java b/runescape-client/src/main/java/AccessFile.java index 91e8744ff1..f2e7fba8e4 100644 --- a/runescape-client/src/main/java/AccessFile.java +++ b/runescape-client/src/main/java/AccessFile.java @@ -9,21 +9,21 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mb") +@ObfuscatedName("my") @Implements("AccessFile") public final class AccessFile { - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("file") RandomAccessFile file; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = 1632378019072179927L + longValue = 3349439872542127423L ) @Export("maxSize") final long maxSize; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - longValue = 3271085237778542147L + longValue = 253746605088017275L ) @Export("offset") long offset; @@ -49,21 +49,21 @@ public final class AccessFile { this.file.seek(0L); } - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("seek") final void seek(long var1) throws IOException { this.file.seek(var1); this.offset = var1; } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "([BIIB)V", - garbageValue = "47" + signature = "([BIII)V", + garbageValue = "239881906" ) @Export("write") public final void write(byte[] var1, int var2, int var3) throws IOException { - if (this.offset + (long)var3 > this.maxSize) { + if ((long)var3 + this.offset > this.maxSize) { this.file.seek(this.maxSize); this.file.write(1); throw new EOFException(); @@ -73,20 +73,20 @@ public final class AccessFile { } } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "10" + signature = "(I)V", + garbageValue = "-1767391731" ) @Export("close") public final void close() throws IOException { this.closeSync(false); } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "2141113619" + signature = "(ZB)V", + garbageValue = "-19" ) @Export("closeSync") public final void closeSync(boolean var1) throws IOException { @@ -104,20 +104,20 @@ public final class AccessFile { } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(B)J", - garbageValue = "74" + signature = "(I)J", + garbageValue = "997596889" ) @Export("length") public final long length() throws IOException { return this.file.length(); } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "([BIII)I", - garbageValue = "-316484023" + garbageValue = "-1991806699" ) @Export("read") public final int read(byte[] var1, int var2, int var3) throws IOException { diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index 5fe8b67975..841b1e2cf6 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -4,320 +4,320 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cw") +@ObfuscatedName("cc") @Implements("Actor") public abstract class Actor extends Entity { - @ObfuscatedName("an") - @Export("isWalking") - boolean isWalking; - @ObfuscatedName("ab") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -1730088457 + intValue = 744009553 ) @Export("x") int x; - @ObfuscatedName("ar") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 58548893 + intValue = 2097901447 ) @Export("y") int y; - @ObfuscatedName("af") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 2047396387 + intValue = 2131261511 ) @Export("rotation") int rotation; - @ObfuscatedName("at") + @ObfuscatedName("ab") + @Export("isWalking") + boolean isWalking; + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 747650361 + intValue = -2038697523 ) - int field976; - @ObfuscatedName("al") + int field967; + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 1154559573 + intValue = -316528469 ) @Export("playerCycle") int playerCycle; - @ObfuscatedName("as") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 399800473 + intValue = -137751655 ) @Export("idleSequence") int idleSequence; - @ObfuscatedName("am") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -684262003 + intValue = -1305511341 ) @Export("turnLeftSequence") int turnLeftSequence; - @ObfuscatedName("au") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -1952661919 + intValue = -513548165 ) @Export("turnRightSequence") int turnRightSequence; - @ObfuscatedName("ao") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 2064847885 + intValue = -72649199 ) @Export("walkSequence") int walkSequence; - @ObfuscatedName("aq") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 1807346449 + intValue = 379584779 ) @Export("walkBackSequence") int walkBackSequence; - @ObfuscatedName("av") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -598231963 + intValue = 186381867 ) @Export("walkLeftSequence") int walkLeftSequence; - @ObfuscatedName("ak") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -1622741341 + intValue = 1749182957 ) @Export("walkRightSequence") int walkRightSequence; - @ObfuscatedName("aa") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 1458798213 + intValue = -966124115 ) @Export("runSequence") int runSequence; - @ObfuscatedName("ax") + @ObfuscatedName("af") @Export("overheadText") String overheadText; - @ObfuscatedName("az") + @ObfuscatedName("at") @Export("isAutoChatting") boolean isAutoChatting; - @ObfuscatedName("aj") - boolean field988; - @ObfuscatedName("ay") + @ObfuscatedName("aa") + boolean field979; + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = -1807093205 + intValue = 447977523 ) @Export("overheadTextCyclesRemaining") int overheadTextCyclesRemaining; - @ObfuscatedName("ad") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -1168789031 + intValue = -825187417 ) @Export("overheadTextColor") int overheadTextColor; - @ObfuscatedName("ac") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -54296883 + intValue = 674699849 ) @Export("overheadTextEffect") int overheadTextEffect; - @ObfuscatedName("ag") + @ObfuscatedName("au") @Export("hitSplatCount") byte hitSplatCount; - @ObfuscatedName("aw") + @ObfuscatedName("aj") @Export("hitSplatTypes") int[] hitSplatTypes; - @ObfuscatedName("bf") + @ObfuscatedName("bk") @Export("hitSplatValues") int[] hitSplatValues; - @ObfuscatedName("bc") + @ObfuscatedName("bh") @Export("hitSplatCycles") int[] hitSplatCycles; - @ObfuscatedName("bo") + @ObfuscatedName("bg") @Export("hitSplatTypes2") int[] hitSplatTypes2; - @ObfuscatedName("bd") + @ObfuscatedName("be") @Export("hitSplatValues2") int[] hitSplatValues2; - @ObfuscatedName("bk") + @ObfuscatedName("bf") @ObfuscatedSignature( - signature = "Ljm;" + signature = "Ljx;" ) @Export("healthBars") IterableNodeDeque healthBars; - @ObfuscatedName("bu") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = 1906218843 + intValue = -1028152459 ) @Export("targetIndex") int targetIndex; - @ObfuscatedName("be") + @ObfuscatedName("bd") @Export("false0") boolean false0; - @ObfuscatedName("bg") + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = -1444761415 + intValue = 861621789 ) - int field1015; - @ObfuscatedName("bt") + int field992; + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = 1296285639 + intValue = -1977710907 ) @Export("movementSequence") int movementSequence; - @ObfuscatedName("bh") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = -1097128947 + intValue = 1631636501 ) @Export("movementFrame") int movementFrame; - @ObfuscatedName("br") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = 1112091343 + intValue = 1589742041 ) @Export("movementFrameCycle") int movementFrameCycle; - @ObfuscatedName("bq") + @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = -20846645 + intValue = -1536630843 ) @Export("sequence") int sequence; - @ObfuscatedName("ba") + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = 1620009483 + intValue = -1208509489 ) @Export("sequenceFrame") int sequenceFrame; - @ObfuscatedName("bv") + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = 1370333627 + intValue = -739438903 ) @Export("sequenceFrameCycle") int sequenceFrameCycle; - @ObfuscatedName("bx") + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = -1532646011 + intValue = -1247625137 ) @Export("sequenceDelay") int sequenceDelay; - @ObfuscatedName("bz") + @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = 743745547 + intValue = 2084373007 ) - int field1011; - @ObfuscatedName("bs") + int field1000; + @ObfuscatedName("bv") @ObfuscatedGetter( - intValue = -1600718851 + intValue = 2084591071 ) @Export("spotAnimation") int spotAnimation; - @ObfuscatedName("bp") + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = -595193051 + intValue = 1471011659 ) @Export("spotAnimationFrame") int spotAnimationFrame; - @ObfuscatedName("bm") + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = -1426517203 + intValue = 337978883 ) @Export("spotAnimationFrameCycle") int spotAnimationFrameCycle; - @ObfuscatedName("bb") + @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = 1048299633 + intValue = 1421591937 ) - int field1013; - @ObfuscatedName("bn") + int field987; + @ObfuscatedName("bx") @ObfuscatedGetter( - intValue = 1503080001 + intValue = 541486383 ) - int field1033; + int field1005; + @ObfuscatedName("br") + @ObfuscatedGetter( + intValue = -558534631 + ) + int field995; + @ObfuscatedName("bs") + @ObfuscatedGetter( + intValue = -1971586345 + ) + int field1007; @ObfuscatedName("by") @ObfuscatedGetter( - intValue = 1317270699 + intValue = 1672081961 ) - int field990; + int field1008; @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = 1667801647 + intValue = -715675955 ) - int field972; - @ObfuscatedName("bi") + int field1009; + @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = 441172781 + intValue = 1514147523 ) - int field1017; - @ObfuscatedName("bl") - @ObfuscatedGetter( - intValue = -1550774947 - ) - int field1018; - @ObfuscatedName("bw") - @ObfuscatedGetter( - intValue = -625975993 - ) - int field1019; - @ObfuscatedName("cw") - @ObfuscatedGetter( - intValue = 1067146179 - ) - int field1020; + int field966; @ObfuscatedName("cc") @ObfuscatedGetter( - intValue = 1247809135 + intValue = 337308087 ) - int field1021; + int field1011; + @ObfuscatedName("cb") + @ObfuscatedGetter( + intValue = -1718156865 + ) + int field1006; @ObfuscatedName("ch") @ObfuscatedGetter( - intValue = 1215799343 + intValue = -249207775 ) @Export("npcCycle") int npcCycle; - @ObfuscatedName("cr") + @ObfuscatedName("cw") @ObfuscatedGetter( - intValue = 1881116621 + intValue = 1368163093 ) @Export("defaultHeight") int defaultHeight; - @ObfuscatedName("cq") + @ObfuscatedName("cz") @ObfuscatedGetter( - intValue = 616594567 + intValue = 1251205823 ) @Export("orientation") int orientation; - @ObfuscatedName("co") + @ObfuscatedName("cg") @ObfuscatedGetter( - intValue = 230967505 + intValue = 1694854685 ) - int field1025; - @ObfuscatedName("cm") + int field1016; + @ObfuscatedName("cn") @ObfuscatedGetter( - intValue = 2061571405 + intValue = 1077718703 ) - int field1026; - @ObfuscatedName("cu") + int field1017; + @ObfuscatedName("ce") @ObfuscatedGetter( - intValue = -525774551 + intValue = 1769461271 ) @Export("pathLength") int pathLength; - @ObfuscatedName("cs") + @ObfuscatedName("cj") @Export("pathX") int[] pathX; - @ObfuscatedName("cg") + @ObfuscatedName("ck") @Export("pathY") int[] pathY; - @ObfuscatedName("cd") + @ObfuscatedName("cv") @Export("pathTraversed") byte[] pathTraversed; - @ObfuscatedName("cx") + @ObfuscatedName("cp") @ObfuscatedGetter( - intValue = -1741747755 + intValue = -706356397 ) - int field1031; - @ObfuscatedName("cn") + int field1022; + @ObfuscatedName("ci") @ObfuscatedGetter( - intValue = -932937077 + intValue = 318153573 ) - int field1032; + int field1023; Actor() { this.isWalking = false; - this.field976 = 1; + this.field967 = 1; this.idleSequence = -1; this.turnLeftSequence = -1; this.turnRightSequence = -1; @@ -327,7 +327,7 @@ public abstract class Actor extends Entity { this.walkRightSequence = -1; this.runSequence = -1; this.overheadText = null; - this.field988 = false; + this.field979 = false; this.overheadTextCyclesRemaining = 100; this.overheadTextColor = 0; this.overheadTextEffect = 0; @@ -340,7 +340,7 @@ public abstract class Actor extends Entity { this.healthBars = new IterableNodeDeque(); this.targetIndex = -1; this.false0 = false; - this.field1015 = -1; + this.field992 = -1; this.movementSequence = -1; this.movementFrame = 0; this.movementFrameCycle = 0; @@ -348,46 +348,46 @@ public abstract class Actor extends Entity { this.sequenceFrame = 0; this.sequenceFrameCycle = 0; this.sequenceDelay = 0; - this.field1011 = 0; + this.field1000 = 0; this.spotAnimation = -1; this.spotAnimationFrame = 0; this.spotAnimationFrameCycle = 0; this.npcCycle = 0; this.defaultHeight = 200; - this.field1025 = 0; - this.field1026 = 32; + this.field1016 = 0; + this.field1017 = 32; this.pathLength = 0; this.pathX = new int[10]; this.pathY = new int[10]; this.pathTraversed = new byte[10]; - this.field1031 = 0; - this.field1032 = 0; + this.field1022 = 0; + this.field1023 = 0; } - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "116176402" + signature = "(B)Z", + garbageValue = "1" ) @Export("isVisible") boolean isVisible() { return false; } - @ObfuscatedName("bu") + @ObfuscatedName("bg") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1960813077" + signature = "(B)V", + garbageValue = "78" ) - final void method1842() { + final void method1810() { this.pathLength = 0; - this.field1032 = 0; + this.field1023 = 0; } @ObfuscatedName("be") @ObfuscatedSignature( signature = "(IIIIIII)V", - garbageValue = "-1774762927" + garbageValue = "-1007174032" ) @Export("addHitSplat") final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) { @@ -407,38 +407,52 @@ public abstract class Actor extends Entity { int var10 = -1; int var11 = 0; if (var1 >= 0) { - HitSplatDefinition var12 = GrandExchangeOfferUnitPriceComparator.method213(var1); - var10 = var12.field3327; - var11 = var12.field3329; + HitSplatDefinition var13 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var1); + HitSplatDefinition var12; + if (var13 != null) { + var12 = var13; + } else { + byte[] var14 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var1); + var13 = new HitSplatDefinition(); + if (var14 != null) { + var13.decode(new Buffer(var14)); + } + + HitSplatDefinition.HitSplatDefinition_cached.put(var13, (long)var1); + var12 = var13; + } + + var10 = var12.field3373; + var11 = var12.field3364; } - int var14; + int var15; if (var8) { if (var10 == -1) { return; } var9 = 0; - var14 = 0; + var15 = 0; if (var10 == 0) { - var14 = this.hitSplatCycles[0]; + var15 = this.hitSplatCycles[0]; } else if (var10 == 1) { - var14 = this.hitSplatValues[0]; + var15 = this.hitSplatValues[0]; } - for (int var13 = 1; var13 < 4; ++var13) { + for (int var16 = 1; var16 < 4; ++var16) { if (var10 == 0) { - if (this.hitSplatCycles[var13] < var14) { - var9 = var13; - var14 = this.hitSplatCycles[var13]; + if (this.hitSplatCycles[var16] < var15) { + var9 = var16; + var15 = this.hitSplatCycles[var16]; } - } else if (var10 == 1 && this.hitSplatValues[var13] < var14) { - var9 = var13; - var14 = this.hitSplatValues[var13]; + } else if (var10 == 1 && this.hitSplatValues[var16] < var15) { + var9 = var16; + var15 = this.hitSplatValues[var16]; } } - if (var10 == 1 && var14 >= var2) { + if (var10 == 1 && var15 >= var2) { return; } } else { @@ -446,11 +460,11 @@ public abstract class Actor extends Entity { this.hitSplatCount = 0; } - for (var14 = 0; var14 < 4; ++var14) { - byte var15 = this.hitSplatCount; + for (var15 = 0; var15 < 4; ++var15) { + byte var17 = this.hitSplatCount; this.hitSplatCount = (byte)((this.hitSplatCount + 1) % 4); - if (this.hitSplatCycles[var15] <= var5) { - var9 = var15; + if (this.hitSplatCycles[var17] <= var5) { + var9 = var17; break; } } @@ -465,10 +479,10 @@ public abstract class Actor extends Entity { } } - @ObfuscatedName("bg") + @ObfuscatedName("bf") @ObfuscatedSignature( - signature = "(IIIIIIB)V", - garbageValue = "-58" + signature = "(IIIIIII)V", + garbageValue = "-680285813" ) @Export("addHealthBar") final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) { @@ -496,7 +510,7 @@ public abstract class Actor extends Entity { HealthBar var13; for (var13 = (HealthBar)this.healthBars.last(); var13 != null; var13 = (HealthBar)this.healthBars.previous()) { ++var12; - if (var13.definition.field3276 == var8.field3276) { + if (var13.definition.field3312 == var8.field3312) { var13.put(var2 + var4, var5, var6, var3); return; } @@ -527,45 +541,85 @@ public abstract class Actor extends Entity { } } - @ObfuscatedName("bt") + @ObfuscatedName("ba") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "671360815" + signature = "(IB)V", + garbageValue = "43" ) @Export("removeHealthBar") final void removeHealthBar(int 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)); - } + HealthBarDefinition var2 = LoginPacket.method3745(var1); - 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(); + for (HealthBar var3 = (HealthBar)this.healthBars.last(); var3 != null; var3 = (HealthBar)this.healthBars.previous()) { + if (var2 == var3.definition) { + var3.remove(); return; } } } - @ObfuscatedName("ak") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-2086656267" + signature = "(Lch;Lch;IZI)I", + garbageValue = "-1172543926" ) - static int method1860(int var0) { - return (int)((Math.log((double)var0) / Interpreter.field1128 - 7.0D) * 256.0D); + @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.method1841() ? (var1.method1841() ? 0 : 1) : (var1.method1841() ? -1 : 0); + } else if (var2 == 5) { + return var0.method1874() ? (var1.method1874() ? 0 : 1) : (var1.method1874() ? -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("aj") + @ObfuscatedSignature( + signature = "([BIIB)I", + garbageValue = "46" + ) + static int method1822(byte[] var0, int var1, int var2) { + int var3 = -1; + + for (int var4 = var1; var4 < var2; ++var4) { + var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; + } + + var3 = ~var3; + return var3; } } diff --git a/runescape-client/src/main/java/Animation.java b/runescape-client/src/main/java/Animation.java index 62ed6abd7f..e4f0d384c5 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("eh") +@ObfuscatedName("es") @Implements("Animation") public class Animation { - @ObfuscatedName("x") - static int[] field1651; @ObfuscatedName("m") - static int[] field1655; - @ObfuscatedName("k") - static int[] field1650; - @ObfuscatedName("d") - static int[] field1654; - @ObfuscatedName("w") + static int[] field1664; + @ObfuscatedName("o") + static int[] field1661; + @ObfuscatedName("q") + static int[] field1662; + @ObfuscatedName("j") + static int[] field1663; + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Leb;" + signature = "Ler;" ) @Export("skeleton") Skeleton skeleton; - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("transformCount") int transformCount; - @ObfuscatedName("q") + @ObfuscatedName("n") @Export("transformSkeletonLabels") int[] transformSkeletonLabels; - @ObfuscatedName("z") + @ObfuscatedName("u") @Export("transformXs") int[] transformXs; - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("transformYs") int[] transformYs; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("transformZs") int[] transformZs; - @ObfuscatedName("s") + @ObfuscatedName("w") @Export("hasAlphaTransform") boolean hasAlphaTransform; static { - field1651 = new int[500]; - field1655 = new int[500]; - field1650 = new int[500]; - field1654 = new int[500]; + field1664 = new int[500]; + field1661 = new int[500]; + field1662 = new int[500]; + field1663 = new int[500]; } @ObfuscatedSignature( - signature = "([BLeb;)V" + signature = "([BLer;)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) { - field1651[var7] = var10; - field1655[var7] = 0; - field1650[var7] = 0; - field1654[var7] = 0; + field1664[var7] = var10; + field1661[var7] = 0; + field1662[var7] = 0; + field1663[var7] = 0; ++var7; break; } } } - field1651[var7] = var8; + field1664[var7] = var8; short var11 = 0; if (this.skeleton.transformTypes[var8] == 3) { var11 = 128; } if ((var9 & 1) != 0) { - field1655[var7] = var4.readShortSmart(); + field1661[var7] = var4.readShortSmart(); } else { - field1655[var7] = var11; + field1661[var7] = var11; } if ((var9 & 2) != 0) { - field1650[var7] = var4.readShortSmart(); + field1662[var7] = var4.readShortSmart(); } else { - field1650[var7] = var11; + field1662[var7] = var11; } if ((var9 & 4) != 0) { - field1654[var7] = var4.readShortSmart(); + field1663[var7] = var4.readShortSmart(); } else { - field1654[var7] = var11; + field1663[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] = field1651[var8]; - this.transformXs[var8] = field1655[var8]; - this.transformYs[var8] = field1650[var8]; - this.transformZs[var8] = field1654[var8]; + this.transformSkeletonLabels[var8] = field1664[var8]; + this.transformXs[var8] = field1661[var8]; + this.transformYs[var8] = field1662[var8]; + this.transformZs[var8] = field1663[var8]; } } diff --git a/runescape-client/src/main/java/ApproximateRouteStrategy.java b/runescape-client/src/main/java/ApproximateRouteStrategy.java index 824bec4516..d49052b0c5 100644 --- a/runescape-client/src/main/java/ApproximateRouteStrategy.java +++ b/runescape-client/src/main/java/ApproximateRouteStrategy.java @@ -1,107 +1,189 @@ -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 netscape.javascript.JSObject; -@ObfuscatedName("bj") +@ObfuscatedName("bs") @Implements("ApproximateRouteStrategy") public class ApproximateRouteStrategy extends RouteStrategy { - @ObfuscatedName("hp") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 363395723 + intValue = 955958433 ) - @Export("cameraPitch") - static int cameraPitch; + static int field630; + @ObfuscatedName("lp") + @ObfuscatedGetter( + intValue = -2033733379 + ) + @Export("menuHeight") + static int menuHeight; ApproximateRouteStrategy() { } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IIILfm;B)Z", - garbageValue = "-112" + signature = "(IIILfz;I)Z", + garbageValue = "-1966963917" ) @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("m") + @ObfuscatedName("ha") @ObfuscatedSignature( - signature = "(Liy;IIIZI)V", - garbageValue = "-1342711563" + signature = "(Lby;IIBI)V", + garbageValue = "-549376931" ) - public static void method1321(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { - class206.field2406 = 1; - class206.musicTrackArchive = var0; - class206.musicTrackGroupId = var1; - class206.musicTrackFileId = var2; - class219.musicTrackVolume = var3; - GrandExchangeOfferUnitPriceComparator.musicTrackBoolean = var4; - AttackOption.field1187 = 10000; - } + static final void method1284(Player var0, int var1, int var2, byte var3) { + int var4 = var0.pathX[0]; + int var5 = var0.pathY[0]; + int var6 = var0.transformedSize(); + if (var4 >= var6 && var4 < 104 - var6 && var5 >= var6 && var5 < 104 - var6) { + if (var1 >= var6 && var1 < 104 - var6 && var2 >= var6 && var2 < 104 - var6) { + int var7 = Login.method2235(var4, var5, var0.transformedSize(), class52.method877(var1, var2), Client.collisionMaps[var0.plane], true, Client.field947, Client.field948); + if (var7 >= 1) { + for (int var8 = 0; var8 < var7 - 1; ++var8) { + var0.method1302(Client.field947[var8], Client.field948[var8], var3); + } - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(I)Lfb;", - garbageValue = "1735702864" - ) - public static Clock method1326() { - try { - return new NanoClock(); - } catch (Throwable var1) { - return new MilliClock(); + } + } } } - @ObfuscatedName("gt") + @ObfuscatedName("hc") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "2095073196" + signature = "(Ljava/lang/String;Ljava/lang/String;IIIIZB)V", + garbageValue = "-63" ) - @Export("getWindowedMode") - static int getWindowedMode() { - return Client.isResizable ? 2 : 1; - } - - @ObfuscatedName("kp") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "-1966698976" - ) - static void method1328(String var0) { - WorldMapData_0.field137 = var0; - - try { - String var1 = WorldMapSection1.client.getParameter(Integer.toString(18)); - String var2 = WorldMapSection1.client.getParameter(Integer.toString(13)); - String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; - String var5; - if (var0.length() == 0) { - var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; - } else { - String var4 = var3 + "; Expires="; - long var6 = class217.currentTimeMillis() + 94608000000L; - Calendar.Calendar_calendar.setTime(new Date(var6)); - int var8 = Calendar.Calendar_calendar.get(7); - int var9 = Calendar.Calendar_calendar.get(5); - int var10 = Calendar.Calendar_calendar.get(2); - int var11 = Calendar.Calendar_calendar.get(1); - int var12 = Calendar.Calendar_calendar.get(11); - int var13 = Calendar.Calendar_calendar.get(12); - int var14 = Calendar.Calendar_calendar.get(13); - var5 = Calendar.DAYS_OF_THE_WEEK[var8 - 1] + ", " + var9 / 10 + var9 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var10] + "-" + var11 + " " + var12 / 10 + var12 % 10 + ":" + var13 / 10 + var13 % 10 + ":" + var14 / 10 + var14 % 10 + " GMT"; - var3 = var4 + var5 + "; Max-Age=" + 94608000L; + @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; } - Client var16 = WorldMapSection1.client; - var5 = "document.cookie=\"" + var3 + "\""; - JSObject.getWindow(var16).eval(var5); - } catch (Throwable var15) { } + } + @ObfuscatedName("id") + @ObfuscatedSignature( + signature = "(Ljz;IIII)V", + garbageValue = "1974138271" + ) + @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 + Canvas.method924(var0.combatLevel, class60.localPlayer.combatLevel) + " " + " (" + "level-" + var0.combatLevel + ")"; + } + + if (var0.isFollower && Client.followerOpsLowPriority) { + ScriptEvent.insertMenuItemNoShift("Examine", ItemContainer.colorStartTag(16776960) + var4, 1003, var1, var2, var3); + } + + if (Client.isItemSelected == 1) { + ScriptEvent.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ItemContainer.colorStartTag(16776960) + var4, 7, var1, var2, var3); + } else if (Client.isSpellSelected) { + if ((WorldMapSprite.selectedSpellFlags & 2) == 2) { + ScriptEvent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ItemContainer.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; + } + + ScriptEvent.insertMenuItemNoShift(var6[var7], ItemContainer.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 (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class60.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; + } + + ScriptEvent.insertMenuItemNoShift(var6[var7], ItemContainer.colorStartTag(16776960) + var4, var8, var1, var2, var3); + } + } + } + } + + if (!var0.isFollower || !Client.followerOpsLowPriority) { + ScriptEvent.insertMenuItemNoShift("Examine", ItemContainer.colorStartTag(16776960) + var4, 1003, var1, var2, var3); + } + } + + } + } + } + } } } diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java index 563a702cf9..0a5ed6a4cf 100644 --- a/runescape-client/src/main/java/Archive.java +++ b/runescape-client/src/main/java/Archive.java @@ -5,78 +5,78 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ih") +@ObfuscatedName("ig") @Implements("Archive") public class Archive extends AbstractArchive { - @ObfuscatedName("ai") + @ObfuscatedName("ao") @Export("Archive_crc") static CRC32 Archive_crc; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Llq;" + signature = "Llp;" ) @Export("archiveDisk") ArchiveDisk archiveDisk; - @ObfuscatedName("j") + @ObfuscatedName("b") @ObfuscatedSignature( - signature = "Llq;" + signature = "Llp;" ) @Export("masterDisk") ArchiveDisk masterDisk; - @ObfuscatedName("y") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -523982811 + intValue = 1429609403 ) @Export("index") int index; @ObfuscatedName("f") - volatile boolean field3154; - @ObfuscatedName("ae") - boolean field3156; - @ObfuscatedName("an") + volatile boolean field3189; + @ObfuscatedName("ah") + boolean field3191; + @ObfuscatedName("ai") @Export("validGroups") volatile boolean[] validGroups; - @ObfuscatedName("ap") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 379652259 + intValue = -1541564901 ) @Export("indexCrc") int indexCrc; - @ObfuscatedName("ab") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 1679567941 + intValue = 1294218015 ) @Export("indexVersion") int indexVersion; - @ObfuscatedName("ar") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 843484953 + intValue = -973433081 ) - int field3161; + int field3196; static { Archive_crc = new CRC32(); } @ObfuscatedSignature( - signature = "(Llq;Llq;IZZZ)V" + signature = "(Llp;Llp;IZZZ)V" ) public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) { super(var4, var5); - this.field3154 = false; - this.field3156 = false; - this.field3161 = -1; + this.field3189 = false; + this.field3191 = false; + this.field3196 = -1; this.archiveDisk = var1; this.masterDisk = var2; this.index = var3; - this.field3156 = var6; - class3.method58(this, this.index); + this.field3191 = var6; + MusicPatchNode.method3968(this, this.index); } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "-11" + signature = "(II)V", + garbageValue = "479482423" ) @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { @@ -89,116 +89,116 @@ public class Archive extends AbstractArchive { } - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "9" + signature = "(II)I", + garbageValue = "-1350822089" ) @Export("groupLoadPercent") int groupLoadPercent(int var1) { if (super.groups[var1] != null) { return 100; + } else if (this.validGroups[var1]) { + return 100; } else { - return this.validGroups[var1] ? 100 : class3.method59(this.index, var1); + int var3 = this.index; + long var4 = (long)((var3 << 16) + var1); + int var2; + if (PlayerType.NetCache_currentResponse != null && PlayerType.NetCache_currentResponse.key == var4) { + var2 = CollisionMap.NetCache_responseArchiveBuffer.offset * 99 / (CollisionMap.NetCache_responseArchiveBuffer.array.length - PlayerType.NetCache_currentResponse.padding) + 1; + } else { + var2 = 0; + } + + return var2; } } - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "-42" + signature = "(II)V", + garbageValue = "-1560066319" ) @Export("loadGroup") void loadGroup(int var1) { if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { - DynamicObject.method2342(var1, this.archiveDisk, this); + WorldMapCacheName.method688(var1, this.archiveDisk, this); } else { - Frames.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); + WorldMapEvent.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); } } - @ObfuscatedName("ct") + @ObfuscatedName("dr") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "1875788056" + garbageValue = "6460755" ) - public boolean method4343() { - return this.field3154; + public boolean method4456() { + return this.field3189; } - @ObfuscatedName("cf") + @ObfuscatedName("di") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1046602653" + garbageValue = "1538719165" ) @Export("percentage") public int percentage() { - if (this.field3154) { + if (this.field3189) { return 100; } else if (super.groups != null) { return 99; } else { - int var1 = class3.method59(255, this.index); - if (var1 >= 100) { - var1 = 99; + int var2 = this.index; + long var3 = (long)(var2 + 16711680); + int var1; + if (PlayerType.NetCache_currentResponse != null && PlayerType.NetCache_currentResponse.key == var3) { + var1 = CollisionMap.NetCache_responseArchiveBuffer.offset * 99 / (CollisionMap.NetCache_responseArchiveBuffer.array.length - PlayerType.NetCache_currentResponse.padding) + 1; + } else { + var1 = 0; } - return var1; + int var5 = var1; + if (var1 >= 100) { + var5 = 99; + } + + return var5; } } - @ObfuscatedName("ca") + @ObfuscatedName("dp") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "60" + signature = "(III)V", + garbageValue = "-1870441691" ) @Export("loadIndex") public void loadIndex(int var1, int var2) { this.indexCrc = var1; this.indexVersion = var2; if (this.masterDisk != null) { - DynamicObject.method2342(this.index, this.masterDisk, this); + WorldMapCacheName.method688(this.index, this.masterDisk, this); } else { - Frames.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); + WorldMapEvent.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); } } - @ObfuscatedName("cj") + @ObfuscatedName("dc") @ObfuscatedSignature( signature = "(I[BZZI)V", - garbageValue = "-1921982231" + garbageValue = "-1362503762" ) @Export("write") public void write(int var1, byte[] var2, boolean var3, boolean var4) { if (var3) { - if (this.field3154) { + if (this.field3189) { throw new RuntimeException(); } if (this.masterDisk != null) { - int var5 = this.index; - ArchiveDisk var6 = this.masterDisk; - ArchiveDiskAction var7 = new ArchiveDiskAction(); - var7.type = 0; - var7.key = (long)var5; - var7.data = var2; - var7.archiveDisk = var6; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var7); - } - - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { - if (ArchiveDiskActionHandler.field3151 == 0) { - class197.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); - class197.ArchiveDiskActionHandler_thread.setDaemon(true); - class197.ArchiveDiskActionHandler_thread.start(); - class197.ArchiveDiskActionHandler_thread.setPriority(5); - } - - ArchiveDiskActionHandler.field3151 = 600; - } + SecureRandomFuture.method2270(this.index, var2, this.masterDisk); } this.decodeIndex(var2); @@ -207,44 +207,32 @@ 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) { - WallDecoration.method3402(var1, var2, this.archiveDisk); + SecureRandomFuture.method2270(var1, var2, this.archiveDisk); this.validGroups[var1] = true; } if (var4) { - Object[] var11 = super.groups; - Object var15; - if (var2 == null) { - var15 = null; - } else if (var2.length > 136) { - DirectByteArrayCopier var8 = new DirectByteArrayCopier(); - var8.set(var2); - var15 = var8; - } else { - var15 = var2; - } - - var11[var1] = var15; + super.groups[var1] = MenuAction.method2169(var2, false); } } } - @ObfuscatedName("cp") + @ObfuscatedName("dt") @ObfuscatedSignature( - signature = "(Llq;I[BZI)V", - garbageValue = "246844871" + signature = "(Llp;I[BZI)V", + garbageValue = "416222280" ) @Export("load") - public void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { + void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { int var5; if (var1 == this.masterDisk) { - if (this.field3154) { + if (this.field3189) { throw new RuntimeException(); } if (var3 == null) { - Frames.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); + WorldMapEvent.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); return; } @@ -252,11 +240,11 @@ public class Archive extends AbstractArchive { Archive_crc.update(var3, 0, var3.length); var5 = (int)Archive_crc.getValue(); if (var5 != this.indexCrc) { - Frames.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); + WorldMapEvent.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); return; } - Buffer var11 = new Buffer(class217.decompressBytes(var3)); + Buffer var11 = new Buffer(Coord.decompressBytes(var3)); int var12 = var11.readUnsignedByte(); if (var12 != 5 && var12 != 6) { throw new RuntimeException(var12 + "," + this.index + "," + var2); @@ -268,21 +256,21 @@ public class Archive extends AbstractArchive { } if (var8 != this.indexVersion) { - Frames.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); + WorldMapEvent.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); return; } this.decodeIndex(var3); this.loadAllLocal(); } else { - if (!var4 && var2 == this.field3161) { - this.field3154 = true; + if (!var4 && var2 == this.field3196) { + this.field3189 = true; } if (var3 == null || var3.length <= 2) { this.validGroups[var2] = false; - if (this.field3156 || var4) { - Frames.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + if (this.field3191 || var4) { + WorldMapEvent.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } return; @@ -294,8 +282,8 @@ public class Archive extends AbstractArchive { int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); if (var5 != super.groupCrcs[var2] || var6 != super.groupVersions[var2]) { this.validGroups[var2] = false; - if (this.field3156 || var4) { - Frames.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + if (this.field3191 || var4) { + WorldMapEvent.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } return; @@ -321,10 +309,10 @@ public class Archive extends AbstractArchive { } - @ObfuscatedName("ck") + @ObfuscatedName("ds") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-539943157" + garbageValue = "1106038504" ) @Export("loadAllLocal") void loadAllLocal() { @@ -336,46 +324,46 @@ public class Archive extends AbstractArchive { } if (this.archiveDisk == null) { - this.field3154 = true; + this.field3189 = true; } else { - this.field3161 = -1; + this.field3196 = -1; for (var1 = 0; var1 < this.validGroups.length; ++var1) { if (super.fileCounts[var1] > 0) { - class228.method4204(var1, this.archiveDisk, this); - this.field3161 = var1; + class228.method4262(var1, this.archiveDisk, this); + this.field3196 = var1; } } - if (this.field3161 == -1) { - this.field3154 = true; + if (this.field3196 == -1) { + this.field3189 = true; } } } - @ObfuscatedName("ce") + @ObfuscatedName("dg") @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "18" + signature = "(II)Z", + garbageValue = "1634778176" ) - public boolean method4352(int var1) { + public boolean method4460(int var1) { return this.validGroups[var1]; } - @ObfuscatedName("cv") + @ObfuscatedName("do") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "2030059947" + garbageValue = "-587516749" ) - public boolean method4353(int var1) { + public boolean method4452(int var1) { return this.getGroupFileIds(var1) != null; } - @ObfuscatedName("cl") + @ObfuscatedName("dn") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "110" + signature = "(I)I", + garbageValue = "-1037828577" ) @Export("loadPercent") public int loadPercent() { diff --git a/runescape-client/src/main/java/ArchiveDisk.java b/runescape-client/src/main/java/ArchiveDisk.java index 21a96969d1..14b496068c 100644 --- a/runescape-client/src/main/java/ArchiveDisk.java +++ b/runescape-client/src/main/java/ArchiveDisk.java @@ -6,45 +6,33 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lq") +@ObfuscatedName("lp") @Implements("ArchiveDisk") public final class ArchiveDisk { - @ObfuscatedName("qh") - @ObfuscatedSignature( - signature = "Lla;" - ) - @Export("sceneMinimapSprite") - static Sprite sceneMinimapSprite; - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("ArchiveDisk_buffer") static byte[] ArchiveDisk_buffer; - @ObfuscatedName("e") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "[Lle;" - ) - @Export("title_muteSprite") - static IndexedSprite[] title_muteSprite; - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "Lms;" + signature = "Lmn;" ) @Export("datFile") BufferedFile datFile; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lms;" + signature = "Lmn;" ) @Export("idxFile") BufferedFile idxFile; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1224222019 + intValue = -114633759 ) @Export("archive") int archive; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1681615989 + intValue = 1458452341 ) @Export("maxEntrySize") int maxEntrySize; @@ -54,7 +42,7 @@ public final class ArchiveDisk { } @ObfuscatedSignature( - signature = "(ILms;Lms;I)V" + signature = "(ILmn;Lmn;I)V" ) public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) { this.datFile = null; @@ -66,10 +54,10 @@ public final class ArchiveDisk { this.maxEntrySize = var4; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(II)[B", - garbageValue = "-613554322" + garbageValue = "475820078" ) @Export("read") public byte[] read(int var1) { @@ -101,7 +89,7 @@ public final class ArchiveDisk { return (byte[])var10000; } - this.datFile.seek((long)var4 * 520L); + this.datFile.seek(520L * (long)var4); int var8 = var3 - var6; int var9; int var10; @@ -125,14 +113,14 @@ public final class ArchiveDisk { } var13 = 8; - this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8); + this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13); var9 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); var10 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); var11 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); var12 = ArchiveDisk_buffer[7] & 255; } - if (var9 == var1 && var10 == var7 && var12 == this.archive) { + if (var9 == var1 && var7 == var10 && var12 == this.archive) { if (var11 >= 0 && (long)var11 <= this.datFile.length() / 520L) { int var14 = var8 + var13; @@ -163,10 +151,10 @@ public final class ArchiveDisk { } } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I[BII)Z", - garbageValue = "-1923242861" + signature = "(I[BIB)Z", + garbageValue = "3" ) @Export("write") public boolean write(int var1, byte[] var2, int var3) { @@ -184,10 +172,10 @@ public final class ArchiveDisk { } } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I[BIZI)Z", - garbageValue = "2120818840" + signature = "(I[BIZS)Z", + garbageValue = "21116" ) @Export("write0") boolean write0(int var1, byte[] var2, int var3, boolean var4) { @@ -228,7 +216,7 @@ public final class ArchiveDisk { while (true) { if (var7 < var3) { - label171: { + label170: { int var9 = 0; int var10; if (var4) { @@ -239,7 +227,7 @@ public final class ArchiveDisk { 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); @@ -250,7 +238,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); @@ -259,7 +247,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; } @@ -277,7 +265,7 @@ public final class ArchiveDisk { ++var9; } - if (var6 == var9) { + if (var9 == var6) { ++var9; } } @@ -319,7 +307,7 @@ public final class ArchiveDisk { ArchiveDisk_buffer[5] = (byte)(var9 >> 8); ArchiveDisk_buffer[6] = (byte)var9; ArchiveDisk_buffer[7] = (byte)this.archive; - this.datFile.seek((long)var6 * 520L); + this.datFile.seek(520L * (long)var6); this.datFile.write(ArchiveDisk_buffer, 0, 8); var10 = var3 - var7; if (var10 > 512) { @@ -348,34 +336,4 @@ public final class ArchiveDisk { public String toString() { return "" + this.archive; } - - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "(I)Lla;", - garbageValue = "-389802701" - ) - static Sprite method5932() { - Sprite var0 = new Sprite(); - var0.width = class335.SpriteBuffer_spriteWidth; - var0.height = class335.SpriteBuffer_spriteHeight; - var0.xOffset = class335.SpriteBuffer_xOffsets[0]; - var0.yOffset = StructDefinition.SpriteBuffer_yOffsets[0]; - var0.subWidth = class335.SpriteBuffer_spriteWidths[0]; - var0.subHeight = class335.SpriteBuffer_spriteHeights[0]; - int var1 = var0.subHeight * var0.subWidth; - byte[] var2 = class4.SpriteBuffer_pixels[0]; - var0.pixels = new int[var1]; - - for (int var3 = 0; var3 < var1; ++var3) { - var0.pixels[var3] = DefaultsGroup.SpriteBuffer_spritePalette[var2[var3] & 255]; - } - - class335.SpriteBuffer_xOffsets = null; - StructDefinition.SpriteBuffer_yOffsets = null; - class335.SpriteBuffer_spriteWidths = null; - class335.SpriteBuffer_spriteHeights = null; - DefaultsGroup.SpriteBuffer_spritePalette = null; - class4.SpriteBuffer_pixels = null; - return var0; - } } diff --git a/runescape-client/src/main/java/ArchiveDiskAction.java b/runescape-client/src/main/java/ArchiveDiskAction.java index 679f338055..f7b0c1515a 100644 --- a/runescape-client/src/main/java/ArchiveDiskAction.java +++ b/runescape-client/src/main/java/ArchiveDiskAction.java @@ -4,37 +4,162 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ir") +@ObfuscatedName("in") @Implements("ArchiveDiskAction") public class ArchiveDiskAction extends Node { - @ObfuscatedName("de") - @ObfuscatedSignature( - signature = "Lih;" - ) - @Export("archive0") - static Archive archive0; - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1964239455 + intValue = -947897909 ) @Export("type") int type; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("data") - public byte[] data; - @ObfuscatedName("k") + byte[] data; + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Llq;" + signature = "Llp;" ) @Export("archiveDisk") - public ArchiveDisk archiveDisk; - @ObfuscatedName("d") + ArchiveDisk archiveDisk; + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lih;" + signature = "Lig;" ) @Export("archive") - public Archive archive; + Archive archive; ArchiveDiskAction() { } + + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "(Lkb;II)Z", + garbageValue = "-1045128194" + ) + @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.field1279[var1] != null) { + var6.read(Players.field1279[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.field1278[var1]; + var6.plane = (byte)var8; + var6.resetPath((var9 << 13) + var3 - class182.baseX, (var10 << 13) + var4 - SecureRandomFuture.baseY); + var6.field659 = false; + return true; + } + } else if (var2 == 1) { + var3 = var0.readBits(2); + var4 = Players.Players_regions[var1]; + Players.Players_regions[var1] = (var4 & 268435455) + (((var4 >> 28) + var3 & 3) << 28); + return false; + } else { + int var5; + int 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 = var11 + var7 & 255; + Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); + return false; + } + } + } + + @ObfuscatedName("js") + @ObfuscatedSignature( + signature = "(II)Z", + garbageValue = "-418956614" + ) + static boolean method4302(int var0) { + for (int var1 = 0; var1 < Client.field894; ++var1) { + if (Client.field896[var1] == var0) { + return true; + } + } + + return false; + } } diff --git a/runescape-client/src/main/java/ArchiveDiskActionHandler.java b/runescape-client/src/main/java/ArchiveDiskActionHandler.java index d288c817a0..0d71840747 100644 --- a/runescape-client/src/main/java/ArchiveDiskActionHandler.java +++ b/runescape-client/src/main/java/ArchiveDiskActionHandler.java @@ -7,31 +7,34 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ip") @Implements("ArchiveDiskActionHandler") public class ArchiveDiskActionHandler implements Runnable { - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Ljh;" - ) - @Export("ArchiveDiskActionHandler_requestQueue") - public static NodeDeque ArchiveDiskActionHandler_requestQueue; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Ljh;" + signature = "Ljp;" + ) + @Export("ArchiveDiskActionHandler_requestQueue") + static NodeDeque ArchiveDiskActionHandler_requestQueue; + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "Ljp;" ) @Export("ArchiveDiskActionHandler_responseQueue") - public static NodeDeque ArchiveDiskActionHandler_responseQueue; - @ObfuscatedName("k") + static NodeDeque ArchiveDiskActionHandler_responseQueue; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -191724831 + intValue = 608159891 ) - public static int field3151; - @ObfuscatedName("d") + static int field3181; + @ObfuscatedName("j") @Export("ArchiveDiskActionHandler_lock") - public static Object ArchiveDiskActionHandler_lock; + static Object ArchiveDiskActionHandler_lock; + @ObfuscatedName("p") + @Export("ArchiveDiskActionHandler_thread") + static Thread ArchiveDiskActionHandler_thread; static { ArchiveDiskActionHandler_requestQueue = new NodeDeque(); ArchiveDiskActionHandler_responseQueue = new NodeDeque(); - field3151 = 0; + field3181 = 0; ArchiveDiskActionHandler_lock = new Object(); } @@ -60,38 +63,129 @@ public class ArchiveDiskActionHandler implements Runnable { } synchronized(ArchiveDiskActionHandler_lock) { - if (field3151 <= 1) { - field3151 = 0; + if (field3181 <= 1) { + field3181 = 0; ArchiveDiskActionHandler_lock.notifyAll(); return; } - field3151 = 600; + field3181 = 600; } } else { - class169.sleepExact(100L); + SpriteMask.sleepExact(99L); + SpriteMask.sleepExact(1L); synchronized(ArchiveDiskActionHandler_lock) { - if (field3151 <= 1) { - field3151 = 0; + if (field3181 <= 1) { + field3181 = 0; ArchiveDiskActionHandler_lock.notifyAll(); return; } - --field3151; + --field3181; } } } } catch (Exception var13) { - WorldMapDecorationType.RunException_sendStackTrace((String)null, var13); + class197.RunException_sendStackTrace((String)null, var13); } } - @ObfuscatedName("bk") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)I", - garbageValue = "-492522565" + signature = "(Lic;Lic;I)I", + garbageValue = "-1395527740" ) - public static int method4340(String var0) { - return var0.length() + 2; + static int method4429(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("logo_seasonal_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; + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(IB)Z", + garbageValue = "8" + ) + @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("fh") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;ZB)V", + garbageValue = "-20" + ) + @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 = MusicPatchNode2.fontPlain12.lineWidth(var0, 250); + int var6 = MusicPatchNode2.fontPlain12.lineCount(var0, 250) * 13; + Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var6 + var2, 0); + Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var6 + var2, 16777215); + MusicPatchNode2.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); + class1.method7(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var2 + var6); + if (var1) { + ArchiveLoader.rasterProvider.drawFull(0, 0); + } else { + WorldMapData_0.method243(var3, var4, var5, var6); + } + + } } } diff --git a/runescape-client/src/main/java/ArchiveLoader.java b/runescape-client/src/main/java/ArchiveLoader.java index 33b10e0f8c..9920a3b2ad 100644 --- a/runescape-client/src/main/java/ArchiveLoader.java +++ b/runescape-client/src/main/java/ArchiveLoader.java @@ -3,31 +3,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("bz") +@ObfuscatedName("bl") @Implements("ArchiveLoader") public class ArchiveLoader { - @ObfuscatedName("m") + @ObfuscatedName("sm") + @ObfuscatedGetter( + intValue = -1707200579 + ) + @Export("foundItemIndex") + static int foundItemIndex; + @ObfuscatedName("x") + @Export("userHomeDirectory") + static String userHomeDirectory; + @ObfuscatedName("an") @ObfuscatedSignature( - signature = "Lih;" + signature = "Llo;" + ) + @Export("rasterProvider") + public static AbstractRasterProvider rasterProvider; + @ObfuscatedName("dw") + @Export("mouseCam") + static boolean mouseCam; + @ObfuscatedName("fy") + @ObfuscatedSignature( + signature = "Lfa;" + ) + @Export("socketTask") + static Task socketTask; + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "Lig;" ) @Export("archive") final Archive archive; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 216071601 + intValue = 1705798073 ) @Export("groupCount") final int groupCount; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -189862787 + intValue = 607937277 ) @Export("loadedCount") int loadedCount; @ObfuscatedSignature( - signature = "(Lih;Ljava/lang/String;)V" + signature = "(Lig;Ljava/lang/String;)V" ) ArchiveLoader(Archive var1, String var2) { this.loadedCount = 0; @@ -35,17 +60,17 @@ public class ArchiveLoader { this.groupCount = var1.getGroupCount(); } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "92028555" + garbageValue = "-1314527591" ) @Export("isLoaded") boolean isLoaded() { this.loadedCount = 0; for (int var1 = 0; var1 < this.groupCount; ++var1) { - if (!this.archive.method4353(var1) || this.archive.method4352(var1)) { + if (!this.archive.method4452(var1) || this.archive.method4460(var1)) { ++this.loadedCount; } } @@ -53,155 +78,129 @@ public class ArchiveLoader { return this.loadedCount >= this.groupCount; } - @ObfuscatedName("s") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(CI)Z", - garbageValue = "527367819" + signature = "(III)I", + garbageValue = "1299326622" ) - @Export("isCharPrintable") - public static boolean isCharPrintable(char var0) { - if (var0 >= ' ' && var0 <= '~') { - return true; - } else if (var0 >= 160 && var0 <= 255) { - return true; + static int method1212(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var2 == null) { + return 0; + } else if (var1 == -1) { + return 0; } else { - return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; - } - } + int var3 = 0; - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(ZB)V", - garbageValue = "-66" - ) - public static void method1254(boolean var0) { - if (var0 != class169.ItemDefinition_inMembersWorld) { - class257.method4558(); - class169.ItemDefinition_inMembersWorld = var0; - } - - } - - @ObfuscatedName("km") - @ObfuscatedSignature( - signature = "(Lhe;IIII)V", - garbageValue = "510029442" - ) - @Export("drawMinimap") - static final void drawMinimap(Widget var0, int var1, int var2, int var3) { - ChatChannel.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 = ByteArrayPool.localPlayer.x / 32 + 48; - int var7 = 464 - ByteArrayPool.localPlayer.y / 32; - ArchiveDisk.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 - ByteArrayPool.localPlayer.x / 32; - var10 = Client.mapIconYs[var8] * 4 + 2 - ByteArrayPool.localPlayer.y / 32; - ScriptEvent.drawSpriteOnMinimap(var1, var2, var9, var10, Client.mapIcons[var8], var4); + for (int var4 = 0; var4 < var2.quantities.length; ++var4) { + if (var2.ids[var4] == var1) { + var3 += var2.quantities[var4]; } - - int var11; - int var12; - for (var8 = 0; var8 < 104; ++var8) { - for (var9 = 0; var9 < 104; ++var9) { - NodeDeque var15 = Client.groundItems[ScriptEvent.Client_plane][var8][var9]; - if (var15 != null) { - var11 = var8 * 4 + 2 - ByteArrayPool.localPlayer.x / 32; - var12 = var9 * 4 + 2 - ByteArrayPool.localPlayer.y / 32; - ScriptEvent.drawSpriteOnMinimap(var1, var2, var11, var12, VarpDefinition.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 - ByteArrayPool.localPlayer.x / 32; - var12 = var16.y / 32 - ByteArrayPool.localPlayer.y / 32; - ScriptEvent.drawSpriteOnMinimap(var1, var2, var11, var12, VarpDefinition.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 != ByteArrayPool.localPlayer) { - var12 = var17.x / 32 - ByteArrayPool.localPlayer.x / 32; - int var13 = var17.y / 32 - ByteArrayPool.localPlayer.y / 32; - boolean var14 = false; - if (ByteArrayPool.localPlayer.team != 0 && var17.team != 0 && var17.team == ByteArrayPool.localPlayer.team) { - var14 = true; - } - - if (var17.isFriend()) { - ScriptEvent.drawSpriteOnMinimap(var1, var2, var12, var13, VarpDefinition.mapDotSprites[3], var4); - } else if (var14) { - ScriptEvent.drawSpriteOnMinimap(var1, var2, var12, var13, VarpDefinition.mapDotSprites[4], var4); - } else if (var17.isClanMember()) { - ScriptEvent.drawSpriteOnMinimap(var1, var2, var12, var13, VarpDefinition.mapDotSprites[5], var4); - } else { - ScriptEvent.drawSpriteOnMinimap(var1, var2, var12, var13, VarpDefinition.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 - ByteArrayPool.localPlayer.x / 32; - var12 = var20.y / 32 - ByteArrayPool.localPlayer.y / 32; - class1.worldToMinimap(var1, var2, var11, var12, WorldMapAreaData.mapMarkerSprites[1], var4); - } - } - - if (Client.hintArrowType == 2) { - var10 = Client.hintArrowX * 4 - class69.baseX * 4 + 2 - ByteArrayPool.localPlayer.x / 32; - var11 = Client.hintArrowY * 4 - class89.baseY * 4 + 2 - ByteArrayPool.localPlayer.y / 32; - class1.worldToMinimap(var1, var2, var10, var11, WorldMapAreaData.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 / 32 - ByteArrayPool.localPlayer.x / 32; - var12 = var21.y / 32 - ByteArrayPool.localPlayer.y / 32; - class1.worldToMinimap(var1, var2, var11, var12, WorldMapAreaData.mapMarkerSprites[1], var4); - } - } - } - - if (Client.destinationX != 0) { - var10 = Client.destinationX * 4 + 2 - ByteArrayPool.localPlayer.x / 32; - var11 = Client.destinationY * 4 + 2 - ByteArrayPool.localPlayer.y / 32; - ScriptEvent.drawSpriteOnMinimap(var1, var2, var10, var11, WorldMapAreaData.mapMarkerSprites[0], var4); - } - - if (!ByteArrayPool.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.field886[var3] = true; + return var3; + } + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(ILcs;ZI)I", + garbageValue = "677134031" + ) + static int method1213(int var0, Script var1, boolean var2) { + int var3; + int var4; + if (var0 == ScriptOpcodes.CC_CREATE) { + UrlRequester.Interpreter_intStackSize -= 3; + var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + int var5 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2]; + if (var4 == 0) { + throw new RuntimeException(); + } else { + Widget var6 = WorldMapSprite.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) { + KeyHandler.field407 = var12; + } else { + SecureRandomCallable.field544 = var12; + } + + class234.invalidateWidget(var6); + return 1; + } + } + } else { + Widget var9; + if (var0 == ScriptOpcodes.CC_DELETE) { + var9 = var2 ? KeyHandler.field407 : SecureRandomCallable.field544; + Widget var10 = WorldMapSprite.getWidget(var9.id); + var10.children[var9.childIndex] = null; + class234.invalidateWidget(var10); + return 1; + } else if (var0 == ScriptOpcodes.CC_DELETEALL) { + var9 = WorldMapSprite.getWidget(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); + var9.children = null; + class234.invalidateWidget(var9); + return 1; + } else if (var0 != ScriptOpcodes.CC_FIND) { + if (var0 == ScriptOpcodes.IF_FIND) { + var9 = WorldMapSprite.getWidget(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); + if (var9 != null) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 1; + if (var2) { + KeyHandler.field407 = var9; + } else { + SecureRandomCallable.field544 = var9; + } + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else { + return 2; + } + } else { + UrlRequester.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + Widget var11 = WorldMapLabelSize.getWidgetChild(var3, var4); + if (var11 != null && var4 != -1) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 1; + if (var2) { + KeyHandler.field407 = var11; + } else { + SecureRandomCallable.field544 = var11; + } + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } } } } diff --git a/runescape-client/src/main/java/AttackOption.java b/runescape-client/src/main/java/AttackOption.java index 413b80c740..03755320ed 100644 --- a/runescape-client/src/main/java/AttackOption.java +++ b/runescape-client/src/main/java/AttackOption.java @@ -3,48 +3,51 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("cb") +@ObfuscatedName("co") @Implements("AttackOption") public enum AttackOption implements Enumerated { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lcb;" + signature = "Lco;" ) @Export("AttackOption_dependsOnCombatLevels") AttackOption_dependsOnCombatLevels(0), - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lcb;" + signature = "Lco;" ) @Export("AttackOption_alwaysRightClick") AttackOption_alwaysRightClick(1), - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lcb;" + signature = "Lco;" ) @Export("AttackOption_leftClickWhereAvailable") AttackOption_leftClickWhereAvailable(2), - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lcb;" + signature = "Lco;" ) @Export("AttackOption_hidden") AttackOption_hidden(3); - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -1084826611 + @ObfuscatedName("of") + @ObfuscatedSignature( + signature = "Lcy;" ) - public static int field1187; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -1589469367 + @Export("varcs") + static Varcs varcs; + @ObfuscatedName("hj") + @ObfuscatedSignature( + signature = "[Llz;" ) - static int field1182; - @ObfuscatedName("w") + @Export("mapDotSprites") + static Sprite[] mapDotSprites; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1155763571 + intValue = -942694603 ) @Export("id") final int id; @@ -53,56 +56,160 @@ public enum AttackOption implements Enumerated { this.id = var3; } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "56" + signature = "(I)I", + garbageValue = "-995092303" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("k") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "2128537982" + signature = "(I)Llh;", + garbageValue = "-1275433341" ) - static int method2157(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; + public static IndexedSprite method2173() { + IndexedSprite var0 = new IndexedSprite(); + var0.width = class335.SpriteBuffer_spriteWidth; + var0.height = UserComparator8.SpriteBuffer_spriteHeight; + var0.xOffset = class335.SpriteBuffer_xOffsets[0]; + var0.yOffset = NPC.SpriteBuffer_yOffsets[0]; + var0.subWidth = class335.SpriteBuffer_spriteWidths[0]; + var0.subHeight = class335.SpriteBuffer_spriteHeights[0]; + var0.palette = class335.SpriteBuffer_spritePalette; + var0.pixels = ItemDefinition.SpriteBuffer_pixels[0]; + GrandExchangeEvent.method158(); + return var0; + } - for (int var4 = 0; var4 < var2.quantities.length; ++var4) { - if (var2.ids[var4] == var1) { - var3 += var2.quantities[var4]; - } + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "-37" + ) + public static void method2181() { + SequenceDefinition.SequenceDefinition_cached.clear(); + SequenceDefinition.SequenceDefinition_cachedFrames.clear(); + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + signature = "(ILcs;ZB)I", + garbageValue = "-99" + ) + static int method2180(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { + UrlRequester.Interpreter_intStackSize -= 2; + Client.field727 = (short)GrandExchangeOffer.method176(Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]); + if (Client.field727 <= 0) { + Client.field727 = 256; } - return var3; + Client.field924 = (short)GrandExchangeOffer.method176(Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]); + if (Client.field924 <= 0) { + Client.field924 = 256; + } + + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { + UrlRequester.Interpreter_intStackSize -= 2; + Client.zoomHeight = (short)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + if (Client.zoomHeight <= 0) { + Client.zoomHeight = 256; + } + + Client.zoomWidth = (short)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + if (Client.zoomWidth <= 0) { + Client.zoomWidth = 320; + } + + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { + UrlRequester.Interpreter_intStackSize -= 4; + Client.field927 = (short)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + if (Client.field927 <= 0) { + Client.field927 = 1; + } + + Client.field928 = (short)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + if (Client.field928 <= 0) { + Client.field928 = 32767; + } else if (Client.field928 < Client.field927) { + Client.field928 = Client.field927; + } + + Client.field685 = (short)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2]; + if (Client.field685 <= 0) { + Client.field685 = 1; + } + + Client.field861 = (short)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 3]; + if (Client.field861 <= 0) { + Client.field861 = 32767; + } else if (Client.field861 < Client.field685) { + Client.field861 = Client.field685; + } + + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { + if (Client.viewportWidget != null) { + WorldMapID.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.viewportWidth; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.viewportHeight; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; + } + + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.zoomHeight; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.zoomWidth; + return 1; + } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = WorldMapSection0.method295(Client.field727); + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = WorldMapSection0.method295(Client.field924); + return 1; + } else if (var0 == 6220) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 6221) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 6222) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Varcs.canvasWidth; + return 1; + } else if (var0 == 6223) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = class52.canvasHeight; + return 1; + } else { + return 2; } } - @ObfuscatedName("t") + @ObfuscatedName("ho") @ObfuscatedSignature( - signature = "(I)Lle;", - garbageValue = "-2121463415" + signature = "(IIIIB)V", + garbageValue = "-113" ) - static IndexedSprite method2165() { - IndexedSprite var0 = new IndexedSprite(); - var0.width = class335.SpriteBuffer_spriteWidth; - var0.height = class335.SpriteBuffer_spriteHeight; - var0.xOffset = class335.SpriteBuffer_xOffsets[0]; - var0.yOffset = StructDefinition.SpriteBuffer_yOffsets[0]; - var0.subWidth = class335.SpriteBuffer_spriteWidths[0]; - var0.subHeight = class335.SpriteBuffer_spriteHeights[0]; - var0.palette = DefaultsGroup.SpriteBuffer_spritePalette; - var0.pixels = class4.SpriteBuffer_pixels[0]; - Ignored.method5235(); - return var0; + @Export("selectSpell") + static void selectSpell(int var0, int var1, int var2, int var3) { + Widget var4 = WorldMapLabelSize.getWidgetChild(var0, var1); + if (var4 != null && var4.onTargetEnter != null) { + ScriptEvent var5 = new ScriptEvent(); + var5.widget = var4; + var5.args = var4.onTargetEnter; + InterfaceParent.runScriptEvent(var5); + } + + Client.field830 = var3; + Client.isSpellSelected = true; + ItemContainer.selectedSpellWidget = var0; + Client.selectedSpellChildIndex = var1; + WorldMapSprite.selectedSpellFlags = var2; + class234.invalidateWidget(var4); } } diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java index fe4af05ea8..86dafa255f 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("dc") +@ObfuscatedName("da") @Implements("AudioFilter") public class AudioFilter { - @ObfuscatedName("v") - static float[][] field1500; - @ObfuscatedName("q") + @ObfuscatedName("g") + static float[][] field1510; + @ObfuscatedName("n") @Export("coefficients") static int[][] coefficients; - @ObfuscatedName("z") - static float field1505; - @ObfuscatedName("t") + @ObfuscatedName("u") + static float field1507; + @ObfuscatedName("a") @Export("forwardMultiplier") static int forwardMultiplier; - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("pairs") int[] pairs; - @ObfuscatedName("k") - int[][][] field1497; - @ObfuscatedName("d") - int[][][] field1502; - @ObfuscatedName("w") - int[] field1504; + @ObfuscatedName("q") + int[][][] field1516; + @ObfuscatedName("j") + int[][][] field1508; + @ObfuscatedName("p") + int[] field1509; static { - field1500 = new float[2][8]; + field1510 = new float[2][8]; coefficients = new int[2][8]; } AudioFilter() { this.pairs = new int[2]; - this.field1497 = new int[2][2][4]; - this.field1502 = new int[2][2][4]; - this.field1504 = new int[2]; + this.field1516 = new int[2][2][4]; + this.field1508 = new int[2][2][4]; + this.field1509 = new int[2]; } - @ObfuscatedName("x") - float method2805(int var1, int var2, float var3) { - float var4 = (float)this.field1502[var1][0][var2] + var3 * (float)(this.field1502[var1][1][var2] - this.field1502[var1][0][var2]); + @ObfuscatedName("m") + float method2830(int var1, int var2, float var3) { + float var4 = (float)this.field1508[var1][0][var2] + var3 * (float)(this.field1508[var1][1][var2] - this.field1508[var1][0][var2]); var4 *= 0.0015258789F; return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F)); } - @ObfuscatedName("k") - float method2803(int var1, int var2, float var3) { - float var4 = (float)this.field1497[var1][0][var2] + var3 * (float)(this.field1497[var1][1][var2] - this.field1497[var1][0][var2]); + @ObfuscatedName("q") + float method2825(int var1, int var2, float var3) { + float var4 = (float)this.field1516[var1][0][var2] + var3 * (float)(this.field1516[var1][1][var2] - this.field1516[var1][0][var2]); var4 *= 1.2207031E-4F; return normalize(var4); } - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("compute") int compute(int var1, float var2) { float var3; if (var1 == 0) { - var3 = (float)this.field1504[0] + (float)(this.field1504[1] - this.field1504[0]) * var2; + var3 = (float)this.field1509[0] + (float)(this.field1509[1] - this.field1509[0]) * var2; var3 *= 0.0030517578F; - field1505 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); - forwardMultiplier = (int)(field1505 * 65536.0F); + field1507 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); + forwardMultiplier = (int)(field1507 * 65536.0F); } if (this.pairs[var1] == 0) { return 0; } else { - var3 = this.method2805(var1, 0, var2); - field1500[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2803(var1, 0, var2)); - field1500[var1][1] = var3 * var3; + var3 = this.method2830(var1, 0, var2); + field1510[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2825(var1, 0, var2)); + field1510[var1][1] = var3 * var3; float[] var10000; int var4; for (var4 = 1; var4 < this.pairs[var1]; ++var4) { - var3 = this.method2805(var1, var4, var2); - float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2803(var1, var4, var2)); + var3 = this.method2830(var1, var4, var2); + float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2825(var1, var4, var2)); float var6 = var3 * var3; - field1500[var1][var4 * 2 + 1] = field1500[var1][var4 * 2 - 1] * var6; - field1500[var1][var4 * 2] = field1500[var1][var4 * 2 - 1] * var5 + field1500[var1][var4 * 2 - 2] * var6; + field1510[var1][var4 * 2 + 1] = field1510[var1][var4 * 2 - 1] * var6; + field1510[var1][var4 * 2] = field1510[var1][var4 * 2 - 1] * var5 + field1510[var1][var4 * 2 - 2] * var6; for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { - var10000 = field1500[var1]; - var10000[var7] += field1500[var1][var7 - 1] * var5 + field1500[var1][var7 - 2] * var6; + var10000 = field1510[var1]; + var10000[var7] += field1510[var1][var7 - 1] * var5 + field1510[var1][var7 - 2] * var6; } - var10000 = field1500[var1]; - var10000[1] += field1500[var1][0] * var5 + var6; - var10000 = field1500[var1]; + var10000 = field1510[var1]; + var10000[1] += field1510[var1][0] * var5 + var6; + var10000 = field1510[var1]; var10000[0] += var5; } if (var1 == 0) { for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) { - var10000 = field1500[0]; - var10000[var4] *= field1505; + var10000 = field1510[0]; + var10000[var4] *= field1507; } } for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { - coefficients[var1][var4] = (int)(field1500[var1][var4] * 65536.0F); + coefficients[var1][var4] = (int)(field1510[var1][var4] * 65536.0F); } return this.pairs[var1] * 2; } } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Lkb;Lde;)V" + signature = "(Lkn;Lds;)V" ) - final void method2813(Buffer var1, SoundEnvelope var2) { + final void method2829(Buffer var1, SoundEnvelope var2) { int var3 = var1.readUnsignedByte(); this.pairs[0] = var3 >> 4; this.pairs[1] = var3 & 15; if (var3 != 0) { - this.field1504[0] = var1.readUnsignedShort(); - this.field1504[1] = var1.readUnsignedShort(); + this.field1509[0] = var1.readUnsignedShort(); + this.field1509[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.field1497[var5][0][var6] = var1.readUnsignedShort(); - this.field1502[var5][0][var6] = var1.readUnsignedShort(); + this.field1516[var5][0][var6] = var1.readUnsignedShort(); + this.field1508[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.field1497[var5][1][var6] = var1.readUnsignedShort(); - this.field1502[var5][1][var6] = var1.readUnsignedShort(); + this.field1516[var5][1][var6] = var1.readUnsignedShort(); + this.field1508[var5][1][var6] = var1.readUnsignedShort(); } else { - this.field1497[var5][1][var6] = this.field1497[var5][0][var6]; - this.field1502[var5][1][var6] = this.field1502[var5][0][var6]; + this.field1516[var5][1][var6] = this.field1516[var5][0][var6]; + this.field1508[var5][1][var6] = this.field1508[var5][0][var6]; } } } - if (var4 != 0 || this.field1504[1] != this.field1504[0]) { + if (var4 != 0 || this.field1509[1] != this.field1509[0]) { var2.decodeSegments(var1); } } else { - int[] var7 = this.field1504; - this.field1504[1] = 0; + int[] var7 = this.field1509; + this.field1509[1] = 0; var7[0] = 0; } } - @ObfuscatedName("m") + @ObfuscatedName("o") @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 f1d6f89e64..48d1dabe62 100644 --- a/runescape-client/src/main/java/BZip2Decompressor.java +++ b/runescape-client/src/main/java/BZip2Decompressor.java @@ -3,10 +3,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lb") +@ObfuscatedName("ly") @Implements("BZip2Decompressor") public final class BZip2Decompressor { - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "Llk;" ) @@ -17,7 +17,7 @@ public final class BZip2Decompressor { BZip2Decompressor_state = new BZip2State(); } - @ObfuscatedName("x") + @ObfuscatedName("m") @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.field3724 = 0; + BZip2Decompressor_state.field3783 = 0; BZip2Decompressor_decompress(BZip2Decompressor_state); var1 -= BZip2Decompressor_state.outputLength; BZip2Decompressor_state.inputArray = null; @@ -38,21 +38,21 @@ public final class BZip2Decompressor { } } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(Llk;)V" ) - static void method5838(BZip2State var0) { + static void method6004(BZip2State var0) { byte var2 = var0.out_char; int var3 = var0.su_rNToGo; int var4 = var0.nblocks_used; int var5 = var0.su_ch2; - int[] var6 = WorldMapData_0.BZip2Decompressor_block; - int var7 = var0.field3743; + int[] var6 = KitDefinition.BZip2Decompressor_block; + int var7 = var0.field3779; byte[] var8 = var0.outputArray; int var9 = var0.next_out; int var10 = var0.outputLength; - int var12 = var0.field3761 + 1; + int var12 = var0.field3766 + 1; label61: while (true) { @@ -148,23 +148,23 @@ public final class BZip2Decompressor { break; } - int var13 = var0.field3724; - var0.field3724 += var10 - var10; - if (var0.field3724 < var13) { + int var13 = var0.field3783; + var0.field3783 += var10 - var10; + if (var0.field3783 < var13) { } var0.out_char = var2; var0.su_rNToGo = var3; var0.nblocks_used = var4; var0.su_ch2 = var5; - WorldMapData_0.BZip2Decompressor_block = var6; - var0.field3743 = var7; + KitDefinition.BZip2Decompressor_block = var6; + var0.field3779 = var7; var0.outputArray = var8; var0.next_out = var9; var0.outputLength = var10; } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(Llk;)V" ) @@ -192,9 +192,9 @@ public final class BZip2Decompressor { int[] var23 = null; int[] var24 = null; int[] var25 = null; - var0.blockSize100k = 239779841; - if (WorldMapData_0.BZip2Decompressor_block == null) { - WorldMapData_0.BZip2Decompressor_block = new int[var0.blockSize100k * 818513568]; + var0.blockSize100k = -425931053; + if (KitDefinition.BZip2Decompressor_block == null) { + KitDefinition.BZip2Decompressor_block = new int[var0.blockSize100k * -2058061088]; } boolean var26 = true; @@ -430,7 +430,7 @@ public final class BZip2Decompressor { } var10002 = var0.unzftab[var0.seqToUnseq[var1 & 255] & 255]++; - WorldMapData_0.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; + KitDefinition.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) { - WorldMapData_0.BZip2Decompressor_block[var47] = var1 & 255; + KitDefinition.BZip2Decompressor_block[var47] = var1 & 255; ++var47; } } @@ -509,22 +509,22 @@ public final class BZip2Decompressor { } for (var36 = 0; var36 < var47; ++var36) { - var1 = (byte)(WorldMapData_0.BZip2Decompressor_block[var36] & 255); - var10000 = WorldMapData_0.BZip2Decompressor_block; + var1 = (byte)(KitDefinition.BZip2Decompressor_block[var36] & 255); + var10000 = KitDefinition.BZip2Decompressor_block; int var10001 = var0.cftab[var1 & 255]; var10000[var10001] |= var36 << 8; var10002 = var0.cftab[var1 & 255]++; } - var0.field3743 = WorldMapData_0.BZip2Decompressor_block[var0.originalPointer] >> 8; + var0.field3779 = KitDefinition.BZip2Decompressor_block[var0.originalPointer] >> 8; var0.nblocks_used = 0; - var0.field3743 = WorldMapData_0.BZip2Decompressor_block[var0.field3743]; - var0.su_ch2 = (byte)(var0.field3743 & 255); - var0.field3743 >>= 8; + var0.field3779 = KitDefinition.BZip2Decompressor_block[var0.field3779]; + var0.su_ch2 = (byte)(var0.field3779 & 255); + var0.field3779 >>= 8; ++var0.nblocks_used; - var0.field3761 = var47; - method5838(var0); - if (var0.field3761 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { + var0.field3766 = var47; + method6004(var0); + if (var0.field3766 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { var26 = true; break; } @@ -538,7 +538,7 @@ public final class BZip2Decompressor { } } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(Llk;)B" ) @@ -547,7 +547,7 @@ public final class BZip2Decompressor { return (byte)BZip2Decompressor_readBits(8, var0); } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(Llk;)B" ) @@ -556,7 +556,7 @@ public final class BZip2Decompressor { return (byte)BZip2Decompressor_readBits(1, var0); } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(ILlk;)I" ) @@ -576,7 +576,7 @@ public final class BZip2Decompressor { return var2; } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(Llk;)V" ) @@ -593,7 +593,7 @@ public final class BZip2Decompressor { } - @ObfuscatedName("z") + @ObfuscatedName("u") @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 e89a00fdea..04471e9a7b 100644 --- a/runescape-client/src/main/java/BZip2State.java +++ b/runescape-client/src/main/java/BZip2State.java @@ -2,165 +2,166 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("lk") @Implements("BZip2State") public final class BZip2State { - @ObfuscatedName("x") - final int field3756; @ObfuscatedName("m") - final int field3725; - @ObfuscatedName("k") - final int field3726; - @ObfuscatedName("d") - final int field3729; - @ObfuscatedName("w") final int field3750; - @ObfuscatedName("v") - final int field3737; + @ObfuscatedName("o") + final int field3784; @ObfuscatedName("q") + final int field3749; + @ObfuscatedName("j") + final int field3755; + @ObfuscatedName("p") + final int field3751; + @ObfuscatedName("g") + final int field3752; + @ObfuscatedName("n") @Export("inputArray") byte[] inputArray; - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1520658841 + intValue = 2048322099 ) @Export("nextByte") int nextByte; - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1705468259 + intValue = -2079551029 ) @Export("nextBit_unused") int nextBit_unused; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("outputArray") byte[] outputArray; - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -530026491 + intValue = -521485937 ) @Export("next_out") int next_out; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1793031375 + intValue = -962372007 ) @Export("outputLength") int outputLength; - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 828020907 + intValue = -1091946921 ) - int field3724; - @ObfuscatedName("u") + int field3783; + @ObfuscatedName("h") @Export("out_char") byte out_char; - @ObfuscatedName("h") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1550283393 + intValue = -475619831 ) @Export("su_rNToGo") int su_rNToGo; - @ObfuscatedName("g") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 2097262377 + intValue = 37444239 ) @Export("bsBuff") int bsBuff; - @ObfuscatedName("i") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1241583147 + intValue = 590709617 ) @Export("bsLive") int bsLive; - @ObfuscatedName("a") + @ObfuscatedName("v") @Export("blockSize100k") int blockSize100k; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1768899761 + intValue = 1631921855 ) @Export("originalPointer") int originalPointer; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 755758005 + ) + int field3779; @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -2111080359 - ) - int field3743; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = -125465233 + intValue = 1026760725 ) @Export("su_ch2") int su_ch2; - @ObfuscatedName("o") + @ObfuscatedName("t") @Export("unzftab") int[] unzftab; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1422716731 + intValue = -819259021 ) @Export("nblocks_used") int nblocks_used; - @ObfuscatedName("j") + @ObfuscatedName("b") @Export("cftab") int[] cftab; @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1484476187 + intValue = -420415873 ) @Export("nInUse") int nInUse; - @ObfuscatedName("ae") + @ObfuscatedName("ah") @Export("inUse") boolean[] inUse; - @ObfuscatedName("an") + @ObfuscatedName("ai") @Export("inUse16") boolean[] inUse16; - @ObfuscatedName("ai") + @ObfuscatedName("ao") @Export("seqToUnseq") byte[] seqToUnseq; - @ObfuscatedName("ap") + @ObfuscatedName("ae") @Export("ll8") byte[] ll8; - @ObfuscatedName("ab") + @ObfuscatedName("ax") @Export("getAndMoveToFrontDecode_yy") int[] getAndMoveToFrontDecode_yy; - @ObfuscatedName("ar") + @ObfuscatedName("ag") @Export("selector") byte[] selector; - @ObfuscatedName("af") + @ObfuscatedName("ab") @Export("selectorMtf") byte[] selectorMtf; - @ObfuscatedName("at") + @ObfuscatedName("am") @Export("temp_charArray2d") byte[][] temp_charArray2d; - @ObfuscatedName("al") + @ObfuscatedName("ak") @Export("limit") int[][] limit; - @ObfuscatedName("as") + @ObfuscatedName("ad") @Export("base") int[][] base; - @ObfuscatedName("am") + @ObfuscatedName("as") @Export("perm") int[][] perm; - @ObfuscatedName("au") + @ObfuscatedName("ar") @Export("minLens") int[] minLens; - @ObfuscatedName("ao") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -453266259 + intValue = 202332287 ) - int field3761; + int field3766; BZip2State() { - this.field3756 = 4096; - this.field3725 = 16; - this.field3726 = 258; - this.field3729 = 6; - this.field3750 = 50; - this.field3737 = 18002; + this.field3750 = 4096; + this.field3784 = 16; + this.field3749 = 258; + this.field3755 = 6; + this.field3751 = 50; + this.field3752 = 18002; this.nextByte = 0; this.next_out = 0; this.unzftab = new int[256]; @@ -178,4 +179,26 @@ public final class BZip2State { this.perm = new int[6][258]; this.minLens = new int[6]; } + + @ObfuscatedName("iq") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;Lhd;I)Ljava/lang/String;", + garbageValue = "-1638627143" + ) + static String method6001(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) + class225.method4182(Canvas.method923(var1, var2 - 1)) + var0.substring(var3 + 2); + } + } + } + + return var0; + } } diff --git a/runescape-client/src/main/java/BoundaryObject.java b/runescape-client/src/main/java/BoundaryObject.java index 85ce4992fa..6f9b8f06a1 100644 --- a/runescape-client/src/main/java/BoundaryObject.java +++ b/runescape-client/src/main/java/BoundaryObject.java @@ -3,62 +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("ep") +@ObfuscatedName("ez") @Implements("BoundaryObject") public final class BoundaryObject { - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 2013637089 - ) - @Export("y") - int y; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1191949217 + intValue = 175264999 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -935099037 + intValue = 782033861 ) @Export("x") int x; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 2050214703 + intValue = 1104746355 + ) + @Export("y") + int y; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -742181125 ) @Export("orientationA") int orientationA; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1637656997 + intValue = -1690066511 ) @Export("orientationB") int orientationB; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lee;" + signature = "Lel;" ) @Export("entity1") public Entity entity1; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lee;" + signature = "Lel;" ) @Export("entity2") public Entity entity2; - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedGetter( - longValue = 8712969699368096229L + longValue = 3086546930439306913L ) @Export("tag") public long tag; - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1289122601 + intValue = 485971219 ) @Export("flags") int flags; @@ -70,354 +69,178 @@ public final class BoundaryObject { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IIII)Lce;", - garbageValue = "-719728055" + signature = "(I)V", + garbageValue = "1351583068" ) - @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 = class41.archive12.getGroupId(var7); - if (var8 == -1) { - var5 = null; - } else { - label56: { - byte[] var9 = class41.archive12.takeFileFlat(var8); - if (var9 != null) { - if (var9.length <= 1) { - var5 = null; - break label56; - } - - var6 = SecureRandomCallable.newScript(var9); - if (var6 != null) { - Script.Script_cached.put(var6, (long)(var3 << 16)); - var5 = var6; - break label56; - } - } - - var5 = null; - } - } - } - - if (var5 != null) { - return var5; - } else { - int var4 = class58.method963(var2, var0); - Script var12 = (Script)Script.Script_cached.get((long)(var4 << 16)); - Script var13; - if (var12 != null) { - var13 = var12; - } else { - String var14 = String.valueOf(var4); - int var10 = class41.archive12.getGroupId(var14); - if (var10 == -1) { - var13 = null; - } else { - byte[] var11 = class41.archive12.takeFileFlat(var10); - if (var11 != null) { - if (var11.length <= 1) { - var13 = null; - return var13 != null ? var13 : null; - } - - var12 = SecureRandomCallable.newScript(var11); - if (var12 != null) { - Script.Script_cached.put(var12, (long)(var4 << 16)); - var13 = var12; - return var13 != null ? var13 : null; - } - } - - var13 = null; - } - } - - return var13 != null ? var13 : null; - } + static void method3390() { + Tiles.field530 = null; + Tiles.field524 = null; + Tiles.field525 = null; + WorldMapLabel.field269 = null; + HealthBarUpdate.field1031 = null; + class171.field2036 = null; + Tiles.field526 = null; + BuddyRankComparator.Tiles_hue = null; + GrandExchangeOfferAgeComparator.Tiles_saturation = null; + TextureProvider.Tiles_lightness = null; + class237.Tiles_hueMultiplier = null; + WorldMapRectangle.field198 = null; } - @ObfuscatedName("am") + @ObfuscatedName("hz") @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "-522510299" + signature = "(Lkb;I)V", + garbageValue = "-1547224129" ) - static int method3376(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]; - UserComparator3.privateChatMode = class219.method4052(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - if (UserComparator3.privateChatMode == null) { - UserComparator3.privateChatMode = PrivateChatMode.field3806; + static final void method3389(PacketBuffer var0) { + for (int var1 = 0; var1 < Client.field718; ++var1) { + int var2 = Client.field719[var1]; + NPC var3 = Client.npcs[var2]; + int var4 = var0.readUnsignedByte(); + int var5; + int var6; + int var7; + if ((var4 & 128) != 0) { + var5 = var0.method5755(); + if (var5 == 65535) { + var5 = -1; + } + + var6 = var0.method5746(); + if (var5 == var3.sequence && var5 != -1) { + var7 = NetSocket.SequenceDefinition_get(var5).field3561; + if (var7 == 1) { + var3.sequenceFrame = 0; + var3.sequenceFrameCycle = 0; + var3.sequenceDelay = var6; + var3.field1000 = 0; + } + + if (var7 == 2) { + var3.field1000 = 0; + } + } else if (var5 == -1 || var3.sequence == -1 || NetSocket.SequenceDefinition_get(var5).field3543 >= NetSocket.SequenceDefinition_get(var3.sequence).field3543) { + var3.sequence = var5; + var3.sequenceFrame = 0; + var3.sequenceFrameCycle = 0; + var3.sequenceDelay = var6; + var3.field1000 = 0; + var3.field1023 = var3.pathLength; + } } - Client.tradeChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - PacketBufferNode var18 = FaceNormal.getPacketBufferNode(ClientPacket.field2212, Client.packetWriter.isaacCipher); - var18.packetBuffer.writeByte(Client.publicChatMode); - var18.packetBuffer.writeByte(UserComparator3.privateChatMode.field3804); - var18.packetBuffer.writeByte(Client.tradeChatMode); - Client.packetWriter.addNode(var18); - return 1; - } 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 = FaceNormal.getPacketBufferNode(ClientPacket.field2289, Client.packetWriter.isaacCipher); - var6.packetBuffer.writeByte(class234.stringCp1252NullTerminatedByteSize(var3) + 2); - var6.packetBuffer.writeStringCp1252NullTerminated(var3); - var6.packetBuffer.writeByte(var4 - 1); - var6.packetBuffer.writeByte(var5); - Client.packetWriter.addNode(var6); - return 1; - } else { + int var8; + if ((var4 & 16) != 0) { + var5 = var0.readUnsignedShort(); + var6 = var0.method5755(); + var7 = var3.x - (var5 - class182.baseX - class182.baseX) * 64; + var8 = var3.y - (var6 - SecureRandomFuture.baseY - SecureRandomFuture.baseY) * 64; + if (var7 != 0 || var8 != 0) { + var3.field992 = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047; + } + } + + if ((var4 & 2) != 0) { + var3.field995 = var0.method5751(); + var3.field1008 = var0.readByte(); + var3.field1007 = var0.readByte(); + var3.field1009 = var0.method5751(); + var3.field966 = var0.method5757() + Client.cycle; + var3.field1011 = var0.method5755() + Client.cycle; + var3.field1006 = var0.readUnsignedShort(); + var3.pathLength = 1; + var3.field1023 = 0; + var3.field995 += var3.pathX[0]; + var3.field1008 += var3.pathY[0]; + var3.field1007 += var3.pathX[0]; + var3.field1009 += var3.pathY[0]; + } + + if ((var4 & 1) != 0) { + var5 = var0.method5748(); + int var9; 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 = class1.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; - } + 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; + } - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Message var16 = PendingSpawn.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; + var11 = var0.readUShortSmart(); + var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11); } + } - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { - if (UserComparator3.privateChatMode == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = UserComparator3.privateChatMode.field3804; - } - - 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 (Language.Language_EN != IgnoreList.clientLanguage) { - 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()); + var6 = var0.readUnsignedByte(); + 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.readUnsignedByte() : var11; + var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12); + } else { + var3.removeHealthBar(var8); } } + } + } - 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 (IgnoreList.clientLanguage != Language.Language_EN) { - 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()); - } - } + if ((var4 & 32) != 0) { + var3.overheadText = var0.readStringCp1252NullTerminated(); + var3.overheadTextCyclesRemaining = 100; + } - PacketBufferNode var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2229, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeByte(0); - int var9 = var8.packetBuffer.offset; - var8.packetBuffer.writeByte(var4); - var8.packetBuffer.writeByte(var17); - var8.packetBuffer.writeByte(var7); - GraphicsDefaults.method5966(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 = FaceNormal.getPacketBufferNode(ClientPacket.field2283, Client.packetWriter.isaacCipher); - var11.packetBuffer.writeShort(0); - int var13 = var11.packetBuffer.offset; - var11.packetBuffer.writeStringCp1252NullTerminated(var3); - GraphicsDefaults.method5966(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] = PacketWriter.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] = ObjectSound.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] = class58.Messages_getLastChatID(var10); - return 1; - } else if (var0 == ScriptOpcodes.DOCHEAT) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - class60.doCheat(var3); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { - Client.field814 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize].toLowerCase().trim(); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Client.field814; - return 1; - } else if (var0 == ScriptOpcodes.DEBUGMES) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - System.out.println(var3); - return 1; - } else { - return 2; - } - } else { - if (ByteArrayPool.localPlayer != null && ByteArrayPool.localPlayer.username != null) { - var3 = ByteArrayPool.localPlayer.username.getName(); - } else { - var3 = ""; - } + if ((var4 & 4) != 0) { + var3.definition = StudioGame.getNpcDefinition(var0.method5757()); + var3.field967 = var3.definition.size; + var3.field1017 = var3.definition.rotation; + var3.walkSequence = var3.definition.walkSequence; + var3.walkBackSequence = var3.definition.walkBackSequence; + var3.walkLeftSequence = var3.definition.walkLeftSequence; + var3.walkRightSequence = var3.definition.walkRightSequence; + var3.idleSequence = var3.definition.idleSequence; + var3.turnLeftSequence = var3.definition.turnLeftSequence; + var3.turnRightSequence = var3.definition.turnRightSequence; + } - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3; - return 1; + if ((var4 & 8) != 0) { + var3.targetIndex = var0.readUnsignedShort(); + if (var3.targetIndex == 65535) { + var3.targetIndex = -1; + } + } + + if ((var4 & 64) != 0) { + var3.spotAnimation = var0.method5757(); + var5 = var0.method5767(); + var3.field1005 = var5 >> 16; + var3.field987 = (var5 & 65535) + Client.cycle; + var3.spotAnimationFrame = 0; + var3.spotAnimationFrameCycle = 0; + if (var3.field987 > Client.cycle) { + var3.spotAnimationFrame = -1; + } + + if (var3.spotAnimation == 65535) { + var3.spotAnimation = -1; } } } + } } diff --git a/runescape-client/src/main/java/Bounds.java b/runescape-client/src/main/java/Bounds.java index c31b0dca3b..752bec4380 100644 --- a/runescape-client/src/main/java/Bounds.java +++ b/runescape-client/src/main/java/Bounds.java @@ -4,30 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ld") +@ObfuscatedName("lv") @Implements("Bounds") public class Bounds { - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 1060370967 - ) - @Export("lowY") - public int lowY; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1597072337 + intValue = -961758993 ) @Export("lowX") public int lowX; - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -456113605 + intValue = 1458350895 + ) + @Export("lowY") + public int lowY; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 875525085 ) @Export("highX") public int highX; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -239139767 + intValue = -1188404153 ) @Export("highY") public int highY; @@ -41,10 +41,10 @@ public class Bounds { this(0, 0, var1, var2); } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "1269806188" + garbageValue = "-2102954293" ) @Export("setLow") public void setLow(int var1, int var2) { @@ -52,10 +52,10 @@ public class Bounds { this.lowY = var2; } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "838675503" + signature = "(IIB)V", + garbageValue = "-40" ) @Export("setHigh") public void setHigh(int var1, int var2) { @@ -63,31 +63,31 @@ public class Bounds { this.highY = var2; } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lld;Lld;B)V", - garbageValue = "-7" + signature = "(Llv;Llv;I)V", + garbageValue = "1555379366" ) - public void method6047(Bounds var1, Bounds var2) { - this.method6051(var1, var2); - this.method6052(var1, var2); + public void method6202(Bounds var1, Bounds var2) { + this.method6199(var1, var2); + this.method6194(var1, var2); } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lld;Lld;I)V", - garbageValue = "-1938755982" + signature = "(Llv;Llv;B)V", + garbageValue = "58" ) - void method6051(Bounds var1, Bounds var2) { + void method6199(Bounds var1, Bounds var2) { var2.lowX = this.lowX; var2.highX = this.highX; if (this.lowX < var1.lowX) { - var2.highX = (var2.highX * -2075179277 - (var1.lowX * -2075179277 - this.lowX * -2075179277)) * -456113605; + var2.highX = (var2.highX * 73759861 - (var1.lowX * 73759861 - this.lowX * 73759861)) * 875525085; var2.lowX = var1.lowX; } - if (var2.method6053() > var1.method6053()) { - var2.highX -= var2.method6053() - var1.method6053(); + if (var2.method6193() > var1.method6193()) { + var2.highX -= var2.method6193() - var1.method6193(); } if (var2.highX < 0) { @@ -96,21 +96,21 @@ public class Bounds { } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Lld;Lld;I)V", - garbageValue = "-642069303" + signature = "(Llv;Llv;I)V", + garbageValue = "-810970943" ) - void method6052(Bounds var1, Bounds var2) { + void method6194(Bounds var1, Bounds var2) { var2.lowY = this.lowY; var2.highY = this.highY; if (this.lowY < var1.lowY) { - var2.highY = (var2.highY * -707514887 - (var1.lowY * -707514887 - this.lowY * -707514887)) * -239139767; + var2.highY = (var2.highY * 1962542455 - (var1.lowY * 1962542455 - this.lowY * 1962542455)) * -1188404153; var2.lowY = var1.lowY; } - if (var2.method6050() > var1.method6050()) { - var2.highY -= var2.method6050() - var1.method6050(); + if (var2.method6196() > var1.method6196()) { + var2.highY -= var2.method6196() - var1.method6196(); } if (var2.highY < 0) { @@ -119,22 +119,22 @@ public class Bounds { } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "0" + signature = "(I)I", + garbageValue = "515582700" ) - int method6053() { + int method6193() { return this.lowX + this.highX; } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "180335993" + garbageValue = "-500619811" ) - int method6050() { - return this.highY + this.lowY; + int method6196() { + return this.lowY + this.highY; } public String toString() { diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java index 8f300abef6..0932f863b1 100644 --- a/runescape-client/src/main/java/Buddy.java +++ b/runescape-client/src/main/java/Buddy.java @@ -4,24 +4,24 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ke") +@ObfuscatedName("kx") @Implements("Buddy") public class Buddy extends User { - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1726409249 + intValue = 746026781 ) @Export("world") public int world; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1414783729 + intValue = 2013337995 ) @Export("int2") public int int2; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -25627413 + intValue = 1889859317 ) @Export("rank") public int rank; @@ -30,10 +30,10 @@ public class Buddy extends User { this.world = -1; } - @ObfuscatedName("ag") + @ObfuscatedName("aw") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "1769610141" + garbageValue = "-820539853" ) @Export("set") void set(int var1, int var2) { @@ -41,23 +41,140 @@ public class Buddy extends User { this.int2 = var2; } - @ObfuscatedName("aw") + @ObfuscatedName("az") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "734760061" + garbageValue = "1724193250" ) @Export("getWorld") public int getWorld() { return this.world; } - @ObfuscatedName("bf") + @ObfuscatedName("aq") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-182915585" + garbageValue = "-279238296" ) @Export("hasWorld") public boolean hasWorld() { return this.world > 0; } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(III)I", + garbageValue = "562871414" + ) + static int method5363(int var0, int var1) { + FloorOverlayDefinition var3 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); + FloorOverlayDefinition var2; + if (var3 != null) { + var2 = var3; + } else { + byte[] var4 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var0); + var3 = new FloorOverlayDefinition(); + if (var4 != null) { + var3.decode(new Buffer(var4), var0); + } + + var3.postDecode(); + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var3, (long)var0); + var2 = var3; + } + + if (var2 == null) { + return var1; + } else if (var2.secondaryRgb >= 0) { + return var2.secondaryRgb | -16777216; + } else { + int 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; + } else { + var8 = Players.method2285(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; + } + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(Lic;III)Llh;", + garbageValue = "214880487" + ) + static IndexedSprite method5355(AbstractArchive var0, int var1, int var2) { + byte[] var4 = var0.takeFile(var1, var2); + boolean var3; + if (var4 == null) { + var3 = false; + } else { + class3.SpriteBuffer_decode(var4); + var3 = true; + } + + return !var3 ? null : AttackOption.method2173(); + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "(IS)V", + garbageValue = "1714" + ) + static void method5349(int var0) { + Login.loginIndex = 12; + Login.field1212 = var0; + } } diff --git a/runescape-client/src/main/java/BuddyRankComparator.java b/runescape-client/src/main/java/BuddyRankComparator.java index 229ecf030f..ce6bc0620c 100644 --- a/runescape-client/src/main/java/BuddyRankComparator.java +++ b/runescape-client/src/main/java/BuddyRankComparator.java @@ -3,10 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fg") +@ObfuscatedName("fn") @Implements("BuddyRankComparator") public class BuddyRankComparator extends AbstractUserComparator { - @ObfuscatedName("x") + @ObfuscatedName("z") + @Export("Tiles_hue") + static int[] Tiles_hue; + @ObfuscatedName("m") @Export("reversed") final boolean reversed; @@ -14,10 +17,10 @@ public class BuddyRankComparator extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lke;Lke;I)I", - garbageValue = "258923483" + signature = "(Lkx;Lkx;I)I", + garbageValue = "1665981134" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -32,12 +35,22 @@ public class BuddyRankComparator extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("z") + @ObfuscatedName("ka") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "16" + signature = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "-1830826767" ) - public static void method3533() { - WorldMapElement.WorldMapElement_cachedSprites.clear(); + static String method3556(String var0) { + PlayerType[] var1 = VarbitDefinition.PlayerType_values(); + + for (int var2 = 0; var2 < var1.length; ++var2) { + PlayerType var3 = var1[var2]; + if (var3.modIcon != -1 && var0.startsWith(WorldMapRegion.method611(var3.modIcon))) { + var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); + break; + } + } + + return var0; } } diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java index 9c061c6888..1a3a090863 100644 --- a/runescape-client/src/main/java/Buffer.java +++ b/runescape-client/src/main/java/Buffer.java @@ -1,27 +1,25 @@ -import java.io.IOException; import java.math.BigInteger; -import java.net.Socket; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kb") +@ObfuscatedName("kn") @Implements("Buffer") public class Buffer extends Node { - @ObfuscatedName("z") + @ObfuscatedName("u") @Export("crc32Table") static int[] crc32Table; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("crc64Table") static long[] crc64Table; - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("array") public byte[] array; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 77261851 + intValue = -1437110173 ) @Export("offset") public int offset; @@ -63,7 +61,7 @@ public class Buffer extends Node { } public Buffer(int var1) { - this.array = class182.ByteArrayPool_getArray(var1); + this.array = WorldMapIcon_0.ByteArrayPool_getArray(var1); this.offset = 0; } @@ -72,34 +70,34 @@ public class Buffer extends Node { this.offset = 0; } - @ObfuscatedName("ay") + @ObfuscatedName("bh") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "1" + signature = "(I)V", + garbageValue = "1332846958" ) @Export("releaseArray") public void releaseArray() { if (this.array != null) { - WorldMapSection3.ByteArrayPool_release(this.array); + User.ByteArrayPool_release(this.array); } this.array = null; } - @ObfuscatedName("ad") + @ObfuscatedName("bg") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1258821856" + garbageValue = "-238244279" ) @Export("writeByte") public void writeByte(int var1) { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("ac") + @ObfuscatedName("be") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "-77" + signature = "(II)V", + garbageValue = "-2062616020" ) @Export("writeShort") public void writeShort(int var1) { @@ -107,10 +105,10 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("ah") + @ObfuscatedName("bf") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "794369714" + garbageValue = "-1322343150" ) @Export("writeMedium") public void writeMedium(int var1) { @@ -119,10 +117,10 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("ag") + @ObfuscatedName("ba") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "747474969" + garbageValue = "1526300467" ) @Export("writeInt") public void writeInt(int var1) { @@ -132,7 +130,7 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)var1; } - @ObfuscatedName("aw") + @ObfuscatedName("bd") @Export("writeLongMedium") public void writeLongMedium(long var1) { this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); @@ -143,7 +141,7 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)((int)var1); } - @ObfuscatedName("bf") + @ObfuscatedName("bb") @Export("writeLong") public void writeLong(long var1) { this.array[++this.offset - 1] = (byte)((int)(var1 >> 56)); @@ -156,20 +154,20 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)((int)var1); } - @ObfuscatedName("bc") + @ObfuscatedName("bw") @ObfuscatedSignature( signature = "(ZI)V", - garbageValue = "-1864827002" + garbageValue = "1754555155" ) @Export("writeBoolean") public void writeBoolean(boolean var1) { this.writeByte(var1 ? 1 : 0); } - @ObfuscatedName("bd") + @ObfuscatedName("bn") @ObfuscatedSignature( signature = "(Ljava/lang/String;I)V", - garbageValue = "1695463658" + garbageValue = "914637380" ) @Export("writeStringCp1252NullTerminated") public void writeStringCp1252NullTerminated(String var1) { @@ -182,10 +180,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("bu") + @ObfuscatedName("bo") @ObfuscatedSignature( - signature = "(Ljava/lang/String;S)V", - garbageValue = "21883" + signature = "(Ljava/lang/String;I)V", + garbageValue = "2130981128" ) @Export("writeStringCp1252NullCircumfixed") public void writeStringCp1252NullCircumfixed(String var1) { @@ -199,17 +197,18 @@ public class Buffer extends Node { } } - @ObfuscatedName("be") + @ObfuscatedName("bp") @ObfuscatedSignature( signature = "(Ljava/lang/CharSequence;I)V", - garbageValue = "-1160654316" + garbageValue = "1273602380" ) @Export("writeCESU8") public void writeCESU8(CharSequence var1) { int var3 = var1.length(); int var4 = 0; - for (int var5 = 0; var5 < var3; ++var5) { + int var5; + for (var5 = 0; var5 < var3; ++var5) { char var6 = var1.charAt(var5); if (var6 <= 127) { ++var4; @@ -222,13 +221,34 @@ public class Buffer extends Node { this.array[++this.offset - 1] = 0; this.writeVarInt(var4); - this.offset += Entity.method3372(this.array, this.offset, var1); + var4 = this.offset * 192844107; + 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 * 192844107 + var4) * -1437110173; } - @ObfuscatedName("bg") + @ObfuscatedName("bm") @ObfuscatedSignature( - signature = "([BIII)V", - garbageValue = "-1590891251" + signature = "([BIIB)V", + garbageValue = "96" ) @Export("writeBytes") public void writeBytes(byte[] var1, int var2, int var3) { @@ -238,19 +258,19 @@ public class Buffer extends Node { } - @ObfuscatedName("bt") + @ObfuscatedName("bl") @ObfuscatedSignature( - signature = "(Lkb;I)V", - garbageValue = "-1161644525" + signature = "(Lkn;I)V", + garbageValue = "-914578816" ) - public void method5789(Buffer var1) { + public void method5711(Buffer var1) { this.writeBytes(var1.array, 0, var1.offset); } - @ObfuscatedName("bh") + @ObfuscatedName("bv") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-788698367" + garbageValue = "1697969107" ) @Export("writeLengthInt") public void writeLengthInt(int var1) { @@ -264,10 +284,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("br") + @ObfuscatedName("bi") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "733201281" + garbageValue = "-510969382" ) @Export("writeLengthShort") public void writeLengthShort(int var1) { @@ -279,10 +299,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("bq") + @ObfuscatedName("bz") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-1675640684" + garbageValue = "-767264169" ) @Export("writeLengthByte") public void writeLengthByte(int var1) { @@ -293,10 +313,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("ba") + @ObfuscatedName("bu") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "-13" + signature = "(II)V", + garbageValue = "416798651" ) @Export("writeSmartByteShort") public void writeSmartByteShort(int var1) { @@ -309,10 +329,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("bv") + @ObfuscatedName("bx") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-2128339921" + signature = "(IB)V", + garbageValue = "18" ) @Export("writeVarInt") public void writeVarInt(int var1) { @@ -335,30 +355,30 @@ public class Buffer extends Node { this.writeByte(var1 & 127); } - @ObfuscatedName("bx") + @ObfuscatedName("br") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "53" + garbageValue = "124" ) @Export("readUnsignedByte") public int readUnsignedByte() { return this.array[++this.offset - 1] & 255; } - @ObfuscatedName("bz") + @ObfuscatedName("bs") @ObfuscatedSignature( - signature = "(I)B", - garbageValue = "-1603028719" + signature = "(B)B", + garbageValue = "81" ) @Export("readByte") public byte readByte() { return this.array[++this.offset - 1]; } - @ObfuscatedName("bs") + @ObfuscatedName("by") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "109" + signature = "(I)I", + garbageValue = "471084162" ) @Export("readUnsignedShort") public int readUnsignedShort() { @@ -366,10 +386,10 @@ public class Buffer extends Node { return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); } - @ObfuscatedName("bp") + @ObfuscatedName("bj") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1835771986" + garbageValue = "87414619" ) @Export("readShort") public int readShort() { @@ -382,10 +402,10 @@ public class Buffer extends Node { return var1; } - @ObfuscatedName("bm") + @ObfuscatedName("bt") @ObfuscatedSignature( - signature = "(S)I", - garbageValue = "3112" + signature = "(I)I", + garbageValue = "1982311791" ) @Export("readMedium") public int readMedium() { @@ -393,10 +413,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("bb") + @ObfuscatedName("cc") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "297718403" + garbageValue = "94863796" ) @Export("readInt") public int readInt() { @@ -404,32 +424,32 @@ public class Buffer extends Node { return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 24); } - @ObfuscatedName("bn") + @ObfuscatedName("cb") @ObfuscatedSignature( - signature = "(B)J", - garbageValue = "106" + signature = "(I)J", + garbageValue = "-497792504" ) @Export("readLong") public long readLong() { long var1 = (long)this.readInt() & 4294967295L; long var3 = (long)this.readInt() & 4294967295L; - return (var1 << 32) + var3; + return var3 + (var1 << 32); } - @ObfuscatedName("by") + @ObfuscatedName("ch") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "25" + signature = "(I)Z", + garbageValue = "364318278" ) @Export("readBoolean") public boolean readBoolean() { return (this.readUnsignedByte() & 1) == 1; } - @ObfuscatedName("bj") + @ObfuscatedName("cw") @ObfuscatedSignature( - signature = "(B)Ljava/lang/String;", - garbageValue = "44" + signature = "(I)Ljava/lang/String;", + garbageValue = "1669124168" ) @Export("readStringCp1252NullTerminatedOrNull") public String readStringCp1252NullTerminatedOrNull() { @@ -441,10 +461,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("bi") + @ObfuscatedName("cz") @ObfuscatedSignature( - signature = "(I)Ljava/lang/String;", - garbageValue = "-1564619990" + signature = "(B)Ljava/lang/String;", + garbageValue = "60" ) @Export("readStringCp1252NullTerminated") public String readStringCp1252NullTerminated() { @@ -454,13 +474,13 @@ public class Buffer extends Node { } int var2 = this.offset - var1 - 1; - return var2 == 0 ? "" : WorldMapArea.decodeStringCp1252(this.array, var1, var2); + return var2 == 0 ? "" : MouseRecorder.decodeStringCp1252(this.array, var1, var2); } - @ObfuscatedName("bl") + @ObfuscatedName("cg") @ObfuscatedSignature( - signature = "(I)Ljava/lang/String;", - garbageValue = "-1416358410" + signature = "(B)Ljava/lang/String;", + garbageValue = "-10" ) @Export("readStringCp1252NullCircumfixed") public String readStringCp1252NullCircumfixed() { @@ -474,14 +494,14 @@ public class Buffer extends Node { } int var3 = this.offset - var2 - 1; - return var3 == 0 ? "" : WorldMapArea.decodeStringCp1252(this.array, var2, var3); + return var3 == 0 ? "" : MouseRecorder.decodeStringCp1252(this.array, var2, var3); } } - @ObfuscatedName("bw") + @ObfuscatedName("cn") @ObfuscatedSignature( signature = "(I)Ljava/lang/String;", - garbageValue = "-902492653" + garbageValue = "-1123161230" ) @Export("readCESU8") public String readCESU8() { @@ -493,68 +513,17 @@ public class Buffer extends Node { if (var2 + this.offset > this.array.length) { throw new IllegalStateException(""); } else { - byte[] var4 = this.array; - int var5 = this.offset; - char[] var6 = new char[var2]; - int var7 = 0; - int var8 = var5; - - int var11; - for (int var9 = var5 + var2; var8 < var9; var6[var7++] = (char)var11) { - int var10 = var4[var8++] & 255; - if (var10 < 128) { - if (var10 == 0) { - var11 = 65533; - } else { - var11 = var10; - } - } else if (var10 < 192) { - var11 = 65533; - } else if (var10 < 224) { - if (var8 < var9 && (var4[var8] & 192) == 128) { - var11 = (var10 & 31) << 6 | var4[var8++] & 63; - if (var11 < 128) { - var11 = 65533; - } - } else { - var11 = 65533; - } - } else if (var10 < 240) { - if (var8 + 1 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128) { - var11 = (var10 & 15) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; - if (var11 < 2048) { - var11 = 65533; - } - } else { - var11 = 65533; - } - } else if (var10 < 248) { - if (var8 + 2 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128 && (var4[var8 + 2] & 192) == 128) { - var11 = (var10 & 7) << 18 | (var4[var8++] & 63) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; - if (var11 >= 65536 && var11 <= 1114111) { - var11 = 65533; - } else { - var11 = 65533; - } - } else { - var11 = 65533; - } - } else { - var11 = 65533; - } - } - - String var3 = new String(var6, 0, var7); + String var3 = class4.method48(this.array, this.offset, var2); this.offset += var2; return var3; } } } - @ObfuscatedName("cw") + @ObfuscatedName("ce") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "-1176132955" + garbageValue = "2094233778" ) @Export("readBytes") public void readBytes(byte[] var1, int var2, int var3) { @@ -564,10 +533,10 @@ public class Buffer extends Node { } - @ObfuscatedName("cc") + @ObfuscatedName("cj") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1517353363" + garbageValue = "1710018513" ) @Export("readShortSmart") public int readShortSmart() { @@ -575,10 +544,10 @@ public class Buffer extends Node { return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; } - @ObfuscatedName("ch") + @ObfuscatedName("ck") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1283642471" + signature = "(B)I", + garbageValue = "-96" ) @Export("readUShortSmart") public int readUShortSmart() { @@ -586,12 +555,12 @@ public class Buffer extends Node { return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; } - @ObfuscatedName("cr") + @ObfuscatedName("cv") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1839551709" + garbageValue = "715402244" ) - public int method5589() { + public int method5732() { int var1 = 0; int var2; @@ -603,21 +572,21 @@ public class Buffer extends Node { return var1; } - @ObfuscatedName("cq") + @ObfuscatedName("cp") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1537726341" + garbageValue = "81140995" ) - public int method5778() { + public int method5733() { return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); } - @ObfuscatedName("co") + @ObfuscatedName("ci") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "-73" + garbageValue = "11" ) - public int method5591() { + public int method5843() { if (this.array[this.offset] < 0) { return this.readInt() & Integer.MAX_VALUE; } else { @@ -626,10 +595,10 @@ public class Buffer extends Node { } } - @ObfuscatedName("cm") + @ObfuscatedName("cu") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1771949174" + garbageValue = "841550272" ) @Export("readVarInt") public int readVarInt() { @@ -643,10 +612,10 @@ public class Buffer extends Node { return var2 | var1; } - @ObfuscatedName("cu") + @ObfuscatedName("cq") @ObfuscatedSignature( - signature = "([IS)V", - garbageValue = "280" + signature = "([II)V", + garbageValue = "-1857698855" ) @Export("xteaEncryptAll") public void xteaEncryptAll(int[] var1) { @@ -671,10 +640,10 @@ public class Buffer extends Node { } - @ObfuscatedName("cs") + @ObfuscatedName("co") @ObfuscatedSignature( signature = "([II)V", - garbageValue = "613143765" + garbageValue = "-1432585027" ) @Export("xteaDecryptAll") public void xteaDecryptAll(int[] var1) { @@ -699,10 +668,10 @@ public class Buffer extends Node { } - @ObfuscatedName("cg") + @ObfuscatedName("ca") @ObfuscatedSignature( - signature = "([IIIB)V", - garbageValue = "37" + signature = "([IIII)V", + garbageValue = "-230257638" ) @Export("xteaEncrypt") public void xteaEncrypt(int[] var1, int var2, int var3) { @@ -729,10 +698,10 @@ public class Buffer extends Node { this.offset = var4; } - @ObfuscatedName("cd") + @ObfuscatedName("cm") @ObfuscatedSignature( signature = "([IIII)V", - garbageValue = "-189170169" + garbageValue = "1537225216" ) @Export("xteaDecrypt") public void xteaDecrypt(int[] var1, int var2, int var3) { @@ -759,10 +728,10 @@ public class Buffer extends Node { this.offset = var4; } - @ObfuscatedName("cx") + @ObfuscatedName("cf") @ObfuscatedSignature( signature = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V", - garbageValue = "-1668495798" + garbageValue = "-859977936" ) @Export("encryptRsa") public void encryptRsa(BigInteger var1, BigInteger var2) { @@ -778,196 +747,194 @@ public class Buffer extends Node { this.writeBytes(var7, 0, var7.length); } - @ObfuscatedName("cn") + @ObfuscatedName("ct") @ObfuscatedSignature( signature = "(II)I", - garbageValue = "-176240895" + garbageValue = "-693896153" ) @Export("writeCrc") public int writeCrc(int var1) { - byte[] var3 = this.array; - int var4 = this.offset; - int var5 = -1; - - for (int var6 = var1; var6 < var4; ++var6) { - var5 = var5 >>> 8 ^ crc32Table[(var5 ^ var3[var6]) & 255]; - } - - var5 = ~var5; - this.writeInt(var5); - return var5; + int var2 = Actor.method1822(this.array, var1, this.offset); + this.writeInt(var2); + return var2; } - @ObfuscatedName("ci") + @ObfuscatedName("cd") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-284855787" + garbageValue = "1948165259" ) @Export("checkCrc") public boolean checkCrc() { this.offset -= 4; - byte[] var2 = this.array; - int var3 = this.offset; - int var4 = -1; - - int var5; - for (var5 = 0; var5 < var3; ++var5) { - var4 = var4 >>> 8 ^ crc32Table[(var4 ^ var2[var5]) & 255]; - } - - var4 = ~var4; - var5 = this.readInt(); - return var5 == var4; - } - - @ObfuscatedName("cz") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-927080333" - ) - public void method5727(int var1) { - this.array[++this.offset - 1] = (byte)(var1 + 128); - } - - @ObfuscatedName("cb") - @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "51" - ) - public void method5724(int var1) { - this.array[++this.offset - 1] = (byte)(0 - var1); + int var1 = Actor.method1822(this.array, 0, this.offset); + int var2 = this.readInt(); + return var2 == var1; } @ObfuscatedName("cy") - @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "16" - ) - public void method5602(int var1) { - this.array[++this.offset - 1] = (byte)(128 - var1); - } - - @ObfuscatedName("ct") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "823972061" - ) - public int method5603() { - return this.array[++this.offset - 1] - 128 & 255; - } - - @ObfuscatedName("cf") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "91963828" - ) - public int method5604() { - return 0 - this.array[++this.offset - 1] & 255; - } - - @ObfuscatedName("ca") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-576195763" - ) - public int method5605() { - return 128 - this.array[++this.offset - 1] & 255; - } - - @ObfuscatedName("cj") - @ObfuscatedSignature( - signature = "(I)B", - garbageValue = "-2046276387" - ) - public byte method5606() { - return (byte)(this.array[++this.offset - 1] - 128); - } - - @ObfuscatedName("cp") - @ObfuscatedSignature( - signature = "(I)B", - garbageValue = "-587494464" - ) - public byte method5607() { - return (byte)(0 - this.array[++this.offset - 1]); - } - - @ObfuscatedName("ck") - @ObfuscatedSignature( - signature = "(I)B", - garbageValue = "12345678" - ) - public byte method5608() { - return (byte)(128 - this.array[++this.offset - 1]); - } - - @ObfuscatedName("ce") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "70039705" - ) - public void method5609(int var1) { - this.array[++this.offset - 1] = (byte)var1; - this.array[++this.offset - 1] = (byte)(var1 >> 8); - } - - @ObfuscatedName("cv") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-2077130267" - ) - public void method5610(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); - this.array[++this.offset - 1] = (byte)(var1 + 128); - } - - @ObfuscatedName("cl") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1323815181" + garbageValue = "2052645276" ) @Export("writeIntME") public void writeIntME(int var1) { this.array[++this.offset - 1] = (byte)(var1 + 128); - this.array[++this.offset - 1] = (byte)(var1 >> 8); } - @ObfuscatedName("dv") + @ObfuscatedName("cx") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "45" + signature = "(IB)V", + garbageValue = "0" ) - public int method5564() { - this.offset += 2; - return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); + public void method5744(int var1) { + this.array[++this.offset - 1] = (byte)(0 - var1); + } + + @ObfuscatedName("cs") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "-394267159" + ) + public void method5837(int var1) { + this.array[++this.offset - 1] = (byte)(128 - var1); + } + + @ObfuscatedName("cr") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "851416829" + ) + public int method5746() { + return this.array[++this.offset - 1] - 128 & 255; + } + + @ObfuscatedName("cl") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "2135245803" + ) + public int method5936() { + return 0 - this.array[++this.offset - 1] & 255; + } + + @ObfuscatedName("dx") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "-1231018339" + ) + public int method5748() { + return 128 - this.array[++this.offset - 1] & 255; + } + + @ObfuscatedName("dw") + @ObfuscatedSignature( + signature = "(I)B", + garbageValue = "-209851904" + ) + public byte method5730() { + return (byte)(this.array[++this.offset - 1] - 128); + } + + @ObfuscatedName("dm") + @ObfuscatedSignature( + signature = "(I)B", + garbageValue = "1146670320" + ) + public byte method5750() { + return (byte)(0 - this.array[++this.offset - 1]); } @ObfuscatedName("dd") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "127" + signature = "(I)B", + garbageValue = "-658631883" ) - public int method5613() { + public byte method5751() { + return (byte)(128 - this.array[++this.offset - 1]); + } + + @ObfuscatedName("dh") + @ObfuscatedSignature( + signature = "(IB)V", + garbageValue = "118" + ) + public void method5752(int var1) { + this.array[++this.offset - 1] = (byte)var1; + this.array[++this.offset - 1] = (byte)(var1 >> 8); + } + + @ObfuscatedName("dl") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "-327298658" + ) + public void method5753(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); + this.array[++this.offset - 1] = (byte)(var1 + 128); + } + + @ObfuscatedName("dr") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "137731710" + ) + public void method5898(int var1) { + this.array[++this.offset - 1] = (byte)(var1 + 128); + this.array[++this.offset - 1] = (byte)(var1 >> 8); + } + + @ObfuscatedName("di") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "-1619364591" + ) + public int method5755() { + this.offset += 2; + return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); + } + + @ObfuscatedName("dp") + @ObfuscatedSignature( + signature = "(B)I", + garbageValue = "-31" + ) + public int method5867() { this.offset += 2; return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); } - @ObfuscatedName("du") + @ObfuscatedName("dc") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "438416270" + garbageValue = "713390854" ) - public int method5614() { + public int method5757() { this.offset += 2; return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); } - @ObfuscatedName("dz") + @ObfuscatedName("dt") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1103250346" + garbageValue = "1572434954" ) - public int method5743() { + public int method5758() { + this.offset += 2; + int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); + if (var1 > 32767) { + var1 -= 65536; + } + + return var1; + } + + @ObfuscatedName("ds") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "89596822" + ) + public int method5759() { this.offset += 2; int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); if (var1 > 32767) { @@ -979,31 +946,41 @@ public class Buffer extends Node { @ObfuscatedName("dg") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "717013158" + signature = "(IB)V", + garbageValue = "95" ) - public void method5616(int var1) { - this.array[++this.offset - 1] = (byte)var1; + public void method5798(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("dq") + @ObfuscatedName("do") + @ObfuscatedSignature( + signature = "(B)I", + garbageValue = "1" + ) + public int method5761() { + this.offset += 3; + return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16); + } + + @ObfuscatedName("dn") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "899177075" + garbageValue = "-68115848" ) - public void method5617(int var1) { + public void method5762(int var1) { this.array[++this.offset - 1] = (byte)var1; this.array[++this.offset - 1] = (byte)(var1 >> 8); this.array[++this.offset - 1] = (byte)(var1 >> 16); this.array[++this.offset - 1] = (byte)(var1 >> 24); } - @ObfuscatedName("dj") + @ObfuscatedName("db") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1411725545" + signature = "(IB)V", + garbageValue = "-95" ) @Export("writeShortLE") public void writeShortLE(int var1) { @@ -1013,101 +990,89 @@ public class Buffer extends Node { this.array[++this.offset - 1] = (byte)(var1 >> 16); } - @ObfuscatedName("dl") + @ObfuscatedName("de") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-598231963" + signature = "(IS)V", + garbageValue = "-18106" ) - public void method5644(int var1) { + public void method5764(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") + @ObfuscatedName("dv") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "123221290" + garbageValue = "1451471311" ) - public int method5619() { + public int method5765() { 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("db") + @ObfuscatedName("dk") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1049580829" + garbageValue = "-684888758" ) - public int method5638() { + public int method5766() { 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("dw") + @ObfuscatedName("da") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "76" + signature = "(I)I", + garbageValue = "-2146396815" ) - public int method5621() { + public int method5767() { 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("de") + @ObfuscatedName("df") @ObfuscatedSignature( - signature = "([BIIB)V", - garbageValue = "69" + signature = "([BIII)V", + garbageValue = "-2049590377" ) - public void method5622(byte[] var1, int var2, int var3) { - for (int var4 = var3 + var2 - 1; var4 >= var2; --var4) { + public void method5821(byte[] var1, int var2, int var3) { + for (int var4 = var2; var4 < var3 + var2; ++var4) { var1[var4] = (byte)(this.array[++this.offset - 1] - 128); } } - @ObfuscatedName("k") - @Export("base37DecodeLong") - public static String base37DecodeLong(long var0) { - if (var0 > 0L && var0 < 6582952005840035281L) { - if (0L == var0 % 37L) { - return null; - } else { - int var2 = 0; + @ObfuscatedName("jx") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-801005893" + ) + static void method5950() { + for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { + int var1 = var0.group; + if (UserComparator4.loadInterface(var1)) { + boolean var2 = true; + Widget[] var3 = Widget.Widget_interfaceComponents[var1]; - for (long var3 = var0; var3 != 0L; var3 /= 37L) { - ++var2; - } - - StringBuilder var5; - char var8; - for (var5 = new StringBuilder(var2); 0L != var0; var5.append(var8)) { - long var6 = var0; - var0 /= 37L; - var8 = class298.base37Table[(int)(var6 - 37L * var0)]; - if (var8 == '_') { - int var9 = var5.length() - 1; - var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); - var8 = 160; + int var4; + for (var4 = 0; var4 < var3.length; ++var4) { + if (var3[var4] != null) { + var2 = var3[var4].isIf3; + break; } } - var5.reverse(); - var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); - return var5.toString(); + if (!var2) { + var4 = (int)var0.key; + Widget var5 = WorldMapSprite.getWidget(var4); + if (var5 != null) { + class234.invalidateWidget(var5); + } + } } - } else { - return null; } - } - @ObfuscatedName("an") - @ObfuscatedSignature( - signature = "(Ljava/net/Socket;IIB)Llt;", - garbageValue = "88" - ) - public static AbstractSocket method5794(Socket var0, int var1, int var2) throws IOException { - return new BufferedNetSocket(var0, var1, var2); } } diff --git a/runescape-client/src/main/java/BufferedFile.java b/runescape-client/src/main/java/BufferedFile.java index 04bfb91db9..9eccb5f737 100644 --- a/runescape-client/src/main/java/BufferedFile.java +++ b/runescape-client/src/main/java/BufferedFile.java @@ -6,72 +6,72 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ms") +@ObfuscatedName("mn") @Implements("BufferedFile") public class BufferedFile { - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lmb;" + signature = "Lmy;" ) @Export("accessFile") AccessFile accessFile; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("readBuffer") byte[] readBuffer; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - longValue = -6621394340155458391L + longValue = 183648846884359197L ) @Export("readBufferOffset") long readBufferOffset; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -498492055 + intValue = 1553809797 ) @Export("readBufferLength") int readBufferLength; - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("writeBuffer") byte[] writeBuffer; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedGetter( - longValue = -915874801967299919L + longValue = -2985208532115456417L ) @Export("writeBufferOffset") long writeBufferOffset; - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 730352763 + intValue = 457646537 ) @Export("writeBufferLength") int writeBufferLength; - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedGetter( - longValue = 8841745747932636313L + longValue = 2498512168954711415L ) @Export("offset") long offset; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - longValue = -5167130975185536305L + longValue = -3113265757492371609L ) @Export("fileLength") long fileLength; - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedGetter( - longValue = -2996772461190095265L + longValue = 6675249402129041573L ) @Export("length") long length; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedGetter( - longValue = -2630268660887985841L + longValue = 1854591788033998237L ) @Export("fileOffset") long fileOffset; @ObfuscatedSignature( - signature = "(Lmb;II)V" + signature = "(Lmy;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("x") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-859079735" + garbageValue = "159388731" ) @Export("close") public void close() throws IOException { @@ -95,7 +95,7 @@ public class BufferedFile { this.accessFile.close(); } - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("seek") public void seek(long var1) throws IOException { if (var1 < 0L) { @@ -105,30 +105,30 @@ public class BufferedFile { } } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(B)J", - garbageValue = "65" + signature = "(I)J", + garbageValue = "243378114" ) @Export("length") public long length() { return this.length; } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "([BI)V", - garbageValue = "1780472721" + garbageValue = "1810550632" ) @Export("readFully") public void readFully(byte[] var1) throws IOException { this.read(var1, 0, var1.length); } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "([BIII)V", - garbageValue = "1941673100" + signature = "([BIIB)V", + garbageValue = "-4" ) @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 (this.writeBufferOffset != -1L && this.offset >= this.writeBufferOffset && this.offset + (long)var3 <= this.writeBufferOffset + (long)this.writeBufferLength) { + if (this.writeBufferOffset != -1L && this.offset >= this.writeBufferOffset && (long)var3 + this.offset <= this.writeBufferOffset + (long)this.writeBufferLength) { System.arraycopy(this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var1, var2, var3); this.offset += (long)var3; return; @@ -146,7 +146,7 @@ public class BufferedFile { long var4 = this.offset; int var7 = var3; int var8; - if (this.offset >= this.readBufferOffset && this.offset < this.readBufferOffset + (long)this.readBufferLength) { + if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { var8 = (int)((long)this.readBufferLength - (this.offset - this.readBufferOffset)); if (var8 > var3) { var8 = var3; @@ -184,7 +184,7 @@ public class BufferedFile { this.offset += (long)var8; } - if (-1L != this.writeBufferOffset) { + if (this.writeBufferOffset != -1L) { if (this.writeBufferOffset > this.offset && var3 > 0) { var8 = var2 + (int)(this.writeBufferOffset - this.offset); if (var8 > var3 + var2) { @@ -202,13 +202,13 @@ public class BufferedFile { long var10 = -1L; if (this.writeBufferOffset >= var4 && this.writeBufferOffset < var4 + (long)var7) { var13 = this.writeBufferOffset; - } else if (var4 >= this.writeBufferOffset && var4 < (long)this.writeBufferLength + this.writeBufferOffset) { + } else if (var4 >= this.writeBufferOffset && var4 < this.writeBufferOffset + (long)this.writeBufferLength) { var13 = var4; } - if ((long)this.writeBufferLength + this.writeBufferOffset > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= (long)var7 + var4) { - var10 = this.writeBufferOffset + (long)this.writeBufferLength; - } else if ((long)var7 + var4 > this.writeBufferOffset && var4 + (long)var7 <= (long)this.writeBufferLength + this.writeBufferOffset) { + if ((long)this.writeBufferLength + this.writeBufferOffset > var4 && (long)this.writeBufferLength + this.writeBufferOffset <= var4 + (long)var7) { + var10 = (long)this.writeBufferLength + this.writeBufferOffset; + } else if (var4 + (long)var7 > this.writeBufferOffset && (long)var7 + var4 <= this.writeBufferOffset + (long)this.writeBufferLength) { var10 = var4 + (long)var7; } @@ -231,10 +231,10 @@ public class BufferedFile { } } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-2013306645" + garbageValue = "1659142795" ) @Export("load") void load() throws IOException { @@ -261,23 +261,23 @@ public class BufferedFile { } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "([BIIB)V", - garbageValue = "-1" + signature = "([BIII)V", + garbageValue = "1917244707" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { try { if (this.offset + (long)var3 > this.length) { - this.length = this.offset + (long)var3; + this.length = (long)var3 + this.offset; } if (this.writeBufferOffset != -1L && (this.offset < this.writeBufferOffset || this.offset > (long)this.writeBufferLength + this.writeBufferOffset)) { this.flush(); } - if (this.writeBufferOffset != -1L && (long)var3 + this.offset > this.writeBufferOffset + (long)this.writeBuffer.length) { + if (this.writeBufferOffset != -1L && 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; @@ -289,7 +289,7 @@ public class BufferedFile { if (var3 <= this.writeBuffer.length) { if (var3 > 0) { - if (this.writeBufferOffset == -1L) { + if (-1L == this.writeBufferOffset) { this.writeBufferOffset = this.offset; } @@ -314,21 +314,21 @@ 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) { + } else if (this.readBufferOffset >= this.offset && this.readBufferOffset < this.offset + (long)var3) { var9 = this.readBufferOffset; } if (this.offset + (long)var3 > this.readBufferOffset && (long)var3 + this.offset <= this.readBufferOffset + (long)this.readBufferLength) { var6 = (long)var3 + this.offset; - } else if ((long)this.readBufferLength + this.readBufferOffset > this.offset && this.readBufferOffset + (long)this.readBufferLength <= (long)var3 + this.offset) { - var6 = (long)this.readBufferLength + this.readBufferOffset; + } else if ((long)this.readBufferLength + this.readBufferOffset > this.offset && (long)this.readBufferLength + this.readBufferOffset <= (long)var3 + this.offset) { + var6 = this.readBufferOffset + (long)this.readBufferLength; } if (var9 > -1L && var6 > var9) { int var8 = (int)(var6 - var9); - System.arraycopy(var1, (int)((long)var2 + var9 - this.offset), this.readBuffer, (int)(var9 - this.readBufferOffset), var8); + System.arraycopy(var1, (int)(var9 + (long)var2 - this.offset), this.readBuffer, (int)(var9 - this.readBufferOffset), var8); } this.offset += (long)var3; @@ -339,21 +339,21 @@ public class BufferedFile { } } - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-985506123" + garbageValue = "-1996252506" ) @Export("flush") void flush() throws IOException { - if (-1L != this.writeBufferOffset) { - if (this.fileOffset != this.writeBufferOffset) { + if (this.writeBufferOffset != -1L) { + if (this.writeBufferOffset != this.fileOffset) { this.accessFile.seek(this.writeBufferOffset); this.fileOffset = this.writeBufferOffset; } this.accessFile.write(this.writeBuffer, 0, this.writeBufferLength); - this.fileOffset += (long)this.writeBufferLength * 257304554331176961L; + this.fileOffset += (long)this.writeBufferLength * -743906103946903551L; 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 < this.readBufferOffset + (long)this.readBufferLength) { var1 = this.writeBufferOffset; - } else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < (long)this.writeBufferLength + this.writeBufferOffset) { + } else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < this.writeBufferOffset + (long)this.writeBufferLength) { var1 = this.readBufferOffset; } - if ((long)this.writeBufferLength + this.writeBufferOffset > this.readBufferOffset && this.writeBufferOffset + (long)this.writeBufferLength <= this.readBufferOffset + (long)this.readBufferLength) { + if (this.writeBufferOffset + (long)this.writeBufferLength > this.readBufferOffset && this.writeBufferOffset + (long)this.writeBufferLength <= this.readBufferOffset + (long)this.readBufferLength) { var3 = this.writeBufferOffset + (long)this.writeBufferLength; - } else if ((long)this.readBufferLength + this.readBufferOffset > this.writeBufferOffset && (long)this.readBufferLength + this.readBufferOffset <= (long)this.writeBufferLength + this.writeBufferOffset) { - var3 = (long)this.readBufferLength + this.readBufferOffset; + } else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && (long)this.readBufferLength + this.readBufferOffset <= (long)this.writeBufferLength + this.writeBufferOffset) { + 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 62fff0e91e..113e699c8d 100644 --- a/runescape-client/src/main/java/BufferedNetSocket.java +++ b/runescape-client/src/main/java/BufferedNetSocket.java @@ -8,18 +8,18 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("lc") @Implements("BufferedNetSocket") public class BufferedNetSocket extends AbstractSocket { - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("socket") Socket socket; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Llm;" + signature = "Lli;" ) @Export("source") BufferedSource source; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Llo;" + signature = "Llu;" ) @Export("sink") BufferedSink sink; @@ -34,10 +34,10 @@ public class BufferedNetSocket extends AbstractSocket { this.sink = new BufferedSink(this.socket.getOutputStream(), var3); } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "7" + signature = "(I)V", + garbageValue = "-768493590" ) @Export("close") public void close() { @@ -51,50 +51,50 @@ public class BufferedNetSocket extends AbstractSocket { this.source.close(); } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1436175029" + signature = "(B)I", + garbageValue = "-8" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { return this.source.readUnsignedByte(); } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "195119972" + garbageValue = "-1942767880" ) @Export("available") public int available() throws IOException { return this.source.available(); } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "0" + signature = "(II)Z", + garbageValue = "1355091335" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { return this.source.isAvailable(var1); } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "([BIIB)I", - garbageValue = "33" + garbageValue = "37" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { return this.source.read(var1, var2, var3); } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "([BIII)V", - garbageValue = "-2040746201" + signature = "([BIIB)V", + garbageValue = "-105" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { diff --git a/runescape-client/src/main/java/BufferedSink.java b/runescape-client/src/main/java/BufferedSink.java index b5cedba1d7..582c2ae507 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("lo") +@ObfuscatedName("lu") @Implements("BufferedSink") public class BufferedSink implements Runnable { - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("thread") Thread thread; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("outputStream") OutputStream outputStream; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -63285245 + intValue = -870723035 ) @Export("capacity") int capacity; - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("buffer") byte[] buffer; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 238793019 + intValue = 136248619 ) @Export("position") int position; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1710004877 + intValue = 961072211 ) @Export("limit") int limit; - @ObfuscatedName("q") + @ObfuscatedName("n") @Export("exception") IOException exception; - @ObfuscatedName("z") + @ObfuscatedName("u") @Export("closed") boolean closed; @@ -54,10 +54,10 @@ public class BufferedSink implements Runnable { this.thread.start(); } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(B)Z", - garbageValue = "86" + garbageValue = "49" ) @Export("isClosed") boolean isClosed() { @@ -79,10 +79,10 @@ public class BufferedSink implements Runnable { } } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "([BIIS)V", - garbageValue = "-5417" + signature = "([BIII)V", + garbageValue = "2083374722" ) @Export("write") void write(byte[] var1, int var2, int var3) throws IOException { @@ -119,10 +119,10 @@ public class BufferedSink implements Runnable { } } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1845686279" + signature = "(S)V", + garbageValue = "7072" ) @Export("close") void close() { diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java index cb28ba44ed..d90d218193 100644 --- a/runescape-client/src/main/java/BufferedSource.java +++ b/runescape-client/src/main/java/BufferedSource.java @@ -7,37 +7,37 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lm") +@ObfuscatedName("li") @Implements("BufferedSource") public class BufferedSource implements Runnable { - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("thread") Thread thread; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("inputStream") InputStream inputStream; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1277158721 + intValue = -775768789 ) @Export("capacity") int capacity; - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("buffer") byte[] buffer; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -555617543 + intValue = 1204557961 ) @Export("position") int position; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 155508897 + intValue = -340586493 ) @Export("limit") int limit; - @ObfuscatedName("q") + @ObfuscatedName("n") @Export("exception") IOException exception; @@ -52,10 +52,10 @@ public class BufferedSource implements Runnable { this.thread.start(); } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "-72" + signature = "(II)Z", + garbageValue = "733897471" ) @Export("isAvailable") boolean isAvailable(int var1) throws IOException { @@ -86,10 +86,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "23" + garbageValue = "122" ) @Export("available") int available() throws IOException { @@ -110,10 +110,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "0" + signature = "(I)I", + garbageValue = "400008412" ) @Export("readUnsignedByte") int readUnsignedByte() throws IOException { @@ -133,10 +133,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "([BIII)I", - garbageValue = "1983189445" + signature = "([BIIB)I", + garbageValue = "24" ) @Export("read") int read(byte[] var1, int var2, int var3) throws IOException { @@ -174,10 +174,10 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-424049486" + signature = "(B)V", + garbageValue = "-1" ) @Export("close") void close() { diff --git a/runescape-client/src/main/java/ByteArrayNode.java b/runescape-client/src/main/java/ByteArrayNode.java index 4c94bfc0c6..9a54f06d2e 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("gu") +@ObfuscatedName("gb") @Implements("ByteArrayNode") public class ByteArrayNode extends Node { - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("byteArray") public byte[] byteArray; diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java index aa194bb3ab..395114295b 100644 --- a/runescape-client/src/main/java/ByteArrayPool.java +++ b/runescape-client/src/main/java/ByteArrayPool.java @@ -3,49 +3,38 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; -@ObfuscatedName("kl") +@ObfuscatedName("kh") @Implements("ByteArrayPool") public class ByteArrayPool { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1085221259 + intValue = -1047368171 ) @Export("ByteArrayPool_smallCount") static int ByteArrayPool_smallCount; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1727061429 + intValue = 404509009 ) @Export("ByteArrayPool_mediumCount") static int ByteArrayPool_mediumCount; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 13537333 + intValue = 294344847 ) @Export("ByteArrayPool_largeCount") static int ByteArrayPool_largeCount; - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("ByteArrayPool_small") static byte[][] ByteArrayPool_small; - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("ByteArrayPool_medium") static byte[][] ByteArrayPool_medium; - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("ByteArrayPool_large") static byte[][] ByteArrayPool_large; - @ObfuscatedName("z") - @Export("ByteArrayPool_altSizeArrayCounts") - public static int[] ByteArrayPool_altSizeArrayCounts; - @ObfuscatedName("t") - @Export("ByteArrayPool_arrays") - public static byte[][][] ByteArrayPool_arrays; - @ObfuscatedName("kv") - @ObfuscatedSignature( - signature = "Lbi;" - ) - @Export("localPlayer") - static Player localPlayer; static { ByteArrayPool_smallCount = 0; @@ -56,10 +45,10 @@ public class ByteArrayPool { ByteArrayPool_large = new byte[50][]; } - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(IZI)[B", - garbageValue = "1813888671" + garbageValue = "1801183295" ) @Export("ByteArrayPool_getArrayBool") static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) { @@ -91,14 +80,14 @@ public class ByteArrayPool { return var2; } - if (ByteArrayPool_arrays != null) { - for (int var4 = 0; var4 < RunException.ByteArrayPool_alternativeSizes.length; ++var4) { - if (RunException.ByteArrayPool_alternativeSizes[var4] != var0) { - if (var0 < RunException.ByteArrayPool_alternativeSizes[var4]) { + if (Fonts.ByteArrayPool_arrays != null) { + for (int var4 = 0; var4 < ParamDefinition.ByteArrayPool_alternativeSizes.length; ++var4) { + if (ParamDefinition.ByteArrayPool_alternativeSizes[var4] != var0) { + if (var0 < ParamDefinition.ByteArrayPool_alternativeSizes[var4]) { } - } else if (ByteArrayPool_altSizeArrayCounts[var4] > 0) { - byte[] var3 = ByteArrayPool_arrays[var4][--ByteArrayPool_altSizeArrayCounts[var4]]; - ByteArrayPool_arrays[var4][ByteArrayPool_altSizeArrayCounts[var4]] = null; + } else if (VarbitDefinition.ByteArrayPool_altSizeArrayCounts[var4] > 0) { + byte[] var3 = Fonts.ByteArrayPool_arrays[var4][--VarbitDefinition.ByteArrayPool_altSizeArrayCounts[var4]]; + Fonts.ByteArrayPool_arrays[var4][VarbitDefinition.ByteArrayPool_altSizeArrayCounts[var4]] = null; return var3; } } @@ -106,4 +95,32 @@ public class ByteArrayPool { return new byte[var0]; } + + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;B)Ljava/lang/Class;", + garbageValue = "28" + ) + @Export("loadClassFromDescriptor") + static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { + if (var0.equals("B")) { + return Byte.TYPE; + } else if (var0.equals("I")) { + return Integer.TYPE; + } else if (var0.equals("S")) { + return Short.TYPE; + } else if (var0.equals("J")) { + return Long.TYPE; + } else if (var0.equals("Z")) { + return Boolean.TYPE; + } else if (var0.equals("F")) { + return Float.TYPE; + } else if (var0.equals("D")) { + return Double.TYPE; + } else if (var0.equals("C")) { + return Character.TYPE; + } else { + return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); + } + } } diff --git a/runescape-client/src/main/java/Calendar.java b/runescape-client/src/main/java/Calendar.java index c7a88057a4..91c25cc0ab 100644 --- a/runescape-client/src/main/java/Calendar.java +++ b/runescape-client/src/main/java/Calendar.java @@ -1,20 +1,18 @@ -import java.io.IOException; import java.util.TimeZone; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hq") +@ObfuscatedName("hy") @Implements("Calendar") public class Calendar { - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("MONTH_NAMES_ENGLISH_GERMAN") public static final String[][] MONTH_NAMES_ENGLISH_GERMAN; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("DAYS_OF_THE_WEEK") public static final String[] DAYS_OF_THE_WEEK; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("Calendar_calendar") public static java.util.Calendar Calendar_calendar; @@ -24,69 +22,4 @@ public class Calendar { java.util.Calendar.getInstance(); Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT")); } - - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-1975590317" - ) - public static int method4033(int var0) { - --var0; - var0 |= var0 >>> 1; - var0 |= var0 >>> 2; - var0 |= var0 >>> 4; - var0 |= var0 >>> 8; - var0 |= var0 >>> 16; - return var0 + 1; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1281352540" - ) - static void method4032() { - if (Login.clearLoginScreen) { - ModelData0.titleboxSprite = null; - GrandExchangeOfferOwnWorldComparator.titlebuttonSprite = null; - Login.runesSprite = null; - Login.leftTitleSprite = null; - DirectByteArrayCopier.rightTitleSprite = null; - class3.logoSprite = null; - ArchiveDisk.title_muteSprite = null; - class4.options_buttons_0Sprite = null; - Login.options_buttons_2Sprite = null; - class69.worldSelectBackSprites = null; - GrandExchangeEvent.worldSelectFlagSprites = null; - WorldMapDecoration.worldSelectArrows = null; - class348.worldSelectStars = null; - ItemContainer.field572 = null; - MilliClock.loginScreenRunesAnimation.method1909(); - class206.field2406 = 1; - class206.musicTrackArchive = null; - class206.musicTrackGroupId = -1; - class206.musicTrackFileId = -1; - class219.musicTrackVolume = 0; - GrandExchangeOfferUnitPriceComparator.musicTrackBoolean = false; - AttackOption.field1187 = 2; - if (NetCache.NetCache_socket != null) { - try { - Buffer var0 = new Buffer(4); - var0.writeByte(2); - var0.writeMedium(0); - NetCache.NetCache_socket.write(var0.array, 0, 4); - } catch (IOException var3) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var2) { - } - - ++NetCache.NetCache_ioExceptions; - NetCache.NetCache_socket = null; - } - } - - Login.clearLoginScreen = false; - } - } } diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java index ee9e79e00d..698700a41f 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -2,12 +2,19 @@ import java.awt.Component; import java.awt.Graphics; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bu") +@ObfuscatedName("ba") @Implements("Canvas") public final class Canvas extends java.awt.Canvas { + @ObfuscatedName("hd") + @ObfuscatedGetter( + intValue = 1560721333 + ) + @Export("cameraYaw") + static int cameraYaw; @ObfuscatedName("m") @Export("component") Component component; @@ -16,39 +23,268 @@ public final class Canvas extends java.awt.Canvas { this.component = var1; } - public final void update(Graphics var1) { - this.component.update(var1); - } - public final void paint(Graphics var1) { this.component.paint(var1); } - @ObfuscatedName("k") + public final void update(Graphics var1) { + this.component.update(var1); + } + + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IS)I", - garbageValue = "-1870" + signature = "(II)Ljg;", + garbageValue = "83996779" ) - public static int method958(int var0) { - return var0 >> 17 & 7; + @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; + } } @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(IIIS)I", - garbageValue = "-22602" + signature = "(Ljava/lang/String;I)V", + garbageValue = "1398023724" ) - static final int method957(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 = class232.method4218(var3, var5); - int var8 = class232.method4218(var3 + 1, var5); - int var9 = class232.method4218(var3, var5 + 1); - int var10 = class232.method4218(var3 + 1, var5 + 1); - int var11 = class195.method3695(var7, var8, var4, var2); - int var12 = class195.method3695(var9, var10, var4, var2); - return class195.method3695(var11, var12, var6, var2); + static final void method927(String var0) { + StringBuilder var10000 = (new StringBuilder()).append(var0); + Object var10001 = null; + String var1 = var10000.append(" is already on your friend list").toString(); + ObjectSound.addGameMessage(30, "", var1); + } + + @ObfuscatedName("ga") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "411559133" + ) + static void method925() { + if (class60.localPlayer.x >> 7 == Client.destinationX && class60.localPlayer.y >> 7 == Client.destinationY) { + Client.destinationX = 0; + } + + } + + @ObfuscatedName("is") + @ObfuscatedSignature( + signature = "(III)Ljava/lang/String;", + garbageValue = "-266618010" + ) + static final String method924(int var0, int var1) { + int var2 = var1 - var0; + if (var2 < -9) { + return ItemContainer.colorStartTag(16711680); + } else if (var2 < -6) { + return ItemContainer.colorStartTag(16723968); + } else if (var2 < -3) { + return ItemContainer.colorStartTag(16740352); + } else if (var2 < 0) { + return ItemContainer.colorStartTag(16756736); + } else if (var2 > 9) { + return ItemContainer.colorStartTag(65280); + } else if (var2 > 6) { + return ItemContainer.colorStartTag(4259584); + } else if (var2 > 3) { + return ItemContainer.colorStartTag(8453888); + } else { + return var2 > 0 ? ItemContainer.colorStartTag(12648192) : ItemContainer.colorStartTag(16776960); + } + } + + @ObfuscatedName("iw") + @ObfuscatedSignature( + signature = "(Lhd;II)I", + garbageValue = "623604092" + ) + static final int method923(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 = WorldMapSprite.getWidget(var9); + var11 = var2[var4++]; + if (var11 != -1 && (!KitDefinition.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 = class60.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 = WorldMapSprite.getWidget(var9); + var11 = var2[var4++]; + if (var11 != -1 && (!KitDefinition.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 = Widget.getVarbit(var9); + } + + if (var6 == 15) { + var8 = 1; + } + + if (var6 == 16) { + var8 = 2; + } + + if (var6 == 17) { + var8 = 3; + } + + if (var6 == 18) { + var7 = (class60.localPlayer.x >> 7) + class182.baseX; + } + + if (var6 == 19) { + var7 = (class60.localPlayer.y >> 7) + SecureRandomFuture.baseY; + } + + if (var6 == 20) { + var7 = var2[var4++]; + } + + if (var8 == 0) { + if (var5 == 0) { + var3 += var7; + } + + if (var5 == 1) { + var3 -= var7; + } + + if (var5 == 2 && var7 != 0) { + var3 /= var7; + } + + if (var5 == 3) { + var3 *= var7; + } + + var5 = 0; + } else { + var5 = var8; + } + } + } catch (Exception var14) { + return -1; + } + } else { + return -2; + } + } + + @ObfuscatedName("kx") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;B)V", + garbageValue = "-83" + ) + @Export("Clan_joinChat") + static final void Clan_joinChat(String var0) { + if (!var0.equals("")) { + PacketBufferNode var1 = UserComparator4.getPacketBufferNode(ClientPacket.field2292, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(DynamicObject.stringCp1252NullTerminatedByteSize(var0)); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); + } } } diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java index 2193a4d931..bd591e5d16 100644 --- a/runescape-client/src/main/java/ChatChannel.java +++ b/runescape-client/src/main/java/ChatChannel.java @@ -1,3 +1,4 @@ +import java.security.SecureRandom; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; @@ -7,26 +8,18 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("cl") @Implements("ChatChannel") public class ChatChannel { - @ObfuscatedName("fc") - @ObfuscatedGetter( - longValue = -181918079142719425L - ) - static long field1319; - @ObfuscatedName("go") + @ObfuscatedName("eh") + @Export("secureRandom") + static SecureRandom secureRandom; + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lla;" - ) - @Export("compass") - static Sprite compass; - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "[Lby;" + signature = "[Lbr;" ) @Export("messages") Message[] messages; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1013484149 + intValue = 1880348079 ) @Export("count") int count; @@ -35,10 +28,10 @@ public class ChatChannel { this.messages = new Message[100]; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lby;", - garbageValue = "922420852" + signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)Lbr;", + garbageValue = "-1" ) @Export("addMessage") Message addMessage(int var1, String var2, String var3, String var4) { @@ -66,111 +59,23 @@ public class ChatChannel { return var5; } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IB)Lby;", - garbageValue = "49" + signature = "(II)Lbr;", + garbageValue = "-317582349" ) @Export("getMessage") Message getMessage(int var1) { return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-2095560133" + garbageValue = "-1472365930" ) @Export("size") int size() { return this.count; } - - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-570972962" - ) - @Export("addChatMessage") - static void addChatMessage(int var0, String var1, String var2, String var3) { - ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); - if (var4 == null) { - var4 = new ChatChannel(); - Messages.Messages_channels.put(var0, var4); - } - - Message var5 = var4.addMessage(var0, var1, var2, var3); - Messages.Messages_hashTable.put(var5, (long)var5.count); - Messages.Messages_queue.add(var5); - Client.chatCycle = Client.cycleCntr; - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "266221696" - ) - static final void method2351() { - GrandExchangeEvent.method165("You can't add yourself to your own ignore list"); - } - - @ObfuscatedName("fo") - @ObfuscatedSignature( - signature = "(IZZZB)Lih;", - garbageValue = "109" - ) - @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, PacketBufferNode.JagexCache_idxFiles[var0], 1000000); - } - - return new Archive(var4, WorldMapRegion.masterDisk, var0, var1, var2, var3); - } - - @ObfuscatedName("fn") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "48" - ) - @Export("playPcmPlayers") - static final void playPcmPlayers() { - if (AbstractWorldMapData.pcmPlayer1 != null) { - AbstractWorldMapData.pcmPlayer1.run(); - } - - if (WorldMapManager.pcmPlayer0 != null) { - WorldMapManager.pcmPlayer0.run(); - } - - } - - @ObfuscatedName("ih") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-2027834560" - ) - static void method2354() { - for (int var0 = 0; var0 < Client.menuOptionsCount; ++var0) { - if (WorldMapLabelSize.method282(Client.menuOpcodes[var0])) { - if (var0 < Client.menuOptionsCount - 1) { - for (int var1 = var0; var1 < Client.menuOptionsCount - 1; ++var1) { - Client.menuActions[var1] = Client.menuActions[var1 + 1]; - Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; - Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; - Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; - Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; - Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; - Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; - } - } - - --var0; - --Client.menuOptionsCount; - } - } - - MusicPatchNode.method3922(WorldMapScaleHandler.menuWidth / 2 + WorldMapDecoration.menuX, PacketBufferNode.menuY); - } } diff --git a/runescape-client/src/main/java/ClanChat.java b/runescape-client/src/main/java/ClanChat.java index 138f7011ec..6279996d33 100644 --- a/runescape-client/src/main/java/ClanChat.java +++ b/runescape-client/src/main/java/ClanChat.java @@ -1,107 +1,165 @@ +import java.io.IOException; +import java.net.Socket; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ko") +@ObfuscatedName("kk") @Implements("ClanChat") public class ClanChat extends UserList { - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lmx;" + signature = "Lmo;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lkt;" + signature = "Lkp;" ) @Export("localUser") final Usernamed localUser; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("name") public String name; - @ObfuscatedName("s") + @ObfuscatedName("w") @Export("owner") public String owner; - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("minKick") public byte minKick; - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1347537209 + intValue = -1947222095 ) @Export("rank") public int rank; - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 2146085943 + intValue = -1869619471 ) - int field3634; + int field3663; @ObfuscatedSignature( - signature = "(Lmx;Lkt;)V" + signature = "(Lmo;Lkp;)V" ) public ClanChat(LoginType var1, Usernamed var2) { super(100); this.name = null; this.owner = null; - this.field3634 = 1; + this.field3663 = 1; this.loginType = var1; this.localUser = var2; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)Ljd;", - garbageValue = "-1332552421" + signature = "(I)Ljf;", + garbageValue = "551595115" ) @Export("newInstance") User newInstance() { return new ClanMate(); } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)[Ljd;", - garbageValue = "-667029686" + signature = "(II)[Ljf;", + garbageValue = "1959965595" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new ClanMate[var1]; } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(Ljava/lang/String;B)V", - garbageValue = "105" + garbageValue = "-85" ) @Export("readName") final void readName(String var1) { - this.name = DevicePcmPlayerProvider.method948(var1); + long var5 = 0L; + int var7 = var1.length(); + + for (int var8 = 0; var8 < var7; ++var8) { + var5 *= 37L; + char var9 = var1.charAt(var8); + if (var9 >= 'A' && var9 <= 'Z') { + var5 += (long)(var9 + 1 - 65); + } else if (var9 >= 'a' && var9 <= 'z') { + var5 += (long)(var9 + 1 - 97); + } else if (var9 >= '0' && var9 <= '9') { + var5 += (long)(var9 + 27 - 48); + } + + if (var5 >= 177917621779460413L) { + break; + } + } + + while (0L == var5 % 37L && var5 != 0L) { + var5 /= 37L; + } + + String var10 = WorldMapData_0.base37DecodeLong(var5); + if (var10 == null) { + var10 = ""; + } + + this.name = var10; + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)V", + garbageValue = "-1810188467" + ) + @Export("setOwner") + final void setOwner(String var1) { + long var5 = 0L; + int var7 = var1.length(); + + for (int var8 = 0; var8 < var7; ++var8) { + var5 *= 37L; + char var9 = var1.charAt(var8); + if (var9 >= 'A' && var9 <= 'Z') { + var5 += (long)(var9 + 1 - 65); + } else if (var9 >= 'a' && var9 <= 'z') { + var5 += (long)(var9 + 1 - 97); + } else if (var9 >= '0' && var9 <= '9') { + var5 += (long)(var9 + 27 - 48); + } + + if (var5 >= 177917621779460413L) { + break; + } + } + + while (0L == var5 % 37L && var5 != 0L) { + var5 /= 37L; + } + + String var10 = WorldMapData_0.base37DecodeLong(var5); + if (var10 == null) { + var10 = ""; + } + + this.owner = var10; } @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "2103961051" - ) - @Export("setOwner") - final void setOwner(String var1) { - this.owner = DevicePcmPlayerProvider.method948(var1); - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(Lkb;I)V", - garbageValue = "1675969989" + signature = "(Lkn;I)V", + garbageValue = "585042716" ) @Export("readUpdate") public final void readUpdate(Buffer var1) { this.setOwner(var1.readStringCp1252NullTerminated()); long var2 = var1.readLong(); - this.readName(GameObject.method3405(var2)); + this.readName(Frames.method3398(var2)); this.minKick = var1.readByte(); int var4 = var1.readUnsignedByte(); if (var4 != 255) { @@ -110,7 +168,7 @@ public class ClanChat extends UserList { 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.field3634 - 1); + var6.set(var7, ++this.field3663 - 1); var6.rank = var1.readByte(); var1.readStringCp1252NullTerminated(); this.isLocalPlayer(var6); @@ -119,12 +177,12 @@ public class ClanChat extends UserList { } } - @ObfuscatedName("ca") + @ObfuscatedName("ci") @ObfuscatedSignature( - signature = "(Lkb;I)V", - garbageValue = "-1155305071" + signature = "(Lkn;B)V", + garbageValue = "-100" ) - public final void method5301(Buffer var1) { + public final void method5421(Buffer var1) { Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); int var3 = var1.readUnsignedShort(); byte var4 = var1.readByte(); @@ -154,17 +212,17 @@ public class ClanChat extends UserList { var6 = (ClanMate)this.addLastNoPreviousUsername(var2); } - var6.set(var3, ++this.field3634 - 1); + var6.set(var3, ++this.field3663 - 1); var6.rank = var4; this.isLocalPlayer(var6); } } - @ObfuscatedName("cj") + @ObfuscatedName("cu") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1797514283" + signature = "(B)V", + garbageValue = "-117" ) @Export("clearFriends") public final void clearFriends() { @@ -174,10 +232,10 @@ public class ClanChat extends UserList { } - @ObfuscatedName("cp") + @ObfuscatedName("cq") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1089464789" + signature = "(B)V", + garbageValue = "-23" ) @Export("invalidateIgnoreds") public final void invalidateIgnoreds() { @@ -187,10 +245,10 @@ public class ClanChat extends UserList { } - @ObfuscatedName("ck") + @ObfuscatedName("co") @ObfuscatedSignature( - signature = "(Ljt;I)V", - garbageValue = "-66701208" + signature = "(Lji;I)V", + garbageValue = "244481619" ) @Export("isLocalPlayer") final void isLocalPlayer(ClanMate var1) { @@ -200,28 +258,22 @@ public class ClanChat extends UserList { } - @ObfuscatedName("d") + @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "(I)Ljava/lang/String;", - garbageValue = "1033875086" + signature = "(Ljava/net/Socket;III)Llj;", + garbageValue = "-1116942702" ) - static String method5318() { - String var0; - if (GrandExchangeOfferOwnWorldComparator.clientPreferences.hideUsername) { - String var2 = Login.Login_username; - int var4 = var2.length(); - char[] var5 = new char[var4]; + public static AbstractSocket method5441(Socket var0, int var1, int var2) throws IOException { + return new BufferedNetSocket(var0, var1, var2); + } - for (int var6 = 0; var6 < var4; ++var6) { - var5[var6] = '*'; - } - - String var3 = new String(var5); - var0 = var3; - } else { - var0 = Login.Login_username; - } - - return var0; + @ObfuscatedName("el") + @ObfuscatedSignature( + signature = "(B)Lma;", + garbageValue = "-90" + ) + @Export("getWorldMap") + static WorldMap getWorldMap() { + return class228.worldMap; } } diff --git a/runescape-client/src/main/java/ClanMate.java b/runescape-client/src/main/java/ClanMate.java index 55d44100ac..dd79fe50a5 100644 --- a/runescape-client/src/main/java/ClanMate.java +++ b/runescape-client/src/main/java/ClanMate.java @@ -3,18 +3,21 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jt") +@ObfuscatedName("ji") @Implements("ClanMate") public class ClanMate extends Buddy { - @ObfuscatedName("x") + @ObfuscatedName("bk") + @Export("otp") + static String otp; + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lkv;" + signature = "Lkf;" ) @Export("friend") TriBool friend; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lkv;" + signature = "Lkf;" ) @Export("ignored") TriBool ignored; @@ -24,20 +27,20 @@ public class ClanMate extends Buddy { this.ignored = TriBool.TriBool_unknown; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "93359593" + signature = "(B)V", + garbageValue = "55" ) @Export("clearIsFriend") void clearIsFriend() { this.friend = TriBool.TriBool_unknown; } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "416982136" + garbageValue = "1504738052" ) @Export("isFriend") public final boolean isFriend() { @@ -48,30 +51,30 @@ public class ClanMate extends Buddy { return this.friend == TriBool.TriBool_true; } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-559295927" + garbageValue = "-2080180390" ) @Export("fillIsFriend") void fillIsFriend() { - this.friend = Projectile.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.friend = ModeWhere.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-203044757" + signature = "(B)V", + garbageValue = "0" ) @Export("clearIsIgnored") void clearIsIgnored() { this.ignored = TriBool.TriBool_unknown; } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-2013472471" + signature = "(B)Z", + garbageValue = "10" ) @Export("isIgnored") public final boolean isIgnored() { @@ -82,13 +85,13 @@ public class ClanMate extends Buddy { return this.ignored == TriBool.TriBool_true; } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "1528" + signature = "(I)V", + garbageValue = "-1156765322" ) @Export("fillIsIgnored") void fillIsIgnored() { - this.ignored = Projectile.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.ignored = ModeWhere.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 6f3ab0ba01..0f8d2ba45c 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -1,11 +1,9 @@ import java.io.File; import java.io.IOException; -import java.io.RandomAccessFile; import java.net.Socket; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; -import java.util.LinkedHashMap; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; @@ -16,1282 +14,1285 @@ import netscape.javascript.JSObject; @Implements("Client") @ObfuscatedName("client") public final class Client extends GameShell implements Usernamed { - @ObfuscatedName("nc") + @ObfuscatedName("na") @ObfuscatedSignature( - signature = "Lhe;" + signature = "Lhd;" ) @Export("clickedWidget") static Widget clickedWidget; - @ObfuscatedName("oq") + @ObfuscatedName("oe") @ObfuscatedGetter( - intValue = -1534976767 + intValue = -729224767 + ) + static int field877; + @ObfuscatedName("ob") + @ObfuscatedGetter( + intValue = 1674098753 ) @Export("rootWidgetCount") static int rootWidgetCount; + @ObfuscatedName("og") + @ObfuscatedGetter( + longValue = -5166210462225322257L + ) + static long field886; @ObfuscatedName("oo") - @ObfuscatedGetter( - intValue = -1032308699 - ) - static int field884; - @ObfuscatedName("od") - @ObfuscatedGetter( - longValue = 7541257458804320211L - ) - static long field893; - @ObfuscatedName("oa") - static boolean[] field679; - @ObfuscatedName("ok") static boolean[] field813; - @ObfuscatedName("ou") - static boolean[] field886; - @ObfuscatedName("na") - static boolean field861; - @ObfuscatedName("ov") + @ObfuscatedName("oa") + static boolean[] field880; + @ObfuscatedName("od") + static boolean[] field879; + @ObfuscatedName("no") + static boolean field854; + @ObfuscatedName("ne") + static boolean field692; + @ObfuscatedName("on") @Export("isResizable") static boolean isResizable; - @ObfuscatedName("nv") + @ObfuscatedName("nm") @ObfuscatedGetter( - intValue = 777988173 + intValue = -1861718839 ) @Export("cycleCntr") static int cycleCntr; @ObfuscatedName("su") @ObfuscatedGetter( - intValue = 2073816179 + intValue = -1473502491 ) - public static int field891; - @ObfuscatedName("oe") + public static int field942; + @ObfuscatedName("op") @ObfuscatedGetter( - intValue = -2140267163 + intValue = 1884992439 ) - static int field873; - @ObfuscatedName("ns") - static boolean field732; - @ObfuscatedName("qn") - static boolean field915; - @ObfuscatedName("np") + static int field866; + @ObfuscatedName("nn") @ObfuscatedGetter( - intValue = 1891755493 + intValue = 1534043965 ) @Export("widgetClickX") static int widgetClickX; - @ObfuscatedName("nd") + @ObfuscatedName("qi") + static boolean field743; + @ObfuscatedName("nb") @ObfuscatedGetter( - intValue = -1161612029 + intValue = 1952446261 ) @Export("widgetClickY") static int widgetClickY; - @ObfuscatedName("nx") + @ObfuscatedName("nl") @ObfuscatedGetter( - intValue = 1561528451 + intValue = 2126591519 ) - static int field859; - @ObfuscatedName("og") - @ObfuscatedSignature( - signature = "Llv;" - ) - @Export("widgetClickMasks") - static NodeHashTable widgetClickMasks; + static int field852; @ObfuscatedName("ng") @ObfuscatedSignature( - signature = "Lhe;" + signature = "Lhd;" ) @Export("clickedWidgetParent") static Widget clickedWidgetParent; - @ObfuscatedName("oz") - @Export("rootWidgetWidths") - static int[] rootWidgetWidths; - @ObfuscatedName("op") - @Export("rootWidgetXs") - static int[] rootWidgetXs; - @ObfuscatedName("nk") - @ObfuscatedGetter( - intValue = -2134546849 - ) - static int field881; - @ObfuscatedName("ne") + @ObfuscatedName("oi") @ObfuscatedSignature( - signature = "Lhe;" + signature = "Lle;" + ) + @Export("widgetClickMasks") + static NodeHashTable widgetClickMasks; + @ObfuscatedName("np") + @ObfuscatedGetter( + intValue = 152745331 + ) + static int field853; + @ObfuscatedName("nk") + @ObfuscatedSignature( + signature = "Lhd;" ) @Export("viewportWidget") static Widget viewportWidget; - @ObfuscatedName("oy") + @ObfuscatedName("oz") @ObfuscatedGetter( - intValue = 881881039 + intValue = 1013553507 ) @Export("gameDrawingMode") static int gameDrawingMode; + @ObfuscatedName("om") + @Export("rootWidgetXs") + static int[] rootWidgetXs; @ObfuscatedName("oc") - @Export("rootWidgetHeights") - static int[] rootWidgetHeights; - @ObfuscatedName("mt") + @Export("rootWidgetWidths") + static int[] rootWidgetWidths; + @ObfuscatedName("mv") @ObfuscatedGetter( - intValue = 1604597695 + intValue = -1442407177 ) @Export("staffModLevel") - static int staffModLevel; - @ObfuscatedName("ob") + public static int staffModLevel; + @ObfuscatedName("rg") + @Export("isCameraLocked") + static boolean isCameraLocked; + @ObfuscatedName("rp") + static boolean[] field918; + @ObfuscatedName("nw") + @ObfuscatedGetter( + intValue = 1213638029 + ) + static int field855; + @ObfuscatedName("tt") + @ObfuscatedSignature( + signature = "Lbs;" + ) + static final ApproximateRouteStrategy field905; + @ObfuscatedName("nv") + @ObfuscatedGetter( + intValue = 924656773 + ) + static int field856; + @ObfuscatedName("os") @Export("rootWidgetYs") static int[] rootWidgetYs; - @ObfuscatedName("tp") - @ObfuscatedSignature( - signature = "Lbj;" - ) - static final ApproximateRouteStrategy field954; @ObfuscatedName("ow") @ObfuscatedSignature( - signature = "Ljh;" + signature = "Ljp;" ) @Export("scriptEvents") static NodeDeque scriptEvents; - @ObfuscatedName("nt") + @ObfuscatedName("ok") + @Export("rootWidgetHeights") + static int[] rootWidgetHeights; + @ObfuscatedName("nz") @ObfuscatedGetter( - intValue = 1322546357 + intValue = 1791790939 ) - static int field834; - @ObfuscatedName("ri") - @Export("isCameraLocked") - static boolean isCameraLocked; - @ObfuscatedName("rq") - static boolean[] field926; + static int field950; @ObfuscatedName("nu") - @ObfuscatedGetter( - intValue = -206540409 - ) - static int field863; - @ObfuscatedName("ru") - static int[] field788; - @ObfuscatedName("pu") - @ObfuscatedGetter( - intValue = 636733525 - ) - @Export("tradeChatMode") - static int tradeChatMode; - @ObfuscatedName("rp") - static int[] field730; - @ObfuscatedName("rs") - static int[] field929; - @ObfuscatedName("pr") - @ObfuscatedGetter( - intValue = 336519687 - ) - @Export("publicChatMode") - static int publicChatMode; - @ObfuscatedName("rz") - static int[] field930; - @ObfuscatedName("nr") - static int[] field866; - @ObfuscatedName("nj") - @ObfuscatedGetter( - intValue = -1815085637 - ) - static int field772; - @ObfuscatedName("tj") - static int[] field955; - @ObfuscatedName("tk") - static int[] field956; - @ObfuscatedName("nf") @Export("isDraggingWidget") static boolean isDraggingWidget; - @ObfuscatedName("qc") + @ObfuscatedName("ta") + static int[] field947; + @ObfuscatedName("tr") + static int[] field948; + @ObfuscatedName("oy") @ObfuscatedGetter( - intValue = 1328358885 + intValue = 652578349 ) - @Export("currentTrackGroupId") - static int currentTrackGroupId; - @ObfuscatedName("mo") + @Export("mouseWheelRotation") + static int mouseWheelRotation; + @ObfuscatedName("mg") @ObfuscatedGetter( - intValue = 1227039409 + intValue = -1228693343 ) @Export("runEnergy") static int runEnergy; @ObfuscatedName("mz") @ObfuscatedGetter( - intValue = 1509251187 + intValue = -1173095783 ) @Export("weight") static int weight; - @ObfuscatedName("qa") + @ObfuscatedName("nh") + static int[] field859; + @ObfuscatedName("nc") @ObfuscatedGetter( - intValue = -1279257455 + intValue = -912002373 ) - @Export("destinationX") - static int destinationX; - @ObfuscatedName("qk") + static int field860; + @ObfuscatedName("qx") @ObfuscatedGetter( - intValue = 1618575593 + intValue = 858415781 ) - @Export("destinationY") - static int destinationY; - @ObfuscatedName("sv") + @Export("currentTrackGroupId") + static int currentTrackGroupId; + @ObfuscatedName("qw") @ObfuscatedGetter( - intValue = 1159687403 - ) - static int field945; - @ObfuscatedName("so") - @ObfuscatedSignature( - signature = "Lhk;" - ) - @Export("playerAppearance") - static PlayerAppearance playerAppearance; - @ObfuscatedName("qy") - @ObfuscatedGetter( - intValue = 1461372687 - ) - @Export("areaSoundEffectVolume") - static int areaSoundEffectVolume; - @ObfuscatedName("se") - @ObfuscatedGetter( - intValue = -276070485 - ) - static int field946; - @ObfuscatedName("on") - @ObfuscatedGetter( - intValue = -929260201 - ) - @Export("mouseWheelRotation") - static int mouseWheelRotation; - @ObfuscatedName("ni") - @ObfuscatedSignature( - signature = "Lhe;" - ) - @Export("draggedOnWidget") - static Widget draggedOnWidget; - @ObfuscatedName("om") - @ObfuscatedGetter( - intValue = -649542909 - ) - static int field877; - @ObfuscatedName("qv") - @ObfuscatedGetter( - intValue = 702335711 + intValue = -1223703005 ) @Export("musicVolume") static int musicVolume; - @ObfuscatedName("qr") + @ObfuscatedName("qg") @ObfuscatedGetter( - intValue = 2086274421 + intValue = 1354700181 ) - @Export("soundEffectCount") - static int soundEffectCount; - @ObfuscatedName("qw") - @Export("soundEffectIds") - static int[] soundEffectIds; - @ObfuscatedName("qf") - @Export("queuedSoundEffectLoops") - static int[] queuedSoundEffectLoops; - @ObfuscatedName("qx") + @Export("areaSoundEffectVolume") + static int areaSoundEffectVolume; + @ObfuscatedName("oq") @ObfuscatedGetter( - intValue = -1155655175 + intValue = -600377077 ) - @Export("minimapState") - static int minimapState; - @ObfuscatedName("qm") - @Export("queuedSoundEffectDelays") - static int[] queuedSoundEffectDelays; - @ObfuscatedName("qz") - @ObfuscatedGetter( - intValue = 1919940513 - ) - @Export("soundEffectVolume") - static int soundEffectVolume; - @ObfuscatedName("qu") + static int field870; + @ObfuscatedName("ni") @ObfuscatedSignature( - signature = "[Ldj;" + signature = "Lhd;" ) - @Export("soundEffects") - static SoundEffect[] soundEffects; - @ObfuscatedName("qp") - @Export("soundLocations") - static int[] soundLocations; - @ObfuscatedName("sf") + @Export("draggedOnWidget") + static Widget draggedOnWidget; + @ObfuscatedName("ph") + static long[] field892; + @ObfuscatedName("sr") + @ObfuscatedGetter( + intValue = -662177847 + ) + static int field868; + @ObfuscatedName("sl") @Export("archiveLoaders") static ArrayList archiveLoaders; - @ObfuscatedName("oh") - @ObfuscatedGetter( - intValue = 1453786377 + @ObfuscatedName("sk") + @ObfuscatedSignature( + signature = "Lhv;" ) - static int field726; - @ObfuscatedName("sz") + @Export("playerAppearance") + static PlayerAppearance playerAppearance; + @ObfuscatedName("sc") @ObfuscatedGetter( - intValue = 1144280751 + intValue = -1024127287 ) @Export("archiveLoadersDone") static int archiveLoadersDone; - @ObfuscatedName("nm") - @Export("changedItemContainers") - static int[] changedItemContainers; - @ObfuscatedName("ny") + @ObfuscatedName("sv") @ObfuscatedGetter( - intValue = 387310397 + intValue = 898610375 ) - static int field869; - @ObfuscatedName("pe") - @ObfuscatedGetter( - longValue = 1482293430841042491L - ) - static long field904; - @ObfuscatedName("mu") - @ObfuscatedGetter( - intValue = -1182225561 - ) - @Export("chatEffects") - static int chatEffects; - @ObfuscatedName("md") - @ObfuscatedSignature( - signature = "Lhe;" - ) - @Export("meslayerContinueWidget") - static Widget meslayerContinueWidget; - @ObfuscatedName("me") - @ObfuscatedGetter( - intValue = -1652911979 - ) - static int field845; - @ObfuscatedName("pz") - @ObfuscatedGetter( - intValue = -720502757 - ) - static int field695; - @ObfuscatedName("or") - @ObfuscatedGetter( - intValue = -29948065 - ) - static int field874; - @ObfuscatedName("sp") - @ObfuscatedSignature( - signature = "Lmm;" - ) - @Export("platformInfoProvider") - static PlatformInfoProvider platformInfoProvider; - @ObfuscatedName("rg") - static short field931; - @ObfuscatedName("ma") - @ObfuscatedGetter( - intValue = 1416910623 - ) - @Export("followerIndex") - static int followerIndex; - @ObfuscatedName("rk") - static short field932; - @ObfuscatedName("rm") - static short field937; - @ObfuscatedName("ra") - static short field938; - @ObfuscatedName("pm") - @ObfuscatedGetter( - intValue = 2023934429 - ) - @Export("mapIconCount") - static int mapIconCount; - @ObfuscatedName("pp") - static long[] field846; - @ObfuscatedName("rw") - static short field748; - @ObfuscatedName("px") - @Export("mapIconXs") - static int[] mapIconXs; - @ObfuscatedName("st") - @ObfuscatedGetter( - intValue = 1508238603 - ) - @Export("viewportZoom") - static int viewportZoom; - @ObfuscatedName("rr") - static short field935; - @ObfuscatedName("sc") - @ObfuscatedGetter( - intValue = 1112173289 - ) - @Export("viewportWidth") - static int viewportWidth; - @ObfuscatedName("nb") + static int field938; + @ObfuscatedName("nr") @Export("changedSkills") static int[] changedSkills; - @ObfuscatedName("nh") + @ObfuscatedName("nx") @ObfuscatedGetter( - intValue = 19610687 + intValue = -842750463 ) @Export("changedSkillsCount") static int changedSkillsCount; - @ObfuscatedName("pg") - @Export("mapIconYs") - static int[] mapIconYs; - @ObfuscatedName("ps") - @ObfuscatedSignature( - signature = "[Lla;" - ) - @Export("mapIcons") - static Sprite[] mapIcons; - @ObfuscatedName("ph") + @ObfuscatedName("pz") @ObfuscatedGetter( - intValue = 180652911 + intValue = -1471739451 ) - static int field900; - @ObfuscatedName("si") + static int field730; + @ObfuscatedName("ou") @ObfuscatedGetter( - intValue = 2055926497 + intValue = -1073959107 ) - @Export("viewportHeight") - static int viewportHeight; - @ObfuscatedName("ro") + static int field943; + @ObfuscatedName("qu") @ObfuscatedGetter( - intValue = -367442815 + intValue = -683211221 ) - @Export("viewportOffsetX") - static int viewportOffsetX; - @ObfuscatedName("sh") + @Export("minimapState") + static int minimapState; + @ObfuscatedName("qb") @ObfuscatedGetter( - intValue = -1701342831 + intValue = -624260701 ) - @Export("viewportOffsetY") - static int viewportOffsetY; - @ObfuscatedName("rj") - @ObfuscatedGetter( - intValue = -527659011 - ) - static int field925; - @ObfuscatedName("pa") - @ObfuscatedGetter( - intValue = -2121206743 - ) - static int field901; - @ObfuscatedName("os") - @ObfuscatedGetter( - intValue = -1525951485 - ) - @Export("chatCycle") - static int chatCycle; - @ObfuscatedName("sn") - @ObfuscatedGetter( - intValue = -453519891 - ) - static int field898; - @ObfuscatedName("pw") - static int[] field872; - @ObfuscatedName("of") - @ObfuscatedSignature( - signature = "Ljh;" - ) - static NodeDeque field727; - @ObfuscatedName("pk") - static int[] field902; - @ObfuscatedName("mh") - @Export("playerMod") - static boolean playerMod; - @ObfuscatedName("ox") - @ObfuscatedSignature( - signature = "Ljh;" - ) - static NodeDeque field919; - @ObfuscatedName("rn") - @Export("zoomHeight") - static short zoomHeight; - @ObfuscatedName("rd") - @Export("zoomWidth") - static short zoomWidth; - @ObfuscatedName("mv") - @ObfuscatedGetter( - intValue = -651344111 - ) - static int field842; - @ObfuscatedName("mk") - @ObfuscatedGetter( - intValue = -1472818425 - ) - static int field843; + @Export("destinationX") + static int destinationX; @ObfuscatedName("sd") @ObfuscatedSignature( - signature = "[Lb;" + signature = "[Ld;" ) @Export("grandExchangeOffers") static GrandExchangeOffer[] grandExchangeOffers; - @ObfuscatedName("oi") + @ObfuscatedName("qe") @ObfuscatedGetter( - intValue = -681527765 + intValue = -57175271 ) - static int field774; - @ObfuscatedName("pi") - static int[] field895; - @ObfuscatedName("pt") - static String field814; - @ObfuscatedName("sk") + @Export("destinationY") + static int destinationY; + @ObfuscatedName("qp") + @ObfuscatedGetter( + intValue = 1814530167 + ) + @Export("soundEffectVolume") + static int soundEffectVolume; + @ObfuscatedName("ov") + @ObfuscatedGetter( + intValue = 1920180329 + ) + static int field818; + @ObfuscatedName("nj") + @Export("changedItemContainers") + static int[] changedItemContainers; + @ObfuscatedName("sf") @ObfuscatedSignature( - signature = "Lbl;" + signature = "Lmk;" + ) + @Export("platformInfoProvider") + static PlatformInfoProvider platformInfoProvider; + @ObfuscatedName("nd") + @ObfuscatedGetter( + intValue = -392982617 + ) + static int field878; + @ObfuscatedName("mq") + @ObfuscatedSignature( + signature = "Lhd;" + ) + @Export("meslayerContinueWidget") + static Widget meslayerContinueWidget; + @ObfuscatedName("qk") + @ObfuscatedGetter( + intValue = -1126917969 + ) + @Export("soundEffectCount") + static int soundEffectCount; + @ObfuscatedName("qf") + @Export("soundEffectIds") + static int[] soundEffectIds; + @ObfuscatedName("ru") + static int[] field919; + @ObfuscatedName("mf") + @ObfuscatedGetter( + intValue = 1696970787 + ) + @Export("chatEffects") + static int chatEffects; + @ObfuscatedName("ql") + @Export("queuedSoundEffectLoops") + static int[] queuedSoundEffectLoops; + @ObfuscatedName("rb") + static int[] field775; + @ObfuscatedName("mt") + @ObfuscatedGetter( + intValue = -1292017341 + ) + static int field838; + @ObfuscatedName("ry") + static int[] field778; + @ObfuscatedName("qz") + @Export("queuedSoundEffectDelays") + static int[] queuedSoundEffectDelays; + @ObfuscatedName("rv") + static short field727; + @ObfuscatedName("pd") + @ObfuscatedGetter( + intValue = 1435648883 + ) + static int field937; + @ObfuscatedName("rf") + static int[] field922; + @ObfuscatedName("rw") + static short field924; + @ObfuscatedName("pu") + @ObfuscatedGetter( + longValue = 5234729741765487197L + ) + static long field897; + @ObfuscatedName("rt") + static short field685; + @ObfuscatedName("qm") + @ObfuscatedSignature( + signature = "[Ldr;" + ) + @Export("soundEffects") + static SoundEffect[] soundEffects; + @ObfuscatedName("rj") + static short field861; + @ObfuscatedName("qv") + @Export("soundLocations") + static int[] soundLocations; + @ObfuscatedName("rx") + static short field928; + @ObfuscatedName("sj") + @ObfuscatedGetter( + intValue = 1878607171 + ) + @Export("viewportZoom") + static int viewportZoom; + @ObfuscatedName("rh") + static short field927; + @ObfuscatedName("so") + @ObfuscatedGetter( + intValue = -1349755447 + ) + @Export("viewportWidth") + static int viewportWidth; + @ObfuscatedName("ss") + @ObfuscatedGetter( + intValue = -1045549837 + ) + @Export("viewportHeight") + static int viewportHeight; + @ObfuscatedName("pt") + @ObfuscatedGetter( + intValue = 262227823 + ) + @Export("mapIconCount") + static int mapIconCount; + @ObfuscatedName("pj") + @Export("mapIconXs") + static int[] mapIconXs; + @ObfuscatedName("mp") + @ObfuscatedGetter( + intValue = -700106021 + ) + @Export("followerIndex") + static int followerIndex; + @ObfuscatedName("pi") + @Export("mapIconYs") + static int[] mapIconYs; + @ObfuscatedName("ro") + @ObfuscatedGetter( + intValue = 1721264053 + ) + @Export("viewportOffsetX") + static int viewportOffsetX; + @ObfuscatedName("pw") + @ObfuscatedSignature( + signature = "[Llz;" + ) + @Export("mapIcons") + static Sprite[] mapIcons; + @ObfuscatedName("sp") + @ObfuscatedGetter( + intValue = -2094601857 + ) + @Export("viewportOffsetY") + static int viewportOffsetY; + @ObfuscatedName("rl") + @Export("zoomHeight") + static short zoomHeight; + @ObfuscatedName("rm") + @Export("zoomWidth") + static short zoomWidth; + @ObfuscatedName("sn") + @ObfuscatedGetter( + intValue = 1224473793 + ) + static int field945; + @ObfuscatedName("oh") + @ObfuscatedGetter( + intValue = 1755181415 + ) + @Export("chatCycle") + static int chatCycle; + @ObfuscatedName("pr") + @ObfuscatedGetter( + intValue = 1773187299 + ) + static int field894; + @ObfuscatedName("pq") + static int[] field896; + @ObfuscatedName("pf") + static int[] field920; + @ObfuscatedName("pa") + @ObfuscatedGetter( + intValue = 793298193 + ) + @Export("publicChatMode") + static int publicChatMode; + @ObfuscatedName("pm") + @ObfuscatedGetter( + intValue = -394353337 + ) + @Export("tradeChatMode") + static int tradeChatMode; + @ObfuscatedName("mx") + @Export("playerMod") + static boolean playerMod; + @ObfuscatedName("oj") + @ObfuscatedSignature( + signature = "Ljp;" + ) + static NodeDeque field891; + @ObfuscatedName("ot") + @ObfuscatedSignature( + signature = "Ljp;" + ) + static NodeDeque field691; + @ObfuscatedName("or") + @ObfuscatedGetter( + intValue = -1554074511 + ) + static int field869; + @ObfuscatedName("mw") + @ObfuscatedGetter( + intValue = -947743503 + ) + static int field835; + @ObfuscatedName("mm") + @ObfuscatedGetter( + intValue = 378113837 + ) + static int field671; + @ObfuscatedName("pn") + static int[] field888; + @ObfuscatedName("pg") + static String field755; + @ObfuscatedName("sx") + @ObfuscatedSignature( + signature = "Lbj;" ) @Export("GrandExchangeEvents_worldComparator") static GrandExchangeOfferOwnWorldComparator GrandExchangeEvents_worldComparator; @ObfuscatedName("w") @ObfuscatedSignature( - signature = "[Lfm;" + signature = "[Lfz;" ) @Export("collisionMaps") static CollisionMap[] collisionMaps; - @ObfuscatedName("aw") - static boolean field749; - @ObfuscatedName("bf") + @ObfuscatedName("aj") + static boolean field669; + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = 67970213 + intValue = 2001872587 ) @Export("worldId") public static int worldId; - @ObfuscatedName("bc") + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = -454237971 + intValue = 807704553 ) @Export("worldProperties") static int worldProperties; - @ObfuscatedName("bd") + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = 50872335 + intValue = -341861453 ) @Export("gameBuild") static int gameBuild; - @ObfuscatedName("be") + @ObfuscatedName("bd") @Export("isMembersWorld") public static boolean isMembersWorld; - @ObfuscatedName("bg") + @ObfuscatedName("bb") @Export("isLowDetail") static boolean isLowDetail; - @ObfuscatedName("ba") + @ObfuscatedName("bn") + static String field871; + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = -1948298563 + intValue = -419209615 ) @Export("clientType") static int clientType; - @ObfuscatedName("bv") + @ObfuscatedName("bp") @Export("onMobile") static boolean onMobile; - @ObfuscatedName("bx") + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = -734659311 + intValue = -176982947 ) @Export("gameState") static int gameState; - @ObfuscatedName("cg") + @ObfuscatedName("ck") @Export("isLoading") static boolean isLoading; - @ObfuscatedName("cd") + @ObfuscatedName("cv") @ObfuscatedGetter( - intValue = -2024138363 + intValue = 1130810935 ) @Export("cycle") static int cycle; - @ObfuscatedName("cx") + @ObfuscatedName("cp") @ObfuscatedGetter( - longValue = -2067581052141850097L + longValue = -4780591351762996103L ) @Export("mouseLastLastPressedTimeMillis") static long mouseLastLastPressedTimeMillis; - @ObfuscatedName("ci") + @ObfuscatedName("cu") @ObfuscatedGetter( - intValue = -1167045491 + intValue = 1372131715 ) - static int field691; - @ObfuscatedName("cz") + static int field683; + @ObfuscatedName("cq") @ObfuscatedGetter( - intValue = 736381377 + intValue = 330959641 ) - static int field692; - @ObfuscatedName("cb") + static int field684; + @ObfuscatedName("co") @ObfuscatedGetter( - longValue = -9018780370059554257L + longValue = 6700383244029833147L ) - static long field875; - @ObfuscatedName("cy") + static long field738; + @ObfuscatedName("ca") @Export("hadFocus") static boolean hadFocus; - @ObfuscatedName("ct") + @ObfuscatedName("cm") @Export("displayFps") static boolean displayFps; @ObfuscatedName("cf") @ObfuscatedGetter( - intValue = -475175391 + intValue = -883512619 ) @Export("rebootTimer") static int rebootTimer; - @ObfuscatedName("ca") + @ObfuscatedName("ct") @ObfuscatedGetter( - intValue = -1953007669 + intValue = -1769866173 ) @Export("hintArrowType") static int hintArrowType; - @ObfuscatedName("cj") + @ObfuscatedName("cd") @ObfuscatedGetter( - intValue = 538709907 + intValue = -1512277987 ) @Export("hintArrowNpcIndex") static int hintArrowNpcIndex; - @ObfuscatedName("cp") + @ObfuscatedName("cy") @ObfuscatedGetter( - intValue = 1820154893 + intValue = -1664926141 ) @Export("hintArrowPlayerIndex") static int hintArrowPlayerIndex; - @ObfuscatedName("ck") + @ObfuscatedName("cx") @ObfuscatedGetter( - intValue = -528461793 + intValue = -1602606573 ) @Export("hintArrowX") static int hintArrowX; - @ObfuscatedName("ce") + @ObfuscatedName("cs") @ObfuscatedGetter( - intValue = -89638729 + intValue = -738703837 ) @Export("hintArrowY") static int hintArrowY; - @ObfuscatedName("cv") + @ObfuscatedName("cr") @ObfuscatedGetter( - intValue = 806134121 + intValue = 378352399 ) @Export("hintArrowHeight") static int hintArrowHeight; @ObfuscatedName("cl") @ObfuscatedGetter( - intValue = 1105349969 + intValue = -867258703 ) @Export("hintArrowSubX") static int hintArrowSubX; - @ObfuscatedName("dv") + @ObfuscatedName("dx") @ObfuscatedGetter( - intValue = 634022549 + intValue = -954844719 ) @Export("hintArrowSubY") static int hintArrowSubY; - @ObfuscatedName("du") + @ObfuscatedName("dm") @ObfuscatedSignature( - signature = "Lcb;" + signature = "Lco;" ) @Export("playerAttackOption") static AttackOption playerAttackOption; - @ObfuscatedName("dz") + @ObfuscatedName("dd") @ObfuscatedSignature( - signature = "Lcb;" + signature = "Lco;" ) @Export("npcAttackOption") static AttackOption npcAttackOption; - @ObfuscatedName("dq") + @ObfuscatedName("dl") @ObfuscatedGetter( - intValue = 1329734549 + intValue = 1526205263 ) @Export("titleLoadingStage") static int titleLoadingStage; - @ObfuscatedName("dm") + @ObfuscatedName("dr") + @ObfuscatedSignature( + signature = "Lfa;" + ) + @Export("js5SocketTask") + static Task js5SocketTask; + @ObfuscatedName("dp") @ObfuscatedGetter( - intValue = 887284589 + intValue = -1037086785 ) @Export("js5ConnectState") static int js5ConnectState; - @ObfuscatedName("db") + @ObfuscatedName("dc") @ObfuscatedGetter( - intValue = -1245813257 + intValue = 174147835 ) - static int field709; - @ObfuscatedName("eq") + static int field815; + @ObfuscatedName("ea") @ObfuscatedGetter( - intValue = -303941171 + intValue = -331323577 ) @Export("js5Errors") static int js5Errors; @ObfuscatedName("ei") @ObfuscatedGetter( - intValue = 1964000781 + intValue = -972927187 ) @Export("loginState") static int loginState; - @ObfuscatedName("en") + @ObfuscatedName("et") @ObfuscatedGetter( - intValue = -1937308451 + intValue = -1222807213 ) - static int field712; - @ObfuscatedName("ec") + static int field705; + @ObfuscatedName("eq") @ObfuscatedGetter( - intValue = -1595212999 + intValue = -1645904359 ) - static int field713; - @ObfuscatedName("ev") + static int field706; + @ObfuscatedName("ex") @ObfuscatedGetter( - intValue = -1280111513 + intValue = -92180293 ) - static int field714; - @ObfuscatedName("eb") + static int field675; + @ObfuscatedName("er") @ObfuscatedSignature( - signature = "Lfu;" + signature = "Lfg;" ) - static class169 field715; - @ObfuscatedName("ez") + static class169 field708; + @ObfuscatedName("el") + @ObfuscatedGetter( + intValue = 1015918785 + ) + @Export("port2") + static int port2; + @ObfuscatedName("ep") @Export("Login_isUsernameRemembered") static boolean Login_isUsernameRemembered; - @ObfuscatedName("ek") + @ObfuscatedName("ev") @ObfuscatedSignature( - signature = "Lca;" + signature = "Lct;" ) @Export("secureRandomFuture") static SecureRandomFuture secureRandomFuture; - @ObfuscatedName("fk") + @ObfuscatedName("fe") @Export("randomDatData") static byte[] randomDatData; - @ObfuscatedName("ff") + @ObfuscatedName("fc") @ObfuscatedSignature( - signature = "[Lcd;" + signature = "[Lcv;" ) @Export("npcs") static NPC[] npcs; - @ObfuscatedName("fd") + @ObfuscatedName("ft") @ObfuscatedGetter( - intValue = -13803859 + intValue = 2041291171 ) @Export("npcCount") static int npcCount; - @ObfuscatedName("fo") + @ObfuscatedName("fp") @Export("npcIndices") static int[] npcIndices; - @ObfuscatedName("fi") + @ObfuscatedName("fq") @ObfuscatedGetter( - intValue = 1186510191 + intValue = -1459583387 ) - static int field851; - @ObfuscatedName("fv") - static int[] field725; - @ObfuscatedName("fg") + static int field718; + @ObfuscatedName("fk") + static int[] field719; + @ObfuscatedName("fn") @ObfuscatedSignature( - signature = "Ldv;" + signature = "Ldx;" ) @Export("packetWriter") public static final PacketWriter packetWriter; - @ObfuscatedName("fu") + @ObfuscatedName("fg") @ObfuscatedGetter( - intValue = -842980155 + intValue = 2002648973 ) @Export("logoutTimer") static int logoutTimer; - @ObfuscatedName("ft") - static boolean field728; - @ObfuscatedName("fj") + @ObfuscatedName("fu") + static boolean field722; + @ObfuscatedName("ff") @Export("useBufferedSocket") static boolean useBufferedSocket; - @ObfuscatedName("fn") + @ObfuscatedName("fs") @ObfuscatedSignature( - signature = "Ljr;" + signature = "Ljy;" ) @Export("timer") static Timer timer; - @ObfuscatedName("fe") + @ObfuscatedName("fl") @Export("fontsMap") static HashMap fontsMap; - @ObfuscatedName("gw") + @ObfuscatedName("gq") @ObfuscatedGetter( - intValue = 1736766239 + intValue = 416832453 ) - static int field818; - @ObfuscatedName("gu") + static int field822; + @ObfuscatedName("gb") @ObfuscatedGetter( - intValue = 237208089 + intValue = -1691657031 ) - static int field921; - @ObfuscatedName("gt") + static int field759; + @ObfuscatedName("gd") @ObfuscatedGetter( - intValue = -1880791937 + intValue = -386652489 ) - static int field734; - @ObfuscatedName("gz") + static int field690; + @ObfuscatedName("gc") @ObfuscatedGetter( - intValue = 313478257 + intValue = -498328781 ) - static int field735; - @ObfuscatedName("ga") + static int field729; + @ObfuscatedName("gr") @ObfuscatedGetter( - intValue = -965509961 + intValue = -1249993183 ) - static int field899; - @ObfuscatedName("gs") + static int field809; + @ObfuscatedName("gg") @Export("isInInstance") static boolean isInInstance; - @ObfuscatedName("gk") + @ObfuscatedName("gh") @Export("instanceChunkTemplates") static int[][][] instanceChunkTemplates; - @ObfuscatedName("gl") - static final int[] field699; - @ObfuscatedName("gj") + @ObfuscatedName("gz") + static final int[] field734; + @ObfuscatedName("gy") @ObfuscatedGetter( - intValue = -352208827 - ) - static int field741; - @ObfuscatedName("hi") - @ObfuscatedGetter( - intValue = 952516679 - ) - static int field742; - @ObfuscatedName("hl") - @ObfuscatedGetter( - intValue = -499490457 + intValue = -103852435 ) static int field747; @ObfuscatedName("hq") @ObfuscatedGetter( - intValue = 1112772085 + intValue = 26866095 ) - static int field744; - @ObfuscatedName("hw") + static int field736; + @ObfuscatedName("hk") @ObfuscatedGetter( - intValue = 59309843 + intValue = 683906157 ) - static int field745; - @ObfuscatedName("hb") - static boolean field746; - @ObfuscatedName("hd") + static int field737; + @ObfuscatedName("hy") @ObfuscatedGetter( - intValue = -71090641 + intValue = 1193836409 + ) + static int field694; + @ObfuscatedName("hn") + @ObfuscatedGetter( + intValue = -678810071 + ) + static int field739; + @ObfuscatedName("he") + static boolean field740; + @ObfuscatedName("hr") + @ObfuscatedGetter( + intValue = -708523843 ) @Export("alternativeScrollbarWidth") static int alternativeScrollbarWidth; - @ObfuscatedName("hn") + @ObfuscatedName("hu") @ObfuscatedGetter( - intValue = -1566395531 + intValue = -1899320339 ) @Export("camAngleX") static int camAngleX; - @ObfuscatedName("hu") + @ObfuscatedName("ho") @ObfuscatedGetter( - intValue = 442725255 + intValue = 1115448517 ) @Export("camAngleY") static int camAngleY; - @ObfuscatedName("ha") + @ObfuscatedName("hp") @ObfuscatedGetter( - intValue = 139375317 + intValue = 217664287 ) @Export("camAngleDY") static int camAngleDY; - @ObfuscatedName("ho") + @ObfuscatedName("hf") @ObfuscatedGetter( - intValue = -2038484537 + intValue = -1231248307 ) @Export("camAngleDX") static int camAngleDX; - @ObfuscatedName("hr") + @ObfuscatedName("hb") @ObfuscatedGetter( - intValue = 702140089 + intValue = 1991000361 ) @Export("mouseCamClickedX") static int mouseCamClickedX; - @ObfuscatedName("hv") + @ObfuscatedName("hs") @ObfuscatedGetter( - intValue = 1980402249 + intValue = -56491575 ) @Export("mouseCamClickedY") static int mouseCamClickedY; - @ObfuscatedName("hx") + @ObfuscatedName("hc") @ObfuscatedGetter( - intValue = -167717143 + intValue = 952453857 ) @Export("oculusOrbState") static int oculusOrbState; - @ObfuscatedName("im") + @ObfuscatedName("ia") @ObfuscatedGetter( - intValue = 1280381451 + intValue = 899099377 ) @Export("camFollowHeight") static int camFollowHeight; - @ObfuscatedName("ig") + @ObfuscatedName("is") @ObfuscatedGetter( - intValue = -586245253 + intValue = 1234153475 ) - static int field756; - @ObfuscatedName("ii") + static int field717; + @ObfuscatedName("ij") @ObfuscatedGetter( - intValue = 1464169135 + intValue = 2036163559 ) - static int field757; - @ObfuscatedName("iv") + static int field751; + @ObfuscatedName("ib") @ObfuscatedGetter( - intValue = -660367395 + intValue = 1474588135 ) - static int field724; - @ObfuscatedName("ir") + static int field752; + @ObfuscatedName("iq") @ObfuscatedGetter( - intValue = -949088515 - ) - static int field759; - @ObfuscatedName("ip") - @ObfuscatedGetter( - intValue = -412319227 + intValue = -968086637 ) @Export("oculusOrbNormalSpeed") static int oculusOrbNormalSpeed; - @ObfuscatedName("ih") + @ObfuscatedName("ic") @ObfuscatedGetter( - intValue = -493333163 + intValue = 312783465 ) @Export("oculusOrbSlowedSpeed") static int oculusOrbSlowedSpeed; - @ObfuscatedName("ia") + @ObfuscatedName("ip") @ObfuscatedGetter( - intValue = 1356416223 + intValue = -1503339861 ) - static int field762; - @ObfuscatedName("in") - static boolean field770; - @ObfuscatedName("ie") - @ObfuscatedGetter( - intValue = -472895563 - ) - static int field764; - @ObfuscatedName("iq") - static boolean field765; - @ObfuscatedName("ik") - @ObfuscatedGetter( - intValue = 575633547 - ) - static int field941; - @ObfuscatedName("io") - @ObfuscatedGetter( - intValue = -39115273 - ) - @Export("overheadTextCount") - static int overheadTextCount; + static int field836; + @ObfuscatedName("ig") + static boolean field756; @ObfuscatedName("it") @Export("selectedItemName") static String selectedItemName; - @ObfuscatedName("iw") + @ObfuscatedName("if") @ObfuscatedGetter( - intValue = 975397305 + intValue = -855755453 + ) + static int field757; + @ObfuscatedName("il") + static boolean field758; + @ObfuscatedName("iy") + @ObfuscatedGetter( + intValue = 457429091 + ) + static int field881; + @ObfuscatedName("ih") + @ObfuscatedGetter( + intValue = 1649830223 + ) + @Export("overheadTextCount") + static int overheadTextCount; + @ObfuscatedName("iu") + @ObfuscatedGetter( + intValue = -1008916691 ) @Export("overheadTextLimit") static int overheadTextLimit; - @ObfuscatedName("if") + @ObfuscatedName("ie") @Export("overheadTextXs") static int[] overheadTextXs; - @ObfuscatedName("ib") + @ObfuscatedName("iw") @Export("overheadTextYs") static int[] overheadTextYs; - @ObfuscatedName("id") + @ObfuscatedName("ir") @Export("overheadTextAscents") static int[] overheadTextAscents; - @ObfuscatedName("il") + @ObfuscatedName("ik") @Export("overheadTextXOffsets") static int[] overheadTextXOffsets; - @ObfuscatedName("iu") + @ObfuscatedName("iv") @Export("overheadTextColors") static int[] overheadTextColors; - @ObfuscatedName("is") + @ObfuscatedName("ii") @Export("overheadTextEffects") static int[] overheadTextEffects; - @ObfuscatedName("jq") + @ObfuscatedName("je") @Export("overheadTextCyclesRemaining") static int[] overheadTextCyclesRemaining; - @ObfuscatedName("ji") + @ObfuscatedName("jr") @Export("overheadText") static String[] overheadText; - @ObfuscatedName("jv") + @ObfuscatedName("js") @Export("tileLastDrawnActor") static int[][] tileLastDrawnActor; - @ObfuscatedName("jw") + @ObfuscatedName("jg") @ObfuscatedGetter( - intValue = -2121599307 + intValue = 113367579 ) @Export("viewportDrawCount") static int viewportDrawCount; - @ObfuscatedName("jx") + @ObfuscatedName("jo") @ObfuscatedGetter( - intValue = 367239901 + intValue = -1896450279 ) @Export("viewportTempX") static int viewportTempX; - @ObfuscatedName("je") + @ObfuscatedName("jc") @ObfuscatedGetter( - intValue = 315568117 + intValue = 1282867815 ) @Export("viewportTempY") static int viewportTempY; - @ObfuscatedName("jj") + @ObfuscatedName("jz") @ObfuscatedGetter( - intValue = 1079427097 + intValue = 601900271 ) @Export("mouseCrossX") static int mouseCrossX; - @ObfuscatedName("jn") + @ObfuscatedName("jt") @ObfuscatedGetter( - intValue = 2092751039 + intValue = 1179562767 ) @Export("mouseCrossY") static int mouseCrossY; - @ObfuscatedName("jc") + @ObfuscatedName("jm") @ObfuscatedGetter( - intValue = -518761301 + intValue = 125020733 ) @Export("mouseCrossState") static int mouseCrossState; - @ObfuscatedName("jl") + @ObfuscatedName("jd") @ObfuscatedGetter( - intValue = -806793857 + intValue = -1956058299 ) @Export("mouseCrossColor") static int mouseCrossColor; - @ObfuscatedName("jm") + @ObfuscatedName("jx") @Export("showMouseCross") static boolean showMouseCross; - @ObfuscatedName("jk") + @ObfuscatedName("jn") @ObfuscatedGetter( - intValue = 2013290137 + intValue = 1621281143 ) - static int field786; - @ObfuscatedName("jg") + static int field808; + @ObfuscatedName("jl") @ObfuscatedGetter( - intValue = -1764977003 + intValue = -886925517 ) - static int field880; - @ObfuscatedName("jo") + static int field668; + @ObfuscatedName("ja") @ObfuscatedGetter( - intValue = -540153301 + intValue = -668604129 ) @Export("dragItemSlotSource") static int dragItemSlotSource; - @ObfuscatedName("ja") + @ObfuscatedName("jv") @ObfuscatedGetter( - intValue = -1956792499 + intValue = -793315667 ) @Export("draggedWidgetX") static int draggedWidgetX; - @ObfuscatedName("jp") + @ObfuscatedName("jj") @ObfuscatedGetter( - intValue = -1891050173 + intValue = 1962512569 ) @Export("draggedWidgetY") static int draggedWidgetY; - @ObfuscatedName("jy") + @ObfuscatedName("jh") @ObfuscatedGetter( - intValue = -1965076329 + intValue = -952269611 ) @Export("dragItemSlotDestination") static int dragItemSlotDestination; - @ObfuscatedName("jf") - static boolean field887; - @ObfuscatedName("jr") + @ObfuscatedName("jb") + static boolean field785; + @ObfuscatedName("jy") @ObfuscatedGetter( - intValue = -1524629153 + intValue = 1160990691 ) @Export("itemDragDuration") static int itemDragDuration; - @ObfuscatedName("jt") + @ObfuscatedName("ji") @ObfuscatedGetter( - intValue = -1322333605 + intValue = -713831637 ) - static int field794; - @ObfuscatedName("js") + static int field787; + @ObfuscatedName("jk") @Export("showLoadingMessages") static boolean showLoadingMessages; - @ObfuscatedName("kw") + @ObfuscatedName("ku") @ObfuscatedSignature( - signature = "[Lbi;" + signature = "[Lby;" ) @Export("players") static Player[] players; - @ObfuscatedName("ke") + @ObfuscatedName("kx") @ObfuscatedGetter( - intValue = -767774261 + intValue = -2104761709 ) @Export("localPlayerIndex") static int localPlayerIndex; - @ObfuscatedName("kt") + @ObfuscatedName("kp") @ObfuscatedGetter( - intValue = -1853665647 + intValue = 1712399345 ) - static int field798; - @ObfuscatedName("kr") + static int field791; + @ObfuscatedName("ki") @Export("renderSelf") static boolean renderSelf; - @ObfuscatedName("kk") + @ObfuscatedName("ks") @ObfuscatedGetter( - intValue = -931711387 + intValue = 1574229217 ) @Export("drawPlayerNames") static int drawPlayerNames; - @ObfuscatedName("kn") + @ObfuscatedName("km") @ObfuscatedGetter( - intValue = 2084987415 + intValue = 1638972327 ) - static int field801; - @ObfuscatedName("kq") - static int[] field918; - @ObfuscatedName("kc") + static int field687; + @ObfuscatedName("kt") + static int[] field907; + @ObfuscatedName("kj") @Export("playerMenuOpcodes") static final int[] playerMenuOpcodes; - @ObfuscatedName("ka") + @ObfuscatedName("ke") @Export("playerMenuActions") static String[] playerMenuActions; - @ObfuscatedName("kf") + @ObfuscatedName("kv") @Export("playerOptionsPriorities") static boolean[] playerOptionsPriorities; - @ObfuscatedName("kg") + @ObfuscatedName("kw") @Export("defaultRotations") static int[] defaultRotations; - @ObfuscatedName("kx") + @ObfuscatedName("ko") @ObfuscatedGetter( - intValue = -246802771 + intValue = -1537500949 ) @Export("combatTargetPlayerIndex") static int combatTargetPlayerIndex; - @ObfuscatedName("kh") + @ObfuscatedName("ka") @ObfuscatedSignature( - signature = "[[[Ljh;" + signature = "[[[Ljp;" ) @Export("groundItems") static NodeDeque[][][] groundItems; - @ObfuscatedName("kp") + @ObfuscatedName("kg") @ObfuscatedSignature( - signature = "Ljh;" + signature = "Ljp;" ) @Export("pendingSpawns") static NodeDeque pendingSpawns; - @ObfuscatedName("kz") + @ObfuscatedName("ky") @ObfuscatedSignature( - signature = "Ljh;" + signature = "Ljp;" ) @Export("projectiles") static NodeDeque projectiles; - @ObfuscatedName("kj") + @ObfuscatedName("kb") @ObfuscatedSignature( - signature = "Ljh;" + signature = "Ljp;" ) @Export("graphicsObjects") static NodeDeque graphicsObjects; - @ObfuscatedName("kb") + @ObfuscatedName("kn") @Export("currentLevels") static int[] currentLevels; - @ObfuscatedName("kd") + @ObfuscatedName("kz") @Export("levels") static int[] levels; - @ObfuscatedName("kl") + @ObfuscatedName("kh") @Export("experience") static int[] experience; @ObfuscatedName("lk") @ObfuscatedGetter( - intValue = 1453030713 + intValue = 1733687711 ) @Export("leftClickOpensMenu") static int leftClickOpensMenu; - @ObfuscatedName("lb") + @ObfuscatedName("ly") @Export("isMenuOpen") static boolean isMenuOpen; - @ObfuscatedName("lg") + @ObfuscatedName("ls") @ObfuscatedGetter( - intValue = -637671939 + intValue = 1259358681 ) @Export("menuOptionsCount") static int menuOptionsCount; - @ObfuscatedName("lf") + @ObfuscatedName("lm") @Export("menuArguments1") static int[] menuArguments1; - @ObfuscatedName("lx") + @ObfuscatedName("lq") @Export("menuArguments2") static int[] menuArguments2; - @ObfuscatedName("ly") + @ObfuscatedName("lx") @Export("menuOpcodes") static int[] menuOpcodes; - @ObfuscatedName("ll") + @ObfuscatedName("la") @Export("menuIdentifiers") static int[] menuIdentifiers; - @ObfuscatedName("lh") + @ObfuscatedName("lt") @Export("menuActions") static String[] menuActions; - @ObfuscatedName("ln") + @ObfuscatedName("lf") @Export("menuTargets") static String[] menuTargets; - @ObfuscatedName("lw") + @ObfuscatedName("ln") @Export("menuShiftClick") static boolean[] menuShiftClick; - @ObfuscatedName("lv") + @ObfuscatedName("le") @Export("followerOpsLowPriority") static boolean followerOpsLowPriority; - @ObfuscatedName("lz") + @ObfuscatedName("lr") @Export("shiftClickDrop") static boolean shiftClickDrop; - @ObfuscatedName("li") + @ObfuscatedName("ld") @Export("tapToDrop") static boolean tapToDrop; - @ObfuscatedName("lj") + @ObfuscatedName("lo") @Export("showMouseOverText") static boolean showMouseOverText; - @ObfuscatedName("lu") + @ObfuscatedName("lw") @ObfuscatedGetter( - intValue = -79678249 + intValue = -1495458891 ) @Export("viewportX") static int viewportX; - @ObfuscatedName("le") + @ObfuscatedName("lh") @ObfuscatedGetter( - intValue = 521048769 + intValue = -1150774747 ) @Export("viewportY") static int viewportY; - @ObfuscatedName("lp") + @ObfuscatedName("lb") @ObfuscatedGetter( - intValue = -1517512791 + intValue = 1221803191 ) - static int field871; - @ObfuscatedName("mp") + static int field824; + @ObfuscatedName("ms") @ObfuscatedGetter( - intValue = 668929195 + intValue = -173401255 ) - static int field832; - @ObfuscatedName("mm") + static int field825; + @ObfuscatedName("mk") @ObfuscatedGetter( - intValue = -19686459 + intValue = 698992553 ) @Export("isItemSelected") static int isItemSelected; - @ObfuscatedName("mq") - @ObfuscatedGetter( - intValue = 630410191 - ) - @Export("selectedItemSlot") - static int selectedItemSlot; - @ObfuscatedName("mi") + @ObfuscatedName("ml") @Export("isSpellSelected") static boolean isSpellSelected; - @ObfuscatedName("mw") + @ObfuscatedName("mu") @ObfuscatedGetter( - intValue = -335979293 + intValue = 1315575895 ) @Export("selectedSpellChildIndex") static int selectedSpellChildIndex; - @ObfuscatedName("mj") + @ObfuscatedName("mh") @ObfuscatedGetter( - intValue = -167301685 + intValue = 1111856905 ) - static int field837; - @ObfuscatedName("mc") + static int field830; + @ObfuscatedName("mi") @Export("selectedSpellActionName") static String selectedSpellActionName; - @ObfuscatedName("mx") + @ObfuscatedName("mo") @Export("selectedSpellName") static String selectedSpellName; - @ObfuscatedName("mr") + @ObfuscatedName("mj") @ObfuscatedGetter( - intValue = -1504817189 + intValue = -1547224129 ) @Export("rootInterface") static int rootInterface; - @ObfuscatedName("mn") + @ObfuscatedName("md") @ObfuscatedSignature( - signature = "Llv;" + signature = "Lle;" ) @Export("interfaceParents") static NodeHashTable interfaceParents; - @ObfuscatedName("eg") + @ObfuscatedName("ec") @ObfuscatedSignature( - signature = "Lkb;" + signature = "Lkn;" ) - Buffer field718; - @ObfuscatedName("es") + Buffer field929; + @ObfuscatedName("ee") @ObfuscatedSignature( - signature = "Le;" + signature = "Lz;" ) - class9 field719; + class9 field851; static { - field749 = true; + field669 = true; worldId = 1; worldProperties = 0; gameBuild = 0; @@ -1303,9 +1304,9 @@ public final class Client extends GameShell implements Usernamed { isLoading = true; cycle = 0; mouseLastLastPressedTimeMillis = -1L; - field691 = -1; - field692 = -1; - field875 = -1L; + field683 = -1; + field684 = -1; + field738 = -1L; hadFocus = true; displayFps = false; rebootTimer = 0; @@ -1321,42 +1322,42 @@ public final class Client extends GameShell implements Usernamed { npcAttackOption = AttackOption.AttackOption_hidden; titleLoadingStage = 0; js5ConnectState = 0; - field709 = 0; + field815 = 0; js5Errors = 0; loginState = 0; - field712 = 0; - field713 = 0; - field714 = 0; - field715 = class169.field2008; + field705 = 0; + field706 = 0; + field675 = 0; + field708 = class169.field2024; Login_isUsernameRemembered = false; secureRandomFuture = new SecureRandomFuture(); randomDatData = null; npcs = new NPC[32768]; npcCount = 0; npcIndices = new int[32768]; - field851 = 0; - field725 = new int[250]; + field718 = 0; + field719 = new int[250]; packetWriter = new PacketWriter(); logoutTimer = 0; - field728 = false; + field722 = false; useBufferedSocket = true; timer = new Timer(); fontsMap = new HashMap(); - field818 = 0; - field921 = 1; - field734 = 0; - field735 = 1; - field899 = 0; + field822 = 0; + field759 = 1; + field690 = 0; + field729 = 1; + field809 = 0; collisionMaps = new CollisionMap[4]; isInInstance = false; instanceChunkTemplates = new int[4][13][13]; - field699 = 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}; - field741 = 0; - field742 = 2301979; - field747 = 5063219; - field744 = 3353893; - field745 = 7759444; - field746 = false; + field734 = 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}; + field747 = 0; + field736 = 2301979; + field737 = 5063219; + field694 = 3353893; + field739 = 7759444; + field740 = false; alternativeScrollbarWidth = 0; camAngleX = 128; camAngleY = 0; @@ -1366,16 +1367,16 @@ public final class Client extends GameShell implements Usernamed { mouseCamClickedY = 0; oculusOrbState = 0; camFollowHeight = 50; - field757 = 0; - field724 = 0; - field759 = 0; + field717 = 0; + field751 = 0; + field752 = 0; oculusOrbNormalSpeed = 12; oculusOrbSlowedSpeed = 6; - field762 = 0; - field770 = false; - field764 = 0; - field765 = false; - field941 = 0; + field836 = 0; + field756 = false; + field757 = 0; + field758 = false; + field881 = 0; overheadTextCount = 0; overheadTextLimit = 50; overheadTextXs = new int[overheadTextLimit]; @@ -1395,23 +1396,23 @@ public final class Client extends GameShell implements Usernamed { mouseCrossState = 0; mouseCrossColor = 0; showMouseCross = true; - field786 = 0; - field880 = 0; + field808 = 0; + field668 = 0; dragItemSlotSource = 0; draggedWidgetX = 0; draggedWidgetY = 0; dragItemSlotDestination = 0; - field887 = false; + field785 = false; itemDragDuration = 0; - field794 = 0; + field787 = 0; showLoadingMessages = true; players = new Player[2048]; localPlayerIndex = -1; - field798 = 0; + field791 = 0; renderSelf = true; drawPlayerNames = 0; - field801 = 0; - field918 = new int[1000]; + field687 = 0; + field907 = new int[1000]; playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; playerMenuActions = new String[8]; playerOptionsPriorities = new boolean[8]; @@ -1440,21 +1441,21 @@ public final class Client extends GameShell implements Usernamed { showMouseOverText = true; viewportX = -1; viewportY = -1; - field871 = 0; - field832 = 50; + field824 = 0; + field825 = 50; isItemSelected = 0; selectedItemName = null; isSpellSelected = false; selectedSpellChildIndex = -1; - field837 = -1; + field830 = -1; selectedSpellActionName = null; selectedSpellName = null; rootInterface = -1; interfaceParents = new NodeHashTable(8); - field842 = 0; - field843 = -1; + field835 = 0; + field671 = -1; chatEffects = 0; - field845 = 0; + field838 = 0; meslayerContinueWidget = null; runEnergy = 0; weight = 0; @@ -1467,54 +1468,54 @@ public final class Client extends GameShell implements Usernamed { widgetClickX = 0; widgetClickY = 0; draggedOnWidget = null; - field732 = false; - field859 = -1; - field881 = -1; - field861 = false; - field834 = -1; - field863 = -1; + field692 = false; + field852 = -1; + field853 = -1; + field854 = false; + field855 = -1; + field856 = -1; isDraggingWidget = false; cycleCntr = 1; - field866 = new int[32]; - field772 = 0; + field859 = new int[32]; + field860 = 0; changedItemContainers = new int[32]; - field869 = 0; + field878 = 0; changedSkills = new int[32]; changedSkillsCount = 0; chatCycle = 0; - field873 = 0; - field874 = 0; - field774 = 0; - field726 = 0; - field877 = 0; + field866 = 0; + field943 = 0; + field818 = 0; + field869 = 0; + field870 = 0; mouseWheelRotation = 0; scriptEvents = new NodeDeque(); - field727 = new NodeDeque(); - field919 = new NodeDeque(); + field891 = new NodeDeque(); + field691 = new NodeDeque(); widgetClickMasks = new NodeHashTable(512); rootWidgetCount = 0; - field884 = -2; - field679 = new boolean[100]; - field886 = new boolean[100]; + field877 = -2; field813 = new boolean[100]; + field879 = new boolean[100]; + field880 = new boolean[100]; rootWidgetXs = new int[100]; rootWidgetYs = new int[100]; rootWidgetWidths = new int[100]; rootWidgetHeights = new int[100]; gameDrawingMode = 0; - field893 = 0L; + field886 = 0L; isResizable = true; - field895 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; + field888 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; publicChatMode = 0; tradeChatMode = 0; - field814 = ""; - field846 = new long[100]; - field900 = 0; - field901 = 0; - field902 = new int[128]; - field872 = new int[128]; - field904 = -1L; - field695 = -1; + field755 = ""; + field892 = new long[100]; + field730 = 0; + field894 = 0; + field920 = new int[128]; + field896 = new int[128]; + field897 = -1L; + field937 = -1; mapIconCount = 0; mapIconXs = new int[1000]; mapIconYs = new int[1000]; @@ -1524,7 +1525,7 @@ public final class Client extends GameShell implements Usernamed { minimapState = 0; musicVolume = 255; currentTrackGroupId = -1; - field915 = false; + field743 = false; soundEffectVolume = 127; areaSoundEffectVolume = 127; soundEffectCount = 0; @@ -1534,47 +1535,47 @@ public final class Client extends GameShell implements Usernamed { soundLocations = new int[50]; soundEffects = new SoundEffect[50]; isCameraLocked = false; - field926 = new boolean[5]; - field788 = new int[5]; - field730 = new int[5]; - field929 = new int[5]; - field930 = new int[5]; - field931 = 256; - field932 = 205; + field918 = new boolean[5]; + field919 = new int[5]; + field775 = new int[5]; + field778 = new int[5]; + field922 = new int[5]; + field727 = 256; + field924 = 205; zoomHeight = 256; zoomWidth = 320; - field935 = 1; - field748 = 32767; - field937 = 1; - field938 = 32767; + field927 = 1; + field928 = 32767; + field685 = 1; + field861 = 32767; viewportOffsetX = 0; viewportOffsetY = 0; viewportWidth = 0; viewportHeight = 0; viewportZoom = 0; playerAppearance = new PlayerAppearance(); - field945 = -1; - field946 = -1; + field868 = -1; + field938 = -1; platformInfoProvider = new DesktopPlatformInfoProvider(); grandExchangeOffers = new GrandExchangeOffer[8]; GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); - field891 = -1; + field942 = -1; archiveLoaders = new ArrayList(10); archiveLoadersDone = 0; - field898 = 0; - field954 = new ApproximateRouteStrategy(); - field955 = new int[50]; - field956 = new int[50]; + field945 = 0; + field905 = new ApproximateRouteStrategy(); + field947 = new int[50]; + field948 = new int[50]; } - @ObfuscatedName("u") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "108" + signature = "(I)V", + garbageValue = "1805213007" ) @Export("resizeGame") protected final void resizeGame() { - field893 = class217.currentTimeMillis() + 500L; + field886 = MilliClock.currentTimeMillis() + 500L; this.resizeJS(); if (rootInterface != -1) { this.resizeRoot(true); @@ -1582,384 +1583,321 @@ public final class Client extends GameShell implements Usernamed { } - @ObfuscatedName("am") + @ObfuscatedName("ag") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-678556074" + garbageValue = "108465933" ) @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) { - RunException.ByteArrayPool_alternativeSizes = var1; - ByteArrayPool.ByteArrayPool_altSizeArrayCounts = new int[var1.length]; - ByteArrayPool.ByteArrayPool_arrays = new byte[var1.length][][]; - - for (int var5 = 0; var5 < RunException.ByteArrayPool_alternativeSizes.length; ++var5) { - ByteArrayPool.ByteArrayPool_arrays[var5] = new byte[var2[var5]][]; - } - } else { - RunException.ByteArrayPool_alternativeSizes = null; - ByteArrayPool.ByteArrayPool_altSizeArrayCounts = null; - ByteArrayPool.ByteArrayPool_arrays = null; - } - - WorldMapLabelSize.port1 = gameBuild == 0 ? 43594 : worldId + 40000; - GrandExchangeOfferAgeComparator.port2 = gameBuild == 0 ? 443 : worldId + 50000; - class280.port3 = WorldMapLabelSize.port1; - WorldMapLabel.field278 = class224.field2544; - VertexNormal.field1764 = class224.field2547; - PlayerAppearance.field2539 = class224.field2546; - PlayerAppearance.field2535 = class224.field2545; - WorldMapLabel.urlRequester = new UrlRequester(); + class277.method5157(new int[]{20, 260, 10000}, new int[]{1000, 100, 500}); + class90.port1 = gameBuild == 0 ? 43594 : worldId + 40000; + port2 = gameBuild == 0 ? 443 : worldId + 50000; + WorldMapLabel.port3 = class90.port1; + PlayerAppearance.field2574 = class224.field2579; + PlayerAppearance.field2575 = class224.field2580; + PlayerAppearance.field2569 = class224.field2584; + Messages.field1308 = class224.field2582; + WorldMapLabelSize.urlRequester = new UrlRequester(); this.setUpKeyboard(); this.setUpMouse(); - SecureRandomFuture.mouseWheel = this.mouseWheel(); - WorldMapRegion.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); - GrandExchangeOfferOwnWorldComparator.clientPreferences = WorldMapData_1.method813(); - this.setUpClipboard(); - String var4 = WorldMapCacheName.null_string; - class60.applet = this; - if (var4 != null) { - class60.field462 = var4; + class7.mouseWheel = this.mouseWheel(); + FloorUnderlayDefinition.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); + AccessFile var2 = null; + ClientPreferences var3 = new ClientPreferences(); + + try { + var2 = GameShell.getPreferencesFile("", GrandExchangeOfferWorldComparator.field54.name, false); + byte[] var4 = new byte[(int)var2.length()]; + + 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(); + } + } + + var3 = new ClientPreferences(new Buffer(var4)); + } catch (Exception var8) { } + try { + if (var2 != null) { + var2.close(); + } + } catch (Exception var7) { + } + + NetSocket.clientPreferences = var3; + this.setUpClipboard(); + TaskHandler.method3606(this, TileItemPile.null_string); if (gameBuild != 0) { displayFps = true; } - WorldMapIcon_1.setWindowedMode(GrandExchangeOfferOwnWorldComparator.clientPreferences.windowMode); - Projectile.friendSystem = new FriendSystem(WorldMapIcon_0.loginType); + ScriptEvent.setWindowedMode(NetSocket.clientPreferences.windowMode); + ModeWhere.friendSystem = new FriendSystem(class195.loginType); } - @ObfuscatedName("au") + @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-113" + signature = "(I)V", + garbageValue = "202919973" ) @Export("doCycle") protected final void doCycle() { ++cycle; this.doCycleJs5(); + class195.method3749(); - while (true) { - ArchiveDiskAction var1; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - var1 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); - } - - if (var1 == null) { - int var5; - try { - if (class206.field2406 == 1) { - var5 = class206.midiPcmStream.method3793(); - if (var5 > 0 && class206.midiPcmStream.isReady()) { - var5 -= AttackOption.field1187; - if (var5 < 0) { - var5 = 0; - } - - class206.midiPcmStream.setPcmStreamVolume(var5); - } else { - class206.midiPcmStream.clear(); - class206.midiPcmStream.removeAll(); - if (class206.musicTrackArchive != null) { - class206.field2406 = 2; - } else { - class206.field2406 = 0; - } - - class206.musicTrack = null; - UrlRequest.soundCache = null; - } - } - } catch (Exception var9) { - var9.printStackTrace(); - class206.midiPcmStream.clear(); - class206.field2406 = 0; - class206.musicTrack = null; - UrlRequest.soundCache = null; - class206.musicTrackArchive = null; - } - - ChatChannel.playPcmPlayers(); - synchronized(KeyHandler.KeyHandler_instance) { - ++KeyHandler.KeyHandler_idleCycles; - KeyHandler.field434 = KeyHandler.field436; - KeyHandler.field417 = 0; - int var6; - if (KeyHandler.field429 >= 0) { - while (KeyHandler.field439 != KeyHandler.field429) { - var6 = KeyHandler.field427[KeyHandler.field439]; - KeyHandler.field439 = KeyHandler.field439 + 1 & 127; - if (var6 < 0) { - KeyHandler.KeyHandler_pressedKeys[~var6] = false; - } else { - if (!KeyHandler.KeyHandler_pressedKeys[var6] && KeyHandler.field417 < KeyHandler.field432.length - 1) { - KeyHandler.field432[++KeyHandler.field417 - 1] = var6; - } - - KeyHandler.KeyHandler_pressedKeys[var6] = true; - } - } - } else { - for (var6 = 0; var6 < 112; ++var6) { - KeyHandler.KeyHandler_pressedKeys[var6] = false; - } - - KeyHandler.field429 = KeyHandler.field439; + int var1; + try { + if (class206.field2439 == 1) { + var1 = WorldMapSprite.midiPcmStream.method3837(); + if (var1 > 0 && WorldMapSprite.midiPcmStream.isReady()) { + var1 -= class206.field2442; + if (var1 < 0) { + var1 = 0; } - if (KeyHandler.field417 > 0) { - KeyHandler.KeyHandler_idleCycles = 0; - } - - KeyHandler.field436 = KeyHandler.field433; - } - - class52.method900(); - if (SecureRandomFuture.mouseWheel != null) { - var5 = SecureRandomFuture.mouseWheel.useRotation(); - mouseWheelRotation = var5; - } - - if (gameState == 0) { - class237.load(); - GameShell.clock.mark(); - - for (var5 = 0; var5 < 32; ++var5) { - GameShell.graphicsTickTimes[var5] = 0L; - } - - for (var5 = 0; var5 < 32; ++var5) { - GameShell.clientTickTimes[var5] = 0L; - } - - ModelData0.gameCyclesToDo = 0; - } else if (gameState == 5) { - GrandExchangeOfferAgeComparator.doCycleTitle(this); - class237.load(); - GameShell.clock.mark(); - - for (var5 = 0; var5 < 32; ++var5) { - GameShell.graphicsTickTimes[var5] = 0L; - } - - for (var5 = 0; var5 < 32; ++var5) { - GameShell.clientTickTimes[var5] = 0L; - } - - ModelData0.gameCyclesToDo = 0; - } else if (gameState != 10 && gameState != 11) { - if (gameState == 20) { - GrandExchangeOfferAgeComparator.doCycleTitle(this); - this.doCycleLoggedOut(); - } else if (gameState == 25) { - GrandExchangeEvent.method161(); - } + WorldMapSprite.midiPcmStream.setPcmStreamVolume(var1); } else { - GrandExchangeOfferAgeComparator.doCycleTitle(this); - } + WorldMapSprite.midiPcmStream.clear(); + WorldMapSprite.midiPcmStream.removeAll(); + if (Huffman.musicTrackArchive != null) { + class206.field2439 = 2; + } else { + class206.field2439 = 0; + } - if (gameState == 30) { - this.doCycleLoggedIn(); - } else if (gameState == 40 || gameState == 45) { - this.doCycleLoggedOut(); + DevicePcmPlayerProvider.musicTrack = null; + Clock.soundCache = null; } + } + } catch (Exception var5) { + var5.printStackTrace(); + WorldMapSprite.midiPcmStream.clear(); + class206.field2439 = 0; + DevicePcmPlayerProvider.musicTrack = null; + Clock.soundCache = null; + Huffman.musicTrackArchive = null; + } - return; + Timer.playPcmPlayers(); + MidiPcmStream.method3918(); + synchronized(MouseHandler.MouseHandler_instance) { + MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; + MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; + MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; + MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; + MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; + MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; + MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; + MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; + MouseHandler.MouseHandler_lastButtonVolatile = 0; + } + + if (class7.mouseWheel != null) { + var1 = class7.mouseWheel.useRotation(); + mouseWheelRotation = var1; + } + + if (gameState == 0) { + HealthBar.load(); + MidiPcmStream.method3905(); + } else if (gameState == 5) { + GrandExchangeEvent.doCycleTitle(this); + HealthBar.load(); + FriendLoginUpdate.clock.mark(); + + for (var1 = 0; var1 < 32; ++var1) { + GameShell.graphicsTickTimes[var1] = 0L; } - var1.archive.load(var1.archiveDisk, (int)var1.key, var1.data, false); + for (var1 = 0; var1 < 32; ++var1) { + GameShell.clientTickTimes[var1] = 0L; + } + + GameShell.gameCyclesToDo = 0; + } else if (gameState != 10 && gameState != 11) { + if (gameState == 20) { + GrandExchangeEvent.doCycleTitle(this); + this.doCycleLoggedOut(); + } else if (gameState == 25) { + class23.method229(); + } + } else { + GrandExchangeEvent.doCycleTitle(this); } + + if (gameState == 30) { + this.doCycleLoggedIn(); + } else if (gameState == 40 || gameState == 45) { + this.doCycleLoggedOut(); + } + } - @ObfuscatedName("ao") + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(ZB)V", - garbageValue = "1" + signature = "(ZS)V", + garbageValue = "255" ) @Export("draw") protected final void draw(boolean var1) { boolean var2; - label173: { + label165: { try { - if (class206.field2406 == 2) { - if (class206.musicTrack == null) { - class206.musicTrack = MusicTrack.readTrack(class206.musicTrackArchive, class206.musicTrackGroupId, class206.musicTrackFileId); - if (class206.musicTrack == null) { + if (class206.field2439 == 2) { + if (DevicePcmPlayerProvider.musicTrack == null) { + DevicePcmPlayerProvider.musicTrack = MusicTrack.readTrack(Huffman.musicTrackArchive, class206.musicTrackGroupId, MilliClock.musicTrackFileId); + if (DevicePcmPlayerProvider.musicTrack == null) { var2 = false; - break label173; + break label165; } } - if (UrlRequest.soundCache == null) { - UrlRequest.soundCache = new SoundCache(class206.soundEffectsArchive, class206.musicSamplesArchive); + if (Clock.soundCache == null) { + Clock.soundCache = new SoundCache(class206.soundEffectsArchive, class206.musicSamplesArchive); } - if (class206.midiPcmStream.loadMusicTrack(class206.musicTrack, class58.musicPatchesArchive, UrlRequest.soundCache, 22050)) { - class206.midiPcmStream.clearAll(); - class206.midiPcmStream.setPcmStreamVolume(class219.musicTrackVolume); - class206.midiPcmStream.setMusicTrack(class206.musicTrack, GrandExchangeOfferUnitPriceComparator.musicTrackBoolean); - class206.field2406 = 0; - class206.musicTrack = null; - UrlRequest.soundCache = null; - class206.musicTrackArchive = null; + if (WorldMapSprite.midiPcmStream.loadMusicTrack(DevicePcmPlayerProvider.musicTrack, class206.musicPatchesArchive, Clock.soundCache, 22050)) { + WorldMapSprite.midiPcmStream.clearAll(); + WorldMapSprite.midiPcmStream.setPcmStreamVolume(class206.musicTrackVolume); + WorldMapSprite.midiPcmStream.setMusicTrack(DevicePcmPlayerProvider.musicTrack, class336.musicTrackBoolean); + class206.field2439 = 0; + DevicePcmPlayerProvider.musicTrack = null; + Clock.soundCache = null; + Huffman.musicTrackArchive = null; var2 = true; - break label173; + break label165; } } } catch (Exception var6) { var6.printStackTrace(); - class206.midiPcmStream.clear(); - class206.field2406 = 0; - class206.musicTrack = null; - UrlRequest.soundCache = null; - class206.musicTrackArchive = null; + WorldMapSprite.midiPcmStream.clear(); + class206.field2439 = 0; + DevicePcmPlayerProvider.musicTrack = null; + Clock.soundCache = null; + Huffman.musicTrackArchive = null; } var2 = false; } - if (var2 && field915 && WorldMapManager.pcmPlayer0 != null) { - WorldMapManager.pcmPlayer0.tryDiscard(); + if (var2 && field743 && class2.pcmPlayer0 != null) { + class2.pcmPlayer0.tryDiscard(); } - if ((gameState == 10 || gameState == 20 || gameState == 30) && 0L != field893 && class217.currentTimeMillis() > field893) { - WorldMapIcon_1.setWindowedMode(ApproximateRouteStrategy.getWindowedMode()); + if ((gameState == 10 || gameState == 20 || gameState == 30) && 0L != field886 && MilliClock.currentTimeMillis() > field886) { + ScriptEvent.setWindowedMode(class58.getWindowedMode()); } int var4; if (var1) { for (var4 = 0; var4 < 100; ++var4) { - field679[var4] = true; + field813[var4] = true; } } if (gameState == 0) { this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1); } else if (gameState == 5) { - MouseRecorder.drawTitle(TaskHandler.fontBold12, Script.fontPlain11, WorldMapData_0.fontPlain12); + World.drawTitle(GrandExchangeOfferNameComparator.fontBold12, WorldMapLabel.fontPlain11, MusicPatchNode2.fontPlain12); } else if (gameState != 10 && gameState != 11) { if (gameState == 20) { - MouseRecorder.drawTitle(TaskHandler.fontBold12, Script.fontPlain11, WorldMapData_0.fontPlain12); + World.drawTitle(GrandExchangeOfferNameComparator.fontBold12, WorldMapLabel.fontPlain11, MusicPatchNode2.fontPlain12); } else if (gameState == 25) { - if (field899 == 1) { - if (field818 > field921) { - field921 = field818; + if (field809 == 1) { + if (field822 > field759) { + field759 = field822; } - var4 = (field921 * 50 - field818 * 50) / field921; - AbstractByteArrayCopier.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); - } else if (field899 == 2) { - if (field734 > field735) { - field735 = field734; + var4 = (field759 * 50 - field822 * 50) / field759; + ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); + } else if (field809 == 2) { + if (field690 > field729) { + field729 = field690; } - var4 = (field735 * 50 - field734 * 50) / field735 + 50; - AbstractByteArrayCopier.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); + var4 = (field729 * 50 - field690 * 50) / field729 + 50; + ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); } else { - AbstractByteArrayCopier.drawLoadingMessage("Loading - please wait.", false); + ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait.", false); } } else if (gameState == 30) { this.drawLoggedIn(); } else if (gameState == 40) { - AbstractByteArrayCopier.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); + ArchiveDiskActionHandler.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); } else if (gameState == 45) { - AbstractByteArrayCopier.drawLoadingMessage("Please wait...", false); + ArchiveDiskActionHandler.drawLoadingMessage("Please wait...", false); } } else { - MouseRecorder.drawTitle(TaskHandler.fontBold12, Script.fontPlain11, WorldMapData_0.fontPlain12); + World.drawTitle(GrandExchangeOfferNameComparator.fontBold12, WorldMapLabel.fontPlain11, MusicPatchNode2.fontPlain12); } if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { for (var4 = 0; var4 < rootWidgetCount; ++var4) { - if (field886[var4]) { - class206.rasterProvider.draw(rootWidgetXs[var4], rootWidgetYs[var4], rootWidgetWidths[var4], rootWidgetHeights[var4]); - field886[var4] = false; + if (field879[var4]) { + ArchiveLoader.rasterProvider.draw(rootWidgetXs[var4], rootWidgetYs[var4], rootWidgetWidths[var4], rootWidgetHeights[var4]); + field879[var4] = false; } } } else if (gameState > 0) { - class206.rasterProvider.drawFull(0, 0); + ArchiveLoader.rasterProvider.drawFull(0, 0); for (var4 = 0; var4 < rootWidgetCount; ++var4) { - field886[var4] = false; + field879[var4] = false; } } } - @ObfuscatedName("aq") + @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "8226" + signature = "(I)V", + garbageValue = "1432958229" ) @Export("kill0") protected final void kill0() { - if (UserComparator4.varcs.hasUnwrittenChanges()) { - UserComparator4.varcs.write(); + if (AttackOption.varcs.hasUnwrittenChanges()) { + AttackOption.varcs.write(); } - if (MidiPcmStream.mouseRecorder != null) { - MidiPcmStream.mouseRecorder.isRunning = false; + if (class219.mouseRecorder != null) { + class219.mouseRecorder.isRunning = false; } - MidiPcmStream.mouseRecorder = null; + class219.mouseRecorder = null; packetWriter.close(); - if (KeyHandler.KeyHandler_instance != null) { - synchronized(KeyHandler.KeyHandler_instance) { - KeyHandler.KeyHandler_instance = null; - } + TilePaint.method3186(); + UserComparator9.method3509(); + class7.mouseWheel = null; + if (class2.pcmPlayer0 != null) { + class2.pcmPlayer0.shutdown(); } - GraphicsObject.method2121(); - SecureRandomFuture.mouseWheel = null; - if (WorldMapManager.pcmPlayer0 != null) { - WorldMapManager.pcmPlayer0.shutdown(); + if (class58.pcmPlayer1 != null) { + class58.pcmPlayer1.shutdown(); } - if (AbstractWorldMapData.pcmPlayer1 != null) { - AbstractWorldMapData.pcmPlayer1.shutdown(); - } - - class7.method104(); - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { - if (ArchiveDiskActionHandler.field3151 != 0) { - ArchiveDiskActionHandler.field3151 = 1; - - try { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); - } catch (InterruptedException var5) { - } - } - } - - if (WorldMapLabel.urlRequester != null) { - WorldMapLabel.urlRequester.close(); - WorldMapLabel.urlRequester = null; - } - - try { - JagexCache.JagexCache_dat2File.close(); - - for (int var4 = 0; var4 < InterfaceParent.idxCount; ++var4) { - PacketBufferNode.JagexCache_idxFiles[var4].close(); - } - - JagexCache.JagexCache_idx255File.close(); - JagexCache.JagexCache_randomDat.close(); - } catch (Exception var7) { + WorldMapSectionType.method312(); + AbstractWorldMapIcon.method687(); + if (WorldMapLabelSize.urlRequester != null) { + WorldMapLabelSize.urlRequester.close(); + WorldMapLabelSize.urlRequester = null; } + SoundSystem.method2629(); } - @ObfuscatedName("ad") + @ObfuscatedName("av") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-277226112" + garbageValue = "-453140820" ) - protected final void vmethod1400() { + protected final void vmethod1570() { } public final void init() { @@ -1993,317 +1931,94 @@ public final class Client extends GameShell implements Usernamed { worldProperties = Integer.parseInt(var2); break; case 6: - IgnoreList.clientLanguage = Language.Language_get(Integer.parseInt(var2)); + UserComparator9.clientLanguage = Language.Language_get(Integer.parseInt(var2)); break; case 7: - class198.field2353 = Strings.ServerBuild_get(Integer.parseInt(var2)); + int var4 = Integer.parseInt(var2); + GameBuild[] var5 = new GameBuild[]{GameBuild.LIVE, GameBuild.WIP, GameBuild.BUILDLIVE, GameBuild.RC}; + GameBuild[] var6 = var5; + int var7 = 0; + + GameBuild var3; + while (true) { + if (var7 >= var6.length) { + var3 = null; + break; + } + + GameBuild var8 = var6[var7]; + if (var4 == var8.buildId) { + var3 = var8; + break; + } + + ++var7; + } + + PlayerType.field3130 = var3; break; case 8: if (var2.equalsIgnoreCase("true")) { } break; case 9: - WorldMapData_0.field137 = var2; + field871 = var2; break; case 10: - StudioGame[] var3 = new StudioGame[]{StudioGame.runescape, StudioGame.stellardawn, StudioGame.oldscape, StudioGame.game5, StudioGame.game3, StudioGame.game4}; - WorldMapArchiveLoader.field3965 = (StudioGame)GrandExchangeEvent.findEnumerated(var3, Integer.parseInt(var2)); - if (WorldMapArchiveLoader.field3965 == StudioGame.oldscape) { - WorldMapIcon_0.loginType = LoginType.oldscape; + GrandExchangeOfferWorldComparator.field54 = (StudioGame)FaceNormal.findEnumerated(Skills.method4272(), Integer.parseInt(var2)); + if (StudioGame.oldscape == GrandExchangeOfferWorldComparator.field54) { + class195.loginType = LoginType.oldscape; } else { - WorldMapIcon_0.loginType = LoginType.field4054; + class195.loginType = LoginType.field4059; } break; case 12: worldId = Integer.parseInt(var2); break; case 14: - KitDefinition.field3271 = Integer.parseInt(var2); + class228.field2754 = Integer.parseInt(var2); break; case 15: gameBuild = Integer.parseInt(var2); break; case 17: - ModeWhere.worldListURL = var2; + HorizontalAlignment.worldListURL = var2; } } } Scene.Scene_isLowDetail = false; isLowDetail = false; - Script.worldHost = this.getCodeBase().getHost(); - String var17 = class198.field2353.name; - byte var18 = 0; + class169.worldHost = this.getCodeBase().getHost(); + String var9 = PlayerType.field3130.name; + byte var10 = 0; try { - InterfaceParent.idxCount = 21; - class8.cacheGamebuild = var18; - - try { - SequenceDefinition.field3527 = System.getProperty("os.name"); - } catch (Exception var34) { - SequenceDefinition.field3527 = "Unknown"; - } - - class171.field2016 = SequenceDefinition.field3527.toLowerCase(); - - try { - AbstractWorldMapData.userHomeDirectory = System.getProperty("user.home"); - if (AbstractWorldMapData.userHomeDirectory != null) { - AbstractWorldMapData.userHomeDirectory = AbstractWorldMapData.userHomeDirectory + "/"; - } - } catch (Exception var33) { - } - - try { - if (class171.field2016.startsWith("win")) { - if (AbstractWorldMapData.userHomeDirectory == null) { - AbstractWorldMapData.userHomeDirectory = System.getenv("USERPROFILE"); - } - } else if (AbstractWorldMapData.userHomeDirectory == null) { - AbstractWorldMapData.userHomeDirectory = System.getenv("HOME"); - } - - if (AbstractWorldMapData.userHomeDirectory != null) { - AbstractWorldMapData.userHomeDirectory = AbstractWorldMapData.userHomeDirectory + "/"; - } - } catch (Exception var32) { - } - - if (AbstractWorldMapData.userHomeDirectory == null) { - AbstractWorldMapData.userHomeDirectory = "~/"; - } - - Varps.field2522 = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", AbstractWorldMapData.userHomeDirectory, "/tmp/", ""}; - AbstractRasterProvider.field3871 = new String[]{".jagex_cache_" + class8.cacheGamebuild, ".file_store_" + class8.cacheGamebuild}; - int var19 = 0; - - label276: - while (var19 < 4) { - String var5 = var19 == 0 ? "" : "" + var19; - JagexCache.JagexCache_locationFile = new File(AbstractWorldMapData.userHomeDirectory, "jagex_cl_oldschool_" + var17 + var5 + ".dat"); - String var6 = null; - String var7 = null; - boolean var8 = false; - int var11; - int var13; - File var42; - if (JagexCache.JagexCache_locationFile.exists()) { - try { - AccessFile var9 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); - - Buffer var10; - for (var10 = new Buffer((int)var9.length()); var10.offset < var10.array.length; var10.offset += var11) { - var11 = var9.read(var10.array, var10.offset, var10.array.length - var10.offset); - if (var11 == -1) { - throw new IOException(); - } - } - - var10.offset = 0; - var11 = var10.readUnsignedByte(); - if (var11 < 1 || var11 > 3) { - throw new IOException("" + var11); - } - - int var12 = 0; - if (var11 > 1) { - var12 = var10.readUnsignedByte(); - } - - if (var11 <= 2) { - var6 = var10.readStringCp1252NullCircumfixed(); - if (var12 == 1) { - var7 = var10.readStringCp1252NullCircumfixed(); - } - } else { - var6 = var10.readCESU8(); - if (var12 == 1) { - var7 = var10.readCESU8(); - } - } - - var9.close(); - } catch (IOException var36) { - var36.printStackTrace(); - } - - if (var6 != null) { - var42 = new File(var6); - if (!var42.exists()) { - var6 = null; - } - } - - if (var6 != null) { - var42 = new File(var6, "test.dat"); - - boolean var45; - try { - RandomAccessFile var20 = new RandomAccessFile(var42, "rw"); - var13 = var20.read(); - var20.seek(0L); - var20.write(var13); - var20.seek(0L); - var20.close(); - var42.delete(); - var45 = true; - } catch (Exception var31) { - var45 = false; - } - - if (!var45) { - var6 = null; - } - } - } - - if (var6 == null && var19 == 0) { - label252: - for (int var21 = 0; var21 < AbstractRasterProvider.field3871.length; ++var21) { - for (int var22 = 0; var22 < Varps.field2522.length; ++var22) { - File var23 = new File(Varps.field2522[var22] + AbstractRasterProvider.field3871[var21] + File.separatorChar + "oldschool" + File.separatorChar); - if (var23.exists()) { - File var24 = new File(var23, "test.dat"); - - boolean var46; - try { - RandomAccessFile var14 = new RandomAccessFile(var24, "rw"); - int var15 = var14.read(); - var14.seek(0L); - var14.write(var15); - var14.seek(0L); - var14.close(); - var24.delete(); - var46 = true; - } catch (Exception var30) { - var46 = false; - } - - if (var46) { - var6 = var23.toString(); - var8 = true; - break label252; - } - } - } - } - } - - if (var6 == null) { - var6 = AbstractWorldMapData.userHomeDirectory + File.separatorChar + "jagexcache" + var5 + File.separatorChar + "oldschool" + File.separatorChar + var17 + File.separatorChar; - var8 = true; - } - - if (var7 != null) { - File var41 = new File(var7); - var42 = new File(var6); - - try { - File[] var50 = var41.listFiles(); - File[] var48 = var50; - - for (var13 = 0; var13 < var48.length; ++var13) { - File var47 = var48[var13]; - File var25 = new File(var42, var47.getName()); - boolean var16 = var47.renameTo(var25); - if (!var16) { - throw new IOException(); - } - } - } catch (Exception var35) { - var35.printStackTrace(); - } - - var8 = true; - } - - if (var8) { - GameObject.method3408(new File(var6), (File)null); - } - - File var4 = new File(var6); - class92.cacheDir = var4; - if (!class92.cacheDir.exists()) { - class92.cacheDir.mkdirs(); - } - - File[] var40 = class92.cacheDir.listFiles(); - if (var40 == null) { - break; - } - - File[] var43 = var40; - int var26 = 0; - - while (true) { - if (var26 >= var43.length) { - break label276; - } - - File var27 = var43[var26]; - - boolean var49; - try { - RandomAccessFile var44 = new RandomAccessFile(var27, "rw"); - var11 = var44.read(); - var44.seek(0L); - var44.write(var11); - var44.seek(0L); - var44.close(); - var49 = true; - } catch (Exception var29) { - var49 = false; - } - - if (!var49) { - ++var19; - break; - } - - ++var26; - } - } - - File var39 = class92.cacheDir; - FileSystem.FileSystem_cacheDir = var39; - if (!FileSystem.FileSystem_cacheDir.exists()) { - throw new RuntimeException(""); - } - - FileSystem.FileSystem_hasPermissions = true; - Huffman.method4045(); - JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(ViewportMouse.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); - JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(ViewportMouse.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); - PacketBufferNode.JagexCache_idxFiles = new BufferedFile[InterfaceParent.idxCount]; - - for (int var28 = 0; var28 < InterfaceParent.idxCount; ++var28) { - PacketBufferNode.JagexCache_idxFiles[var28] = new BufferedFile(new AccessFile(ViewportMouse.getFile("main_file_cache.idx" + var28), "rw", 1048576L), 6000, 0); - } - } catch (Exception var37) { - WorldMapDecorationType.RunException_sendStackTrace((String)null, var37); + HealthBar.method2137("oldschool", var9, var10, 21); + } catch (Exception var11) { + class197.RunException_sendStackTrace((String)null, var11); } - WorldMapSection1.client = this; + WorldMapSectionType.client = this; RunException.clientType = clientType; - this.startThread(765, 503, 189); + this.startThread(765, 503, 190); } - } catch (RuntimeException var38) { - throw WorldMapSection3.newRunException(var38, "client.init(" + ')'); + } catch (RuntimeException var12) { + throw class1.newRunException(var12, "client.init(" + ')'); } } @ObfuscatedName("eg") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "0" + garbageValue = "-61" ) @Export("doCycleJs5") void doCycleJs5() { if (gameState != 1000) { - long var2 = class217.currentTimeMillis(); - int var4 = (int)(var2 - NetCache.field3165); - NetCache.field3165 = var2; + long var2 = MilliClock.currentTimeMillis(); + int var4 = (int)(var2 - FriendSystem.field1093); + FriendSystem.field1093 = var2; if (var4 > 200) { var4 = 200; } @@ -2316,7 +2031,7 @@ public final class Client extends GameShell implements Usernamed { var1 = false; } else { try { - label243: { + label240: { if (NetCache.NetCache_loadTime > 30000) { throw new IOException(); } @@ -2358,9 +2073,9 @@ public final class Client extends GameShell implements Usernamed { NetCache.NetCache_loadTime = 0; byte var7 = 0; - if (NetCache.NetCache_currentResponse == null) { + if (PlayerType.NetCache_currentResponse == null) { var7 = 8; - } else if (NetCache.field3178 == 0) { + } else if (NetCache.field3214 == 0) { var7 = 1; } @@ -2378,11 +2093,11 @@ public final class Client extends GameShell implements Usernamed { } NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var8); - if (NetCache.field3163 != 0) { + if (NetCache.field3213 != 0) { for (var9 = 0; var9 < var8; ++var9) { var10000 = NetCache.NetCache_responseHeaderBuffer.array; - var10001 = NetCache.NetCache_responseHeaderBuffer.offset + var9; - var10000[var10001] ^= NetCache.field3163; + var10001 = var9 + NetCache.NetCache_responseHeaderBuffer.offset; + var10000[var10001] ^= NetCache.field3213; } } @@ -2392,7 +2107,7 @@ public final class Client extends GameShell implements Usernamed { break; } - if (NetCache.NetCache_currentResponse == null) { + if (PlayerType.NetCache_currentResponse == null) { NetCache.NetCache_responseHeaderBuffer.offset = 0; var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); var10 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); @@ -2400,10 +2115,10 @@ public final class Client extends GameShell implements Usernamed { var12 = NetCache.NetCache_responseHeaderBuffer.readInt(); long var13 = (long)(var10 + (var9 << 16)); NetFileRequest var15 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var13); - GrandExchangeOfferOwnWorldComparator.field677 = true; + NetCache.field3208 = true; if (var15 == null) { var15 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var13); - GrandExchangeOfferOwnWorldComparator.field677 = false; + NetCache.field3208 = false; } if (var15 == null) { @@ -2411,61 +2126,61 @@ public final class Client extends GameShell implements Usernamed { } int var16 = var11 == 0 ? 5 : 9; - NetCache.NetCache_currentResponse = var15; - NetCache.NetCache_responseArchiveBuffer = new Buffer(var12 + var16 + NetCache.NetCache_currentResponse.padding); - NetCache.NetCache_responseArchiveBuffer.writeByte(var11); - NetCache.NetCache_responseArchiveBuffer.writeInt(var12); - NetCache.field3178 = 8; + PlayerType.NetCache_currentResponse = var15; + CollisionMap.NetCache_responseArchiveBuffer = new Buffer(var12 + var16 + PlayerType.NetCache_currentResponse.padding); + CollisionMap.NetCache_responseArchiveBuffer.writeByte(var11); + CollisionMap.NetCache_responseArchiveBuffer.writeInt(var12); + NetCache.field3214 = 8; NetCache.NetCache_responseHeaderBuffer.offset = 0; - } else if (NetCache.field3178 == 0) { + } else if (NetCache.field3214 == 0) { if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { - NetCache.field3178 = 1; + NetCache.field3214 = 1; NetCache.NetCache_responseHeaderBuffer.offset = 0; } else { - NetCache.NetCache_currentResponse = null; + PlayerType.NetCache_currentResponse = null; } } } else { - var8 = NetCache.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding; - var9 = 512 - NetCache.field3178; - if (var9 > var8 - NetCache.NetCache_responseArchiveBuffer.offset) { - var9 = var8 - NetCache.NetCache_responseArchiveBuffer.offset; + var8 = CollisionMap.NetCache_responseArchiveBuffer.array.length - PlayerType.NetCache_currentResponse.padding; + var9 = 512 - NetCache.field3214; + if (var9 > var8 - CollisionMap.NetCache_responseArchiveBuffer.offset) { + var9 = var8 - CollisionMap.NetCache_responseArchiveBuffer.offset; } if (var9 > var18) { var9 = var18; } - NetCache.NetCache_socket.read(NetCache.NetCache_responseArchiveBuffer.array, NetCache.NetCache_responseArchiveBuffer.offset, var9); - if (NetCache.field3163 != 0) { + NetCache.NetCache_socket.read(CollisionMap.NetCache_responseArchiveBuffer.array, CollisionMap.NetCache_responseArchiveBuffer.offset, var9); + if (NetCache.field3213 != 0) { for (var10 = 0; var10 < var9; ++var10) { - var10000 = NetCache.NetCache_responseArchiveBuffer.array; - var10001 = var10 + NetCache.NetCache_responseArchiveBuffer.offset; - var10000[var10001] ^= NetCache.field3163; + var10000 = CollisionMap.NetCache_responseArchiveBuffer.array; + var10001 = CollisionMap.NetCache_responseArchiveBuffer.offset + var10; + var10000[var10001] ^= NetCache.field3213; } } - var25 = NetCache.NetCache_responseArchiveBuffer; + var25 = CollisionMap.NetCache_responseArchiveBuffer; var25.offset += var9; - NetCache.field3178 += var9; - if (var8 == NetCache.NetCache_responseArchiveBuffer.offset) { - if (NetCache.NetCache_currentResponse.key == 16711935L) { - class13.NetCache_reference = NetCache.NetCache_responseArchiveBuffer; + NetCache.field3214 += var9; + if (var8 == CollisionMap.NetCache_responseArchiveBuffer.offset) { + if (16711935L == PlayerType.NetCache_currentResponse.key) { + UserComparator9.NetCache_reference = CollisionMap.NetCache_responseArchiveBuffer; for (var10 = 0; var10 < 256; ++var10) { Archive var19 = NetCache.NetCache_archives[var10]; if (var19 != null) { - class13.NetCache_reference.offset = var10 * 8 + 5; - var12 = class13.NetCache_reference.readInt(); - int var20 = class13.NetCache_reference.readInt(); + UserComparator9.NetCache_reference.offset = var10 * 8 + 5; + var12 = UserComparator9.NetCache_reference.readInt(); + int var20 = UserComparator9.NetCache_reference.readInt(); var19.loadIndex(var12, var20); } } } else { NetCache.NetCache_crc.reset(); - NetCache.NetCache_crc.update(NetCache.NetCache_responseArchiveBuffer.array, 0, var8); + NetCache.NetCache_crc.update(CollisionMap.NetCache_responseArchiveBuffer.array, 0, var8); var10 = (int)NetCache.NetCache_crc.getValue(); - if (var10 != NetCache.NetCache_currentResponse.crc) { + if (var10 != PlayerType.NetCache_currentResponse.crc) { try { NetCache.NetCache_socket.close(); } catch (Exception var23) { @@ -2473,32 +2188,32 @@ public final class Client extends GameShell implements Usernamed { ++NetCache.NetCache_crcMismatches; NetCache.NetCache_socket = null; - NetCache.field3163 = (byte)((int)(Math.random() * 255.0D + 1.0D)); + NetCache.field3213 = (byte)((int)(Math.random() * 255.0D + 1.0D)); var1 = false; - break label243; + break label240; } 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, GrandExchangeOfferOwnWorldComparator.field677); + PlayerType.NetCache_currentResponse.archive.write((int)(PlayerType.NetCache_currentResponse.key & 65535L), CollisionMap.NetCache_responseArchiveBuffer.array, 16711680L == (PlayerType.NetCache_currentResponse.key & 16711680L), NetCache.field3208); } - NetCache.NetCache_currentResponse.remove(); - if (GrandExchangeOfferOwnWorldComparator.field677) { + PlayerType.NetCache_currentResponse.remove(); + if (NetCache.field3208) { --NetCache.NetCache_pendingPriorityResponsesCount; } else { --NetCache.NetCache_pendingResponsesCount; } - NetCache.field3178 = 0; - NetCache.NetCache_currentResponse = null; - NetCache.NetCache_responseArchiveBuffer = null; + NetCache.field3214 = 0; + PlayerType.NetCache_currentResponse = null; + CollisionMap.NetCache_responseArchiveBuffer = null; } else { - if (NetCache.field3178 != 512) { + if (NetCache.field3214 != 512) { break; } - NetCache.field3178 = 0; + NetCache.field3214 = 0; } } } @@ -2524,10 +2239,10 @@ public final class Client extends GameShell implements Usernamed { } } - @ObfuscatedName("es") + @ObfuscatedName("ey") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1183665566" + signature = "(B)V", + garbageValue = "20" ) @Export("doCycleJs5Connect") void doCycleJs5Connect() { @@ -2542,66 +2257,123 @@ public final class Client extends GameShell implements Usernamed { return; } - field709 = 3000; + field815 = 3000; NetCache.NetCache_ioExceptions = 3; } - if (--field709 + 1 <= 0) { + if (--field815 + 1 <= 0) { try { if (js5ConnectState == 0) { - WorldMapManager.js5SocketTask = class227.taskHandler.newSocketTask(Script.worldHost, class280.port3); + js5SocketTask = GrandExchangeOfferAgeComparator.taskHandler.newSocketTask(class169.worldHost, WorldMapLabel.port3); ++js5ConnectState; } if (js5ConnectState == 1) { - if (WorldMapManager.js5SocketTask.status == 2) { + if (js5SocketTask.status == 2) { this.js5Error(-1); return; } - if (WorldMapManager.js5SocketTask.status == 1) { + if (js5SocketTask.status == 1) { ++js5ConnectState; } } if (js5ConnectState == 2) { if (useBufferedSocket) { - MusicPatchNode.js5Socket = Buffer.method5794((Socket)WorldMapManager.js5SocketTask.result, 40000, 5000); + GameObject.js5Socket = ClanChat.method5441((Socket)js5SocketTask.result, 40000, 5000); } else { - MusicPatchNode.js5Socket = new NetSocket((Socket)WorldMapManager.js5SocketTask.result, class227.taskHandler, 5000); + GameObject.js5Socket = new NetSocket((Socket)js5SocketTask.result, GrandExchangeOfferAgeComparator.taskHandler, 5000); } Buffer var1 = new Buffer(5); var1.writeByte(15); - var1.writeInt(189); - MusicPatchNode.js5Socket.write(var1.array, 0, 5); + var1.writeInt(190); + GameObject.js5Socket.write(var1.array, 0, 5); ++js5ConnectState; - class58.field455 = class217.currentTimeMillis(); + WorldMapSprite.field261 = MilliClock.currentTimeMillis(); } if (js5ConnectState == 3) { - if (MusicPatchNode.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { - int var2 = MusicPatchNode.js5Socket.readUnsignedByte(); - if (var2 != 0) { - this.js5Error(var2); + if (GameObject.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { + int var5 = GameObject.js5Socket.readUnsignedByte(); + if (var5 != 0) { + this.js5Error(var5); return; } ++js5ConnectState; - } else if (class217.currentTimeMillis() - class58.field455 > 30000L) { + } else if (MilliClock.currentTimeMillis() - WorldMapSprite.field261 > 30000L) { this.js5Error(-2); return; } } if (js5ConnectState == 4) { - GrandExchangeOfferUnitPriceComparator.method222(MusicPatchNode.js5Socket, gameState > 20); - WorldMapManager.js5SocketTask = null; - MusicPatchNode.js5Socket = null; - js5ConnectState = 0; - js5Errors = 0; + AbstractSocket var10 = GameObject.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; + class41.method624(var2); + NetCache.NetCache_responseHeaderBuffer.offset = 0; + PlayerType.NetCache_currentResponse = null; + CollisionMap.NetCache_responseArchiveBuffer = null; + NetCache.field3214 = 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.field3213 != 0) { + try { + Buffer var11 = new Buffer(4); + var11.writeByte(4); + var11.writeByte(NetCache.field3213); + 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; + FriendSystem.field1093 = MilliClock.currentTimeMillis(); + js5SocketTask = null; + GameObject.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 var3) { + } catch (IOException var9) { this.js5Error(-3); } @@ -2609,20 +2381,20 @@ public final class Client extends GameShell implements Usernamed { } } - @ObfuscatedName("fk") + @ObfuscatedName("ew") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-2003740384" + signature = "(IB)V", + garbageValue = "35" ) @Export("js5Error") void js5Error(int var1) { - WorldMapManager.js5SocketTask = null; - MusicPatchNode.js5Socket = null; + js5SocketTask = null; + GameObject.js5Socket = null; js5ConnectState = 0; - if (WorldMapLabelSize.port1 == class280.port3) { - class280.port3 = GrandExchangeOfferAgeComparator.port2; + if (WorldMapLabel.port3 == class90.port1) { + WorldMapLabel.port3 = port2; } else { - class280.port3 = WorldMapLabelSize.port1; + WorldMapLabel.port3 = class90.port1; } ++js5Errors; @@ -2631,7 +2403,7 @@ public final class Client extends GameShell implements Usernamed { this.error("js5connect_full"); gameState = 1000; } else { - field709 = 3000; + field815 = 3000; } } else if (js5Errors >= 2 && var1 == 6) { this.error("js5connect_outofdate"); @@ -2641,16 +2413,16 @@ public final class Client extends GameShell implements Usernamed { this.error("js5connect"); gameState = 1000; } else { - field709 = 3000; + field815 = 3000; } } } - @ObfuscatedName("fi") + @ObfuscatedName("ee") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "931463513" + garbageValue = "599725078" ) @Export("doCycleLoggedOut") final void doCycleLoggedOut() { @@ -2659,70 +2431,67 @@ public final class Client extends GameShell implements Usernamed { try { if (loginState == 0) { - if (MouseHandler.secureRandom == null && (secureRandomFuture.isDone() || field712 > 250)) { - MouseHandler.secureRandom = secureRandomFuture.get(); + if (ChatChannel.secureRandom == null && (secureRandomFuture.isDone() || field705 > 250)) { + ChatChannel.secureRandom = secureRandomFuture.get(); secureRandomFuture.shutdown(); secureRandomFuture = null; } - if (MouseHandler.secureRandom != null) { + if (ChatChannel.secureRandom != null) { if (var1 != null) { ((AbstractSocket)var1).close(); var1 = null; } - AbstractWorldMapIcon.socketTask = null; - field728 = false; - field712 = 0; + ArchiveLoader.socketTask = null; + field722 = false; + field705 = 0; loginState = 1; } } if (loginState == 1) { - if (AbstractWorldMapIcon.socketTask == null) { - AbstractWorldMapIcon.socketTask = class227.taskHandler.newSocketTask(Script.worldHost, class280.port3); + if (ArchiveLoader.socketTask == null) { + ArchiveLoader.socketTask = GrandExchangeOfferAgeComparator.taskHandler.newSocketTask(class169.worldHost, WorldMapLabel.port3); } - if (AbstractWorldMapIcon.socketTask.status == 2) { + if (ArchiveLoader.socketTask.status == 2) { throw new IOException(); } - if (AbstractWorldMapIcon.socketTask.status == 1) { + if (ArchiveLoader.socketTask.status == 1) { if (useBufferedSocket) { - var1 = Buffer.method5794((Socket)AbstractWorldMapIcon.socketTask.result, 40000, 5000); + var1 = ClanChat.method5441((Socket)ArchiveLoader.socketTask.result, 40000, 5000); } else { - var1 = new NetSocket((Socket)AbstractWorldMapIcon.socketTask.result, class227.taskHandler, 5000); + var1 = new NetSocket((Socket)ArchiveLoader.socketTask.result, GrandExchangeOfferAgeComparator.taskHandler, 5000); } packetWriter.setSocket((AbstractSocket)var1); - AbstractWorldMapIcon.socketTask = null; + ArchiveLoader.socketTask = null; loginState = 2; } } - PacketBufferNode var4; + PacketBufferNode var3; if (loginState == 2) { packetWriter.clearBuffer(); - var4 = UserComparator9.method3496(); - var4.clientPacket = null; - var4.clientPacketLength = 0; - var4.packetBuffer = new PacketBuffer(5000); - var4.packetBuffer.writeByte(LoginPacket.field2315.id); - packetWriter.addNode(var4); + var3 = Tile.method2990(); + var3.packetBuffer.writeByte(LoginPacket.field2352.id); + packetWriter.addNode(var3); packetWriter.flush(); var2.offset = 0; loginState = 3; } + int var4; boolean var13; - int var14; if (loginState == 3) { - if (WorldMapManager.pcmPlayer0 != null) { - WorldMapManager.pcmPlayer0.method2537(); + if (class2.pcmPlayer0 != null) { + class2.pcmPlayer0.method2560(); } - if (AbstractWorldMapData.pcmPlayer1 != null) { - AbstractWorldMapData.pcmPlayer1.method2537(); + if (class58.pcmPlayer1 != null) { + class58.pcmPlayer1.method2560(); } var13 = true; @@ -2731,17 +2500,17 @@ public final class Client extends GameShell implements Usernamed { } if (var13) { - var14 = ((AbstractSocket)var1).readUnsignedByte(); - if (WorldMapManager.pcmPlayer0 != null) { - WorldMapManager.pcmPlayer0.method2537(); + var4 = ((AbstractSocket)var1).readUnsignedByte(); + if (class2.pcmPlayer0 != null) { + class2.pcmPlayer0.method2560(); } - if (AbstractWorldMapData.pcmPlayer1 != null) { - AbstractWorldMapData.pcmPlayer1.method2537(); + if (class58.pcmPlayer1 != null) { + class58.pcmPlayer1.method2560(); } - if (var14 != 0) { - PlayerAppearance.getLoginError(var14); + if (var4 != 0) { + class22.getLoginError(var4); return; } @@ -2750,169 +2519,173 @@ public final class Client extends GameShell implements Usernamed { } } - int var36; + int var32; if (loginState == 4) { if (var2.offset < 8) { - var36 = ((AbstractSocket)var1).available(); - if (var36 > 8 - var2.offset) { - var36 = 8 - var2.offset; + var32 = ((AbstractSocket)var1).available(); + if (var32 > 8 - var2.offset) { + var32 = 8 - var2.offset; } - if (var36 > 0) { - ((AbstractSocket)var1).read(var2.array, var2.offset, var36); - var2.offset += var36; + if (var32 > 0) { + ((AbstractSocket)var1).read(var2.array, var2.offset, var32); + var2.offset += var32; } } if (var2.offset == 8) { var2.offset = 0; - ChatChannel.field1319 = var2.readLong(); + MilliClock.field2046 = var2.readLong(); loginState = 5; } } - int var7; - int var9; - int var15; + int var6; if (loginState == 5) { packetWriter.packetBuffer.offset = 0; packetWriter.clearBuffer(); - PacketBuffer var3 = new PacketBuffer(500); - int[] var27 = new int[]{MouseHandler.secureRandom.nextInt(), MouseHandler.secureRandom.nextInt(), MouseHandler.secureRandom.nextInt(), MouseHandler.secureRandom.nextInt()}; - var3.offset = 0; - var3.writeByte(1); - var3.writeInt(var27[0]); - var3.writeInt(var27[1]); - var3.writeInt(var27[2]); - var3.writeInt(var27[3]); - var3.writeLong(ChatChannel.field1319); + PacketBuffer var23 = new PacketBuffer(500); + int[] var14 = new int[]{ChatChannel.secureRandom.nextInt(), ChatChannel.secureRandom.nextInt(), ChatChannel.secureRandom.nextInt(), ChatChannel.secureRandom.nextInt()}; + var23.offset = 0; + var23.writeByte(1); + var23.writeInt(var14[0]); + var23.writeInt(var14[1]); + var23.writeInt(var14[2]); + var23.writeInt(var14[3]); + var23.writeLong(MilliClock.field2046); if (gameState == 40) { - var3.writeInt(class105.field1345[0]); - var3.writeInt(class105.field1345[1]); - var3.writeInt(class105.field1345[2]); - var3.writeInt(class105.field1345[3]); + var23.writeInt(class7.field28[0]); + var23.writeInt(class7.field28[1]); + var23.writeInt(class7.field28[2]); + var23.writeInt(class7.field28[3]); } else { - var3.writeByte(field715.rsOrdinal()); - switch(field715.field2014) { + var23.writeByte(field708.rsOrdinal()); + switch(field708.field2026) { case 0: - LinkedHashMap var6 = GrandExchangeOfferOwnWorldComparator.clientPreferences.parameters; - String var8 = Login.Login_username; - var9 = var8.length(); - int var10 = 0; - - for (int var11 = 0; var11 < var9; ++var11) { - var10 = (var10 << 5) - var10 + var8.charAt(var11); - } - - var3.writeInt((Integer)var6.get(var10)); + var23.writeInt((Integer)NetSocket.clientPreferences.parameters.get(WorldMapAreaData.method759(Login.Login_username))); break; case 1: - case 2: - var3.writeMedium(GraphicsObject.field1141); - ++var3.offset; - break; case 3: - var3.offset += 4; + var23.writeMedium(WorldMapSprite.field264); + ++var23.offset; + break; + case 2: + var23.offset += 4; } - var3.writeByte(class322.field3825.rsOrdinal()); - var3.writeStringCp1252NullTerminated(Login.Login_password); + var23.writeByte(class322.field3841.rsOrdinal()); + var23.writeStringCp1252NullTerminated(Login.Login_password); } - var3.encryptRsa(class92.field1181, class92.field1178); - class105.field1345 = var27; - PacketBufferNode var33 = UserComparator9.method3496(); - var33.clientPacket = null; - var33.clientPacketLength = 0; - var33.packetBuffer = new PacketBuffer(5000); - var33.packetBuffer.offset = 0; + var23.encryptRsa(class92.field1188, class92.field1189); + class7.field28 = var14; + PacketBufferNode var5 = Tile.method2990(); + var5.packetBuffer.offset = 0; if (gameState == 40) { - var33.packetBuffer.writeByte(LoginPacket.field2313.id); + var5.packetBuffer.writeByte(LoginPacket.field2348.id); } else { - var33.packetBuffer.writeByte(LoginPacket.field2317.id); + var5.packetBuffer.writeByte(LoginPacket.field2347.id); } - var33.packetBuffer.writeShort(0); - var7 = var33.packetBuffer.offset; - var33.packetBuffer.writeInt(189); - var33.packetBuffer.writeInt(1); - var33.packetBuffer.writeByte(clientType); - var33.packetBuffer.writeBytes(var3.array, 0, var3.offset); - var15 = var33.packetBuffer.offset; - var33.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); - var33.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); - var33.packetBuffer.writeShort(WorldMapLabel.canvasWidth); - var33.packetBuffer.writeShort(Varps.canvasHeight); - PacketBuffer var16 = var33.packetBuffer; + var5.packetBuffer.writeShort(0); + var6 = var5.packetBuffer.offset; + var5.packetBuffer.writeInt(190); + var5.packetBuffer.writeInt(1); + var5.packetBuffer.writeByte(clientType); + var5.packetBuffer.writeBytes(var23.array, 0, var23.offset); + int var7 = var5.packetBuffer.offset; + var5.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); + var5.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); + var5.packetBuffer.writeShort(Varcs.canvasWidth); + var5.packetBuffer.writeShort(class52.canvasHeight); + PacketBuffer var8 = var5.packetBuffer; + int var11; if (randomDatData != null) { - var16.writeBytes(randomDatData, 0, randomDatData.length); + var8.writeBytes(randomDatData, 0, randomDatData.length); } else { - byte[] var17 = GraphicsObject.method2120(); - var16.writeBytes(var17, 0, var17.length); + byte[] var10 = new byte[24]; + + try { + JagexCache.JagexCache_randomDat.seek(0L); + JagexCache.JagexCache_randomDat.readFully(var10); + + for (var11 = 0; var11 < 24 && var10[var11] == 0; ++var11) { + } + + if (var11 >= 24) { + throw new IOException(); + } + } catch (Exception var21) { + for (int var12 = 0; var12 < 24; ++var12) { + var10[var12] = -1; + } + } + + var8.writeBytes(var10, 0, var10.length); } - var33.packetBuffer.writeStringCp1252NullTerminated(WorldMapData_0.field137); - var33.packetBuffer.writeInt(KitDefinition.field3271); - Buffer var38 = new Buffer(Varcs.platformInfo.size()); - Varcs.platformInfo.write(var38); - var33.packetBuffer.writeBytes(var38.array, 0, var38.array.length); - var33.packetBuffer.writeByte(clientType); - var33.packetBuffer.writeInt(0); - var33.packetBuffer.writeInt(ArchiveDiskAction.archive0.hash); - var33.packetBuffer.writeInt(DirectByteArrayCopier.archive1.hash); - var33.packetBuffer.writeInt(GrandExchangeOffer.archive2.hash); - var33.packetBuffer.writeInt(WorldMapSprite.archive3.hash); - var33.packetBuffer.writeInt(FontName.archive4.hash); - var33.packetBuffer.writeInt(WorldMapIcon_0.archive5.hash); - var33.packetBuffer.writeInt(AbstractWorldMapIcon.archive6.hash); - var33.packetBuffer.writeInt(AbstractWorldMapIcon.archive7.hash); - var33.packetBuffer.writeInt(class228.archive8.hash); - var33.packetBuffer.writeInt(SecureRandomFuture.archive9.hash); - var33.packetBuffer.writeInt(PlayerAppearance.archive10.hash); - var33.packetBuffer.writeInt(WorldMapRegion.archive11.hash); - var33.packetBuffer.writeInt(class41.archive12.hash); - var33.packetBuffer.writeInt(NPC.archive13.hash); - var33.packetBuffer.writeInt(class224.archive14.hash); - var33.packetBuffer.writeInt(GrandExchangeOfferNameComparator.archive15.hash); - var33.packetBuffer.writeInt(0); - var33.packetBuffer.writeInt(MenuAction.archive17.hash); - var33.packetBuffer.writeInt(UserComparator9.archive18.hash); - var33.packetBuffer.writeInt(class278.archive19.hash); - var33.packetBuffer.writeInt(class25.archive20.hash); - var33.packetBuffer.xteaEncrypt(var27, var15, var33.packetBuffer.offset); - var33.packetBuffer.writeLengthShort(var33.packetBuffer.offset - var7); - packetWriter.addNode(var33); + var5.packetBuffer.writeStringCp1252NullTerminated(field871); + var5.packetBuffer.writeInt(class228.field2754); + Buffer var9 = new Buffer(class13.platformInfo.size()); + class13.platformInfo.write(var9); + var5.packetBuffer.writeBytes(var9.array, 0, var9.array.length); + var5.packetBuffer.writeByte(clientType); + var5.packetBuffer.writeInt(0); + var5.packetBuffer.method5764(UserComparator7.archive6.hash); + var5.packetBuffer.method5762(Clock.archive2.hash); + var5.packetBuffer.writeShortLE(WorldMapData_0.archive11.hash); + var5.packetBuffer.method5764(Projectile.archive7.hash); + var5.packetBuffer.writeShortLE(GrandExchangeEvent.archive8.hash); + var5.packetBuffer.writeShortLE(Message.archive12.hash); + var5.packetBuffer.method5764(WorldMapData_0.archive19.hash); + var5.packetBuffer.method5762(GameBuild.archive13.hash); + var5.packetBuffer.writeShortLE(VarcInt.archive18.hash); + var5.packetBuffer.method5764(WorldMapIcon_1.archive14.hash); + var5.packetBuffer.method5762(AbstractWorldMapIcon.archive17.hash); + var5.packetBuffer.writeShortLE(Tile.archive9.hash); + var5.packetBuffer.method5762(WorldMapRectangle.archive5.hash); + var5.packetBuffer.writeShortLE(Message.archive1.hash); + var5.packetBuffer.method5762(ClientPacket.archive20.hash); + var5.packetBuffer.method5762(0); + var5.packetBuffer.writeInt(WorldMapLabel.archive15.hash); + var5.packetBuffer.method5762(GraphicsObject.archive10.hash); + var5.packetBuffer.method5762(class105.archive3.hash); + var5.packetBuffer.writeInt(GrandExchangeOffer.archive4.hash); + var5.packetBuffer.method5762(MilliClock.archive0.hash); + var5.packetBuffer.xteaEncrypt(var14, var7, var5.packetBuffer.offset); + var5.packetBuffer.writeLengthShort(var5.packetBuffer.offset - var6); + packetWriter.addNode(var5); packetWriter.flush(); - packetWriter.isaacCipher = new IsaacCipher(var27); - int[] var18 = new int[4]; + packetWriter.isaacCipher = new IsaacCipher(var14); + int[] var31 = new int[4]; - for (int var12 = 0; var12 < 4; ++var12) { - var18[var12] = var27[var12] + 50; + for (var11 = 0; var11 < 4; ++var11) { + var31[var11] = var14[var11] + 50; } - var2.newIsaacCipher(var18); + var2.newIsaacCipher(var31); loginState = 6; } if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { - var36 = ((AbstractSocket)var1).readUnsignedByte(); - if (var36 == 21 && gameState == 20) { + var32 = ((AbstractSocket)var1).readUnsignedByte(); + if (var32 == 21 && gameState == 20) { loginState = 12; - } else if (var36 == 2) { + } else if (var32 == 2) { loginState = 14; - } else if (var36 == 15 && gameState == 40) { + } else if (var32 == 15 && gameState == 40) { packetWriter.serverPacketLength = -1; loginState = 19; - } else if (var36 == 64) { + } else if (var32 == 64) { loginState = 10; - } else if (var36 == 23 && field713 < 1) { - ++field713; + } else if (var32 == 23 && field706 < 1) { + ++field706; loginState = 0; - } else if (var36 == 29) { + } else if (var32 == 29) { loginState = 17; } else { - if (var36 != 69) { - PlayerAppearance.getLoginError(var36); + if (var32 != 69) { + class22.getLoginError(var32); return; } @@ -2923,146 +2696,132 @@ public final class Client extends GameShell implements Usernamed { if (loginState == 7 && ((AbstractSocket)var1).available() >= 2) { ((AbstractSocket)var1).read(var2.array, 0, 2); var2.offset = 0; - MilliClock.field2026 = var2.readUnsignedShort(); + WorldMapSectionType.field174 = var2.readUnsignedShort(); loginState = 8; } - if (loginState == 8 && ((AbstractSocket)var1).available() >= MilliClock.field2026) { + if (loginState == 8 && ((AbstractSocket)var1).available() >= WorldMapSectionType.field174) { var2.offset = 0; - ((AbstractSocket)var1).read(var2.array, var2.offset, MilliClock.field2026); - class7[] var25 = new class7[]{class7.field34}; - class7 var28 = var25[var2.readUnsignedByte()]; + ((AbstractSocket)var1).read(var2.array, var2.offset, WorldMapSectionType.field174); + class7 var24 = class3.method41()[var2.readUnsignedByte()]; try { - switch(var28.field30) { + switch(var24.field26) { case 0: - class5 var5 = new class5(); - this.field719 = new class9(var2, var5); + class5 var33 = new class5(); + this.field851 = new class9(var2, var33); loginState = 9; break; default: throw new IllegalArgumentException(); } - } catch (Exception var23) { - PlayerAppearance.getLoginError(22); + } catch (Exception var20) { + class22.getLoginError(22); return; } } - if (loginState == 9 && this.field719.method111()) { - this.field718 = this.field719.method113(); - this.field719.method110(); - this.field719 = null; - if (this.field718 == null) { - PlayerAppearance.getLoginError(22); + if (loginState == 9 && this.field851.method106()) { + this.field929 = this.field851.method108(); + this.field851.method107(); + this.field851 = null; + if (this.field929 == null) { + class22.getLoginError(22); return; } packetWriter.clearBuffer(); - var4 = UserComparator9.method3496(); - var4.clientPacket = null; - var4.clientPacketLength = 0; - var4.packetBuffer = new PacketBuffer(5000); - var4.packetBuffer.writeByte(LoginPacket.field2314.id); - var4.packetBuffer.writeShort(this.field718.offset); - var4.packetBuffer.method5789(this.field718); - packetWriter.addNode(var4); + var3 = Tile.method2990(); + var3.packetBuffer.writeByte(LoginPacket.field2345.id); + var3.packetBuffer.writeShort(this.field929.offset); + var3.packetBuffer.method5711(this.field929); + packetWriter.addNode(var3); packetWriter.flush(); - this.field718 = null; + this.field929 = null; loginState = 6; } if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { - class52.field407 = ((AbstractSocket)var1).readUnsignedByte(); + WorldMapDecoration.field238 = ((AbstractSocket)var1).readUnsignedByte(); loginState = 11; } - if (loginState == 11 && ((AbstractSocket)var1).available() >= class52.field407) { - ((AbstractSocket)var1).read(var2.array, 0, class52.field407); + if (loginState == 11 && ((AbstractSocket)var1).available() >= WorldMapDecoration.field238) { + ((AbstractSocket)var1).read(var2.array, 0, WorldMapDecoration.field238); var2.offset = 0; loginState = 6; } if (loginState == 12 && ((AbstractSocket)var1).available() > 0) { - field714 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; + field675 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; loginState = 13; } if (loginState == 13) { - field712 = 0; - HealthBarUpdate.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field714 / 60 + " seconds."); - if (--field714 <= 0) { + field705 = 0; + MusicPatchPcmStream.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field675 / 60 + " seconds."); + if (--field675 <= 0) { loginState = 0; } } else { if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { - GrandExchangeEvents.field71 = ((AbstractSocket)var1).readUnsignedByte(); + WorldMapSprite.field254 = ((AbstractSocket)var1).readUnsignedByte(); loginState = 15; } - if (loginState == 15 && ((AbstractSocket)var1).available() >= GrandExchangeEvents.field71) { + int var16; + if (loginState == 15 && ((AbstractSocket)var1).available() >= WorldMapSprite.field254) { var13 = ((AbstractSocket)var1).readUnsignedByte() == 1; ((AbstractSocket)var1).read(var2.array, 0, 4); var2.offset = 0; - boolean var37 = false; + boolean var25 = false; if (var13) { - var14 = var2.readByteIsaac() << 24; - var14 |= var2.readByteIsaac() << 16; - var14 |= var2.readByteIsaac() << 8; - var14 |= var2.readByteIsaac(); - String var34 = Login.Login_username; - var7 = var34.length(); - var15 = 0; - var9 = 0; - - while (true) { - if (var9 >= var7) { - if (GrandExchangeOfferOwnWorldComparator.clientPreferences.parameters.size() >= 10 && !GrandExchangeOfferOwnWorldComparator.clientPreferences.parameters.containsKey(var15)) { - Iterator var35 = GrandExchangeOfferOwnWorldComparator.clientPreferences.parameters.entrySet().iterator(); - var35.next(); - var35.remove(); - } - - GrandExchangeOfferOwnWorldComparator.clientPreferences.parameters.put(var15, var14); - break; - } - - var15 = (var15 << 5) - var15 + var34.charAt(var9); - ++var9; + var4 = var2.readByteIsaac() << 24; + var4 |= var2.readByteIsaac() << 16; + var4 |= var2.readByteIsaac() << 8; + var4 |= var2.readByteIsaac(); + var16 = WorldMapAreaData.method759(Login.Login_username); + if (NetSocket.clientPreferences.parameters.size() >= 10 && !NetSocket.clientPreferences.parameters.containsKey(var16)) { + Iterator var17 = NetSocket.clientPreferences.parameters.entrySet().iterator(); + var17.next(); + var17.remove(); } + + NetSocket.clientPreferences.parameters.put(var16, var4); } if (Login_isUsernameRemembered) { - GrandExchangeOfferOwnWorldComparator.clientPreferences.rememberedUsername = Login.Login_username; + NetSocket.clientPreferences.rememberedUsername = Login.Login_username; } else { - GrandExchangeOfferOwnWorldComparator.clientPreferences.rememberedUsername = null; + NetSocket.clientPreferences.rememberedUsername = null; } - WorldMapArea.savePreferences(); + SpriteMask.savePreferences(); staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); localPlayerIndex <<= 8; localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); - field798 = ((AbstractSocket)var1).readUnsignedByte(); + field791 = ((AbstractSocket)var1).readUnsignedByte(); ((AbstractSocket)var1).read(var2.array, 0, 1); var2.offset = 0; - ServerPacket[] var29 = KeyHandler.ServerPacket_values(); - int var20 = var2.readSmartByteShortIsaac(); - if (var20 < 0 || var20 >= var29.length) { - throw new IOException(var20 + " " + var2.offset); + ServerPacket[] var28 = StructDefinition.ServerPacket_values(); + var6 = var2.readSmartByteShortIsaac(); + if (var6 < 0 || var6 >= var28.length) { + throw new IOException(var6 + " " + var2.offset); } - packetWriter.serverPacket = var29[var20]; + packetWriter.serverPacket = var28[var6]; packetWriter.serverPacketLength = packetWriter.serverPacket.length; ((AbstractSocket)var1).read(var2.array, 0, 2); var2.offset = 0; packetWriter.serverPacketLength = var2.readUnsignedShort(); try { - class56.method950(WorldMapSection1.client, "zap"); - } catch (Throwable var22) { + Client var18 = WorldMapSectionType.client; + JSObject.getWindow(var18).call("zap", (Object[])null); + } catch (Throwable var19) { } loginState = 16; @@ -3072,11 +2831,118 @@ public final class Client extends GameShell implements Usernamed { if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { var2.offset = 0; ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); - timer.method5045(); - MusicPatchPcmStream.method4004(); - TriBool.updatePlayer(var2); - class69.field585 = -1; - GameObject.loadRegions(false, var2); + timer.method5178(); + mouseLastLastPressedTimeMillis = -1L; + class219.mouseRecorder.index = 0; + WorldMapArea.hasFocus = true; + hadFocus = true; + field897 = -1L; + class90.method2164(); + packetWriter.clearBuffer(); + packetWriter.packetBuffer.offset = 0; + packetWriter.serverPacket = null; + packetWriter.field1350 = null; + packetWriter.field1351 = null; + packetWriter.field1342 = null; + packetWriter.serverPacketLength = 0; + packetWriter.field1348 = 0; + rebootTimer = 0; + logoutTimer = 0; + hintArrowType = 0; + menuOptionsCount = 0; + isMenuOpen = false; + MouseHandler.MouseHandler_idleCycles = 0; + LoginScreenAnimation.method1906(); + isItemSelected = 0; + isSpellSelected = false; + soundEffectCount = 0; + camAngleY = 0; + oculusOrbState = 0; + class278.field3585 = null; + minimapState = 0; + field937 = -1; + destinationX = 0; + destinationY = 0; + playerAttackOption = AttackOption.AttackOption_hidden; + npcAttackOption = AttackOption.AttackOption_hidden; + npcCount = 0; + NPC.method2156(); + + for (var32 = 0; var32 < 2048; ++var32) { + players[var32] = null; + } + + for (var32 = 0; var32 < 32768; ++var32) { + npcs[var32] = null; + } + + combatTargetPlayerIndex = -1; + projectiles.clear(); + graphicsObjects.clear(); + + for (var32 = 0; var32 < 4; ++var32) { + for (var4 = 0; var4 < 104; ++var4) { + for (var16 = 0; var16 < 104; ++var16) { + groundItems[var32][var4][var16] = null; + } + } + } + + pendingSpawns = new NodeDeque(); + ModeWhere.friendSystem.clear(); + + for (var32 = 0; var32 < VarpDefinition.VarpDefinition_fileCount; ++var32) { + VarpDefinition var36 = class219.VarpDefinition_get(var32); + if (var36 != null) { + Varps.Varps_temp[var32] = 0; + Varps.Varps_main[var32] = 0; + } + } + + AttackOption.varcs.clearTransient(); + followerIndex = -1; + if (rootInterface != -1) { + Tiles.method1200(rootInterface); + } + + for (InterfaceParent var27 = (InterfaceParent)interfaceParents.first(); var27 != null; var27 = (InterfaceParent)interfaceParents.next()) { + class41.closeInterface(var27, 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 (var32 = 0; var32 < 8; ++var32) { + playerMenuActions[var32] = null; + playerOptionsPriorities[var32] = false; + } + + ItemContainer.itemContainers = new NodeHashTable(32); + isLoading = true; + + for (var32 = 0; var32 < 100; ++var32) { + field813[var32] = true; + } + + var3 = UserComparator4.getPacketBufferNode(ClientPacket.field2279, packetWriter.isaacCipher); + var3.packetBuffer.writeByte(class58.getWindowedMode()); + var3.packetBuffer.writeShort(Varcs.canvasWidth); + var3.packetBuffer.writeShort(class52.canvasHeight); + packetWriter.addNode(var3); + ClientPreferences.clanChat = null; + + for (var32 = 0; var32 < 8; ++var32) { + grandExchangeOffers[var32] = new GrandExchangeOffer(); + } + + WorldMapIcon_0.grandExchangeEvents = null; + HitSplatDefinition.updatePlayer(var2); + WorldMapCacheName.field328 = -1; + class8.loadRegions(false, var2); packetWriter.serverPacket = null; } @@ -3085,35 +2951,35 @@ public final class Client extends GameShell implements Usernamed { var2.offset = 0; ((AbstractSocket)var1).read(var2.array, 0, 2); var2.offset = 0; - class7.field33 = var2.readUnsignedShort(); + WorldMapLabelSize.field134 = var2.readUnsignedShort(); loginState = 18; } - if (loginState == 18 && ((AbstractSocket)var1).available() >= class7.field33) { + if (loginState == 18 && ((AbstractSocket)var1).available() >= WorldMapLabelSize.field134) { var2.offset = 0; - ((AbstractSocket)var1).read(var2.array, 0, class7.field33); + ((AbstractSocket)var1).read(var2.array, 0, WorldMapLabelSize.field134); var2.offset = 0; String var26 = var2.readStringCp1252NullTerminated(); - String var30 = var2.readStringCp1252NullTerminated(); - String var31 = var2.readStringCp1252NullTerminated(); - HealthBarUpdate.setLoginResponseString(var26, var30, var31); - MouseRecorder.updateGameState(10); + String var34 = var2.readStringCp1252NullTerminated(); + String var29 = var2.readStringCp1252NullTerminated(); + MusicPatchPcmStream.setLoginResponseString(var26, var34, var29); + ClientPreferences.updateGameState(10); } if (loginState != 19) { - ++field712; - if (field712 > 2000) { - if (field713 < 1) { - if (class280.port3 == WorldMapLabelSize.port1) { - class280.port3 = GrandExchangeOfferAgeComparator.port2; + ++field705; + if (field705 > 2000) { + if (field706 < 1) { + if (WorldMapLabel.port3 == class90.port1) { + WorldMapLabel.port3 = port2; } else { - class280.port3 = WorldMapLabelSize.port1; + WorldMapLabel.port3 = class90.port1; } - ++field713; + ++field706; loginState = 0; } else { - PlayerAppearance.getLoginError(-3); + class22.getLoginError(-3); } } } else { @@ -3130,75 +2996,76 @@ 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; - var36 = packetWriter.serverPacketLength; - timer.method5047(); + var32 = packetWriter.serverPacketLength; + timer.method5166(); packetWriter.clearBuffer(); packetWriter.packetBuffer.offset = 0; packetWriter.serverPacket = null; - packetWriter.field1334 = null; - packetWriter.field1329 = null; - packetWriter.field1339 = null; + packetWriter.field1350 = null; + packetWriter.field1351 = null; + packetWriter.field1342 = null; packetWriter.serverPacketLength = 0; - packetWriter.field1338 = 0; + packetWriter.field1348 = 0; rebootTimer = 0; - AbstractByteArrayCopier.method4023(); + menuOptionsCount = 0; + isMenuOpen = false; minimapState = 0; destinationX = 0; - for (var14 = 0; var14 < 2048; ++var14) { - players[var14] = null; + for (var4 = 0; var4 < 2048; ++var4) { + players[var4] = null; } - ByteArrayPool.localPlayer = null; + class60.localPlayer = null; - for (var14 = 0; var14 < npcs.length; ++var14) { - NPC var32 = npcs[var14]; - if (var32 != null) { - var32.targetIndex = -1; - var32.false0 = false; + for (var4 = 0; var4 < npcs.length; ++var4) { + NPC var30 = npcs[var4]; + if (var30 != null) { + var30.targetIndex = -1; + var30.false0 = false; } } ItemContainer.itemContainers = new NodeHashTable(32); - MouseRecorder.updateGameState(30); + ClientPreferences.updateGameState(30); - for (var14 = 0; var14 < 100; ++var14) { - field679[var14] = true; + for (var4 = 0; var4 < 100; ++var4) { + field813[var4] = true; } - var4 = FaceNormal.getPacketBufferNode(ClientPacket.field2257, packetWriter.isaacCipher); - var4.packetBuffer.writeByte(ApproximateRouteStrategy.getWindowedMode()); - var4.packetBuffer.writeShort(WorldMapLabel.canvasWidth); - var4.packetBuffer.writeShort(Varps.canvasHeight); - packetWriter.addNode(var4); - TriBool.updatePlayer(var2); - if (var36 != var2.offset) { + PacketBufferNode var35 = UserComparator4.getPacketBufferNode(ClientPacket.field2279, packetWriter.isaacCipher); + var35.packetBuffer.writeByte(class58.getWindowedMode()); + var35.packetBuffer.writeShort(Varcs.canvasWidth); + var35.packetBuffer.writeShort(class52.canvasHeight); + packetWriter.addNode(var35); + HitSplatDefinition.updatePlayer(var2); + if (var32 != var2.offset) { throw new RuntimeException(); } } } } } - } catch (IOException var24) { - if (field713 < 1) { - if (class280.port3 == WorldMapLabelSize.port1) { - class280.port3 = GrandExchangeOfferAgeComparator.port2; + } catch (IOException var22) { + if (field706 < 1) { + if (WorldMapLabel.port3 == class90.port1) { + WorldMapLabel.port3 = port2; } else { - class280.port3 = WorldMapLabelSize.port1; + WorldMapLabel.port3 = class90.port1; } - ++field713; + ++field706; loginState = 0; } else { - PlayerAppearance.getLoginError(-2); + class22.getLoginError(-2); } } } - @ObfuscatedName("fj") + @ObfuscatedName("ft") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1428106045" + garbageValue = "-873982601" ) @Export("doCycleLoggedIn") final void doCycleLoggedIn() { @@ -3210,308 +3077,339 @@ public final class Client extends GameShell implements Usernamed { --logoutTimer; } - if (field728) { - field728 = false; - VertexNormal.method3093(); + if (field722) { + field722 = false; + CollisionMap.method3707(); } else { if (!isMenuOpen) { - Tile.addCancelMenuEntry(); + FontName.addCancelMenuEntry(); } int var1; - for (var1 = 0; var1 < 100 && this.method1524(packetWriter); ++var1) { + for (var1 = 0; var1 < 100 && this.method1768(packetWriter); ++var1) { } if (gameState == 30) { - while (true) { - ReflectionCheck var2 = (ReflectionCheck)class105.reflectionChecks.last(); - boolean var31; - if (var2 == null) { - var31 = false; - } else { - var31 = true; + int var2; + PacketBufferNode var14; + while (MusicPatchNode.method3966()) { + var14 = UserComparator4.getPacketBufferNode(ClientPacket.field2286, packetWriter.isaacCipher); + var14.packetBuffer.writeByte(0); + var2 = var14.packetBuffer.offset; + TriBool.performReflectionCheck(var14.packetBuffer); + var14.packetBuffer.writeLengthByte(var14.packetBuffer.offset - var2); + packetWriter.addNode(var14); + } + + if (timer.field3618) { + var14 = UserComparator4.getPacketBufferNode(ClientPacket.field2310, 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.method5165(); + } + + int var3; + int var4; + int var5; + int var6; + int var7; + int var8; + int var9; + int var10; + int var11; + int var12; + PacketBuffer var10000; + synchronized(class219.mouseRecorder.lock) { + if (!field669) { + class219.mouseRecorder.index = 0; + } else if (MouseHandler.MouseHandler_lastButton != 0 || class219.mouseRecorder.index >= 40) { + PacketBufferNode var15 = null; + var3 = 0; + var4 = 0; + var5 = 0; + var6 = 0; + + for (var7 = 0; var7 < class219.mouseRecorder.index && (var15 == null || var15.packetBuffer.offset - var3 < 246); ++var7) { + var4 = var7; + var8 = class219.mouseRecorder.ys[var7]; + if (var8 < -1) { + var8 = -1; + } else if (var8 > 65534) { + var8 = 65534; + } + + var9 = class219.mouseRecorder.xs[var7]; + if (var9 < -1) { + var9 = -1; + } else if (var9 > 65534) { + var9 = 65534; + } + + if (var9 != field683 || var8 != field684) { + if (var15 == null) { + var15 = UserComparator4.getPacketBufferNode(ClientPacket.field2253, packetWriter.isaacCipher); + var15.packetBuffer.writeByte(0); + var3 = var15.packetBuffer.offset; + var10000 = var15.packetBuffer; + var10000.offset += 2; + var5 = 0; + var6 = 0; + } + + if (field738 != -1L) { + var10 = var9 - field683; + var11 = var8 - field684; + var12 = (int)((class219.mouseRecorder.millis[var7] - field738) / 20L); + var5 = (int)((long)var5 + (class219.mouseRecorder.millis[var7] - field738) % 20L); + } else { + var10 = var9; + var11 = var8; + var12 = Integer.MAX_VALUE; + } + + field683 = var9; + field684 = 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; + field738 = class219.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 >= class219.mouseRecorder.index) { + class219.mouseRecorder.index = 0; + } else { + MouseRecorder var44 = class219.mouseRecorder; + var44.index -= var4; + System.arraycopy(class219.mouseRecorder.xs, var4, class219.mouseRecorder.xs, 0, class219.mouseRecorder.index); + System.arraycopy(class219.mouseRecorder.ys, var4, class219.mouseRecorder.ys, 0, class219.mouseRecorder.index); + System.arraycopy(class219.mouseRecorder.millis, var4, class219.mouseRecorder.millis, 0, class219.mouseRecorder.index); + } + } + } + + PacketBufferNode var18; + if (MouseHandler.MouseHandler_lastButton == 1 || !ArchiveLoader.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { + long var16 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; + if (var16 > 32767L) { + var16 = 32767L; } - int var3; - PacketBufferNode var32; - if (!var31) { - PacketBufferNode var15; - int var16; - if (timer.field3581) { - var15 = FaceNormal.getPacketBufferNode(ClientPacket.field2270, packetWriter.isaacCipher); - var15.packetBuffer.writeByte(0); - var16 = var15.packetBuffer.offset; - timer.write(var15.packetBuffer); - var15.packetBuffer.writeLengthByte(var15.packetBuffer.offset - var16); - packetWriter.addNode(var15); - timer.method5046(); + mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; + var3 = MouseHandler.MouseHandler_lastPressedY; + if (var3 < 0) { + var3 = 0; + } else if (var3 > class52.canvasHeight) { + var3 = class52.canvasHeight; + } + + var4 = MouseHandler.MouseHandler_lastPressedX; + if (var4 < 0) { + var4 = 0; + } else if (var4 > Varcs.canvasWidth) { + var4 = Varcs.canvasWidth; + } + + var5 = (int)var16; + var18 = UserComparator4.getPacketBufferNode(ClientPacket.field2244, 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.field425 > 0) { + var14 = UserComparator4.getPacketBufferNode(ClientPacket.field2330, packetWriter.isaacCipher); + var14.packetBuffer.writeShort(0); + var2 = var14.packetBuffer.offset; + long var19 = MilliClock.currentTimeMillis(); + + for (var5 = 0; var5 < KeyHandler.field425; ++var5) { + long var21 = var19 - field897; + if (var21 > 16777215L) { + var21 = 16777215L; } - int var4; - int var5; - int var6; - int var7; - int var8; - int var9; - int var10; - int var11; - int var12; - synchronized(MidiPcmStream.mouseRecorder.lock) { - if (!field749) { - MidiPcmStream.mouseRecorder.index = 0; - } else if (MouseHandler.MouseHandler_lastButton != 0 || MidiPcmStream.mouseRecorder.index >= 40) { - var32 = null; - var3 = 0; - var4 = 0; - var5 = 0; - var6 = 0; + field897 = var19; + var14.packetBuffer.writeIntME(KeyHandler.field429[var5]); + var14.packetBuffer.method5798((int)var21); + } - for (var7 = 0; var7 < MidiPcmStream.mouseRecorder.index && (var32 == null || var32.packetBuffer.offset - var3 < 246); ++var7) { - var4 = var7; - var8 = MidiPcmStream.mouseRecorder.ys[var7]; - if (var8 < -1) { - var8 = -1; - } else if (var8 > 65534) { - var8 = 65534; - } + var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var2); + packetWriter.addNode(var14); + } - var9 = MidiPcmStream.mouseRecorder.xs[var7]; - if (var9 < -1) { - var9 = -1; - } else if (var9 > 65534) { - var9 = 65534; - } + if (field757 > 0) { + --field757; + } - if (var9 != field691 || var8 != field692) { - if (var32 == null) { - var32 = FaceNormal.getPacketBufferNode(ClientPacket.field2281, packetWriter.isaacCipher); - var32.packetBuffer.writeByte(0); - var3 = var32.packetBuffer.offset; - PacketBuffer var10000 = var32.packetBuffer; - var10000.offset += 2; - var5 = 0; - var6 = 0; - } + if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { + field758 = true; + } - if (field875 != -1L) { - var10 = var9 - field691; - var11 = var8 - field692; - var12 = (int)((MidiPcmStream.mouseRecorder.millis[var7] - field875) / 20L); - var5 = (int)((long)var5 + (MidiPcmStream.mouseRecorder.millis[var7] - field875) % 20L); - } else { - var10 = var9; - var11 = var8; - var12 = Integer.MAX_VALUE; - } + if (field758 && field757 <= 0) { + field757 = 20; + field758 = false; + var14 = UserComparator4.getPacketBufferNode(ClientPacket.field2258, packetWriter.isaacCipher); + var14.packetBuffer.writeShort(camAngleY); + var14.packetBuffer.writeShort(camAngleX); + packetWriter.addNode(var14); + } - field691 = var9; - field692 = var8; - if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { - var10 += 32; - var11 += 32; - var32.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); - } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { - var10 += 128; - var11 += 128; - var32.packetBuffer.writeByte(var12 + 128); - var32.packetBuffer.writeShort(var11 + (var10 << 8)); - } else if (var12 < 32) { - var32.packetBuffer.writeByte(var12 + 192); - if (var9 != -1 && var8 != -1) { - var32.packetBuffer.writeInt(var9 | var8 << 16); - } else { - var32.packetBuffer.writeInt(Integer.MIN_VALUE); - } - } else { - var32.packetBuffer.writeShort((var12 & 8191) + 57344); - if (var9 != -1 && var8 != -1) { - var32.packetBuffer.writeInt(var9 | var8 << 16); - } else { - var32.packetBuffer.writeInt(Integer.MIN_VALUE); - } - } + if (WorldMapArea.hasFocus && !hadFocus) { + hadFocus = true; + var14 = UserComparator4.getPacketBufferNode(ClientPacket.field2290, packetWriter.isaacCipher); + var14.packetBuffer.writeByte(1); + packetWriter.addNode(var14); + } - ++var6; - field875 = MidiPcmStream.mouseRecorder.millis[var7]; - } + if (!WorldMapArea.hasFocus && hadFocus) { + hadFocus = false; + var14 = UserComparator4.getPacketBufferNode(ClientPacket.field2290, packetWriter.isaacCipher); + var14.packetBuffer.writeByte(0); + packetWriter.addNode(var14); + } + + if (class228.worldMap != null) { + class228.worldMap.method6696(); + } + + if (class4.ClanChat_inClanChat) { + if (ClientPreferences.clanChat != null) { + ClientPreferences.clanChat.sort(); + } + + class7.FriendSystem_invalidateFriends(); + class4.ClanChat_inClanChat = false; + } + + JagexCache.method3625(); + if (gameState == 30) { + Frames.method3396(); + + 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(GrandExchangeOffer.archive4, soundEffectIds[var1], 0); + if (var35 == null) { + continue; } - if (var32 != null) { - var32.packetBuffer.writeLengthByte(var32.packetBuffer.offset - var3); - var7 = var32.packetBuffer.offset; - var32.packetBuffer.offset = var3; - var32.packetBuffer.writeByte(var5 / var6); - var32.packetBuffer.writeByte(var5 % var6); - var32.packetBuffer.offset = var7; - packetWriter.addNode(var32); - } + int[] var45 = queuedSoundEffectDelays; + var45[var1] += var35.calculateDelay(); + soundEffects[var1] = var35; + } - if (var4 >= MidiPcmStream.mouseRecorder.index) { - MidiPcmStream.mouseRecorder.index = 0; + if (queuedSoundEffectDelays[var1] < 0) { + if (soundLocations[var1] != 0) { + var4 = (soundLocations[var1] & 255) * 128; + var5 = soundLocations[var1] >> 16 & 255; + var6 = var5 * 128 + 64 - class60.localPlayer.x; + if (var6 < 0) { + var6 = -var6; + } + + var7 = soundLocations[var1] >> 8 & 255; + var8 = var7 * 128 + 64 - class60.localPlayer.y; + if (var8 < 0) { + var8 = -var8; + } + + var9 = var6 + var8 - 128; + if (var9 > var4) { + queuedSoundEffectDelays[var1] = -100; + continue; + } + + if (var9 < 0) { + var9 = 0; + } + + var3 = (var4 - var9) * areaSoundEffectVolume / var4; } else { - MouseRecorder var46 = MidiPcmStream.mouseRecorder; - var46.index -= var4; - System.arraycopy(MidiPcmStream.mouseRecorder.xs, var4, MidiPcmStream.mouseRecorder.xs, 0, MidiPcmStream.mouseRecorder.index); - System.arraycopy(MidiPcmStream.mouseRecorder.ys, var4, MidiPcmStream.mouseRecorder.ys, 0, MidiPcmStream.mouseRecorder.index); - System.arraycopy(MidiPcmStream.mouseRecorder.millis, var4, MidiPcmStream.mouseRecorder.millis, 0, MidiPcmStream.mouseRecorder.index); - } - } - } - - PacketBufferNode var19; - if (MouseHandler.MouseHandler_lastButton == 1 || !class217.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { - long var17 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; - if (var17 > 32767L) { - var17 = 32767L; - } - - mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; - var3 = MouseHandler.MouseHandler_lastPressedY; - if (var3 < 0) { - var3 = 0; - } else if (var3 > Varps.canvasHeight) { - var3 = Varps.canvasHeight; - } - - var4 = MouseHandler.MouseHandler_lastPressedX; - if (var4 < 0) { - var4 = 0; - } else if (var4 > WorldMapLabel.canvasWidth) { - var4 = WorldMapLabel.canvasWidth; - } - - var5 = (int)var17; - var19 = FaceNormal.getPacketBufferNode(ClientPacket.field2209, packetWriter.isaacCipher); - var19.packetBuffer.writeShort((var5 << 1) + (MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0)); - var19.packetBuffer.writeShort(var4); - var19.packetBuffer.writeShort(var3); - packetWriter.addNode(var19); - } - - if (KeyHandler.field417 > 0) { - var15 = FaceNormal.getPacketBufferNode(ClientPacket.field2210, packetWriter.isaacCipher); - var15.packetBuffer.writeShort(0); - var16 = var15.packetBuffer.offset; - long var20 = class217.currentTimeMillis(); - - for (var5 = 0; var5 < KeyHandler.field417; ++var5) { - long var22 = var20 - field904; - if (var22 > 16777215L) { - var22 = 16777215L; + var3 = soundEffectVolume; } - field904 = var20; - var15.packetBuffer.method5616((int)var22); - var15.packetBuffer.writeByte(KeyHandler.field432[var5]); - } - - var15.packetBuffer.writeLengthShort(var15.packetBuffer.offset - var16); - packetWriter.addNode(var15); - } - - if (field764 > 0) { - --field764; - } - - if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { - field765 = true; - } - - if (field765 && field764 <= 0) { - field764 = 20; - field765 = false; - var15 = FaceNormal.getPacketBufferNode(ClientPacket.field2220, packetWriter.isaacCipher); - var15.packetBuffer.writeIntME(camAngleY); - var15.packetBuffer.writeIntME(camAngleX); - packetWriter.addNode(var15); - } - - if (GameShell.hasFocus && !hadFocus) { - hadFocus = true; - var15 = FaceNormal.getPacketBufferNode(ClientPacket.field2261, packetWriter.isaacCipher); - var15.packetBuffer.writeByte(1); - packetWriter.addNode(var15); - } - - if (!GameShell.hasFocus && hadFocus) { - hadFocus = false; - var15 = FaceNormal.getPacketBufferNode(ClientPacket.field2261, packetWriter.isaacCipher); - var15.packetBuffer.writeByte(0); - packetWriter.addNode(var15); - } - - if (GrandExchangeOfferAgeComparator.worldMap != null) { - GrandExchangeOfferAgeComparator.worldMap.method6509(); - } - - if (Timer.ClanChat_inClanChat) { - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.sort(); - } - - WorldMapRegion.method537(); - Timer.ClanChat_inClanChat = false; - } - - InvDefinition.method4443(); - if (gameState != 30) { - return; - } - - for (PendingSpawn var37 = (PendingSpawn)pendingSpawns.last(); var37 != null; var37 = (PendingSpawn)pendingSpawns.previous()) { - if (var37.hitpoints > 0) { - --var37.hitpoints; - } - - if (var37.hitpoints == 0) { - if (var37.objectId < 0 || FileSystem.method3588(var37.objectId, var37.field963)) { - SoundCache.addPendingSpawnToScene(var37.plane, var37.type, var37.x, var37.y, var37.objectId, var37.field968, var37.field963); - var37.remove(); - } - } else { - if (var37.delay > 0) { - --var37.delay; + if (var3 > 0) { + RawSound var23 = var35.toRawSound().resample(class197.decimator); + RawPcmStream var24 = RawPcmStream.createRawPcmStream(var23, 100, var3); + var24.setNumLoops(queuedSoundEffectLoops[var1] - 1); + class60.pcmStreamMixer.addSubStream(var24); } - if (var37.delay == 0 && var37.x >= 1 && var37.y >= 1 && var37.x <= 102 && var37.y <= 102 && (var37.id < 0 || FileSystem.method3588(var37.id, var37.field967))) { - SoundCache.addPendingSpawnToScene(var37.plane, var37.type, var37.x, var37.y, var37.id, var37.orientation, var37.field967); - var37.delay = -1; - if (var37.id == var37.objectId && var37.objectId == -1) { - var37.remove(); - } else if (var37.objectId == var37.id && var37.field968 == var37.orientation && var37.field967 == var37.field963) { - var37.remove(); - } - } + queuedSoundEffectDelays[var1] = -100; } - } + } else { + --soundEffectCount; - class22.method252(); - ++packetWriter.field1338; - if (packetWriter.field1338 > 750) { - VertexNormal.method3093(); - return; - } - - var1 = Players.Players_count; - int[] var33 = Players.Players_indices; - - for (var3 = 0; var3 < var1; ++var3) { - Player var24 = players[var33[var3]]; - if (var24 != null) { - class41.updateActorSequence(var24, 1); + 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 (field743 && !WorldMapLabelSize.method251()) { + if (musicVolume != 0 && currentTrackGroupId != -1) { + UserComparator9.method3513(UserComparator7.archive6, currentTrackGroupId, 0, musicVolume, false); } - for (var1 = 0; var1 < npcCount; ++var1) { - var16 = npcIndices[var1]; - NPC var25 = npcs[var16]; - if (var25 != null) { - class41.updateActorSequence(var25, var25.definition.size); - } - } + field743 = false; + } - WorldMapRegion.method630(); - ++field741; + ++packetWriter.field1348; + if (packetWriter.field1348 > 750) { + CollisionMap.method3707(); + } else { + TileItem.method2260(); + class247.method4496(); + class3.method33(); + ++field747; if (mouseCrossColor != 0) { mouseCrossState += 20; if (mouseCrossState >= 400) { @@ -3519,158 +3417,158 @@ public final class Client extends GameShell implements Usernamed { } } - if (WorldMapID.field307 != null) { - ++field786; - if (field786 >= 15) { - ItemContainer.invalidateWidget(WorldMapID.field307); - WorldMapID.field307 = null; + if (class194.field2356 != null) { + ++field808; + if (field808 >= 15) { + class234.invalidateWidget(class194.field2356); + class194.field2356 = null; } } - Widget var38 = class9.mousedOverWidgetIf1; - Widget var34 = Language.field2368; - class9.mousedOverWidgetIf1 = null; - Language.field2368 = null; + Widget var34 = WorldMapSection1.mousedOverWidgetIf1; + Widget var36 = SecureRandomCallable.field542; + WorldMapSection1.mousedOverWidgetIf1 = null; + SecureRandomCallable.field542 = null; draggedOnWidget = null; - field861 = false; - field732 = false; - field901 = 0; + field854 = false; + field692 = false; + field894 = 0; - while (class22.isKeyDown() && field901 < 128) { - if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && class3.field16 == 66) { - String var42 = ""; + while (WorldMapManager.isKeyDown() && field894 < 128) { + if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && SecureRandomCallable.field546 == 66) { + String var39 = ""; - Message var39; - for (Iterator var26 = Messages.Messages_hashTable.iterator(); var26.hasNext(); var42 = var42 + var39.sender + ':' + var39.text + '\n') { - var39 = (Message)var26.next(); + Message var37; + for (Iterator var41 = Messages.Messages_hashTable.iterator(); var41.hasNext(); var39 = var39 + var37.sender + ':' + var37.text + '\n') { + var37 = (Message)var41.next(); } - WorldMapSection1.client.clipboardSetString(var42); - } else if (oculusOrbState != 1 || Coord.field2531 <= 0) { - field872[field901] = class3.field16; - field902[field901] = Coord.field2531; - ++field901; + WorldMapSectionType.client.clipboardSetString(var39); + } else if (oculusOrbState != 1 || class58.field442 <= 0) { + field896[field894] = SecureRandomCallable.field546; + field920[field894] = class58.field442; + ++field894; } } - boolean var35 = staffModLevel >= 2; - if (var35 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { - var4 = ByteArrayPool.localPlayer.plane - mouseWheelRotation; + boolean var30 = staffModLevel >= 2; + if (var30 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { + var4 = class60.localPlayer.plane - mouseWheelRotation; if (var4 < 0) { var4 = 0; } else if (var4 > 3) { var4 = 3; } - if (var4 != ByteArrayPool.localPlayer.plane) { - GrandExchangeOfferWorldComparator.method148(ByteArrayPool.localPlayer.pathX[0] + class69.baseX, ByteArrayPool.localPlayer.pathY[0] + class89.baseY, var4, false); + if (var4 != class60.localPlayer.plane) { + GrandExchangeOffer.method191(class60.localPlayer.pathX[0] + class182.baseX, class60.localPlayer.pathY[0] + SecureRandomFuture.baseY, var4, false); } mouseWheelRotation = 0; } if (rootInterface != -1) { - class2.updateRootInterface(rootInterface, 0, 0, WorldMapLabel.canvasWidth, Varps.canvasHeight, 0, 0); + MusicPatchNode.updateRootInterface(rootInterface, 0, 0, Varcs.canvasWidth, class52.canvasHeight, 0, 0); } ++cycleCntr; while (true) { - Widget var40; - ScriptEvent var43; - Widget var45; + Widget var38; + ScriptEvent var40; + Widget var42; do { - var43 = (ScriptEvent)field727.removeLast(); - if (var43 == null) { + var40 = (ScriptEvent)field891.removeLast(); + if (var40 == null) { while (true) { do { - var43 = (ScriptEvent)field919.removeLast(); - if (var43 == null) { + var40 = (ScriptEvent)field691.removeLast(); + if (var40 == null) { while (true) { do { - var43 = (ScriptEvent)scriptEvents.removeLast(); - if (var43 == null) { + var40 = (ScriptEvent)scriptEvents.removeLast(); + if (var40 == null) { this.menu(); - WorldMapArea.method508(); - if (clickedWidget != null) { - this.method1420(); + if (class228.worldMap != null) { + class228.worldMap.method6532(TileItemPile.Client_plane, (class60.localPlayer.x >> 7) + class182.baseX, (class60.localPlayer.y >> 7) + SecureRandomFuture.baseY, false); + class228.worldMap.loadCache(); } - if (class236.dragInventoryWidget != null) { - ItemContainer.invalidateWidget(class236.dragInventoryWidget); + if (clickedWidget != null) { + this.method1372(); + } + + if (KeyHandler.dragInventoryWidget != null) { + class234.invalidateWidget(KeyHandler.dragInventoryWidget); ++itemDragDuration; if (MouseHandler.MouseHandler_currentButton == 0) { - if (field887) { - if (class236.dragInventoryWidget == RouteStrategy.field2106 && dragItemSlotSource != dragItemSlotDestination) { - Widget var44 = class236.dragInventoryWidget; - byte var36 = 0; - if (field845 == 1 && var44.contentType == 206) { - var36 = 1; + if (field785) { + if (KeyHandler.dragInventoryWidget == TaskHandler.field2066 && dragItemSlotSource != dragItemSlotDestination) { + Widget var43 = KeyHandler.dragInventoryWidget; + byte var31 = 0; + if (field838 == 1 && var43.contentType == 206) { + var31 = 1; } - if (var44.itemIds[dragItemSlotDestination] <= 0) { - var36 = 0; + if (var43.itemIds[dragItemSlotDestination] <= 0) { + var31 = 0; } - if (MilliClock.method3560(ScriptEvent.getWidgetClickMask(var44))) { + if (Projectile.method2249(KeyHandler.getWidgetClickMask(var43))) { var6 = dragItemSlotSource; var7 = dragItemSlotDestination; - var44.itemIds[var7] = var44.itemIds[var6]; - var44.itemQuantities[var7] = var44.itemQuantities[var6]; - var44.itemIds[var6] = -1; - var44.itemQuantities[var6] = 0; - } else if (var36 == 1) { + var43.itemIds[var7] = var43.itemIds[var6]; + var43.itemQuantities[var7] = var43.itemQuantities[var6]; + var43.itemIds[var6] = -1; + var43.itemQuantities[var6] = 0; + } else if (var31 == 1) { var6 = dragItemSlotSource; var7 = dragItemSlotDestination; - while (var6 != var7) { + while (var7 != var6) { if (var6 > var7) { - var44.swapItems(var6 - 1, var6); + var43.swapItems(var6 - 1, var6); --var6; } else if (var6 < var7) { - var44.swapItems(var6 + 1, var6); + var43.swapItems(var6 + 1, var6); ++var6; } } } else { - var44.swapItems(dragItemSlotDestination, dragItemSlotSource); + var43.swapItems(dragItemSlotDestination, dragItemSlotSource); } - var19 = FaceNormal.getPacketBufferNode(ClientPacket.field2298, packetWriter.isaacCipher); - var19.packetBuffer.writeIntME(dragItemSlotDestination); - var19.packetBuffer.method5610(dragItemSlotSource); - var19.packetBuffer.writeByte(var36); - var19.packetBuffer.writeShortLE(class236.dragInventoryWidget.id); - packetWriter.addNode(var19); + var18 = UserComparator4.getPacketBufferNode(ClientPacket.field2256, packetWriter.isaacCipher); + var18.packetBuffer.method5837(var31); + var18.packetBuffer.writeInt(KeyHandler.dragInventoryWidget.id); + var18.packetBuffer.method5898(dragItemSlotDestination); + var18.packetBuffer.method5898(dragItemSlotSource); + packetWriter.addNode(var18); } } else if (this.shouldLeftClickOpenMenu()) { this.openMenu(draggedWidgetX, draggedWidgetY); } else if (menuOptionsCount > 0) { - var4 = draggedWidgetX; - var5 = draggedWidgetY; - MenuAction var41 = AbstractWorldMapIcon.tempMenuAction; - AbstractByteArrayCopier.menuAction(var41.param0, var41.param1, var41.opcode, var41.identifier, var41.action, var41.action, var4, var5); - AbstractWorldMapIcon.tempMenuAction = null; + GrandExchangeOffer.method189(draggedWidgetX, draggedWidgetY); } - field786 = 10; + field808 = 10; MouseHandler.MouseHandler_lastButton = 0; - class236.dragInventoryWidget = null; + KeyHandler.dragInventoryWidget = null; } else if (itemDragDuration >= 5 && (MouseHandler.MouseHandler_x > draggedWidgetX + 5 || MouseHandler.MouseHandler_x < draggedWidgetX - 5 || MouseHandler.MouseHandler_y > draggedWidgetY + 5 || MouseHandler.MouseHandler_y < draggedWidgetY - 5)) { - field887 = true; + field785 = true; } } - if (Scene.method3215()) { + if (Scene.method3230()) { var4 = Scene.Scene_selectedX; var5 = Scene.Scene_selectedY; - var19 = FaceNormal.getPacketBufferNode(ClientPacket.field2248, packetWriter.isaacCipher); - var19.packetBuffer.writeByte(5); - var19.packetBuffer.writeShort(var4 + class69.baseX); - var19.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); - var19.packetBuffer.writeShort(var5 + class89.baseY); - packetWriter.addNode(var19); - Scene.method3347(); + var18 = UserComparator4.getPacketBufferNode(ClientPacket.field2311, packetWriter.isaacCipher); + var18.packetBuffer.writeByte(5); + var18.packetBuffer.writeShort(var5 + SecureRandomFuture.baseY); + var18.packetBuffer.writeShort(var4 + class182.baseX); + var18.packetBuffer.method5744(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); + packetWriter.addNode(var18); + Scene.method3346(); mouseCrossX = MouseHandler.MouseHandler_lastPressedX; mouseCrossY = MouseHandler.MouseHandler_lastPressedY; mouseCrossColor = 1; @@ -3679,236 +3577,288 @@ public final class Client extends GameShell implements Usernamed { destinationY = var5; } - if (var38 != class9.mousedOverWidgetIf1) { - if (var38 != null) { - ItemContainer.invalidateWidget(var38); - } - - if (class9.mousedOverWidgetIf1 != null) { - ItemContainer.invalidateWidget(class9.mousedOverWidgetIf1); - } - } - - if (var34 != Language.field2368 && field871 == field832) { + if (var34 != WorldMapSection1.mousedOverWidgetIf1) { if (var34 != null) { - ItemContainer.invalidateWidget(var34); + class234.invalidateWidget(var34); } - if (Language.field2368 != null) { - ItemContainer.invalidateWidget(Language.field2368); + if (WorldMapSection1.mousedOverWidgetIf1 != null) { + class234.invalidateWidget(WorldMapSection1.mousedOverWidgetIf1); } } - if (Language.field2368 != null) { - if (field871 < field832) { - ++field871; - if (field832 == field871) { - ItemContainer.invalidateWidget(Language.field2368); + if (var36 != SecureRandomCallable.field542 && field825 == field824) { + if (var36 != null) { + class234.invalidateWidget(var36); + } + + if (SecureRandomCallable.field542 != null) { + class234.invalidateWidget(SecureRandomCallable.field542); + } + } + + if (SecureRandomCallable.field542 != null) { + if (field824 < field825) { + ++field824; + if (field825 == field824) { + class234.invalidateWidget(SecureRandomCallable.field542); } } - } else if (field871 > 0) { - --field871; + } else if (field824 > 0) { + --field824; + } + + if (oculusOrbState == 0) { + var4 = class60.localPlayer.x; + var5 = class60.localPlayer.y; + if (class225.oculusOrbFocalPointX - var4 < -500 || class225.oculusOrbFocalPointX - var4 > 500 || HealthBarDefinition.oculusOrbFocalPointY - var5 < -500 || HealthBarDefinition.oculusOrbFocalPointY - var5 > 500) { + class225.oculusOrbFocalPointX = var4; + HealthBarDefinition.oculusOrbFocalPointY = var5; + } + + if (var4 != class225.oculusOrbFocalPointX) { + class225.oculusOrbFocalPointX += (var4 - class225.oculusOrbFocalPointX) / 16; + } + + if (var5 != HealthBarDefinition.oculusOrbFocalPointY) { + HealthBarDefinition.oculusOrbFocalPointY += (var5 - HealthBarDefinition.oculusOrbFocalPointY) / 16; + } + + var6 = class225.oculusOrbFocalPointX >> 7; + var7 = HealthBarDefinition.oculusOrbFocalPointY >> 7; + var8 = Language.getTileHeight(class225.oculusOrbFocalPointX, HealthBarDefinition.oculusOrbFocalPointY, TileItemPile.Client_plane); + var9 = 0; + if (var6 > 3 && var7 > 3 && var6 < 100 && var7 < 100) { + for (var10 = var6 - 4; var10 <= var6 + 4; ++var10) { + for (var11 = var7 - 4; var11 <= var7 + 4; ++var11) { + var12 = TileItemPile.Client_plane; + if (var12 < 3 && (Tiles.Tiles_renderFlags[1][var10][var11] & 2) == 2) { + ++var12; + } + + int var26 = var8 - Tiles.Tiles_heights[var12][var10][var11]; + if (var26 > var9) { + var9 = var26; + } + } + } + } + + var10 = var9 * 192; + if (var10 > 98048) { + var10 = 98048; + } + + if (var10 < 32768) { + var10 = 32768; + } + + if (var10 > field881) { + field881 += (var10 - field881) / 24; + } else if (var10 < field881) { + field881 += (var10 - field881) / 80; + } + + WorldMapDecoration.field234 = Language.getTileHeight(class60.localPlayer.x, class60.localPlayer.y, TileItemPile.Client_plane) - camFollowHeight; + } else if (oculusOrbState == 1) { + NetSocket.method3674(); + short var32 = -1; + if (KeyHandler.KeyHandler_pressedKeys[33]) { + var32 = 0; + } else if (KeyHandler.KeyHandler_pressedKeys[49]) { + var32 = 1024; + } + + if (KeyHandler.KeyHandler_pressedKeys[48]) { + if (var32 == 0) { + var32 = 1792; + } else if (var32 == 1024) { + var32 = 1280; + } else { + var32 = 1536; + } + } else if (KeyHandler.KeyHandler_pressedKeys[50]) { + if (var32 == 0) { + var32 = 256; + } else if (var32 == 1024) { + var32 = 768; + } else { + var32 = 512; + } + } + + byte var33 = 0; + if (KeyHandler.KeyHandler_pressedKeys[35]) { + var33 = -1; + } else if (KeyHandler.KeyHandler_pressedKeys[51]) { + var33 = 1; + } + + var6 = 0; + if (var32 >= 0 || var33 != 0) { + var6 = KeyHandler.KeyHandler_pressedKeys[81] ? oculusOrbSlowedSpeed * 312783465 * 354155993 : oculusOrbNormalSpeed * -997807461 * -968086637; + var6 *= 16; + field751 = var32; + field752 = var33; + } + + if (field717 < var6) { + field717 += var6 / 8; + if (field717 > var6) { + field717 = var6; + } + } else if (field717 > var6) { + field717 = field717 * 9 / 10; + } + + if (field717 > 0) { + var7 = field717 / 16; + if (field751 >= 0) { + var4 = field751 - Canvas.cameraYaw & 2047; + var8 = Rasterizer3D.Rasterizer3D_sine[var4]; + var9 = Rasterizer3D.Rasterizer3D_cosine[var4]; + class225.oculusOrbFocalPointX += var7 * var8 / 65536; + HealthBarDefinition.oculusOrbFocalPointY += var7 * var9 / 65536; + } + + if (field752 != 0) { + WorldMapDecoration.field234 += var7 * field752; + if (WorldMapDecoration.field234 > 0) { + WorldMapDecoration.field234 = 0; + } + } + } else { + field751 = -1; + field752 = -1; + } + + if (KeyHandler.KeyHandler_pressedKeys[13]) { + GrandExchangeOfferNameComparator.method206(); + } + } + + if (MouseHandler.MouseHandler_currentButton == 4 && ArchiveLoader.mouseCam) { + var4 = MouseHandler.MouseHandler_y - mouseCamClickedY; + camAngleDX = var4 * 2; + mouseCamClickedY = var4 != -1 && var4 != 1 ? (MouseHandler.MouseHandler_y + mouseCamClickedY) / 2 : MouseHandler.MouseHandler_y * -137685025 * -1383373793; + var5 = mouseCamClickedX - MouseHandler.MouseHandler_x; + camAngleDY = var5 * 2; + mouseCamClickedX = var5 != -1 && var5 != 1 ? (MouseHandler.MouseHandler_x + mouseCamClickedX) / 2 : MouseHandler.MouseHandler_x * -493092611 * -1040704427; + } 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; } - Tile.method2961(); if (isCameraLocked) { - var4 = HealthBar.field1145 * 128 + 64; - var5 = WorldMapRectangle.field217 * 128 + 64; - var6 = class277.getTileHeight(var4, var5, ScriptEvent.Client_plane) - class4.field20; - if (WorldMapRectangle.cameraX < var4) { - WorldMapRectangle.cameraX = (var4 - WorldMapRectangle.cameraX) * NetFileRequest.field3126 / 1000 + WorldMapRectangle.cameraX + GrandExchangeOfferWorldComparator.field64; - if (WorldMapRectangle.cameraX > var4) { - WorldMapRectangle.cameraX = var4; - } - } - - if (WorldMapRectangle.cameraX > var4) { - WorldMapRectangle.cameraX -= NetFileRequest.field3126 * (WorldMapRectangle.cameraX - var4) / 1000 + GrandExchangeOfferWorldComparator.field64; - if (WorldMapRectangle.cameraX < var4) { - WorldMapRectangle.cameraX = var4; - } - } - - if (GrandExchangeOfferWorldComparator.cameraY < var6) { - GrandExchangeOfferWorldComparator.cameraY = (var6 - GrandExchangeOfferWorldComparator.cameraY) * NetFileRequest.field3126 / 1000 + GrandExchangeOfferWorldComparator.cameraY + GrandExchangeOfferWorldComparator.field64; - if (GrandExchangeOfferWorldComparator.cameraY > var6) { - GrandExchangeOfferWorldComparator.cameraY = var6; - } - } - - if (GrandExchangeOfferWorldComparator.cameraY > var6) { - GrandExchangeOfferWorldComparator.cameraY -= NetFileRequest.field3126 * (GrandExchangeOfferWorldComparator.cameraY - var6) / 1000 + GrandExchangeOfferWorldComparator.field64; - if (GrandExchangeOfferWorldComparator.cameraY < var6) { - GrandExchangeOfferWorldComparator.cameraY = var6; - } - } - - if (class200.cameraZ < var5) { - class200.cameraZ = (var5 - class200.cameraZ) * NetFileRequest.field3126 / 1000 + class200.cameraZ + GrandExchangeOfferWorldComparator.field64; - if (class200.cameraZ > var5) { - class200.cameraZ = var5; - } - } - - if (class200.cameraZ > var5) { - class200.cameraZ -= NetFileRequest.field3126 * (class200.cameraZ - var5) / 1000 + GrandExchangeOfferWorldComparator.field64; - if (class200.cameraZ < var5) { - class200.cameraZ = var5; - } - } - - var4 = field925 * 128 + 64; - var5 = Strings.field2759 * 128 + 64; - var6 = class277.getTileHeight(var4, var5, ScriptEvent.Client_plane) - TextureProvider.field1549; - var7 = var4 - WorldMapRectangle.cameraX; - var8 = var6 - GrandExchangeOfferWorldComparator.cameraY; - var9 = var5 - class200.cameraZ; - var10 = (int)Math.sqrt((double)(var7 * var7 + var9 * var9)); - var11 = (int)(Math.atan2((double)var8, (double)var10) * 325.949D) & 2047; - var12 = (int)(Math.atan2((double)var7, (double)var9) * -325.949D) & 2047; - if (var11 < 128) { - var11 = 128; - } - - if (var11 > 383) { - var11 = 383; - } - - if (ApproximateRouteStrategy.cameraPitch < var11) { - ApproximateRouteStrategy.cameraPitch = (var11 - ApproximateRouteStrategy.cameraPitch) * Players.field1280 / 1000 + ApproximateRouteStrategy.cameraPitch + Friend.field3626; - if (ApproximateRouteStrategy.cameraPitch > var11) { - ApproximateRouteStrategy.cameraPitch = var11; - } - } - - if (ApproximateRouteStrategy.cameraPitch > var11) { - ApproximateRouteStrategy.cameraPitch -= Players.field1280 * ( - ApproximateRouteStrategy.cameraPitch - var11) / 1000 + Friend.field3626; - if (ApproximateRouteStrategy.cameraPitch < var11) { - ApproximateRouteStrategy.cameraPitch = var11; - } - } - - int var27 = var12 - WorldMapIcon_1.cameraYaw; - if (var27 > 1024) { - var27 -= 2048; - } - - if (var27 < -1024) { - var27 += 2048; - } - - if (var27 > 0) { - WorldMapIcon_1.cameraYaw = var27 * Players.field1280 / 1000 + WorldMapIcon_1.cameraYaw + Friend.field3626; - WorldMapIcon_1.cameraYaw &= 2047; - } - - if (var27 < 0) { - WorldMapIcon_1.cameraYaw -= Friend.field3626 + -var27 * Players.field1280 / 1000; - WorldMapIcon_1.cameraYaw &= 2047; - } - - int var14 = var12 - WorldMapIcon_1.cameraYaw; - if (var14 > 1024) { - var14 -= 2048; - } - - if (var14 < -1024) { - var14 += 2048; - } - - if (var14 < 0 && var27 > 0 || var14 > 0 && var27 < 0) { - WorldMapIcon_1.cameraYaw = var12; - } + WorldMapLabel.method488(); } for (var4 = 0; var4 < 5; ++var4) { - int var10002 = field930[var4]++; + var10002 = field922[var4]++; } - UserComparator4.varcs.tryWrite(); - var4 = ++MouseHandler.MouseHandler_idleCycles - 1; - var6 = KeyHandler.KeyHandler_idleCycles; - PacketBufferNode var28; - if (var4 > 15000 && var6 > 15000) { + AttackOption.varcs.tryWrite(); + var4 = Skills.method4271(); + var5 = KeyHandler.KeyHandler_idleCycles; + PacketBufferNode var27; + if (var4 > 15000 && var5 > 15000) { logoutTimer = 250; - ServerPacket.method3684(14500); - var28 = FaceNormal.getPacketBufferNode(ClientPacket.field2251, packetWriter.isaacCipher); - packetWriter.addNode(var28); + MouseHandler.MouseHandler_idleCycles = 14500; + var27 = UserComparator4.getPacketBufferNode(ClientPacket.field2243, packetWriter.isaacCipher); + packetWriter.addNode(var27); } - Projectile.friendSystem.processFriendUpdates(); + ModeWhere.friendSystem.processFriendUpdates(); ++packetWriter.pendingWrites; if (packetWriter.pendingWrites > 50) { - var28 = FaceNormal.getPacketBufferNode(ClientPacket.field2295, packetWriter.isaacCipher); - packetWriter.addNode(var28); + var27 = UserComparator4.getPacketBufferNode(ClientPacket.field2285, packetWriter.isaacCipher); + packetWriter.addNode(var27); } try { packetWriter.flush(); - } catch (IOException var29) { - VertexNormal.method3093(); + } catch (IOException var28) { + CollisionMap.method3707(); } return; } - var45 = var43.widget; - if (var45.childIndex < 0) { + var42 = var40.widget; + if (var42.childIndex < 0) { break; } - var40 = MusicPatchNode.getWidget(var45.parentId); - } while(var40 == null || var40.children == null || var45.childIndex >= var40.children.length || var45 != var40.children[var45.childIndex]); + var38 = WorldMapSprite.getWidget(var42.parentId); + } while(var38 == null || var38.children == null || var42.childIndex >= var38.children.length || var42 != var38.children[var42.childIndex]); - GrandExchangeOfferOwnWorldComparator.runScriptEvent(var43); + InterfaceParent.runScriptEvent(var40); } } - var45 = var43.widget; - if (var45.childIndex < 0) { + var42 = var40.widget; + if (var42.childIndex < 0) { break; } - var40 = MusicPatchNode.getWidget(var45.parentId); - } while(var40 == null || var40.children == null || var45.childIndex >= var40.children.length || var45 != var40.children[var45.childIndex]); + var38 = WorldMapSprite.getWidget(var42.parentId); + } while(var38 == null || var38.children == null || var42.childIndex >= var38.children.length || var42 != var38.children[var42.childIndex]); - GrandExchangeOfferOwnWorldComparator.runScriptEvent(var43); + InterfaceParent.runScriptEvent(var40); } } - var45 = var43.widget; - if (var45.childIndex < 0) { + var42 = var40.widget; + if (var42.childIndex < 0) { break; } - var40 = MusicPatchNode.getWidget(var45.parentId); - } while(var40 == null || var40.children == null || var45.childIndex >= var40.children.length || var45 != var40.children[var45.childIndex]); + var38 = WorldMapSprite.getWidget(var42.parentId); + } while(var38 == null || var38.children == null || var42.childIndex >= var38.children.length || var42 != var38.children[var42.childIndex]); - GrandExchangeOfferOwnWorldComparator.runScriptEvent(var43); + InterfaceParent.runScriptEvent(var40); } } - - var32 = FaceNormal.getPacketBufferNode(ClientPacket.field2304, packetWriter.isaacCipher); - var32.packetBuffer.writeByte(0); - var3 = var32.packetBuffer.offset; - GameObject.performReflectionCheck(var32.packetBuffer); - var32.packetBuffer.writeLengthByte(var32.packetBuffer.offset - var3); - packetWriter.addNode(var32); } } } } - @ObfuscatedName("ga") + @ObfuscatedName("fl") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-61779781" + garbageValue = "1501968527" ) @Export("resizeJS") void resizeJS() { - int var1 = WorldMapLabel.canvasWidth; - int var2 = Varps.canvasHeight; + int var1 = Varcs.canvasWidth; + int var2 = class52.canvasHeight; if (super.contentWidth < var1) { var1 = super.contentWidth; } @@ -3917,10 +3867,10 @@ public final class Client extends GameShell implements Usernamed { var2 = super.contentHeight; } - if (GrandExchangeOfferOwnWorldComparator.clientPreferences != null) { + if (NetSocket.clientPreferences != null) { try { - Client var3 = WorldMapSection1.client; - Object[] var4 = new Object[]{ApproximateRouteStrategy.getWindowedMode()}; + Client var3 = WorldMapSectionType.client; + Object[] var4 = new Object[]{class58.getWindowedMode()}; JSObject.getWindow(var3).call("resize", var4); } catch (Throwable var5) { } @@ -3928,58 +3878,56 @@ public final class Client extends GameShell implements Usernamed { } - @ObfuscatedName("gc") + @ObfuscatedName("fb") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "38" + signature = "(I)V", + garbageValue = "1953660969" ) @Export("drawLoggedIn") final void drawLoggedIn() { int var1; if (rootInterface != -1) { var1 = rootInterface; - if (LoginScreenAnimation.loadInterface(var1)) { - MilliClock.drawModelComponents(Widget.Widget_interfaceComponents[var1], -1); + if (UserComparator4.loadInterface(var1)) { + WorldMapDecoration.drawModelComponents(Widget.Widget_interfaceComponents[var1], -1); } } for (var1 = 0; var1 < rootWidgetCount; ++var1) { - if (field679[var1]) { - field886[var1] = true; + if (field813[var1]) { + field879[var1] = true; } - field813[var1] = field679[var1]; - field679[var1] = false; + field880[var1] = field813[var1]; + field813[var1] = false; } - field884 = cycle; + field877 = cycle; viewportX = -1; viewportY = -1; - RouteStrategy.field2106 = null; + TaskHandler.field2066 = null; if (rootInterface != -1) { rootWidgetCount = 0; - MusicPatch.drawWidgets(rootInterface, 0, 0, WorldMapLabel.canvasWidth, Varps.canvasHeight, 0, 0, -1); + NetFileRequest.drawWidgets(rootInterface, 0, 0, Varcs.canvasWidth, class52.canvasHeight, 0, 0, -1); } Rasterizer2D.Rasterizer2D_resetClip(); if (showMouseCross) { if (mouseCrossColor == 1) { - class299.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); + Timer.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); } if (mouseCrossColor == 2) { - class299.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); + Timer.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); } } - int var2; - int var3; if (!isMenuOpen) { if (viewportX != -1) { var1 = viewportX; - var2 = viewportY; + int var2 = viewportY; if ((menuOptionsCount >= 2 || isItemSelected != 0 || isSpellSelected) && showMouseOverText) { - var3 = AbstractWorldMapData.method381(); + int var3 = UrlRequester.method3421(); String var4; if (isItemSelected == 1 && menuOptionsCount < 2) { var4 = "Use" + " " + selectedItemName + " " + "->"; @@ -3999,100 +3947,68 @@ public final class Client extends GameShell implements Usernamed { } if (menuOptionsCount > 2) { - var4 = var4 + class297.colorStartTag(16777215) + " " + '/' + " " + (menuOptionsCount - 2) + " more options"; + var4 = var4 + ItemContainer.colorStartTag(16777215) + " " + '/' + " " + (menuOptionsCount - 2) + " more options"; } - TaskHandler.fontBold12.drawRandomAlphaAndSpacing(var4, var1 + 4, var2 + 15, 16777215, 0, cycle / 1000); + GrandExchangeOfferNameComparator.fontBold12.drawRandomAlphaAndSpacing(var4, var1 + 4, var2 + 15, 16777215, 0, cycle / 1000); } } } else { - var1 = WorldMapDecoration.menuX; - var2 = PacketBufferNode.menuY; - var3 = WorldMapScaleHandler.menuWidth; - int var13 = WorldMapData_1.menuHeight; - int var14 = 6116423; - Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var13, var14); - Rasterizer2D.Rasterizer2D_fillRectangle(var1 + 1, var2 + 1, var3 - 2, 16, 0); - Rasterizer2D.Rasterizer2D_drawRectangle(var1 + 1, var2 + 18, var3 - 2, var13 - 19, 0); - TaskHandler.fontBold12.draw("Choose Option", var1 + 3, var2 + 14, var14, -1); - int var6 = MouseHandler.MouseHandler_x; - int var7 = MouseHandler.MouseHandler_y; - - for (int var8 = 0; var8 < menuOptionsCount; ++var8) { - int var9 = var2 + (menuOptionsCount - 1 - var8) * 15 + 31; - int var10 = 16777215; - if (var6 > var1 && var6 < var3 + var1 && var7 > var9 - 13 && var7 < var9 + 3) { - var10 = 16776960; - } - - Font var11 = TaskHandler.fontBold12; - String var12; - if (var8 < 0) { - var12 = ""; - } else if (menuTargets[var8].length() > 0) { - var12 = menuActions[var8] + " " + menuTargets[var8]; - } else { - var12 = menuActions[var8]; - } - - var11.draw(var12, var1 + 3, var9, var10, 0); - } - - WorldMapScaleHandler.method848(WorldMapDecoration.menuX, PacketBufferNode.menuY, WorldMapScaleHandler.menuWidth, WorldMapData_1.menuHeight); + WorldMapSection3.method841(); } if (gameDrawingMode == 3) { for (var1 = 0; var1 < rootWidgetCount; ++var1) { - if (field813[var1]) { + if (field880[var1]) { Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); - } else if (field886[var1]) { + } else if (field879[var1]) { Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); } } } - Message.method1300(ScriptEvent.Client_plane, ByteArrayPool.localPlayer.x, ByteArrayPool.localPlayer.y, field741); - field741 = 0; + class1.method16(TileItemPile.Client_plane, class60.localPlayer.x, class60.localPlayer.y, field747); + field747 = 0; } - @ObfuscatedName("hl") + @ObfuscatedName("gt") @ObfuscatedSignature( - signature = "(Ldv;I)Z", - garbageValue = "-124055306" + signature = "(Ldx;B)Z", + garbageValue = "-15" ) - final boolean method1524(PacketWriter var1) { + final boolean method1768(PacketWriter var1) { AbstractSocket var2 = var1.getSocket(); PacketBuffer var3 = var1.packetBuffer; if (var2 == null) { return false; } else { - int var6; - String var27; + String var20; + int var21; try { int var5; if (var1.serverPacket == null) { - if (var1.field1335) { + if (var1.field1347) { if (!var2.isAvailable(1)) { return false; } var2.read(var1.packetBuffer.array, 0, 1); - var1.field1338 = 0; - var1.field1335 = false; + var1.field1348 = 0; + var1.field1347 = false; } var3.offset = 0; - if (var3.method5524()) { + if (var3.method5657()) { if (!var2.isAvailable(1)) { return false; } var2.read(var1.packetBuffer.array, 1, 1); - var1.field1338 = 0; + var1.field1348 = 0; } - var1.field1335 = true; - ServerPacket[] var4 = KeyHandler.ServerPacket_values(); + var1.field1347 = true; + ServerPacket[] var4 = StructDefinition.ServerPacket_values(); var5 = var3.readSmartByteShortIsaac(); if (var5 < 0 || var5 >= var4.length) { throw new IOException(var5 + " " + var3.offset); @@ -4127,90 +4043,869 @@ public final class Client extends GameShell implements Usernamed { var3.offset = 0; var2.read(var3.array, 0, var1.serverPacketLength); - var1.field1338 = 0; - timer.method5051(); - var1.field1339 = var1.field1329; - var1.field1329 = var1.field1334; - var1.field1334 = var1.serverPacket; + var1.field1348 = 0; + timer.method5162(); + var1.field1342 = var1.field1351; + var1.field1351 = var1.field1350; + var1.field1350 = var1.serverPacket; int var16; - if (ServerPacket.field2204 == var1.serverPacket) { - var16 = var3.method5614(); - var5 = var3.method5638(); - Varps.Varps_temp[var16] = var5; - if (Varps.Varps_main[var16] != var5) { - Varps.Varps_main[var16] = var5; + if (ServerPacket.field2163 == var1.serverPacket) { + isCameraLocked = false; + + for (var16 = 0; var16 < 5; ++var16) { + field918[var16] = false; } - class22.changeGameOptions(var16); - field866[++field772 - 1 & 31] = var16; var1.serverPacket = null; return true; } - int var42; - if (ServerPacket.field2129 == var1.serverPacket) { - var16 = var3.readUnsignedByte(); - var5 = var3.readUnsignedByte(); - var6 = var3.readUnsignedByte(); - var42 = var3.readUnsignedByte(); - field926[var16] = true; - field788[var16] = var5; - field730[var16] = var6; - field929[var16] = var42; - field930[var16] = 0; + if (ServerPacket.field2214 == var1.serverPacket) { + ModeWhere.friendSystem.readUpdate(var3, var1.serverPacketLength); + field866 = cycleCntr; + var1.serverPacket = null; + return true; + } + + long var7; + long var17; + String var39; + if (ServerPacket.field2200 == var1.serverPacket) { + var39 = var3.readStringCp1252NullTerminated(); + var17 = (long)var3.readUnsignedShort(); + var7 = (long)var3.readMedium(); + PlayerType var9 = (PlayerType)FaceNormal.findEnumerated(VarbitDefinition.PlayerType_values(), var3.readUnsignedByte()); + long var10 = var7 + (var17 << 32); + boolean var12 = false; + + for (int var13 = 0; var13 < 100; ++var13) { + if (field892[var13] == var10) { + var12 = true; + break; + } + } + + if (ModeWhere.friendSystem.isIgnored(new Username(var39, class195.loginType))) { + var12 = true; + } + + if (!var12 && field787 == 0) { + field892[field730] = var10; + field730 = (field730 + 1) % 100; + String var19 = AbstractFont.escapeBrackets(TileItemPile.method2903(NPC.method2157(var3))); + byte var46; + if (var9.isPrivileged) { + var46 = 7; + } else { + var46 = 3; + } + + if (var9.modIcon != -1) { + ObjectSound.addGameMessage(var46, WorldMapRegion.method611(var9.modIcon) + var39, var19); + } else { + ObjectSound.addGameMessage(var46, var39, var19); + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2153 == var1.serverPacket) { + World.privateChatMode = ItemContainer.method1232(var3.readUnsignedByte()); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2206 == 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]; + WorldMapSection0.changeGameOptions(var16); + field859[++field860 - 1 & 31] = var16; + } + } + var1.serverPacket = null; return true; } if (ServerPacket.field2160 == var1.serverPacket) { - WorldMapData_1.method816(class194.field2325); + class2.updateNpcs(true, var3); var1.serverPacket = null; return true; } - if (ServerPacket.field2187 == var1.serverPacket) { - isCameraLocked = true; - HealthBar.field1145 = var3.readUnsignedByte(); - WorldMapRectangle.field217 = var3.readUnsignedByte(); - class4.field20 = var3.readUnsignedShort(); - GrandExchangeOfferWorldComparator.field64 = var3.readUnsignedByte(); - NetFileRequest.field3126 = var3.readUnsignedByte(); - if (NetFileRequest.field3126 >= 100) { - WorldMapRectangle.cameraX = HealthBar.field1145 * 128 + 64; - class200.cameraZ = WorldMapRectangle.field217 * 128 + 64; - GrandExchangeOfferWorldComparator.cameraY = class277.getTileHeight(WorldMapRectangle.cameraX, class200.cameraZ, ScriptEvent.Client_plane) - class4.field20; + if (ServerPacket.field2235 == var1.serverPacket) { + var39 = var3.readStringCp1252NullTerminated(); + var20 = AbstractFont.escapeBrackets(TileItemPile.method2903(NPC.method2157(var3))); + ObjectSound.addGameMessage(6, var39, var20); + var1.serverPacket = null; + return true; + } + + Widget var6; + if (ServerPacket.field2193 == var1.serverPacket) { + var16 = var3.method5766(); + var5 = var3.method5867(); + var6 = WorldMapSprite.getWidget(var16); + if (var6.modelType != 2 || var5 != var6.modelId) { + var6.modelType = 2; + var6.modelId = var5; + class234.invalidateWidget(var6); } var1.serverPacket = null; return true; } - if (ServerPacket.field2199 == var1.serverPacket) { - tradeChatMode = var3.method5604(); - publicChatMode = var3.method5604(); + if (ServerPacket.field2157 == var1.serverPacket) { + var39 = var3.readStringCp1252NullTerminated(); + Object[] var55 = new Object[var39.length() + 1]; + + for (var21 = var39.length() - 1; var21 >= 0; --var21) { + if (var39.charAt(var21) == 's') { + var55[var21 + 1] = var3.readStringCp1252NullTerminated(); + } else { + var55[var21 + 1] = new Integer(var3.readInt()); + } + } + + var55[0] = new Integer(var3.readInt()); + ScriptEvent var45 = new ScriptEvent(); + var45.args = var55; + InterfaceParent.runScriptEvent(var45); var1.serverPacket = null; return true; } - if (ServerPacket.field2144 == var1.serverPacket) { - Projectile.friendSystem.readUpdate(var3, var1.serverPacketLength); - field873 = cycleCntr; + if (ServerPacket.field2182 == var1.serverPacket) { + ModeWhere.friendSystem.ignoreList.read(var3, var1.serverPacketLength); + WorldMapSprite.FriendSystem_invalidateIgnoreds(); + field866 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2204 == var1.serverPacket) { + var16 = var3.method5755(); + if (var16 == 65535) { + var16 = -1; + } + + UserComparator9.playSong(var16); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2171 == var1.serverPacket) { + var16 = var3.method5757(); + if (var16 == 65535) { + var16 = -1; + } + + var5 = var3.method5761(); + MouseRecorder.playSoundJingle(var16, var5); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2194 == var1.serverPacket) { + var16 = var3.readUnsignedByte(); + MidiPcmStream.forceDisconnect(var16); + var1.serverPacket = null; + return false; + } + + if (ServerPacket.field2209 == var1.serverPacket) { + for (var16 = 0; var16 < VarpDefinition.VarpDefinition_fileCount; ++var16) { + VarpDefinition var54 = class219.VarpDefinition_get(var16); + if (var54 != null) { + Varps.Varps_temp[var16] = 0; + Varps.Varps_main[var16] = 0; + } + } + + Buffer.method5950(); + field860 += 32; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2180 == var1.serverPacket) { + rebootTimer = var3.readUnsignedShort() * 30; + field870 = cycleCntr; + var1.serverPacket = null; + return true; + } + + int var22; + if (ServerPacket.field2155 == var1.serverPacket) { + Buffer.method5950(); + var16 = var3.method5748(); + var5 = var3.method5765(); + var21 = var3.method5936(); + experience[var21] = var5; + currentLevels[var21] = var16; + levels[var21] = 1; + + for (var22 = 0; var22 < 98; ++var22) { + if (var5 >= Skills.Skills_experienceTable[var22]) { + levels[var21] = var22 + 2; + } + } + + changedSkills[++changedSkillsCount - 1 & 31] = var21; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2178 == var1.serverPacket) { + MouseRecorder.logOut(); + var1.serverPacket = null; + return false; + } + + long var23; + long var25; + if (ServerPacket.field2217 == var1.serverPacket) { + var39 = var3.readStringCp1252NullTerminated(); + var17 = var3.readLong(); + var7 = (long)var3.readUnsignedShort(); + var23 = (long)var3.readMedium(); + PlayerType var44 = (PlayerType)FaceNormal.findEnumerated(VarbitDefinition.PlayerType_values(), var3.readUnsignedByte()); + var25 = var23 + (var7 << 32); + boolean var14 = false; + + for (int var15 = 0; var15 < 100; ++var15) { + if (field892[var15] == var25) { + var14 = true; + break; + } + } + + if (var44.isUser && ModeWhere.friendSystem.isIgnored(new Username(var39, class195.loginType))) { + var14 = true; + } + + if (!var14 && field787 == 0) { + field892[field730] = var25; + field730 = (field730 + 1) % 100; + String var27 = AbstractFont.escapeBrackets(TileItemPile.method2903(NPC.method2157(var3))); + if (var44.modIcon != -1) { + WorldMapID.addChatMessage(9, WorldMapRegion.method611(var44.modIcon) + var39, var27, WorldMapData_0.base37DecodeLong(var17)); + } else { + WorldMapID.addChatMessage(9, var39, var27, WorldMapData_0.base37DecodeLong(var17)); + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2205 == var1.serverPacket) { + class39.method616(class194.field2362); + var1.serverPacket = null; + return true; + } + + Widget var58; + if (ServerPacket.field2203 == var1.serverPacket) { + var16 = var3.method5867(); + var5 = var3.method5766(); + var21 = var3.readUnsignedShort(); + var58 = WorldMapSprite.getWidget(var5); + var58.field2658 = var16 + (var21 << 16); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2198 == var1.serverPacket) { + World var38 = new World(); + var38.host = var3.readStringCp1252NullTerminated(); + var38.id = var3.readUnsignedShort(); + var5 = var3.readInt(); + var38.properties = var5; + ClientPreferences.updateGameState(45); + var2.close(); + var2 = null; + Friend.changeWorld(var38); + var1.serverPacket = null; + return false; + } + + if (ServerPacket.field2201 == var1.serverPacket) { + var16 = var3.method5767(); + var5 = var3.readUnsignedShort(); + var6 = WorldMapSprite.getWidget(var16); + if (var6 != null && var6.type == 0) { + if (var5 > var6.scrollHeight - var6.height) { + var5 = var6.scrollHeight - var6.height; + } + + if (var5 < 0) { + var5 = 0; + } + + if (var5 != var6.scrollY) { + var6.scrollY = var5; + class234.invalidateWidget(var6); + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2238 == var1.serverPacket) { + if (ClientPreferences.clanChat != null) { + ClientPreferences.clanChat.method5421(var3); + } + + Frames.method3399(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2175 == var1.serverPacket) { + Buffer.method5950(); + runEnergy = var3.readUnsignedByte(); + field870 = cycleCntr; + var1.serverPacket = null; + return true; + } + + InterfaceParent var28; + if (ServerPacket.field2167 == var1.serverPacket) { + var16 = var3.readUnsignedByte(); + var5 = var3.method5867(); + var21 = var3.method5767(); + var28 = (InterfaceParent)interfaceParents.get((long)var21); + if (var28 != null) { + class41.closeInterface(var28, var5 != var28.group); + } + + WorldMapLabel.method486(var21, var5, var16); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2161 == var1.serverPacket) { + var16 = var3.readUnsignedByte(); + if (var3.readUnsignedByte() == 0) { + grandExchangeOffers[var16] = new GrandExchangeOffer(); + var3.offset += 18; + } else { + --var3.offset; + grandExchangeOffers[var16] = new GrandExchangeOffer(var3, false); + } + + field818 = cycleCntr; + var1.serverPacket = null; + return true; + } + + String var41; + if (ServerPacket.field2237 == var1.serverPacket) { + var16 = var3.readUShortSmart(); + boolean var47 = var3.readUnsignedByte() == 1; + var41 = ""; + boolean var56 = false; + if (var47) { + var41 = var3.readStringCp1252NullTerminated(); + if (ModeWhere.friendSystem.isIgnored(new Username(var41, class195.loginType))) { + var56 = true; + } + } + + String var43 = var3.readStringCp1252NullTerminated(); + if (!var56) { + ObjectSound.addGameMessage(var16, var41, var43); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2196 == var1.serverPacket) { + var16 = var3.method5767(); + var5 = var3.method5757(); + Varps.Varps_temp[var5] = var16; + if (Varps.Varps_main[var5] != var16) { + Varps.Varps_main[var5] = var16; + } + + WorldMapSection0.changeGameOptions(var5); + field859[++field860 - 1 & 31] = var5; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2166 == var1.serverPacket) { + var16 = var3.method5867(); + LoginScreenAnimation.method1908(var16); + changedItemContainers[++field878 - 1 & 31] = var16 & 32767; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2154 == var1.serverPacket) { + var16 = var3.readUnsignedShort(); + var5 = var3.readUnsignedByte(); + var21 = var3.readUnsignedShort(); + AbstractWorldMapIcon.queueSoundEffect(var16, var5, var21); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2234 == var1.serverPacket) { + var16 = var3.readUnsignedByte(); + var5 = var3.readUnsignedByte(); + var21 = var3.readUnsignedByte(); + var22 = var3.readUnsignedByte(); + field918[var16] = true; + field919[var16] = var5; + field775[var16] = var21; + field778[var16] = var22; + field922[var16] = 0; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2228 == var1.serverPacket) { + var16 = var3.method5767(); + var5 = var3.method5755(); + var6 = WorldMapSprite.getWidget(var16); + if (var6.modelType != 1 || var5 != var6.modelId) { + var6.modelType = 1; + var6.modelId = var5; + class234.invalidateWidget(var6); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2223 == var1.serverPacket) { + class8.loadRegions(true, var1.packetBuffer); + var1.serverPacket = null; + return true; + } + + int var29; + if (ServerPacket.field2232 == var1.serverPacket) { + var16 = var3.method5766(); + var5 = var3.readUnsignedShort(); + if (var5 == 65535) { + var5 = -1; + } + + var21 = var3.method5755(); + if (var21 == 65535) { + var21 = -1; + } + + var22 = var3.method5765(); + + for (var29 = var5; var29 <= var21; ++var29) { + var23 = (long)var29 + ((long)var16 << 32); + Node var11 = widgetClickMasks.get(var23); + if (var11 != null) { + var11.remove(); + } + + widgetClickMasks.put(new IntegerNode(var22), var23); + } + + var1.serverPacket = null; + return true; + } + + int var30; + int var31; + if (ServerPacket.field2224 == var1.serverPacket) { + isCameraLocked = true; + DevicePcmPlayerProvider.field435 = var3.readUnsignedByte(); + class9.field42 = var3.readUnsignedByte(); + class206.field2446 = var3.readUnsignedShort(); + class329.field3867 = var3.readUnsignedByte(); + WorldMapCacheName.field329 = var3.readUnsignedByte(); + if (WorldMapCacheName.field329 >= 100) { + var16 = DevicePcmPlayerProvider.field435 * 128 + 64; + var5 = class9.field42 * 128 + 64; + var21 = Language.getTileHeight(var16, var5, TileItemPile.Client_plane) - class206.field2446; + var22 = var16 - MouseHandler.cameraX; + var29 = var21 - WorldMapSection3.cameraY; + var30 = var5 - ObjectSound.cameraZ; + var31 = (int)Math.sqrt((double)(var22 * var22 + var30 * var30)); + TilePaint.cameraPitch = (int)(Math.atan2((double)var29, (double)var31) * 325.949D) & 2047; + Canvas.cameraYaw = (int)(Math.atan2((double)var22, (double)var30) * -325.949D) & 2047; + if (TilePaint.cameraPitch < 128) { + TilePaint.cameraPitch = 128; + } + + if (TilePaint.cameraPitch > 383) { + TilePaint.cameraPitch = 383; + } + } + + var1.serverPacket = null; + return true; + } + + boolean var48; + if (ServerPacket.field2174 == var1.serverPacket) { + var48 = var3.readBoolean(); + if (var48) { + if (class278.field3585 == null) { + class278.field3585 = new class247(); + } + } else { + class278.field3585 = null; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2218 == var1.serverPacket) { + var16 = var3.readInt(); + var5 = var3.method5867(); + if (var5 == 65535) { + var5 = -1; + } + + var21 = var3.method5766(); + var58 = WorldMapSprite.getWidget(var16); + ItemDefinition var42; + if (!var58.isIf3) { + if (var5 == -1) { + var58.modelType = 0; + var1.serverPacket = null; + return true; + } + + var42 = KitDefinition.ItemDefinition_get(var5); + var58.modelType = 4; + var58.modelId = var5; + var58.modelAngleX = var42.xan2d; + var58.modelAngleY = var42.yan2d; + var58.modelZoom = var42.zoom2d * 100 / var21; + class234.invalidateWidget(var58); + } else { + var58.itemId = var5; + var58.itemQuantity = var21; + var42 = KitDefinition.ItemDefinition_get(var5); + var58.modelAngleX = var42.xan2d; + var58.modelAngleY = var42.yan2d; + var58.modelAngleZ = var42.zan2d; + var58.modelOffsetX = var42.offsetX2d; + var58.modelOffsetY = var42.offsetY2d; + var58.modelZoom = var42.zoom2d; + if (var42.isStackable == 1) { + var58.itemQuantityMode = 1; + } else { + var58.itemQuantityMode = 2; + } + + if (var58.field2657 > 0) { + var58.modelZoom = var58.modelZoom * 32 / var58.field2657; + } else if (var58.rawWidth > 0) { + var58.modelZoom = var58.modelZoom * 32 / var58.rawWidth; + } + + class234.invalidateWidget(var58); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2179 == var1.serverPacket) { + var16 = var3.readUnsignedByte(); + var20 = var3.readStringCp1252NullTerminated(); + var21 = var3.readUnsignedByte(); + if (var21 >= 1 && var21 <= 8) { + if (var20.equalsIgnoreCase("null")) { + var20 = null; + } + + playerMenuActions[var21 - 1] = var20; + playerOptionsPriorities[var21 - 1] = var16 == 0; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2229 == var1.serverPacket) { + var16 = var3.offset + var1.serverPacketLength; + var5 = var3.readUnsignedShort(); + var21 = var3.readUnsignedShort(); + if (var5 != rootInterface) { + rootInterface = var5; + this.resizeRoot(false); + WorldMapSection3.Widget_resetModelFrames(rootInterface); + UserComparator4.runWidgetOnLoadListener(rootInterface); + + for (var22 = 0; var22 < 100; ++var22) { + field813[var22] = true; + } + } + + InterfaceParent var59; + for (; var21-- > 0; var59.field587 = true) { + var22 = var3.readInt(); + var29 = var3.readUnsignedShort(); + var30 = var3.readUnsignedByte(); + var59 = (InterfaceParent)interfaceParents.get((long)var22); + if (var59 != null && var29 != var59.group) { + class41.closeInterface(var59, true); + var59 = null; + } + + if (var59 == null) { + var59 = WorldMapLabel.method486(var22, var29, var30); + } + } + + for (var28 = (InterfaceParent)interfaceParents.first(); var28 != null; var28 = (InterfaceParent)interfaceParents.next()) { + if (var28.field587) { + var28.field587 = false; + } else { + class41.closeInterface(var28, true); + } + } + + widgetClickMasks = new NodeHashTable(512); + + while (var3.offset < var16) { + var22 = var3.readInt(); + var29 = var3.readUnsignedShort(); + var30 = var3.readUnsignedShort(); + var31 = var3.readInt(); + + for (int var33 = var29; var33 <= var30; ++var33) { + var25 = (long)var33 + ((long)var22 << 32); + widgetClickMasks.put(new IntegerNode(var31), var25); + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2158 == var1.serverPacket) { + var16 = var3.method5765(); + var5 = var3.method5759(); + var21 = var3.method5758(); + var58 = WorldMapSprite.getWidget(var16); + if (var5 != var58.rawX || var21 != var58.rawY || var58.xAlignment != 0 || var58.yAlignment != 0) { + var58.rawX = var5; + var58.rawY = var21; + var58.xAlignment = 0; + var58.yAlignment = 0; + class234.invalidateWidget(var58); + this.alignWidget(var58); + if (var58.type == 0) { + WorldMapIcon_0.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var16 >> 16], var58, false); + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2168 == var1.serverPacket) { + class39.method616(class194.field2361); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2220 == var1.serverPacket) { + ModeWhere.friendSystem.method1981(); + field866 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2213 == var1.serverPacket) { + class39.method616(class194.field2359); var1.serverPacket = null; return true; } - Widget var47; if (ServerPacket.field2186 == var1.serverPacket) { - var16 = var3.method5564(); - var5 = var3.method5564(); - var6 = var3.method5621(); - var47 = MusicPatchNode.getWidget(var6); - var47.field2623 = var5 + (var16 << 16); + var16 = var3.readInt(); + if (var16 != field836) { + field836 = var16; + WorldMapLabelSize.method247(); + } + var1.serverPacket = null; return true; } - if (ServerPacket.field2145 == var1.serverPacket) { + if (ServerPacket.field2216 == var1.serverPacket) { + class39.method616(class194.field2354); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2172 == var1.serverPacket) { + Buffer.method5950(); + weight = var3.readShort(); + field870 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2222 == var1.serverPacket) { + var16 = var3.readInt(); + var5 = var3.readInt(); + var21 = VerticalAlignment.getGcDuration(); + PacketBufferNode var57 = UserComparator4.getPacketBufferNode(ClientPacket.field2323, packetWriter.isaacCipher); + var57.packetBuffer.method5744(GameShell.fps); + var57.packetBuffer.method5837(var21); + var57.packetBuffer.method5762(var16); + var57.packetBuffer.method5764(var5); + packetWriter.addNode(var57); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2156 == var1.serverPacket) { + class39.method616(class194.field2355); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2187 == var1.serverPacket) { + var16 = var3.readInt(); + var5 = var3.readUnsignedShort(); + if (var16 < -70000) { + var5 += 32768; + } + + if (var16 >= 0) { + var6 = WorldMapSprite.getWidget(var16); + } else { + var6 = null; + } + + if (var6 != null) { + for (var22 = 0; var22 < var6.itemIds.length; ++var22) { + var6.itemIds[var22] = 0; + var6.itemQuantities[var22] = 0; + } + } + + SoundCache.clearItemContainer(var5); + var22 = var3.readUnsignedShort(); + + for (var29 = 0; var29 < var22; ++var29) { + var30 = var3.readUnsignedByte(); + if (var30 == 255) { + var30 = var3.method5765(); + } + + var31 = var3.method5755(); + if (var6 != null && var29 < var6.itemIds.length) { + var6.itemIds[var29] = var31; + var6.itemQuantities[var29] = var30; + } + + WorldMapSprite.itemContainerSetItem(var5, var29, var31 - 1, var30); + } + + if (var6 != null) { + class234.invalidateWidget(var6); + } + + Buffer.method5950(); + changedItemContainers[++field878 - 1 & 31] = var5 & 32767; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2195 == var1.serverPacket) { + byte[] var37 = new byte[var1.serverPacketLength]; + var3.method5680(var37, 0, var37.length); + Buffer var53 = new Buffer(var37); + var41 = var53.readStringCp1252NullTerminated(); + WorldMapSectionType.openURL(var41, true, false); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2162 == var1.serverPacket) { + class39.method616(class194.field2358); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2181 == var1.serverPacket) { + if (var1.serverPacketLength == 0) { + ClientPreferences.clanChat = null; + } else { + if (ClientPreferences.clanChat == null) { + ClientPreferences.clanChat = new ClanChat(class195.loginType, WorldMapSectionType.client); + } + + ClientPreferences.clanChat.readUpdate(var3); + } + + Frames.method3399(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2165 == var1.serverPacket) { + Player.field638 = var3.method5748(); + class41.field302 = var3.method5748(); + + for (var16 = Player.field638; var16 < Player.field638 + 8; ++var16) { + for (var5 = class41.field302; var5 < class41.field302 + 8; ++var5) { + if (groundItems[TileItemPile.Client_plane][var16][var5] != null) { + groundItems[TileItemPile.Client_plane][var16][var5] = null; + class41.updateItemPile(var16, var5); + } + } + } + + for (PendingSpawn var36 = (PendingSpawn)pendingSpawns.last(); var36 != null; var36 = (PendingSpawn)pendingSpawns.previous()) { + if (var36.x >= Player.field638 && var36.x < Player.field638 + 8 && var36.y >= class41.field302 && var36.y < class41.field302 + 8 && var36.plane == TileItemPile.Client_plane) { + var36.hitpoints = 0; + } + } + + var1.serverPacket = null; + return true; + } + + Widget var50; + if (ServerPacket.field2211 == var1.serverPacket) { + var16 = var3.method5765(); + var50 = WorldMapSprite.getWidget(var16); + + for (var21 = 0; var21 < var50.itemIds.length; ++var21) { + var50.itemIds[var21] = -1; + var50.itemIds[var21] = 0; + } + + class234.invalidateWidget(var50); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2212 == var1.serverPacket) { + class60.updatePlayers(var3, var1.serverPacketLength); + class303.method5525(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2240 == var1.serverPacket) { hintArrowType = var3.readUnsignedByte(); if (hintArrowType == 1) { hintArrowNpcIndex = var3.readUnsignedShort(); @@ -4256,947 +4951,72 @@ public final class Client extends GameShell implements Usernamed { return true; } - if (ServerPacket.field2119 == var1.serverPacket) { - var16 = var3.method5564(); - byte var45 = var3.method5608(); - Varps.Varps_temp[var16] = var45; - if (Varps.Varps_main[var16] != var45) { - Varps.Varps_main[var16] = var45; - } - - class22.changeGameOptions(var16); - field866[++field772 - 1 & 31] = var16; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2125 == var1.serverPacket) { - WorldMapData_1.method816(class194.field2328); - var1.serverPacket = null; - return true; - } - - boolean var60; - if (ServerPacket.field2164 == var1.serverPacket) { - var60 = var3.readBoolean(); - if (var60) { - if (WorldMapRectangle.field222 == null) { - WorldMapRectangle.field222 = new class247(); - } - } else { - WorldMapRectangle.field222 = null; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2146 == var1.serverPacket) { - var16 = var3.readUnsignedShort(); - rootInterface = var16; - this.resizeRoot(false); - class4.Widget_resetModelFrames(var16); - WorldMapSectionType.runWidgetOnLoadListener(rootInterface); - - for (var5 = 0; var5 < 100; ++var5) { - field679[var5] = true; - } - - var1.serverPacket = null; - return true; - } - - Widget var50; - if (ServerPacket.field2179 == var1.serverPacket) { + if (ServerPacket.field2230 == var1.serverPacket) { var16 = var3.readInt(); - var5 = var3.method5613(); - var50 = MusicPatchNode.getWidget(var16); - if (var50.modelType != 1 || var5 != var50.modelId) { - var50.modelType = 1; - var50.modelId = var5; - ItemContainer.invalidateWidget(var50); + var5 = var3.method5755(); + var21 = var5 >> 10 & 31; + var22 = var5 >> 5 & 31; + var29 = var5 & 31; + var30 = (var22 << 11) + (var21 << 19) + (var29 << 3); + Widget var32 = WorldMapSprite.getWidget(var16); + if (var30 != var32.color) { + var32.color = var30; + class234.invalidateWidget(var32); } var1.serverPacket = null; return true; } - if (ServerPacket.field2121 == var1.serverPacket) { - var16 = var3.readUnsignedByte(); - Player.forceDisconnect(var16); - var1.serverPacket = null; - return false; - } - - if (ServerPacket.field2197 == var1.serverPacket) { - WorldMapData_1.method816(class194.field2331); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2200 == var1.serverPacket) { - Huffman.logOut(); - var1.serverPacket = null; - return false; - } - - if (ServerPacket.field2202 == var1.serverPacket) { - rebootTimer = var3.readUnsignedShort() * 30; - field877 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2161 == var1.serverPacket) { - WorldMapData_1.method816(class194.field2329); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2195 == var1.serverPacket) { - class58.method966(); - weight = var3.readShort(); - field877 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2183 == var1.serverPacket) { - WorldMapData_1.method816(class194.field2323); - var1.serverPacket = null; - return true; - } - - int var8; - int var9; - int var10; - if (ServerPacket.field2177 == var1.serverPacket) { + Widget var8; + if (ServerPacket.field2215 == var1.serverPacket) { var16 = var3.readInt(); - var5 = var3.readUnsignedShort(); - if (var16 < -70000) { - var5 += 32768; + var5 = var3.method5765(); + InterfaceParent var40 = (InterfaceParent)interfaceParents.get((long)var5); + var28 = (InterfaceParent)interfaceParents.get((long)var16); + if (var28 != null) { + class41.closeInterface(var28, var40 == null || var28.group != var40.group); } - if (var16 >= 0) { - var50 = MusicPatchNode.getWidget(var16); - } else { - var50 = null; + if (var40 != null) { + var40.remove(); + interfaceParents.put(var40, (long)var16); } - if (var50 != null) { - for (var42 = 0; var42 < var50.itemIds.length; ++var42) { - var50.itemIds[var42] = 0; - var50.itemQuantities[var42] = 0; - } + var8 = WorldMapSprite.getWidget(var5); + if (var8 != null) { + class234.invalidateWidget(var8); } - GrandExchangeOfferOwnWorldComparator.clearItemContainer(var5); - var42 = var3.readUnsignedShort(); - - for (var8 = 0; var8 < var42; ++var8) { - var9 = var3.method5614(); - var10 = var3.method5604(); - if (var10 == 255) { - var10 = var3.method5621(); - } - - if (var50 != null && var8 < var50.itemIds.length) { - var50.itemIds[var8] = var9; - var50.itemQuantities[var8] = var10; - } - - Messages.itemContainerSetItem(var5, var8, var9 - 1, var10); + var8 = WorldMapSprite.getWidget(var16); + if (var8 != null) { + class234.invalidateWidget(var8); + WorldMapIcon_0.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var8.id >>> 16], var8, true); } - if (var50 != null) { - ItemContainer.invalidateWidget(var50); - } - - class58.method966(); - changedItemContainers[++field869 - 1 & 31] = var5 & 32767; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2147 == var1.serverPacket) { - Projectile.friendSystem.method1953(); - field873 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2185 == var1.serverPacket) { - var16 = var3.method5619(); - var5 = var3.method5743(); - var6 = var3.method5743(); - var47 = MusicPatchNode.getWidget(var16); - if (var5 != var47.rawX || var6 != var47.rawY || var47.xAlignment != 0 || var47.yAlignment != 0) { - var47.rawX = var5; - var47.rawY = var6; - var47.xAlignment = 0; - var47.yAlignment = 0; - ItemContainer.invalidateWidget(var47); - this.alignWidget(var47); - if (var47.type == 0) { - MouseHandler.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var16 >> 16], var47, false); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2162 == var1.serverPacket) { - var60 = var3.readUnsignedByte() == 1; - if (var60) { - TilePaint.field1802 = class217.currentTimeMillis() - var3.readLong(); - GrandExchangeEvent.grandExchangeEvents = new GrandExchangeEvents(var3, true); - } else { - GrandExchangeEvent.grandExchangeEvents = null; - } - - field726 = cycleCntr; - var1.serverPacket = null; - return true; - } - - long var12; - long var19; - long var21; - long var23; - String var37; - if (ServerPacket.field2193 == var1.serverPacket) { - var37 = var3.readStringCp1252NullTerminated(); - var19 = var3.readLong(); - var21 = (long)var3.readUnsignedShort(); - var23 = (long)var3.readMedium(); - PlayerType var43 = (PlayerType)GrandExchangeEvent.findEnumerated(InterfaceParent.PlayerType_values(), var3.readUnsignedByte()); - var12 = var23 + (var21 << 32); - boolean var44 = false; - - for (int var15 = 0; var15 < 100; ++var15) { - if (var12 == field846[var15]) { - var44 = true; - break; - } - } - - if (var43.isUser && Projectile.friendSystem.isIgnored(new Username(var37, WorldMapIcon_0.loginType))) { - var44 = true; - } - - if (!var44 && field794 == 0) { - field846[field900] = var12; - field900 = (field900 + 1) % 100; - String var25 = AbstractFont.escapeBrackets(Decimator.method2636(JagexCache.method3577(var3))); - if (var43.modIcon != -1) { - ChatChannel.addChatMessage(9, class1.method21(var43.modIcon) + var37, var25, Buffer.base37DecodeLong(var19)); - } else { - ChatChannel.addChatMessage(9, var37, var25, Buffer.base37DecodeLong(var19)); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2176 == var1.serverPacket) { - var16 = var3.method5564(); - var5 = var3.readInt(); - var6 = var16 >> 10 & 31; - var42 = var16 >> 5 & 31; - var8 = var16 & 31; - var9 = (var42 << 11) + (var6 << 19) + (var8 << 3); - Widget var51 = MusicPatchNode.getWidget(var5); - if (var9 != var51.color) { - var51.color = var9; - ItemContainer.invalidateWidget(var51); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2137 == var1.serverPacket) { - var16 = var3.readInt(); - if (var16 != field762) { - field762 = var16; - class3.method48(); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2184 == var1.serverPacket) { - isCameraLocked = false; - - for (var16 = 0; var16 < 5; ++var16) { - field926[var16] = false; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2143 == var1.serverPacket) { - destinationX = var3.readUnsignedByte(); - if (destinationX == 255) { - destinationX = 0; - } - - destinationY = var3.readUnsignedByte(); - if (destinationY == 255) { - destinationY = 0; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2153 == var1.serverPacket) { - var16 = var3.readInt(); - var5 = var3.readUnsignedShort(); - if (var16 < -70000) { - var5 += 32768; - } - - if (var16 >= 0) { - var50 = MusicPatchNode.getWidget(var16); - } else { - var50 = null; - } - - for (; var3.offset < var1.serverPacketLength; Messages.itemContainerSetItem(var5, var42, var8 - 1, var9)) { - var42 = var3.readUShortSmart(); - var8 = var3.readUnsignedShort(); - var9 = 0; - if (var8 != 0) { - var9 = var3.readUnsignedByte(); - if (var9 == 255) { - var9 = var3.readInt(); - } - } - - if (var50 != null && var42 >= 0 && var42 < var50.itemIds.length) { - var50.itemIds[var42] = var8; - var50.itemQuantities[var42] = var9; - } - } - - if (var50 != null) { - ItemContainer.invalidateWidget(var50); - } - - class58.method966(); - changedItemContainers[++field869 - 1 & 31] = var5 & 32767; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2133 == var1.serverPacket) { - var16 = var3.readInt(); - var27 = var3.readStringCp1252NullTerminated(); - var50 = MusicPatchNode.getWidget(var16); - if (!var27.equals(var50.text)) { - var50.text = var27; - ItemContainer.invalidateWidget(var50); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2171 == var1.serverPacket) { - var16 = var3.method5614(); - if (var16 == 65535) { - var16 = -1; - } - - StudioGame.playSong(var16); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2173 == var1.serverPacket) { - var16 = var3.readMedium(); - var5 = var3.readUnsignedShort(); - if (var5 == 65535) { - var5 = -1; - } - - VerticalAlignment.playSoundJingle(var5, var16); - var1.serverPacket = null; - return true; - } - - Widget var28; - if (ServerPacket.field2168 == var1.serverPacket) { - var16 = var3.method5613(); - var5 = var3.method5619(); - var6 = var3.method5614(); - var42 = var3.readUnsignedShort(); - var28 = MusicPatchNode.getWidget(var5); - if (var42 != var28.modelAngleX || var16 != var28.modelAngleY || var6 != var28.modelZoom) { - var28.modelAngleX = var42; - var28.modelAngleY = var16; - var28.modelZoom = var6; - ItemContainer.invalidateWidget(var28); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2203 == var1.serverPacket) { - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.method5301(var3); - } - - WorldMapData_0.method263(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2155 == var1.serverPacket) { - class58.method966(); - var16 = var3.method5604(); - var5 = var3.method5603(); - var6 = var3.method5619(); - experience[var5] = var6; - currentLevels[var5] = var16; - levels[var5] = 1; - - for (var42 = 0; var42 < 98; ++var42) { - if (var6 >= Skills.Skills_experienceTable[var42]) { - levels[var5] = var42 + 2; - } - } - - changedSkills[++changedSkillsCount - 1 & 31] = var5; - var1.serverPacket = null; - return true; - } - - InterfaceParent var17; - if (ServerPacket.field2182 == var1.serverPacket) { - var16 = var3.method5604(); - var5 = var3.method5613(); - var6 = var3.method5638(); - var17 = (InterfaceParent)interfaceParents.get((long)var6); - if (var17 != null) { - class41.closeInterface(var17, var5 != var17.group); - } - - AbstractWorldMapData.method382(var6, var5, var16); - var1.serverPacket = null; - return true; - } - - String var48; - if (ServerPacket.field2175 == var1.serverPacket) { - byte[] var41 = new byte[var1.serverPacketLength]; - var3.method5516(var41, 0, var41.length); - Buffer var59 = new Buffer(var41); - var48 = var59.readStringCp1252NullTerminated(); - Script.openURL(var48, true, false); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2150 == var1.serverPacket) { - WorldMapData_1.method816(class194.field2330); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2154 == var1.serverPacket) { if (rootInterface != -1) { - class198.runIntfCloseListeners(rootInterface, 0); + Language.runIntfCloseListeners(rootInterface, 1); } var1.serverPacket = null; return true; } - if (ServerPacket.field2172 == var1.serverPacket) { - var3.offset += 28; - if (var3.checkCrc()) { - ModelData0.method3362(var3, var3.offset - 28); - } - + if (ServerPacket.field2231 == var1.serverPacket) { + class39.method616(class194.field2363); var1.serverPacket = null; return true; } - if (ServerPacket.field2152 == var1.serverPacket) { - ApproximateRouteStrategy.method1328(var3.readStringCp1252NullTerminated()); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2141 == var1.serverPacket) { - WorldMapData_1.method816(class194.field2324); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2198 == var1.serverPacket) { - WorldMapData_1.method816(class194.field2326); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2159 == var1.serverPacket) { - World var40 = new World(); - var40.host = var3.readStringCp1252NullTerminated(); - var40.id = var3.readUnsignedShort(); - var5 = var3.readInt(); - var40.properties = var5; - MouseRecorder.updateGameState(45); - var2.close(); - var2 = null; - UserComparator3.changeWorld(var40); - var1.serverPacket = null; - return false; - } - - if (ServerPacket.field2126 == var1.serverPacket) { - var16 = var3.method5743(); - var5 = var3.method5621(); - var50 = MusicPatchNode.getWidget(var5); - if (var16 != var50.sequenceId || var16 == -1) { - var50.sequenceId = var16; - var50.modelFrame = 0; - var50.modelFrameCycle = 0; - ItemContainer.invalidateWidget(var50); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2132 == var1.serverPacket) { - var16 = var3.readUnsignedShort(); - var5 = var3.readUnsignedByte(); - var6 = var3.readUnsignedShort(); - ModelData0.queueSoundEffect(var16, var5, var6); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2158 == var1.serverPacket) { - PlatformInfo.field3959 = var3.method5605(); - GrandExchangeOfferTotalQuantityComparator.field91 = var3.method5605(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2166 == var1.serverPacket) { - isCameraLocked = true; - field925 = var3.readUnsignedByte(); - Strings.field2759 = var3.readUnsignedByte(); - TextureProvider.field1549 = var3.readUnsignedShort(); - Friend.field3626 = var3.readUnsignedByte(); - Players.field1280 = var3.readUnsignedByte(); - if (Players.field1280 >= 100) { - var16 = field925 * 128 + 64; - var5 = Strings.field2759 * 128 + 64; - var6 = class277.getTileHeight(var16, var5, ScriptEvent.Client_plane) - TextureProvider.field1549; - var42 = var16 - WorldMapRectangle.cameraX; - var8 = var6 - GrandExchangeOfferWorldComparator.cameraY; - var9 = var5 - class200.cameraZ; - var10 = (int)Math.sqrt((double)(var42 * var42 + var9 * var9)); - ApproximateRouteStrategy.cameraPitch = (int)(Math.atan2((double)var8, (double)var10) * 325.949D) & 2047; - WorldMapIcon_1.cameraYaw = (int)(Math.atan2((double)var42, (double)var9) * -325.949D) & 2047; - if (ApproximateRouteStrategy.cameraPitch < 128) { - ApproximateRouteStrategy.cameraPitch = 128; - } - - if (ApproximateRouteStrategy.cameraPitch > 383) { - ApproximateRouteStrategy.cameraPitch = 383; - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2139 == var1.serverPacket) { - GameObject.loadRegions(false, var1.packetBuffer); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2140 == var1.serverPacket) { - var16 = var3.method5638(); - var5 = var3.method5613(); - var50 = MusicPatchNode.getWidget(var16); - if (var50.modelType != 2 || var5 != var50.modelId) { - var50.modelType = 2; - var50.modelId = var5; - ItemContainer.invalidateWidget(var50); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2128 == var1.serverPacket) { - for (var16 = 0; var16 < Varps.Varps_main.length; ++var16) { - if (Varps.Varps_temp[var16] != Varps.Varps_main[var16]) { - Varps.Varps_main[var16] = Varps.Varps_temp[var16]; - class22.changeGameOptions(var16); - field866[++field772 - 1 & 31] = var16; - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2130 == var1.serverPacket) { - GameObject.loadRegions(true, var1.packetBuffer); - var1.serverPacket = null; - return true; - } - - boolean var39; - if (ServerPacket.field2196 == var1.serverPacket) { - var16 = var3.method5638(); - var39 = var3.readUnsignedByte() == 1; - var50 = MusicPatchNode.getWidget(var16); - if (var39 != var50.isHidden) { - var50.isHidden = var39; - ItemContainer.invalidateWidget(var50); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2142 == var1.serverPacket) { - var37 = var3.readStringCp1252NullTerminated(); - var27 = AbstractFont.escapeBrackets(Decimator.method2636(JagexCache.method3577(var3))); - Skeleton.addGameMessage(6, var37, var27); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2194 == var1.serverPacket) { - PlatformInfo.field3959 = var3.method5605(); - GrandExchangeOfferTotalQuantityComparator.field91 = var3.readUnsignedByte(); - - while (var3.offset < var1.serverPacketLength) { - var16 = var3.readUnsignedByte(); - class194 var58 = WorldMapSection2.method434()[var16]; - WorldMapData_1.method816(var58); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2131 == var1.serverPacket) { - if (var1.serverPacketLength == 0) { - InterfaceParent.clanChat = null; - } else { - if (InterfaceParent.clanChat == null) { - InterfaceParent.clanChat = new ClanChat(WorldMapIcon_0.loginType, WorldMapSection1.client); - } - - InterfaceParent.clanChat.readUpdate(var3); - } - - WorldMapData_0.method263(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2148 == var1.serverPacket) { - var37 = var3.readStringCp1252NullTerminated(); - var19 = (long)var3.readUnsignedShort(); - var21 = (long)var3.readMedium(); - PlayerType var29 = (PlayerType)GrandExchangeEvent.findEnumerated(InterfaceParent.PlayerType_values(), var3.readUnsignedByte()); - long var30 = (var19 << 32) + var21; - boolean var32 = false; - - for (int var13 = 0; var13 < 100; ++var13) { - if (field846[var13] == var30) { - var32 = true; - break; - } - } - - if (Projectile.friendSystem.isIgnored(new Username(var37, WorldMapIcon_0.loginType))) { - var32 = true; - } - - if (!var32 && field794 == 0) { - field846[field900] = var30; - field900 = (field900 + 1) % 100; - String var33 = AbstractFont.escapeBrackets(Decimator.method2636(JagexCache.method3577(var3))); - byte var14; - if (var29.isPrivileged) { - var14 = 7; - } else { - var14 = 3; - } - - if (var29.modIcon != -1) { - Skeleton.addGameMessage(var14, class1.method21(var29.modIcon) + var37, var33); - } else { - Skeleton.addGameMessage(var14, var37, var33); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2189 == var1.serverPacket) { - var16 = var3.method5614(); - if (var16 == 65535) { - var16 = -1; - } - - var5 = var3.method5619(); - var6 = var3.method5621(); - var47 = MusicPatchNode.getWidget(var6); - ItemDefinition var56; - if (!var47.isIf3) { - if (var16 == -1) { - var47.modelType = 0; - var1.serverPacket = null; - return true; - } - - var56 = AbstractWorldMapData.ItemDefinition_get(var16); - var47.modelType = 4; - var47.modelId = var16; - var47.modelAngleX = var56.xan2d; - var47.modelAngleY = var56.yan2d; - var47.modelZoom = var56.zoom2d * 100 / var5; - ItemContainer.invalidateWidget(var47); - } else { - var47.itemId = var16; - var47.itemQuantity = var5; - var56 = AbstractWorldMapData.ItemDefinition_get(var16); - var47.modelAngleX = var56.xan2d; - var47.modelAngleY = var56.yan2d; - var47.modelAngleZ = var56.zan2d; - var47.modelOffsetX = var56.offsetX2d; - var47.modelOffsetY = var56.offsetY2d; - var47.modelZoom = var56.zoom2d; - if (var56.isStackable == 1) { - var47.itemQuantityMode = 1; - } else { - var47.itemQuantityMode = 2; - } - - if (var47.field2622 > 0) { - var47.modelZoom = var47.modelZoom * 32 / var47.field2622; - } else if (var47.rawWidth > 0) { - var47.modelZoom = var47.modelZoom * 32 / var47.rawWidth; - } - - ItemContainer.invalidateWidget(var47); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2180 == var1.serverPacket) { - GrandExchangeOffer.updateNpcs(false, var3); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2165 == var1.serverPacket) { - class58.method966(); - runEnergy = var3.readUnsignedByte(); - field877 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2192 == var1.serverPacket) { - var37 = var3.readStringCp1252NullTerminated(); - var5 = var3.method5604(); - var6 = var3.method5603(); - if (var6 >= 1 && var6 <= 8) { - if (var37.equalsIgnoreCase("null")) { - var37 = null; - } - - playerMenuActions[var6 - 1] = var37; - playerOptionsPriorities[var6 - 1] = var5 == 0; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2163 == var1.serverPacket) { - UserComparator3.privateChatMode = class219.method4052(var3.readUnsignedByte()); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2149 == var1.serverPacket) { - WorldMapData_1.method816(class194.field2332); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2156 == var1.serverPacket) { - WorldMapData_1.method816(class194.field2327); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2127 == var1.serverPacket) { - minimapState = var3.readUnsignedByte(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2191 == var1.serverPacket) { - var16 = var3.offset + var1.serverPacketLength; - var5 = var3.readUnsignedShort(); - var6 = var3.readUnsignedShort(); - if (var5 != rootInterface) { - rootInterface = var5; - this.resizeRoot(false); - class4.Widget_resetModelFrames(rootInterface); - WorldMapSectionType.runWidgetOnLoadListener(rootInterface); - - for (var42 = 0; var42 < 100; ++var42) { - field679[var42] = true; - } - } - - InterfaceParent var26; - for (; var6-- > 0; var26.field594 = true) { - var42 = var3.readInt(); - var8 = var3.readUnsignedShort(); - var9 = var3.readUnsignedByte(); - var26 = (InterfaceParent)interfaceParents.get((long)var42); - if (var26 != null && var8 != var26.group) { - class41.closeInterface(var26, true); - var26 = null; - } - - if (var26 == null) { - var26 = AbstractWorldMapData.method382(var42, var8, var9); - } - } - - for (var17 = (InterfaceParent)interfaceParents.first(); var17 != null; var17 = (InterfaceParent)interfaceParents.next()) { - if (var17.field594) { - var17.field594 = false; - } else { - class41.closeInterface(var17, true); - } - } - - widgetClickMasks = new NodeHashTable(512); - - while (var3.offset < var16) { - var42 = var3.readInt(); - var8 = var3.readUnsignedShort(); - var9 = var3.readUnsignedShort(); - var10 = var3.readInt(); - - for (int var34 = var8; var34 <= var9; ++var34) { - var12 = (long)var34 + ((long)var42 << 32); - widgetClickMasks.put(new IntegerNode(var10), var12); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2188 == var1.serverPacket) { - var16 = var3.readInt(); - InterfaceParent var57 = (InterfaceParent)interfaceParents.get((long)var16); - if (var57 != null) { - class41.closeInterface(var57, true); - } - - if (meslayerContinueWidget != null) { - ItemContainer.invalidateWidget(meslayerContinueWidget); - meslayerContinueWidget = null; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2134 == var1.serverPacket) { - GrandExchangeOfferTotalQuantityComparator.field91 = var3.readUnsignedByte(); - PlatformInfo.field3959 = var3.method5605(); - - for (var16 = GrandExchangeOfferTotalQuantityComparator.field91; var16 < GrandExchangeOfferTotalQuantityComparator.field91 + 8; ++var16) { - for (var5 = PlatformInfo.field3959; var5 < PlatformInfo.field3959 + 8; ++var5) { - if (groundItems[ScriptEvent.Client_plane][var16][var5] != null) { - groundItems[ScriptEvent.Client_plane][var16][var5] = null; - World.updateItemPile(var16, var5); - } - } - } - - for (PendingSpawn var38 = (PendingSpawn)pendingSpawns.last(); var38 != null; var38 = (PendingSpawn)pendingSpawns.previous()) { - if (var38.x >= GrandExchangeOfferTotalQuantityComparator.field91 && var38.x < GrandExchangeOfferTotalQuantityComparator.field91 + 8 && var38.y >= PlatformInfo.field3959 && var38.y < PlatformInfo.field3959 + 8 && var38.plane == ScriptEvent.Client_plane) { - var38.hitpoints = 0; - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2169 == var1.serverPacket) { - for (var16 = 0; var16 < VarpDefinition.VarpDefinition_fileCount; ++var16) { - VarpDefinition var54 = class228.VarpDefinition_get(var16); - if (var54 != null) { - Varps.Varps_temp[var16] = 0; - Varps.Varps_main[var16] = 0; - } - } - - class58.method966(); - field772 += 32; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2136 == var1.serverPacket) { - var16 = var3.readUnsignedByte(); - class22.method256(var16); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2178 == var1.serverPacket) { - var16 = var3.method5564(); - var5 = var3.method5619(); - var50 = MusicPatchNode.getWidget(var5); - if (var50 != null && var50.type == 0) { - if (var16 > var50.scrollHeight - var50.height) { - var16 = var50.scrollHeight - var50.height; - } - - if (var16 < 0) { - var16 = 0; - } - - if (var16 != var50.scrollY) { - var50.scrollY = var16; - ItemContainer.invalidateWidget(var50); - } + if (ServerPacket.field2226 == var1.serverPacket) { + var16 = var3.method5767(); + var5 = var3.readShort(); + var6 = WorldMapSprite.getWidget(var16); + if (var5 != var6.sequenceId || var5 == -1) { + var6.sequenceId = var5; + var6.modelFrame = 0; + var6.modelFrameCycle = 0; + class234.invalidateWidget(var6); } var1.serverPacket = null; @@ -5204,148 +5024,128 @@ public final class Client extends GameShell implements Usernamed { } if (ServerPacket.field2190 == var1.serverPacket) { - GrandExchangeOfferTotalQuantityComparator.readReflectionCheck(var3, var1.serverPacketLength); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2118 == var1.serverPacket) { - var16 = var3.method5564(); - ScriptFrame.method1242(var16); - changedItemContainers[++field869 - 1 & 31] = var16 & 32767; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2120 == var1.serverPacket) { - GrandExchangeOffer.updateNpcs(true, var3); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2122 == var1.serverPacket) { var16 = var3.readInt(); - var5 = var3.readInt(); - var6 = RouteStrategy.getGcDuration(); - PacketBufferNode var46 = FaceNormal.getPacketBufferNode(ClientPacket.field2218, packetWriter.isaacCipher); - var46.packetBuffer.writeShortLE(var16); - var46.packetBuffer.method5617(var5); - var46.packetBuffer.method5727(GameShell.fps); - var46.packetBuffer.method5727(var6); - packetWriter.addNode(var46); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2138 == var1.serverPacket) { - Projectile.friendSystem.ignoreList.read(var3, var1.serverPacketLength); - FontName.FriendSystem_invalidateIgnoreds(); - field873 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2174 == var1.serverPacket) { - class4.updatePlayers(var3, var1.serverPacketLength); - Login.method2177(); - var1.serverPacket = null; - return true; - } - - Widget var53; - if (ServerPacket.field2181 == var1.serverPacket) { - var16 = var3.method5619(); - var53 = MusicPatchNode.getWidget(var16); - - for (var6 = 0; var6 < var53.itemIds.length; ++var6) { - var53.itemIds[var6] = -1; - var53.itemIds[var6] = 0; + InterfaceParent var52 = (InterfaceParent)interfaceParents.get((long)var16); + if (var52 != null) { + class41.closeInterface(var52, true); } - ItemContainer.invalidateWidget(var53); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2201 == var1.serverPacket) { - var16 = var3.method5564(); - if (var16 == 65535) { - var16 = -1; - } - - var5 = var3.method5638(); - var6 = var3.readInt(); - var42 = var3.method5614(); - if (var42 == 65535) { - var42 = -1; - } - - for (var8 = var16; var8 <= var42; ++var8) { - var23 = (long)var8 + ((long)var5 << 32); - Node var11 = widgetClickMasks.get(var23); - if (var11 != null) { - var11.remove(); - } - - widgetClickMasks.put(new IntegerNode(var6), var23); + if (meslayerContinueWidget != null) { + class234.invalidateWidget(meslayerContinueWidget); + meslayerContinueWidget = null; } var1.serverPacket = null; return true; } - if (ServerPacket.field2123 == var1.serverPacket) { - var16 = var3.method5621(); - var53 = MusicPatchNode.getWidget(var16); - var53.modelType = 3; - var53.modelId = ByteArrayPool.localPlayer.appearance.getChatHeadId(); - ItemContainer.invalidateWidget(var53); + if (ServerPacket.field2185 == var1.serverPacket) { + byte var49 = var3.method5751(); + var5 = var3.readUnsignedShort(); + Varps.Varps_temp[var5] = var49; + if (Varps.Varps_main[var5] != var49) { + Varps.Varps_main[var5] = var49; + } + + WorldMapSection0.changeGameOptions(var5); + field859[++field860 - 1 & 31] = var5; var1.serverPacket = null; return true; } - if (ServerPacket.field2167 == var1.serverPacket) { - var37 = var3.readStringCp1252NullTerminated(); - Object[] var52 = new Object[var37.length() + 1]; + if (ServerPacket.field2219 == var1.serverPacket) { + var16 = var3.method5757(); + rootInterface = var16; + this.resizeRoot(false); + WorldMapSection3.Widget_resetModelFrames(var16); + UserComparator4.runWidgetOnLoadListener(rootInterface); - for (var6 = var37.length() - 1; var6 >= 0; --var6) { - if (var37.charAt(var6) == 's') { - var52[var6 + 1] = var3.readStringCp1252NullTerminated(); - } else { - var52[var6 + 1] = new Integer(var3.readInt()); - } - } - - var52[0] = new Integer(var3.readInt()); - ScriptEvent var49 = new ScriptEvent(); - var49.args = var52; - GrandExchangeOfferOwnWorldComparator.runScriptEvent(var49); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2157 == var1.serverPacket) { - var16 = var3.readUShortSmart(); - var39 = var3.readUnsignedByte() == 1; - var48 = ""; - boolean var7 = false; - if (var39) { - var48 = var3.readStringCp1252NullTerminated(); - if (Projectile.friendSystem.isIgnored(new Username(var48, WorldMapIcon_0.loginType))) { - var7 = true; - } - } - - String var55 = var3.readStringCp1252NullTerminated(); - if (!var7) { - Skeleton.addGameMessage(var16, var48, var55); + for (var5 = 0; var5 < 100; ++var5) { + field813[var5] = true; } var1.serverPacket = null; return true; } - if (ServerPacket.field2151 == var1.serverPacket) { + if (ServerPacket.field2188 == var1.serverPacket) { + var16 = var3.readUnsignedByte(); + class25.method245(var16); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2169 == var1.serverPacket) { + class41.field302 = var3.method5936(); + Player.field638 = var3.readUnsignedByte(); + + while (var3.offset < var1.serverPacketLength) { + var16 = var3.readUnsignedByte(); + class194 var51 = GameBuild.method4291()[var16]; + class39.method616(var51); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2173 == var1.serverPacket) { + UserComparator2.readReflectionCheck(var3, var1.serverPacketLength); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2199 == var1.serverPacket) { + UserComparator10.method3522(var3.readStringCp1252NullTerminated()); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2184 == var1.serverPacket) { + class39.method616(class194.field2357); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2221 == var1.serverPacket) { + publicChatMode = var3.readUnsignedByte(); + tradeChatMode = var3.method5746(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2176 == var1.serverPacket) { + class39.method616(class194.field2353); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2210 == var1.serverPacket) { + var48 = var3.method5746() == 1; + var5 = var3.method5765(); + var6 = WorldMapSprite.getWidget(var5); + if (var48 != var6.isHidden) { + var6.isHidden = var48; + class234.invalidateWidget(var6); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2159 == var1.serverPacket) { + minimapState = var3.readUnsignedByte(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2164 == var1.serverPacket) { + class39.method616(class194.field2360); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2227 == var1.serverPacket) { for (var16 = 0; var16 < players.length; ++var16) { if (players[var16] != null) { players[var16].sequence = -1; @@ -5362,325 +5162,435 @@ public final class Client extends GameShell implements Usernamed { return true; } - if (ServerPacket.field2170 == var1.serverPacket) { - var16 = var3.readUnsignedByte(); - if (var3.readUnsignedByte() == 0) { - grandExchangeOffers[var16] = new GrandExchangeOffer(); - var3.offset += 18; - } else { - --var3.offset; - grandExchangeOffers[var16] = new GrandExchangeOffer(var3, false); + if (ServerPacket.field2191 == var1.serverPacket) { + destinationX = var3.readUnsignedByte(); + if (destinationX == 255) { + destinationX = 0; + } + + destinationY = var3.readUnsignedByte(); + if (destinationY == 255) { + destinationY = 0; } - field774 = cycleCntr; var1.serverPacket = null; return true; } - if (ServerPacket.field2124 == var1.serverPacket) { - var16 = var3.method5638(); - var5 = var3.readInt(); - InterfaceParent var18 = (InterfaceParent)interfaceParents.get((long)var5); - var17 = (InterfaceParent)interfaceParents.get((long)var16); - if (var17 != null) { - class41.closeInterface(var17, var18 == null || var18.group != var17.group); - } - - if (var18 != null) { - var18.remove(); - interfaceParents.put(var18, (long)var16); - } - - var28 = MusicPatchNode.getWidget(var5); - if (var28 != null) { - ItemContainer.invalidateWidget(var28); - } - - var28 = MusicPatchNode.getWidget(var16); - if (var28 != null) { - ItemContainer.invalidateWidget(var28); - MouseHandler.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var28.id >>> 16], var28, true); - } - + if (ServerPacket.field2225 == var1.serverPacket) { if (rootInterface != -1) { - class198.runIntfCloseListeners(rootInterface, 1); + Language.runIntfCloseListeners(rootInterface, 0); } var1.serverPacket = null; return true; } - WorldMapDecorationType.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * -1540694469 * 706104051 : -1) + "," + (var1.field1329 != null ? var1.field1329.id * -1540694469 * 706104051 : -1) + "," + (var1.field1339 != null ? var1.field1339.id * -1540694469 * 706104051 : -1) + "," + var1.serverPacketLength, (Throwable)null); - Huffman.logOut(); - } catch (IOException var35) { - VertexNormal.method3093(); - } catch (Exception var36) { - var27 = "" + (var1.serverPacket != null ? var1.serverPacket.id * -1540694469 * 706104051 : -1) + "," + (var1.field1329 != null ? var1.field1329.id * -1540694469 * 706104051 : -1) + "," + (var1.field1339 != null ? var1.field1339.id * -1540694469 * 706104051 : -1) + "," + var1.serverPacketLength + "," + (ByteArrayPool.localPlayer.pathX[0] + class69.baseX) + "," + (ByteArrayPool.localPlayer.pathY[0] + class89.baseY) + ","; + if (ServerPacket.field2183 == var1.serverPacket) { + var3.offset += 28; + if (var3.checkCrc()) { + GrandExchangeOfferNameComparator.method214(var3, var3.offset - 28); + } - for (var6 = 0; var6 < var1.serverPacketLength && var6 < 50; ++var6) { - var27 = var27 + var3.array[var6] + ","; + var1.serverPacket = null; + return true; } - WorldMapDecorationType.RunException_sendStackTrace(var27, var36); - Huffman.logOut(); + if (ServerPacket.field2208 == var1.serverPacket) { + var16 = var3.method5766(); + var20 = var3.readStringCp1252NullTerminated(); + var6 = WorldMapSprite.getWidget(var16); + if (!var20.equals(var6.text)) { + var6.text = var20; + class234.invalidateWidget(var6); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2207 == var1.serverPacket) { + var16 = var3.readUnsignedShort(); + var5 = var3.method5867(); + var21 = var3.method5867(); + var22 = var3.method5767(); + var8 = WorldMapSprite.getWidget(var22); + if (var5 != var8.modelAngleX || var21 != var8.modelAngleY || var16 != var8.modelZoom) { + var8.modelAngleX = var5; + var8.modelAngleY = var21; + var8.modelZoom = var16; + class234.invalidateWidget(var8); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2233 == var1.serverPacket) { + var48 = var3.readUnsignedByte() == 1; + if (var48) { + GraphicsObject.field1139 = MilliClock.currentTimeMillis() - var3.readLong(); + WorldMapIcon_0.grandExchangeEvents = new GrandExchangeEvents(var3, true); + } else { + WorldMapIcon_0.grandExchangeEvents = null; + } + + field869 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2170 == var1.serverPacket) { + Player.field638 = var3.method5936(); + class41.field302 = var3.method5746(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2236 == var1.serverPacket) { + class2.updateNpcs(false, var3); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2202 == var1.serverPacket) { + isCameraLocked = true; + class204.field2420 = var3.readUnsignedByte(); + WorldMapManager.field348 = var3.readUnsignedByte(); + WorldMapLabel.field275 = var3.readUnsignedShort(); + class25.field122 = var3.readUnsignedByte(); + ScriptEvent.field604 = var3.readUnsignedByte(); + if (ScriptEvent.field604 >= 100) { + MouseHandler.cameraX = class204.field2420 * 128 + 64; + ObjectSound.cameraZ = WorldMapManager.field348 * 128 + 64; + WorldMapSection3.cameraY = Language.getTileHeight(MouseHandler.cameraX, ObjectSound.cameraZ, TileItemPile.Client_plane) - WorldMapLabel.field275; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2197 == var1.serverPacket) { + var16 = var3.method5766(); + var50 = WorldMapSprite.getWidget(var16); + var50.modelType = 3; + var50.modelId = class60.localPlayer.appearance.getChatHeadId(); + class234.invalidateWidget(var50); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2177 == var1.serverPacket) { + var16 = var3.readInt(); + var5 = var3.readUnsignedShort(); + if (var16 < -70000) { + var5 += 32768; + } + + if (var16 >= 0) { + var6 = WorldMapSprite.getWidget(var16); + } else { + var6 = null; + } + + for (; var3.offset < var1.serverPacketLength; WorldMapSprite.itemContainerSetItem(var5, var22, var29 - 1, var30)) { + var22 = var3.readUShortSmart(); + var29 = var3.readUnsignedShort(); + var30 = 0; + if (var29 != 0) { + var30 = var3.readUnsignedByte(); + if (var30 == 255) { + var30 = var3.readInt(); + } + } + + if (var6 != null && var22 >= 0 && var22 < var6.itemIds.length) { + var6.itemIds[var22] = var29; + var6.itemQuantities[var22] = var30; + } + } + + if (var6 != null) { + class234.invalidateWidget(var6); + } + + Buffer.method5950(); + changedItemContainers[++field878 - 1 & 31] = var5 & 32767; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2189 == var1.serverPacket) { + class8.loadRegions(false, var1.packetBuffer); + var1.serverPacket = null; + return true; + } + + class197.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * -343660333 * -1993969829 : -1) + "," + (var1.field1351 != null ? var1.field1351.id * -343660333 * -1993969829 : -1) + "," + (var1.field1342 != null ? var1.field1342.id * -343660333 * -1993969829 : -1) + "," + var1.serverPacketLength, (Throwable)null); + MouseRecorder.logOut(); + } catch (IOException var34) { + CollisionMap.method3707(); + } catch (Exception var35) { + var20 = "" + (var1.serverPacket != null ? var1.serverPacket.id * -343660333 * -1993969829 : -1) + "," + (var1.field1351 != null ? var1.field1351.id * -343660333 * -1993969829 : -1) + "," + (var1.field1342 != null ? var1.field1342.id * -343660333 * -1993969829 : -1) + "," + var1.serverPacketLength + "," + (class60.localPlayer.pathX[0] + class182.baseX) + "," + (class60.localPlayer.pathY[0] + SecureRandomFuture.baseY) + ","; + + for (var21 = 0; var21 < var1.serverPacketLength && var21 < 50; ++var21) { + var20 = var20 + var3.array[var21] + ","; + } + + class197.RunException_sendStackTrace(var20, var35); + MouseRecorder.logOut(); } return true; } } - @ObfuscatedName("ho") + @ObfuscatedName("hr") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "93" + signature = "(I)V", + garbageValue = "-302072154" ) @Export("menu") final void menu() { - class69.method1275(); - if (class236.dragInventoryWidget == null) { + boolean var1 = false; + + int var2; + int var5; + while (!var1) { + var1 = true; + + for (var2 = 0; var2 < menuOptionsCount - 1; ++var2) { + if (menuOpcodes[var2] < 1000 && menuOpcodes[var2 + 1] > 1000) { + String 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 (KeyHandler.dragInventoryWidget == null) { if (clickedWidget == null) { - int var2; - int var4; - int var5; + int var14 = MouseHandler.MouseHandler_lastButton; + int var8; int var9; - int var10; - label303: { - int var1 = MouseHandler.MouseHandler_lastButton; - int var3; - int var6; - int var8; - if (isMenuOpen) { - int var19; - if (var1 != 1 && (class217.mouseCam || var1 != 4)) { - var2 = MouseHandler.MouseHandler_x; - var3 = MouseHandler.MouseHandler_y; - if (var2 < WorldMapDecoration.menuX - 10 || var2 > WorldMapScaleHandler.menuWidth + WorldMapDecoration.menuX + 10 || var3 < PacketBufferNode.menuY - 10 || var3 > WorldMapData_1.menuHeight + PacketBufferNode.menuY + 10) { - isMenuOpen = false; - var4 = WorldMapDecoration.menuX; - var5 = PacketBufferNode.menuY; - var6 = WorldMapScaleHandler.menuWidth; - var19 = WorldMapData_1.menuHeight; - - for (var8 = 0; var8 < rootWidgetCount; ++var8) { - if (rootWidgetWidths[var8] + rootWidgetXs[var8] > var4 && rootWidgetXs[var8] < var6 + var4 && rootWidgetHeights[var8] + rootWidgetYs[var8] > var5 && rootWidgetYs[var8] < var19 + var5) { - field679[var8] = true; - } - } - } - } - - if (var1 == 1 || !class217.mouseCam && var1 == 4) { - var2 = WorldMapDecoration.menuX; - var3 = PacketBufferNode.menuY; - var4 = WorldMapScaleHandler.menuWidth; - var5 = MouseHandler.MouseHandler_lastPressedX; - var6 = MouseHandler.MouseHandler_lastPressedY; - var19 = -1; - - for (var8 = 0; var8 < menuOptionsCount; ++var8) { - var9 = var3 + (menuOptionsCount - 1 - var8) * 15 + 31; - if (var5 > var2 && var5 < var4 + var2 && var6 > var9 - 13 && var6 < var9 + 3) { - var19 = var8; - } - } - - int var11; - if (var19 != -1 && var19 >= 0) { - var8 = menuArguments1[var19]; - var9 = menuArguments2[var19]; - var10 = menuOpcodes[var19]; - var11 = menuIdentifiers[var19]; - String var18 = menuActions[var19]; - String var13 = menuTargets[var19]; - AbstractByteArrayCopier.menuAction(var8, var9, var10, var11, var18, var13, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); - } - + int var11; + int var12; + if (isMenuOpen) { + if (var14 != 1 && (ArchiveLoader.mouseCam || var14 != 4)) { + var2 = MouseHandler.MouseHandler_x; + var11 = MouseHandler.MouseHandler_y; + if (var2 < WorldMapRectangle.menuX - 10 || var2 > class69.menuWidth + WorldMapRectangle.menuX + 10 || var11 < Frames.menuY - 10 || var11 > Frames.menuY + ApproximateRouteStrategy.menuHeight + 10) { isMenuOpen = false; - var8 = WorldMapDecoration.menuX; - var9 = PacketBufferNode.menuY; - var10 = WorldMapScaleHandler.menuWidth; - var11 = WorldMapData_1.menuHeight; - - for (int var12 = 0; var12 < rootWidgetCount; ++var12) { - if (rootWidgetWidths[var12] + rootWidgetXs[var12] > var8 && rootWidgetXs[var12] < var8 + var10 && rootWidgetHeights[var12] + rootWidgetYs[var12] > var9 && rootWidgetYs[var12] < var11 + var9) { - field679[var12] = true; - } - } - } - } else { - var2 = AbstractWorldMapData.method381(); - if ((var1 == 1 || !class217.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 = MusicPatchNode.getWidget(var5); - var8 = ScriptEvent.getWidgetClickMask(var14); - boolean var7 = (var8 >> 28 & 1) != 0; - if (var7) { - break label303; - } - - Object var10000 = null; - if (MilliClock.method3560(ScriptEvent.getWidgetClickMask(var14))) { - break label303; - } - } - } - - if ((var1 == 1 || !class217.mouseCam && var1 == 4) && this.shouldLeftClickOpenMenu()) { - var1 = 2; - } - - if ((var1 == 1 || !class217.mouseCam && var1 == 4) && menuOptionsCount > 0 && var2 >= 0) { - var3 = menuArguments1[var2]; - var4 = menuArguments2[var2]; - var5 = menuOpcodes[var2]; - var6 = menuIdentifiers[var2]; - String var16 = menuActions[var2]; - String var17 = menuTargets[var2]; - AbstractByteArrayCopier.menuAction(var3, var4, var5, var6, var16, var17, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); - } - - if (var1 == 2 && menuOptionsCount > 0) { - this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); + class1.method7(WorldMapRectangle.menuX, Frames.menuY, class69.menuWidth, ApproximateRouteStrategy.menuHeight); } } + if (var14 == 1 || !ArchiveLoader.mouseCam && var14 == 4) { + var2 = WorldMapRectangle.menuX; + var11 = Frames.menuY; + var12 = class69.menuWidth; + var5 = MouseHandler.MouseHandler_lastPressedX; + int var15 = MouseHandler.MouseHandler_lastPressedY; + int var16 = -1; + + for (var8 = 0; var8 < menuOptionsCount; ++var8) { + var9 = (menuOptionsCount - 1 - var8) * 15 + var11 + 31; + if (var5 > var2 && var5 < var12 + var2 && var15 > var9 - 13 && var15 < var9 + 3) { + var16 = var8; + } + } + + if (var16 != -1) { + GrandExchangeEvent.method155(var16); + } + + isMenuOpen = false; + class1.method7(WorldMapRectangle.menuX, Frames.menuY, class69.menuWidth, ApproximateRouteStrategy.menuHeight); + } + } else { + label281: { + var2 = UrlRequester.method3421(); + if ((var14 == 1 || !ArchiveLoader.mouseCam && var14 == 4) && var2 >= 0) { + var11 = menuOpcodes[var2]; + if (var11 == 39 || var11 == 40 || var11 == 41 || var11 == 42 || var11 == 43 || var11 == 33 || var11 == 34 || var11 == 35 || var11 == 36 || var11 == 37 || var11 == 38 || var11 == 1005) { + var12 = menuArguments1[var2]; + var5 = menuArguments2[var2]; + Widget var13 = WorldMapSprite.getWidget(var5); + var8 = KeyHandler.getWidgetClickMask(var13); + boolean var7 = (var8 >> 28 & 1) != 0; + if (var7) { + break label281; + } + + Object var10000 = null; + if (Projectile.method2249(KeyHandler.getWidgetClickMask(var13))) { + break label281; + } + } + } + + if ((var14 == 1 || !ArchiveLoader.mouseCam && var14 == 4) && this.shouldLeftClickOpenMenu()) { + var14 = 2; + } + + if ((var14 == 1 || !ArchiveLoader.mouseCam && var14 == 4) && menuOptionsCount > 0) { + GrandExchangeEvent.method155(var2); + } + + if (var14 == 2 && menuOptionsCount > 0) { + this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); + } + + return; + } + + if (KeyHandler.dragInventoryWidget != null && !field785 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { + var9 = draggedWidgetX; + int var10 = draggedWidgetY; + SecureRandomCallable.method1205(class169.tempMenuAction, var9, var10); + class169.tempMenuAction = null; + } + + field785 = false; + itemDragDuration = 0; + if (KeyHandler.dragInventoryWidget != null) { + class234.invalidateWidget(KeyHandler.dragInventoryWidget); + } + + KeyHandler.dragInventoryWidget = WorldMapSprite.getWidget(var5); + dragItemSlotSource = var12; + draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; + draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; + if (var2 >= 0) { + WorldMapSection1.method648(var2); + } + + class234.invalidateWidget(KeyHandler.dragInventoryWidget); return; } - if (class236.dragInventoryWidget != null && !field887 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { - var9 = draggedWidgetX; - var10 = draggedWidgetY; - MenuAction var15 = AbstractWorldMapIcon.tempMenuAction; - AbstractByteArrayCopier.menuAction(var15.param0, var15.param1, var15.opcode, var15.identifier, var15.action, var15.action, var9, var10); - AbstractWorldMapIcon.tempMenuAction = null; - } - - field887 = false; - itemDragDuration = 0; - if (class236.dragInventoryWidget != null) { - ItemContainer.invalidateWidget(class236.dragInventoryWidget); - } - - class236.dragInventoryWidget = MusicPatchNode.getWidget(var5); - dragItemSlotSource = var4; - draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; - draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; - if (var2 >= 0) { - AbstractWorldMapIcon.tempMenuAction = new MenuAction(); - AbstractWorldMapIcon.tempMenuAction.param0 = menuArguments1[var2]; - AbstractWorldMapIcon.tempMenuAction.param1 = menuArguments2[var2]; - AbstractWorldMapIcon.tempMenuAction.opcode = menuOpcodes[var2]; - AbstractWorldMapIcon.tempMenuAction.identifier = menuIdentifiers[var2]; - AbstractWorldMapIcon.tempMenuAction.action = menuActions[var2]; - } - - ItemContainer.invalidateWidget(class236.dragInventoryWidget); } } } - @ObfuscatedName("hr") + @ObfuscatedName("hh") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "1329547181" + garbageValue = "-1243315480" ) @Export("shouldLeftClickOpenMenu") final boolean shouldLeftClickOpenMenu() { - int var1 = AbstractWorldMapData.method381(); - return (leftClickOpensMenu == 1 && menuOptionsCount > 2 || class9.method121(var1)) && !menuShiftClick[var1]; + int var1 = UrlRequester.method3421(); + return (leftClickOpensMenu == 1 && menuOptionsCount > 2 || class7.method94(var1)) && !menuShiftClick[var1]; } - @ObfuscatedName("hv") + @ObfuscatedName("ht") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "1654431956" + signature = "(IIB)V", + garbageValue = "4" ) @Export("openMenu") final void openMenu(int var1, int var2) { - MusicPatchNode.method3922(var1, var2); - GrandExchangeOfferWorldComparator.scene.menuOpen(ScriptEvent.Client_plane, var1, var2, false); + WorldMapEvent.method840(var1, var2); + UserComparator3.scene.menuOpen(TileItemPile.Client_plane, var1, var2, false); isMenuOpen = true; } - @ObfuscatedName("ib") + @ObfuscatedName("ip") @ObfuscatedSignature( - signature = "(ZB)V", - garbageValue = "0" + signature = "(ZI)V", + garbageValue = "-558702165" ) @Export("resizeRoot") final void resizeRoot(boolean var1) { int var2 = rootInterface; - int var3 = WorldMapLabel.canvasWidth; - int var4 = Varps.canvasHeight; - if (LoginScreenAnimation.loadInterface(var2)) { - InterfaceParent.resizeInterface(Widget.Widget_interfaceComponents[var2], -1, var3, var4, var1); + int var3 = Varcs.canvasWidth; + int var4 = class52.canvasHeight; + if (UserComparator4.loadInterface(var2)) { + GrandExchangeOfferUnitPriceComparator.resizeInterface(Widget.Widget_interfaceComponents[var2], -1, var3, var4, var1); } } - @ObfuscatedName("id") + @ObfuscatedName("ig") @ObfuscatedSignature( - signature = "(Lhe;I)V", - garbageValue = "-159825150" + signature = "(Lhd;I)V", + garbageValue = "-985582804" ) @Export("alignWidget") void alignWidget(Widget var1) { - Widget var2 = var1.parentId == -1 ? null : MusicPatchNode.getWidget(var1.parentId); + Widget var2 = var1.parentId == -1 ? null : WorldMapSprite.getWidget(var1.parentId); int var3; int var4; if (var2 == null) { - var3 = WorldMapLabel.canvasWidth; - var4 = Varps.canvasHeight; + var3 = Varcs.canvasWidth; + var4 = class52.canvasHeight; } else { var3 = var2.width; var4 = var2.height; } - WorldMapAreaData.alignWidgetSize(var1, var3, var4, false); - WorldMapLabelSize.alignWidgetPosition(var1, var3, var4); + UserComparator3.alignWidgetSize(var1, var3, var4, false); + WorldMapLabel.alignWidgetPosition(var1, var3, var4); } @ObfuscatedName("jz") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "22074" + signature = "(I)V", + garbageValue = "1745197570" ) - final void method1420() { - ItemContainer.invalidateWidget(clickedWidget); - ++MilliClock.widgetDragDuration; - if (field861 && field732) { + final void method1372() { + class234.invalidateWidget(clickedWidget); + ++GrandExchangeOfferAgeComparator.widgetDragDuration; + if (field854 && field692) { int var1 = MouseHandler.MouseHandler_x; int var2 = MouseHandler.MouseHandler_y; var1 -= widgetClickX; var2 -= widgetClickY; - if (var1 < field859) { - var1 = field859; + if (var1 < field852) { + var1 = field852; } - if (var1 + clickedWidget.width > field859 + clickedWidgetParent.width) { - var1 = field859 + clickedWidgetParent.width - clickedWidget.width; + if (var1 + clickedWidget.width > field852 + clickedWidgetParent.width) { + var1 = field852 + clickedWidgetParent.width - clickedWidget.width; } - if (var2 < field881) { - var2 = field881; + if (var2 < field853) { + var2 = field853; } - if (var2 + clickedWidget.height > field881 + clickedWidgetParent.height) { - var2 = field881 + clickedWidgetParent.height - clickedWidget.height; + if (var2 + clickedWidget.height > field853 + clickedWidgetParent.height) { + var2 = field853 + clickedWidgetParent.height - clickedWidget.height; } - int var3 = var1 - field834; - int var4 = var2 - field863; + int var3 = var1 - field855; + int var4 = var2 - field856; int var5 = clickedWidget.dragZoneSize; - if (MilliClock.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { + if (GrandExchangeOfferAgeComparator.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { isDraggingWidget = true; } - int var6 = var1 - field859 + clickedWidgetParent.scrollX; - int var7 = var2 - field881 + clickedWidgetParent.scrollY; + int var6 = var1 - field852 + clickedWidgetParent.scrollX; + int var7 = var2 - field853 + clickedWidgetParent.scrollY; ScriptEvent var8; if (clickedWidget.onDrag != null && isDraggingWidget) { var8 = new ScriptEvent(); @@ -5688,7 +5598,7 @@ public final class Client extends GameShell implements Usernamed { var8.mouseX = var6; var8.mouseY = var7; var8.args = clickedWidget.onDrag; - GrandExchangeOfferOwnWorldComparator.runScriptEvent(var8); + InterfaceParent.runScriptEvent(var8); } if (MouseHandler.MouseHandler_currentButton == 0) { @@ -5700,58 +5610,166 @@ public final class Client extends GameShell implements Usernamed { var8.mouseY = var7; var8.dragTarget = draggedOnWidget; var8.args = clickedWidget.onDragComplete; - GrandExchangeOfferOwnWorldComparator.runScriptEvent(var8); + InterfaceParent.runScriptEvent(var8); } - if (draggedOnWidget != null && GrandExchangeOfferTotalQuantityComparator.method181(clickedWidget) != null) { - PacketBufferNode var12 = FaceNormal.getPacketBufferNode(ClientPacket.field2234, packetWriter.isaacCipher); - var12.packetBuffer.method5617(draggedOnWidget.id); - var12.packetBuffer.method5610(draggedOnWidget.childIndex); - var12.packetBuffer.writeShortLE(clickedWidget.id); - var12.packetBuffer.method5609(draggedOnWidget.itemId); - var12.packetBuffer.method5609(clickedWidget.childIndex); - var12.packetBuffer.method5609(clickedWidget.itemId); - packetWriter.addNode(var12); + if (draggedOnWidget != null && FriendSystem.method1994(clickedWidget) != null) { + PacketBufferNode var9 = UserComparator4.getPacketBufferNode(ClientPacket.field2299, packetWriter.isaacCipher); + var9.packetBuffer.writeShort(draggedOnWidget.itemId); + var9.packetBuffer.method5753(draggedOnWidget.childIndex); + var9.packetBuffer.method5898(clickedWidget.itemId); + var9.packetBuffer.method5752(clickedWidget.childIndex); + var9.packetBuffer.method5764(clickedWidget.id); + var9.packetBuffer.writeShortLE(draggedOnWidget.id); + packetWriter.addNode(var9); } } else if (this.shouldLeftClickOpenMenu()) { - this.openMenu(field834 + widgetClickX, widgetClickY + field863); + this.openMenu(field855 + widgetClickX, field856 + widgetClickY); } else if (menuOptionsCount > 0) { - int var11 = field834 + widgetClickX; - int var9 = widgetClickY + field863; - MenuAction var10 = AbstractWorldMapIcon.tempMenuAction; - AbstractByteArrayCopier.menuAction(var10.param0, var10.param1, var10.opcode, var10.identifier, var10.action, var10.action, var11, var9); - AbstractWorldMapIcon.tempMenuAction = null; + GrandExchangeOffer.method189(field855 + widgetClickX, field856 + widgetClickY); } clickedWidget = null; } } else { - if (MilliClock.widgetDragDuration > 1) { + if (GrandExchangeOfferAgeComparator.widgetDragDuration > 1) { clickedWidget = null; } } } - @ObfuscatedName("kd") + @ObfuscatedName("kr") @ObfuscatedSignature( - signature = "(I)Lku;", - garbageValue = "-1860083598" + signature = "(B)Lkq;", + garbageValue = "-76" ) @Export("username") public Username username() { - return ByteArrayPool.localPlayer != null ? ByteArrayPool.localPlayer.username : null; + return class60.localPlayer != null ? class60.localPlayer.username : null; } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "11" + signature = "(II)Lih;", + garbageValue = "1222368622" ) - public static void method1496() { - class206.midiPcmStream.clear(); - class206.field2406 = 1; - class206.musicTrackArchive = null; + @Export("WorldMapElement_get") + public static WorldMapElement WorldMapElement_get(int var0) { + return var0 >= 0 && var0 < class257.WorldMapElement_cached.length && class257.WorldMapElement_cached[var0] != null ? class257.WorldMapElement_cached[var0] : new WorldMapElement(var0); + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(Ljava/io/File;Ljava/io/File;I)V", + garbageValue = "1015952997" + ) + static void method1803(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("c") + @ObfuscatedSignature( + signature = "(Lbn;B)V", + garbageValue = "2" + ) + static void method1522(GameShell var0) { + while (WorldMapManager.isKeyDown()) { + if (SecureRandomCallable.field546 == 13) { + WorldMapSection2.method398(); + return; + } + + if (SecureRandomCallable.field546 == 96) { + if (Login.worldSelectPage > 0 && class13.worldSelectLeftSprite != null) { + --Login.worldSelectPage; + } + } else if (SecureRandomCallable.field546 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && ClientPreferences.worldSelectRightSprite != null) { + ++Login.worldSelectPage; + } + } + + if (MouseHandler.MouseHandler_lastButton == 1 || !ArchiveLoader.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) { + Player.changeWorldSelectSorting(0, 0); + return; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + Player.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) { + Player.changeWorldSelectSorting(1, 0); + return; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + Player.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) { + Player.changeWorldSelectSorting(2, 0); + return; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + Player.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) { + Player.changeWorldSelectSorting(3, 0); + return; + } + + if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { + Player.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) { + WorldMapSection2.method398(); + return; + } + + if (Login.hoveredWorldIndex != -1) { + World var5 = class13.World_worlds[Login.hoveredWorldIndex]; + Friend.changeWorld(var5); + WorldMapSection2.method398(); + return; + } + + if (Login.worldSelectPage > 0 && class13.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= class13.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= class52.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class52.canvasHeight / 2 + 50) { + --Login.worldSelectPage; + } + + if (Login.worldSelectPage < Login.worldSelectPagesCount && ClientPreferences.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= Varcs.canvasWidth - ClientPreferences.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= Varcs.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= class52.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class52.canvasHeight / 2 + 50) { + ++Login.worldSelectPage; + } + } + } } diff --git a/runescape-client/src/main/java/ClientPacket.java b/runescape-client/src/main/java/ClientPacket.java index 86fcf4424f..91b5fbc4a6 100644 --- a/runescape-client/src/main/java/ClientPacket.java +++ b/runescape-client/src/main/java/ClientPacket.java @@ -7,923 +7,636 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("gn") @Implements("ClientPacket") public class ClientPacket implements class190 { - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2239; @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lgn;" ) - public static final ClientPacket field2260; - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2209; - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2210; - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2211; - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2244; - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2213; - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2214; - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2215; - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2216; - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2304; - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2218; - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2219; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2208; - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2240; - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2222; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2259; - @ObfuscatedName("a") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2299; - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2224; - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2226; - @ObfuscatedName("r") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2227; + public static final ClientPacket field2270; @ObfuscatedName("o") @ObfuscatedSignature( signature = "Lgn;" ) - public static final ClientPacket field2228; - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2229; - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2230; - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2231; - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2232; - @ObfuscatedName("ae") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2233; - @ObfuscatedName("an") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2234; - @ObfuscatedName("ai") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2235; - @ObfuscatedName("ap") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2236; - @ObfuscatedName("ab") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2295; - @ObfuscatedName("ar") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2238; - @ObfuscatedName("af") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2287; - @ObfuscatedName("at") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2225; - @ObfuscatedName("al") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2241; - @ObfuscatedName("as") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2272; - @ObfuscatedName("am") + public static final ClientPacket field2242; + @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lgn;" ) public static final ClientPacket field2243; - @ObfuscatedName("au") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "Lgn;" ) - public static final ClientPacket field2303; - @ObfuscatedName("ao") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2245; - @ObfuscatedName("aq") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2237; - @ObfuscatedName("av") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2247; - @ObfuscatedName("ak") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2300; - @ObfuscatedName("aa") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2273; - @ObfuscatedName("ax") + public static final ClientPacket field2244; + @ObfuscatedName("p") @ObfuscatedSignature( signature = "Lgn;" ) public static final ClientPacket field2250; - @ObfuscatedName("az") + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2298; + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2247; + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2248; + @ObfuscatedName("a") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2249; + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2257; + @ObfuscatedName("w") @ObfuscatedSignature( signature = "Lgn;" ) public static final ClientPacket field2251; - @ObfuscatedName("aj") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "Lgn;" ) public static final ClientPacket field2252; + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2273; + @ObfuscatedName("h") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2254; + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2292; + @ObfuscatedName("r") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2256; + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2253; + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2258; + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2259; + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2260; + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2291; + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2261; + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2263; + @ObfuscatedName("b") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2264; + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2265; + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2283; + @ObfuscatedName("ah") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2267; + @ObfuscatedName("ai") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2268; + @ObfuscatedName("ao") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2269; + @ObfuscatedName("ae") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2262; + @ObfuscatedName("ax") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2340; + @ObfuscatedName("ag") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2255; + @ObfuscatedName("ab") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2241; + @ObfuscatedName("am") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2274; + @ObfuscatedName("ak") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2275; + @ObfuscatedName("ad") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2290; + @ObfuscatedName("as") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2344; + @ObfuscatedName("ar") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2278; + @ObfuscatedName("ap") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2295; + @ObfuscatedName("al") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2280; + @ObfuscatedName("an") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2281; + @ObfuscatedName("ac") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2282; + @ObfuscatedName("av") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2296; + @ObfuscatedName("af") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2284; + @ObfuscatedName("at") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2285; + @ObfuscatedName("aa") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2286; + @ObfuscatedName("aw") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2279; + @ObfuscatedName("az") + @ObfuscatedSignature( + signature = "Lgn;" + ) + static final ClientPacket field2321; + @ObfuscatedName("aq") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2289; @ObfuscatedName("ay") @ObfuscatedSignature( signature = "Lgn;" ) public static final ClientPacket field2277; - @ObfuscatedName("ad") + @ObfuscatedName("au") @ObfuscatedSignature( signature = "Lgn;" ) - public static final ClientPacket field2270; - @ObfuscatedName("ac") + public static final ClientPacket field2329; + @ObfuscatedName("aj") @ObfuscatedSignature( signature = "Lgn;" ) - public static final ClientPacket field2255; - @ObfuscatedName("ah") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2256; - @ObfuscatedName("ag") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2271; - @ObfuscatedName("aw") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2254; - @ObfuscatedName("bf") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2257; - @ObfuscatedName("bc") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2258; - @ObfuscatedName("bo") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2261; - @ObfuscatedName("bd") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2262; + public static final ClientPacket field2287; @ObfuscatedName("bk") @ObfuscatedSignature( signature = "Lgn;" ) - public static final ClientPacket field2263; - @ObfuscatedName("bu") + public static final ClientPacket field2293; + @ObfuscatedName("bh") @ObfuscatedSignature( signature = "Lgn;" ) - public static final ClientPacket field2264; - @ObfuscatedName("be") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2265; + public static final ClientPacket field2294; @ObfuscatedName("bg") @ObfuscatedSignature( signature = "Lgn;" ) public static final ClientPacket field2266; - @ObfuscatedName("bt") + @ObfuscatedName("be") @ObfuscatedSignature( signature = "Lgn;" ) - public static final ClientPacket field2267; - @ObfuscatedName("bh") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2268; - @ObfuscatedName("br") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2269; - @ObfuscatedName("bq") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2283; - @ObfuscatedName("ba") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2291; - @ObfuscatedName("bv") - @ObfuscatedSignature( - signature = "Lgn;" - ) - static final ClientPacket field2249; - @ObfuscatedName("bx") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2220; - @ObfuscatedName("bz") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2274; - @ObfuscatedName("bs") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2275; - @ObfuscatedName("bp") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2276; - @ObfuscatedName("bm") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2290; - @ObfuscatedName("bb") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2278; - @ObfuscatedName("bn") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2279; - @ObfuscatedName("by") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2280; - @ObfuscatedName("bj") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2281; - @ObfuscatedName("bi") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2282; - @ObfuscatedName("bl") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2221; - @ObfuscatedName("bw") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2284; - @ObfuscatedName("cw") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2285; - @ObfuscatedName("cc") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2217; - @ObfuscatedName("ch") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2286; - @ObfuscatedName("cr") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2288; - @ObfuscatedName("cq") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2212; - @ObfuscatedName("co") - @ObfuscatedSignature( - signature = "Lgn;" - ) - static final ClientPacket field2293; - @ObfuscatedName("cm") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2294; - @ObfuscatedName("cu") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2248; - @ObfuscatedName("cs") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2289; - @ObfuscatedName("cg") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2207; - @ObfuscatedName("cd") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2298; - @ObfuscatedName("cx") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2296; - @ObfuscatedName("cn") + public static final ClientPacket field2327; + @ObfuscatedName("bf") @ObfuscatedSignature( signature = "Lgn;" ) public static final ClientPacket field2297; - @ObfuscatedName("ci") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2242; - @ObfuscatedName("cz") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2253; - @ObfuscatedName("cb") - @ObfuscatedSignature( - signature = "Lgn;" - ) - public static final ClientPacket field2246; - @ObfuscatedName("cy") + @ObfuscatedName("ba") @ObfuscatedSignature( signature = "Lgn;" ) public static final ClientPacket field2301; - @ObfuscatedName("ct") + @ObfuscatedName("bd") @ObfuscatedSignature( signature = "Lgn;" ) - public static final ClientPacket field2302; - @ObfuscatedName("cf") + public static final ClientPacket field2299; + @ObfuscatedName("bb") @ObfuscatedSignature( signature = "Lgn;" ) - public static final ClientPacket field2223; - @ObfuscatedName("ca") + public static final ClientPacket field2300; + @ObfuscatedName("bw") @ObfuscatedSignature( signature = "Lgn;" ) - public static final ClientPacket field2292; - @ObfuscatedName("cj") + public static final ClientPacket field2276; + @ObfuscatedName("bq") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2328; + @ObfuscatedName("bn") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2303; + @ObfuscatedName("bc") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2335; + @ObfuscatedName("bo") @ObfuscatedSignature( signature = "Lgn;" ) public static final ClientPacket field2305; - @ObfuscatedName("cp") + @ObfuscatedName("bp") @ObfuscatedSignature( signature = "Lgn;" ) public static final ClientPacket field2306; + @ObfuscatedName("bm") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2311; + @ObfuscatedName("bl") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2308; + @ObfuscatedName("bv") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2309; + @ObfuscatedName("bi") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2310; + @ObfuscatedName("bz") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2288; + @ObfuscatedName("bu") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2312; + @ObfuscatedName("bx") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2313; + @ObfuscatedName("br") + @ObfuscatedSignature( + signature = "Lgn;" + ) + static final ClientPacket field2314; + @ObfuscatedName("bs") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2315; + @ObfuscatedName("by") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2316; + @ObfuscatedName("bj") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2245; + @ObfuscatedName("bt") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2318; + @ObfuscatedName("cc") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2337; + @ObfuscatedName("cb") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2320; + @ObfuscatedName("ch") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2304; + @ObfuscatedName("cw") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2271; + @ObfuscatedName("cz") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2323; + @ObfuscatedName("cg") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2324; + @ObfuscatedName("cn") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2325; + @ObfuscatedName("ce") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2326; + @ObfuscatedName("cj") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2319; @ObfuscatedName("ck") @ObfuscatedSignature( signature = "Lgn;" ) - static final ClientPacket field2307; - @ObfuscatedName("ce") + public static final ClientPacket field2338; + @ObfuscatedName("cv") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2307; + @ObfuscatedName("cp") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2330; + @ObfuscatedName("ci") + @ObfuscatedSignature( + signature = "Lgn;" + ) + static final ClientPacket field2331; + @ObfuscatedName("cu") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2332; + @ObfuscatedName("cq") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2333; + @ObfuscatedName("co") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2334; + @ObfuscatedName("ca") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2272; + @ObfuscatedName("cm") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2336; + @ObfuscatedName("cf") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2302; + @ObfuscatedName("ct") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2317; + @ObfuscatedName("cd") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2339; + @ObfuscatedName("cy") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2322; + @ObfuscatedName("cx") + @ObfuscatedSignature( + signature = "Lgn;" + ) + public static final ClientPacket field2341; + @ObfuscatedName("eo") + @ObfuscatedSignature( + signature = "Lig;" + ) + @Export("archive20") + static Archive archive20; + @ObfuscatedName("cs") @ObfuscatedGetter( - intValue = 1793698213 + intValue = 2086996783 ) @Export("id") final int id; - @ObfuscatedName("cv") + @ObfuscatedName("cr") @ObfuscatedGetter( - intValue = 660997365 + intValue = 1606130337 ) @Export("length") final int length; static { - field2239 = new ClientPacket(0, 13); - field2260 = new ClientPacket(1, 4); - field2209 = new ClientPacket(2, 6); - field2210 = new ClientPacket(3, -2); - field2211 = new ClientPacket(4, 3); - field2244 = new ClientPacket(5, 8); - field2213 = new ClientPacket(6, -1); - field2214 = new ClientPacket(7, -2); - field2215 = new ClientPacket(8, 4); - field2216 = new ClientPacket(9, -1); - field2304 = new ClientPacket(10, -1); - field2218 = new ClientPacket(11, 10); - field2219 = new ClientPacket(12, 3); - field2208 = new ClientPacket(13, 8); - field2240 = new ClientPacket(14, 15); - field2222 = new ClientPacket(15, -1); - field2259 = new ClientPacket(16, -1); - field2299 = new ClientPacket(17, 8); - field2224 = new ClientPacket(18, 9); - field2226 = new ClientPacket(19, 8); - field2227 = new ClientPacket(20, 7); - field2228 = new ClientPacket(21, 14); - field2229 = new ClientPacket(22, -1); - field2230 = new ClientPacket(23, 8); - field2231 = new ClientPacket(24, 4); - field2232 = new ClientPacket(25, 3); - field2233 = new ClientPacket(26, 13); - field2234 = new ClientPacket(27, 16); - field2235 = new ClientPacket(28, 7); - field2236 = new ClientPacket(29, -1); - field2295 = new ClientPacket(30, 0); - field2238 = new ClientPacket(31, 8); - field2287 = new ClientPacket(32, 7); - field2225 = new ClientPacket(33, 11); - field2241 = new ClientPacket(34, 0); - field2272 = new ClientPacket(35, 16); - field2243 = new ClientPacket(36, 7); - field2303 = new ClientPacket(37, 3); - field2245 = new ClientPacket(38, 0); - field2237 = new ClientPacket(39, 11); - field2247 = new ClientPacket(40, 3); - field2300 = new ClientPacket(41, 9); - field2273 = new ClientPacket(42, -1); - field2250 = new ClientPacket(43, 3); - field2251 = new ClientPacket(44, 0); - field2252 = new ClientPacket(45, 13); - field2277 = new ClientPacket(46, 3); - field2270 = new ClientPacket(47, -1); - field2255 = new ClientPacket(48, 8); - field2256 = new ClientPacket(49, 8); - field2271 = new ClientPacket(50, 9); - field2254 = new ClientPacket(51, 3); - field2257 = new ClientPacket(52, 5); - field2258 = new ClientPacket(53, 8); - field2261 = new ClientPacket(54, 1); - field2262 = new ClientPacket(55, 8); - field2263 = new ClientPacket(56, 3); - field2264 = new ClientPacket(57, 8); - field2265 = new ClientPacket(58, 8); - field2266 = new ClientPacket(59, 3); - field2267 = new ClientPacket(60, 3); - field2268 = new ClientPacket(61, 8); - field2269 = new ClientPacket(62, 8); - field2283 = new ClientPacket(63, -2); - field2291 = new ClientPacket(64, 6); - field2249 = new ClientPacket(65, 7); - field2220 = new ClientPacket(66, 4); - field2274 = new ClientPacket(67, 7); - field2275 = new ClientPacket(68, 7); - field2276 = new ClientPacket(69, 8); - field2290 = new ClientPacket(70, -1); - field2278 = new ClientPacket(71, 8); - field2279 = new ClientPacket(72, 4); - field2280 = new ClientPacket(73, 8); - field2281 = new ClientPacket(74, -1); - field2282 = new ClientPacket(75, 3); - field2221 = new ClientPacket(76, 7); - field2284 = new ClientPacket(77, 2); - field2285 = new ClientPacket(78, 8); - field2217 = new ClientPacket(79, -1); - field2286 = new ClientPacket(80, 7); - field2288 = new ClientPacket(81, 7); - field2212 = new ClientPacket(82, 3); - field2293 = new ClientPacket(83, -1); - field2294 = new ClientPacket(84, 2); - field2248 = new ClientPacket(85, -1); - field2289 = new ClientPacket(86, -1); - field2207 = new ClientPacket(87, -1); - field2298 = new ClientPacket(88, 9); - field2296 = new ClientPacket(89, 7); - field2297 = new ClientPacket(90, -1); - field2242 = new ClientPacket(91, 2); - field2253 = new ClientPacket(92, 2); - field2246 = new ClientPacket(93, -1); - field2301 = new ClientPacket(94, 3); - field2302 = new ClientPacket(95, 15); - field2223 = new ClientPacket(96, 8); - field2292 = new ClientPacket(97, 8); - field2305 = new ClientPacket(98, 16); - field2306 = new ClientPacket(99, 0); - field2307 = new ClientPacket(100, 2); + field2270 = new ClientPacket(0, -1); + field2242 = new ClientPacket(1, 7); + field2243 = new ClientPacket(2, 0); + field2244 = new ClientPacket(3, 6); + field2250 = new ClientPacket(4, 3); + field2298 = new ClientPacket(5, 4); + field2247 = new ClientPacket(6, -2); + field2248 = new ClientPacket(7, 8); + field2249 = new ClientPacket(8, 2); + field2257 = new ClientPacket(9, 11); + field2251 = new ClientPacket(10, 3); + field2252 = new ClientPacket(11, 8); + field2273 = new ClientPacket(12, -1); + field2254 = new ClientPacket(13, 8); + field2292 = new ClientPacket(14, -1); + field2256 = new ClientPacket(15, 9); + field2253 = new ClientPacket(16, -1); + field2258 = new ClientPacket(17, 4); + field2259 = new ClientPacket(18, 13); + field2260 = new ClientPacket(19, 3); + field2291 = new ClientPacket(20, 8); + field2261 = new ClientPacket(21, 3); + field2263 = new ClientPacket(22, 4); + field2264 = new ClientPacket(23, 8); + field2265 = new ClientPacket(24, 0); + field2283 = new ClientPacket(25, 13); + field2267 = new ClientPacket(26, 2); + field2268 = new ClientPacket(27, -1); + field2269 = new ClientPacket(28, 2); + field2262 = new ClientPacket(29, 7); + field2340 = new ClientPacket(30, 7); + field2255 = new ClientPacket(31, -1); + field2241 = new ClientPacket(32, 15); + field2274 = new ClientPacket(33, 3); + field2275 = new ClientPacket(34, 8); + field2290 = new ClientPacket(35, 1); + field2344 = new ClientPacket(36, 8); + field2278 = new ClientPacket(37, 3); + field2295 = new ClientPacket(38, 9); + field2280 = new ClientPacket(39, 7); + field2281 = new ClientPacket(40, 16); + field2282 = new ClientPacket(41, 7); + field2296 = new ClientPacket(42, 7); + field2284 = new ClientPacket(43, 7); + field2285 = new ClientPacket(44, 0); + field2286 = new ClientPacket(45, -1); + field2279 = new ClientPacket(46, 5); + field2321 = new ClientPacket(47, 7); + field2289 = new ClientPacket(48, -1); + field2277 = new ClientPacket(49, 9); + field2329 = new ClientPacket(50, -1); + field2287 = new ClientPacket(51, 3); + field2293 = new ClientPacket(52, 8); + field2294 = new ClientPacket(53, 15); + field2266 = new ClientPacket(54, 14); + field2327 = new ClientPacket(55, 9); + field2297 = new ClientPacket(56, 4); + field2301 = new ClientPacket(57, 3); + field2299 = new ClientPacket(58, 16); + field2300 = new ClientPacket(59, 7); + field2276 = new ClientPacket(60, 13); + field2328 = new ClientPacket(61, 8); + field2303 = new ClientPacket(62, 8); + field2335 = new ClientPacket(63, 16); + field2305 = new ClientPacket(64, 8); + field2306 = new ClientPacket(65, -1); + field2311 = new ClientPacket(66, -1); + field2308 = new ClientPacket(67, 8); + field2309 = new ClientPacket(68, 8); + field2310 = new ClientPacket(69, -1); + field2288 = new ClientPacket(70, 6); + field2312 = new ClientPacket(71, -1); + field2313 = new ClientPacket(72, 7); + field2314 = new ClientPacket(73, 2); + field2315 = new ClientPacket(74, 8); + field2316 = new ClientPacket(75, -1); + field2245 = new ClientPacket(76, 8); + field2318 = new ClientPacket(77, 8); + field2337 = new ClientPacket(78, 3); + field2320 = new ClientPacket(79, 8); + field2304 = new ClientPacket(80, -2); + field2271 = new ClientPacket(81, 3); + field2323 = new ClientPacket(82, 10); + field2324 = new ClientPacket(83, 3); + field2325 = new ClientPacket(84, -1); + field2326 = new ClientPacket(85, 0); + field2319 = new ClientPacket(86, 8); + field2338 = new ClientPacket(87, 3); + field2307 = new ClientPacket(88, 7); + field2330 = new ClientPacket(89, -2); + field2331 = new ClientPacket(90, -1); + field2332 = new ClientPacket(91, 8); + field2333 = new ClientPacket(92, 4); + field2334 = new ClientPacket(93, 8); + field2272 = new ClientPacket(94, 3); + field2336 = new ClientPacket(95, -1); + field2302 = new ClientPacket(96, 2); + field2317 = new ClientPacket(97, 3); + field2339 = new ClientPacket(98, 0); + field2322 = new ClientPacket(99, 11); + field2341 = new ClientPacket(100, -1); } ClientPacket(int var1, int var2) { this.id = var1; this.length = var2; } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(Liy;IIB)[Lla;", - garbageValue = "119" - ) - public static Sprite[] method3688(AbstractArchive var0, int var1, int var2) { - return !UserComparator7.method3516(var0, var1, var2) ? null : WorldMapSprite.method516(); - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-2105956972" - ) - public static void method3687() { - StructDefinition.StructDefinition_cached.clear(); - } - - @ObfuscatedName("ge") - @ObfuscatedSignature( - signature = "(Lcw;I)V", - garbageValue = "135896742" - ) - static final void method3686(Actor var0) { - var0.movementSequence = var0.idleSequence; - if (var0.pathLength == 0) { - var0.field1031 = 0; - } else { - if (var0.sequence != -1 && var0.sequenceDelay == 0) { - SequenceDefinition var1 = SpotAnimationDefinition.SequenceDefinition_get(var0.sequence); - if (var0.field1032 > 0 && var1.field3520 == 0) { - ++var0.field1031; - return; - } - - if (var0.field1032 <= 0 && var1.field3524 == 0) { - ++var0.field1031; - return; - } - } - - int var10 = var0.x; - int var2 = var0.y; - int var3 = var0.field976 * 64 + var0.pathX[var0.pathLength - 1] * 128; - int var4 = var0.field976 * 64 + var0.pathY[var0.pathLength - 1] * 128; - if (var10 < var3) { - if (var2 < var4) { - var0.orientation = 1280; - } else if (var2 > var4) { - var0.orientation = 1792; - } else { - var0.orientation = 1536; - } - } else if (var10 > var3) { - if (var2 < var4) { - var0.orientation = 768; - } else if (var2 > var4) { - var0.orientation = 256; - } else { - var0.orientation = 512; - } - } else if (var2 < var4) { - var0.orientation = 1024; - } else if (var2 > var4) { - var0.orientation = 0; - } - - byte var5 = var0.pathTraversed[var0.pathLength - 1]; - if (var3 - var10 <= 256 && var3 - var10 >= -256 && var4 - var2 <= 256 && var4 - var2 >= -256) { - int var6 = var0.orientation - var0.rotation & 2047; - if (var6 > 1024) { - var6 -= 2048; - } - - int var7 = var0.walkBackSequence; - if (var6 >= -256 && var6 <= 256) { - var7 = var0.walkSequence; - } else if (var6 >= 256 && var6 < 768) { - var7 = var0.walkRightSequence; - } else if (var6 >= -768 && var6 <= -256) { - var7 = var0.walkLeftSequence; - } - - if (var7 == -1) { - var7 = var0.walkSequence; - } - - var0.movementSequence = var7; - int var8 = 4; - boolean var9 = true; - if (var0 instanceof NPC) { - var9 = ((NPC)var0).definition.isClickable; - } - - if (var9) { - if (var0.orientation != var0.rotation && var0.targetIndex == -1 && var0.field1026 != 0) { - var8 = 2; - } - - if (var0.pathLength > 2) { - var8 = 6; - } - - if (var0.pathLength > 3) { - var8 = 8; - } - - if (var0.field1031 > 0 && var0.pathLength > 1) { - var8 = 8; - --var0.field1031; - } - } else { - if (var0.pathLength > 1) { - var8 = 6; - } - - if (var0.pathLength > 2) { - var8 = 8; - } - - if (var0.field1031 > 0 && var0.pathLength > 1) { - var8 = 8; - --var0.field1031; - } - } - - if (var5 == 2) { - var8 <<= 1; - } - - if (var8 >= 8 && var0.walkSequence == var0.movementSequence && var0.runSequence != -1) { - var0.movementSequence = var0.runSequence; - } - - if (var3 != var10 || var2 != var4) { - if (var10 < var3) { - var0.x += var8; - if (var0.x > var3) { - var0.x = var3; - } - } else if (var10 > var3) { - var0.x -= var8; - if (var0.x < var3) { - var0.x = var3; - } - } - - if (var2 < var4) { - var0.y += var8; - if (var0.y > var4) { - var0.y = var4; - } - } else if (var2 > var4) { - var0.y -= var8; - if (var0.y < var4) { - var0.y = var4; - } - } - } - - if (var3 == var0.x && var4 == var0.y) { - --var0.pathLength; - if (var0.field1032 > 0) { - --var0.field1032; - } - } - - } else { - var0.x = var3; - var0.y = var4; - --var0.pathLength; - if (var0.field1032 > 0) { - --var0.field1032; - } - - } - } - } - - @ObfuscatedName("iv") - @ObfuscatedSignature( - signature = "(IIIILjava/lang/String;B)V", - garbageValue = "10" - ) - @Export("widgetDefaultMenuAction") - static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { - Widget var5 = GrandExchangeOfferUnitPriceComparator.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; - GrandExchangeOfferOwnWorldComparator.runScriptEvent(var6); - } - - boolean var11 = true; - if (var5.contentType > 0) { - var11 = WorldMapSectionType.method344(var5); - } - - if (var11) { - int var8 = ScriptEvent.getWidgetClickMask(var5); - int var9 = var0 - 1; - boolean var7 = (var8 >> var9 + 1 & 1) != 0; - if (var7) { - PacketBufferNode var10; - if (var0 == 1) { - var10 = FaceNormal.getPacketBufferNode(field2264, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 2) { - var10 = FaceNormal.getPacketBufferNode(field2280, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 3) { - var10 = FaceNormal.getPacketBufferNode(field2278, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 4) { - var10 = FaceNormal.getPacketBufferNode(field2226, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 5) { - var10 = FaceNormal.getPacketBufferNode(field2269, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 6) { - var10 = FaceNormal.getPacketBufferNode(field2230, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 7) { - var10 = FaceNormal.getPacketBufferNode(field2256, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 8) { - var10 = FaceNormal.getPacketBufferNode(field2262, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 9) { - var10 = FaceNormal.getPacketBufferNode(field2223, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 10) { - var10 = FaceNormal.getPacketBufferNode(field2255, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - } - } - } - } } diff --git a/runescape-client/src/main/java/ClientPreferences.java b/runescape-client/src/main/java/ClientPreferences.java index 64ddebcfab..6b93edfb63 100644 --- a/runescape-client/src/main/java/ClientPreferences.java +++ b/runescape-client/src/main/java/ClientPreferences.java @@ -7,40 +7,46 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cq") +@ObfuscatedName("cz") @Implements("ClientPreferences") public class ClientPreferences { - @ObfuscatedName("x") + @ObfuscatedName("pv") + @ObfuscatedSignature( + signature = "Lkk;" + ) + @Export("clanChat") + static ClanChat clanChat; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1654668565 + intValue = -833768267 ) @Export("ClientPreferences_optionCount") static int ClientPreferences_optionCount; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = 1650607601 + @ObfuscatedName("bp") + @ObfuscatedSignature( + signature = "Llh;" ) - @Export("clientTickTimeIdx") - static int clientTickTimeIdx; - @ObfuscatedName("k") + @Export("worldSelectRightSprite") + static IndexedSprite worldSelectRightSprite; + @ObfuscatedName("q") @Export("roofsHidden") boolean roofsHidden; - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("titleMusicDisabled") boolean titleMusicDisabled; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1989279891 + intValue = -1665448065 ) @Export("windowMode") int windowMode; - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("rememberedUsername") String rememberedUsername; - @ObfuscatedName("q") + @ObfuscatedName("n") @Export("hideUsername") boolean hideUsername; - @ObfuscatedName("z") + @ObfuscatedName("u") @Export("parameters") LinkedHashMap parameters; @@ -53,11 +59,11 @@ public class ClientPreferences { this.rememberedUsername = null; this.hideUsername = false; this.parameters = new LinkedHashMap(); - this.method1942(true); + this.method1911(true); } @ObfuscatedSignature( - signature = "(Lkb;)V" + signature = "(Lkn;)V" ) ClientPreferences(Buffer var1) { this.windowMode = 1; @@ -85,7 +91,6 @@ public class ClientPreferences { for (int var4 = 0; var4 < var3; ++var4) { int var5 = var1.readInt(); int var6 = var1.readInt(); - this.parameters.put(var5, var6); } } @@ -98,26 +103,26 @@ public class ClientPreferences { this.hideUsername = var1.readBoolean(); } } else { - this.method1942(true); + this.method1911(true); } } else { - this.method1942(true); + this.method1911(true); } } - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "-1802002327" - ) - void method1942(boolean var1) { - } - @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)Lkb;", - garbageValue = "745371681" + signature = "(ZI)V", + garbageValue = "-943142768" + ) + void method1911(boolean var1) { + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(S)Lkn;", + garbageValue = "128" ) @Export("toBuffer") Buffer toBuffer() { @@ -140,12 +145,89 @@ public class ClientPreferences { return var1; } - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "102" + signature = "(IIB)I", + garbageValue = "116" ) - static final void method1950(String var0) { - GrandExchangeEvent.method165("Please remove " + var0 + " from your ignore list first"); + static final int method1914(int var0, int var1) { + int var2 = var0 + var1 * 57; + var2 ^= var2 << 13; + int var3 = var2 * (var2 * var2 * 15731 + 789221) + 1376312589 & Integer.MAX_VALUE; + return var3 >> 19 & 255; + } + + @ObfuscatedName("ed") + @ObfuscatedSignature( + signature = "(IB)V", + garbageValue = "-82" + ) + @Export("updateGameState") + static void updateGameState(int var0) { + if (var0 != Client.gameState) { + if (Client.gameState == 0) { + WorldMapSectionType.client.method1017(); + } + + if (var0 == 20 || var0 == 40 || var0 == 45) { + Client.loginState = 0; + Client.field705 = 0; + Client.field706 = 0; + Client.timer.method5184(var0); + if (var0 != 20) { + SequenceDefinition.method4973(false); + } + } + + if (var0 != 20 && var0 != 40 && class8.field35 != null) { + class8.field35.close(); + class8.field35 = null; + } + + if (Client.gameState == 25) { + Client.field809 = 0; + Client.field822 = 0; + Client.field759 = 1; + Client.field690 = 0; + Client.field729 = 1; + } + + if (var0 != 5 && var0 != 10) { + if (var0 == 20) { + WorldMapRegion.method541(GraphicsObject.archive10, GrandExchangeEvent.archive8, true, Client.gameState == 11 ? 4 : 0); + } else if (var0 == 11) { + WorldMapRegion.method541(GraphicsObject.archive10, GrandExchangeEvent.archive8, false, 4); + } else if (GrandExchangeOfferAgeComparator.clearLoginScreen) { + HealthBar.titleboxSprite = null; + Fonts.titlebuttonSprite = null; + Login.runesSprite = null; + Login.leftTitleSprite = null; + ItemContainer.rightTitleSprite = null; + Login.logoSprite = null; + Decimator.title_muteSprite = null; + Login.options_buttons_0Sprite = null; + GameShell.options_buttons_2Sprite = null; + class90.worldSelectBackSprites = null; + SpotAnimationDefinition.worldSelectFlagSprites = null; + GrandExchangeEvent.worldSelectArrows = null; + class228.worldSelectStars = null; + WorldMapIcon_1.field206 = null; + Login.loginScreenRunesAnimation.method1878(); + class206.field2439 = 1; + Huffman.musicTrackArchive = null; + class206.musicTrackGroupId = -1; + MilliClock.musicTrackFileId = -1; + class206.musicTrackVolume = 0; + class336.musicTrackBoolean = false; + class206.field2442 = 2; + class41.method624(true); + GrandExchangeOfferAgeComparator.clearLoginScreen = false; + } + } else { + WorldMapRegion.method541(GraphicsObject.archive10, GrandExchangeEvent.archive8, true, 0); + } + + Client.gameState = var0; + } } } diff --git a/runescape-client/src/main/java/Clock.java b/runescape-client/src/main/java/Clock.java index 64887eccdd..2cffa887ad 100644 --- a/runescape-client/src/main/java/Clock.java +++ b/runescape-client/src/main/java/Clock.java @@ -3,55 +3,108 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("fb") @Implements("Clock") public abstract class Clock { - @ObfuscatedName("t") + @ObfuscatedName("nq") @ObfuscatedGetter( - intValue = 2046484107 + intValue = -815222231 ) - static int field2061; + static int field2092; + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "Ldo;" + ) + @Export("soundCache") + public static SoundCache soundCache; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -357959565 + ) + @Export("clientTickTimeIdx") + static int clientTickTimeIdx; + @ObfuscatedName("do") + @ObfuscatedSignature( + signature = "Lig;" + ) + @Export("archive2") + static Archive archive2; Clock() { } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1351231250" + garbageValue = "-1017447827" ) @Export("mark") public abstract void mark(); - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(III)I", - garbageValue = "-1723558008" + garbageValue = "-1786752641" ) @Export("wait") public abstract int wait(int var1, int var2); - @ObfuscatedName("k") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "16" + signature = "(ILcs;ZI)I", + garbageValue = "1957582234" ) - public static int method3590(int var0) { - var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); - var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); - var0 = var0 + (var0 >>> 4) & 252645135; - var0 += var0 >>> 8; - var0 += var0 >>> 16; - return var0 & 255; - } - - @ObfuscatedName("ko") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "2" - ) - static final void method3599() { - Client.field873 = Client.cycleCntr; + static int method3641(int var0, Script var1, boolean var2) { + Widget var3 = WorldMapSprite.getWidget(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); + if (var0 == ScriptOpcodes.IF_GETSCROLLX) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.scrollX; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.scrollY; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETTEXT) { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3.text; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.scrollWidth; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.scrollHeight; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.modelZoom; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.modelAngleX; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.modelAngleZ; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.modelAngleY; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETTRANSTOP) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.transparencyTop; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETTRANSBOT) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.transparencyBot; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.color; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.color2; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETFILLMODE) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); + return 1; + } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; + return 1; + } else { + return 2; + } } } diff --git a/runescape-client/src/main/java/CollisionMap.java b/runescape-client/src/main/java/CollisionMap.java index bf174777d8..131523f42c 100644 --- a/runescape-client/src/main/java/CollisionMap.java +++ b/runescape-client/src/main/java/CollisionMap.java @@ -4,34 +4,46 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fm") +@ObfuscatedName("fz") @Implements("CollisionMap") public class CollisionMap { - @ObfuscatedName("at") + @ObfuscatedName("r") + @ObfuscatedSignature( + signature = "Lkn;" + ) + @Export("NetCache_responseArchiveBuffer") + public static Buffer NetCache_responseArchiveBuffer; + @ObfuscatedName("gs") + @ObfuscatedSignature( + signature = "[Llz;" + ) + @Export("headIconPkSprites") + static Sprite[] headIconPkSprites; + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -1688029989 + intValue = 2098915851 ) @Export("xInset") - public int xInset; - @ObfuscatedName("al") + int xInset; + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -1941455175 + intValue = 337356269 ) @Export("yInset") - public int yInset; - @ObfuscatedName("as") + int yInset; + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 1262495837 + intValue = 1883511421 ) @Export("xSize") int xSize; - @ObfuscatedName("am") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -281985159 + intValue = 1176086575 ) @Export("ySize") int ySize; - @ObfuscatedName("au") + @ObfuscatedName("ar") @Export("flags") public int[][] flags; @@ -44,10 +56,10 @@ public class CollisionMap { this.clear(); } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1624935812" + signature = "(B)V", + garbageValue = "0" ) @Export("clear") public void clear() { @@ -63,12 +75,12 @@ public class CollisionMap { } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(IIIIZI)V", - garbageValue = "-1240663333" + garbageValue = "1939344506" ) - public void method3630(int var1, int var2, int var3, int var4, boolean var5) { + public void method3680(int var1, int var2, int var3, int var4, boolean var5) { var1 -= this.xInset; var2 -= this.yInset; if (var3 == 0) { @@ -215,10 +227,10 @@ public class CollisionMap { } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IIIIZB)V", - garbageValue = "2" + signature = "(IIIIZI)V", + garbageValue = "-2000199056" ) @Export("addGameObject") public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) { @@ -242,10 +254,10 @@ public class CollisionMap { } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "1257789406" + signature = "(IIB)V", + garbageValue = "14" ) @Export("setBlockedByFloor") public void setBlockedByFloor(int var1, int var2) { @@ -255,10 +267,10 @@ public class CollisionMap { var10000[var2] |= 2097152; } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-88147521" + garbageValue = "1576549082" ) @Export("setBlockedByFloorDec") public void setBlockedByFloorDec(int var1, int var2) { @@ -268,10 +280,10 @@ public class CollisionMap { var10000[var2] |= 262144; } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(IIII)V", - garbageValue = "2136101912" + garbageValue = "-1405991942" ) @Export("setFlag") void setFlag(int var1, int var2, int var3) { @@ -279,12 +291,12 @@ public class CollisionMap { var10000[var2] |= var3; } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(IIIIZI)V", - garbageValue = "1473004141" + garbageValue = "2079202664" ) - public void method3635(int var1, int var2, int var3, int var4, boolean var5) { + public void method3702(int var1, int var2, int var3, int var4, boolean var5) { var1 -= this.xInset; var2 -= this.yInset; if (var3 == 0) { @@ -431,10 +443,10 @@ public class CollisionMap { } - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(IIIIIZI)V", - garbageValue = "1811467744" + signature = "(IIIIIZB)V", + garbageValue = "-35" ) @Export("setFlagOffNonSquare") public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5, boolean var6) { @@ -464,10 +476,10 @@ public class CollisionMap { } - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(IIIB)V", - garbageValue = "61" + signature = "(IIII)V", + garbageValue = "-299380257" ) @Export("setFlagOff") void setFlagOff(int var1, int var2, int var3) { @@ -475,15 +487,31 @@ public class CollisionMap { var10000[var2] &= ~var3; } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(IIB)V", - garbageValue = "-25" + garbageValue = "1" ) - public void method3655(int var1, int var2) { + public void method3689(int var1, int var2) { var1 -= this.xInset; var2 -= this.yInset; int[] var10000 = this.flags[var1]; var10000[var2] &= -262145; } + + @ObfuscatedName("fd") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1042513280" + ) + static final void method3707() { + if (Client.logoutTimer > 0) { + MouseRecorder.logOut(); + } else { + Client.timer.method5161(); + ClientPreferences.updateGameState(40); + class8.field35 = Client.packetWriter.getSocket(); + Client.packetWriter.removeSocket(); + } + } } diff --git a/runescape-client/src/main/java/Coord.java b/runescape-client/src/main/java/Coord.java index e304cca404..019608e041 100644 --- a/runescape-client/src/main/java/Coord.java +++ b/runescape-client/src/main/java/Coord.java @@ -4,37 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hj") +@ObfuscatedName("hg") @Implements("Coord") public class Coord { - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 301187265 - ) - public static int field2530; - @ObfuscatedName("cd") - public static char field2531; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 762647407 - ) - @Export("y") - public int y; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 660497933 + intValue = -1064559233 ) @Export("plane") public int plane; - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1808182037 + intValue = 381144149 ) @Export("x") public int x; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -63925861 + ) + @Export("y") + public int y; @ObfuscatedSignature( - signature = "(Lhj;)V" + signature = "(Lhg;)V" ) public Coord(Coord var1) { this.plane = var1.plane; @@ -59,20 +52,20 @@ public class Coord { } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-1927907066" + signature = "(B)I", + garbageValue = "57" ) @Export("packed") public int packed() { return this.plane << 28 | this.x << 14 | this.y; } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lhj;I)Z", - garbageValue = "-2112462573" + signature = "(Lhg;I)Z", + garbageValue = "1413568323" ) @Export("equalsCoord") boolean equalsCoord(Coord var1) { @@ -85,16 +78,24 @@ public class Coord { } } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "404618696" + signature = "(Ljava/lang/String;S)Ljava/lang/String;", + garbageValue = "-17265" ) @Export("toString") String toString(String var1) { return this.plane + var1 + (this.x >> 6) + var1 + (this.y >> 6) + var1 + (this.x & 63) + var1 + (this.y & 63); } + public int hashCode() { + return this.packed(); + } + + public String toString() { + return this.toString(","); + } + public boolean equals(Object var1) { if (this == var1) { return true; @@ -103,235 +104,80 @@ public class Coord { } } - public String toString() { - return this.toString(","); - } - - public int hashCode() { - return this.packed(); - } - - @ObfuscatedName("x") + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(B)[Lie;", - garbageValue = "112" + signature = "([BB)[B", + garbageValue = "113" ) - static VerticalAlignment[] method4084() { - return new VerticalAlignment[]{VerticalAlignment.field3193, VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field3196}; - } - - @ObfuscatedName("gn") - @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "1911582516" - ) - @Export("drawEntities") - static final void drawEntities(int var0, int var1, int var2, int var3) { - ++Client.viewportDrawCount; - if (ByteArrayPool.localPlayer.x >> 7 == Client.destinationX && ByteArrayPool.localPlayer.y >> 7 == Client.destinationY) { - Client.destinationX = 0; - } - - if (Client.renderSelf) { - class22.addPlayerToScene(ByteArrayPool.localPlayer, false); - } - - WorldMapCacheName.method716(); - Messages.addNpcsToScene(true); - int var4 = Players.Players_count; - int[] var5 = Players.Players_indices; - - int var6; - for (var6 = 0; var6 < var4; ++var6) { - if (var5[var6] != Client.combatTargetPlayerIndex && var5[var6] != Client.localPlayerIndex) { - class22.addPlayerToScene(Client.players[var5[var6]], true); - } - } - - Messages.addNpcsToScene(false); - - for (Projectile var19 = (Projectile)Client.projectiles.last(); var19 != null; var19 = (Projectile)Client.projectiles.previous()) { - if (var19.plane == ScriptEvent.Client_plane && Client.cycle <= var19.cycleEnd) { - if (Client.cycle >= var19.cycleStart) { - if (var19.targetIndex > 0) { - NPC var21 = Client.npcs[var19.targetIndex - 1]; - if (var21 != null && var21.x >= 0 && var21.x < 13312 && var21.y >= 0 && var21.y < 13312) { - var19.setDestination(var21.x, var21.y, class277.getTileHeight(var21.x, var21.y, var19.plane) - var19.endHeight, Client.cycle); - } - } - - if (var19.targetIndex < 0) { - var6 = -var19.targetIndex - 1; - Player var22; - if (var6 == Client.localPlayerIndex) { - var22 = ByteArrayPool.localPlayer; - } else { - var22 = Client.players[var6]; - } - - if (var22 != null && var22.x >= 0 && var22.x < 13312 && var22.y >= 0 && var22.y < 13312) { - var19.setDestination(var22.x, var22.y, class277.getTileHeight(var22.x, var22.y, var19.plane) - var19.endHeight, Client.cycle); - } - } - - var19.advance(Client.field741); - GrandExchangeOfferWorldComparator.scene.drawEntity(ScriptEvent.Client_plane, (int)var19.x, (int)var19.y, (int)var19.z, 60, var19, var19.yaw, -1L, false); + @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.field3177 != 0 && var3 > AbstractArchive.field3177) { + 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.field3177 == 0 || var6 <= AbstractArchive.field3177)) { + 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 { - var19.remove(); + throw new RuntimeException(); } } + } - GrandExchangeOfferAgeComparator.method249(); - class204.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(); + @ObfuscatedName("iy") + @ObfuscatedSignature( + signature = "(Lhd;IIIIIIB)V", + garbageValue = "-69" + ) + static final void method4135(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (Client.field740) { + Client.alternativeScrollbarWidth = 32; + } else { + Client.alternativeScrollbarWidth = 0; + } + + Client.field740 = false; int var7; - int var8; - int var9; - int var10; - int var11; - int var12; - int var20; - if (!Client.isCameraLocked) { - var4 = Client.camAngleX; - if (Client.field941 / 256 > var4) { - var4 = Client.field941 / 256; - } - - if (Client.field926[4] && Client.field730[4] + 128 > var4) { - var4 = Client.field730[4] + 128; - } - - var20 = Client.camAngleY & 2047; - var6 = SoundSystem.oculusOrbFocalPointX; - var7 = Client.field756; - var8 = ServerPacket.oculusOrbFocalPointY; - var9 = var4 * 3 + 600; - var10 = Varcs.method2295(var9, var3); - var11 = 2048 - var4 & 2047; - var12 = 2048 - var20 & 2047; - int var13 = 0; - int 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 = var14 * var17 - var16 * var10 >> 16; - var15 = var16 * var14 + var10 * var17 >> 16; - var14 = var18; - } - - if (var12 != 0) { - var16 = Rasterizer3D.Rasterizer3D_sine[var12]; - var17 = Rasterizer3D.Rasterizer3D_cosine[var12]; - var18 = var17 * var13 + var16 * var15 >> 16; - var15 = var17 * var15 - var16 * var13 >> 16; - var13 = var18; - } - - WorldMapRectangle.cameraX = var6 - var13; - GrandExchangeOfferWorldComparator.cameraY = var7 - var14; - class200.cameraZ = var8 - var15; - ApproximateRouteStrategy.cameraPitch = var4; - WorldMapIcon_1.cameraYaw = var20; - if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (SoundSystem.oculusOrbFocalPointX >> 7 != ByteArrayPool.localPlayer.x >> 7 || ServerPacket.oculusOrbFocalPointY >> 7 != ByteArrayPool.localPlayer.y >> 7)) { - var16 = ByteArrayPool.localPlayer.plane; - var17 = (SoundSystem.oculusOrbFocalPointX >> 7) + class69.baseX; - var18 = (ServerPacket.oculusOrbFocalPointY >> 7) + class89.baseY; - GrandExchangeOfferWorldComparator.method148(var17, var18, var16, true); - } - } - - if (!Client.isCameraLocked) { - var4 = UserComparator8.method3503(); - } else { - var4 = Tiles.method1238(); - } - - var20 = WorldMapRectangle.cameraX; - var6 = GrandExchangeOfferWorldComparator.cameraY; - var7 = class200.cameraZ; - var8 = ApproximateRouteStrategy.cameraPitch; - var9 = WorldMapIcon_1.cameraYaw; - - for (var10 = 0; var10 < 5; ++var10) { - if (Client.field926[var10]) { - var11 = (int)(Math.random() * (double)(Client.field788[var10] * 2 + 1) - (double)Client.field788[var10] + Math.sin((double)Client.field929[var10] / 100.0D * (double)Client.field930[var10]) * (double)Client.field730[var10]); - if (var10 == 0) { - WorldMapRectangle.cameraX += var11; + if (MouseHandler.MouseHandler_currentButton == 1 || !ArchiveLoader.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { + if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { + var0.scrollY -= 4; + class234.invalidateWidget(var0); + } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { + var0.scrollY += 4; + class234.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; } - if (var10 == 1) { - GrandExchangeOfferWorldComparator.cameraY += var11; - } - - if (var10 == 2) { - class200.cameraZ += var11; - } - - if (var10 == 3) { - WorldMapIcon_1.cameraYaw = var11 + WorldMapIcon_1.cameraYaw & 2047; - } - - if (var10 == 4) { - ApproximateRouteStrategy.cameraPitch += var11; - if (ApproximateRouteStrategy.cameraPitch < 128) { - ApproximateRouteStrategy.cameraPitch = 128; - } - - if (ApproximateRouteStrategy.cameraPitch > 383) { - ApproximateRouteStrategy.cameraPitch = 383; - } - } + int var8 = var6 - var2 - 16 - var7 / 2; + int var9 = var3 - 32 - var7; + var0.scrollY = var8 * (var4 - var3) / var9; + class234.invalidateWidget(var0); + Client.field740 = true; } } - 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) { - AbstractSocket.method5886(var10 - var0, var11 - var1); - } else { - GameShell.method1155(); - } - - ChatChannel.playPcmPlayers(); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); - ChatChannel.playPcmPlayers(); - var12 = Rasterizer3D.Rasterizer3D_zoom; - Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; - GrandExchangeOfferWorldComparator.scene.draw(WorldMapRectangle.cameraX, GrandExchangeOfferWorldComparator.cameraY, class200.cameraZ, ApproximateRouteStrategy.cameraPitch, WorldMapIcon_1.cameraYaw, var4); - Rasterizer3D.Rasterizer3D_zoom = var12; - ChatChannel.playPcmPlayers(); - GrandExchangeOfferWorldComparator.scene.clearTempGameObjects(); - MouseHandler.method1202(var0, var1, var2, var3); - UserComparator4.method3490(var0, var1); - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field741); - UserComparator5.method3523(var0, var1, var2, var3); - WorldMapRectangle.cameraX = var20; - GrandExchangeOfferWorldComparator.cameraY = var6; - class200.cameraZ = var7; - ApproximateRouteStrategy.cameraPitch = var8; - WorldMapIcon_1.cameraYaw = var9; - if (Client.isLoading && WorldMapLabelSize.method292(true, false) == 0) { - Client.isLoading = false; - } - - if (Client.isLoading) { - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); - AbstractByteArrayCopier.drawLoadingMessage("Loading - please wait.", false); + if (Client.mouseWheelRotation != 0) { + var7 = var0.width; + if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { + var0.scrollY += Client.mouseWheelRotation * 45; + class234.invalidateWidget(var0); + } } } diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java index 871a51ffac..92be3a278d 100644 --- a/runescape-client/src/main/java/Decimator.java +++ b/runescape-client/src/main/java/Decimator.java @@ -3,30 +3,35 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("dx") +@ObfuscatedName("dv") @Implements("Decimator") public class Decimator { - @ObfuscatedName("d") + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "[Llh;" + ) + @Export("title_muteSprite") + static IndexedSprite[] title_muteSprite; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -591203607 + intValue = 566194753 ) @Export("inputRate") int inputRate; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -772700621 + intValue = -690101149 ) @Export("outputRate") int outputRate; - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("table") int[][] table; public Decimator(int var1, int var2) { if (var2 != var1) { - int var3 = ModeWhere.method3763(var1, var2); + int var3 = class204.method3818(var1, var2); var1 /= var3; var2 /= var3; this.inputRate = var1; @@ -35,7 +40,7 @@ public class Decimator { for (int var4 = 0; var4 < var1; ++var4) { int[] var5 = this.table[var4]; - double var6 = 6.0D + (double)var4 / (double)var1; + double var6 = (double)var4 / (double)var1 + 6.0D; int var8 = (int)Math.floor(1.0D + (var6 - 7.0D)); if (var8 < 0) { var8 = 0; @@ -47,24 +52,24 @@ public class Decimator { } for (double var10 = (double)var2 / (double)var1; var8 < var9; ++var8) { - double var12 = 3.141592653589793D * ((double)var8 - var6); + double var12 = ((double)var8 - var6) * 3.141592653589793D; double var14 = var10; if (var12 < -1.0E-4D || var12 > 1.0E-4D) { var14 = var10 * (Math.sin(var12) / var12); } var14 *= 0.54D + 0.46D * Math.cos(((double)var8 - var6) * 0.2243994752564138D); - var5[var8] = (int)Math.floor(65536.0D * var14 + 0.5D); + var5[var8] = (int)Math.floor(0.5D + var14 * 65536.0D); } } } } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "([BI)[B", - garbageValue = "2035174504" + garbageValue = "880157357" ) @Export("resample") byte[] resample(byte[] var1) { @@ -81,7 +86,7 @@ public class Decimator { int var9; for (var9 = 0; var9 < 14; ++var9) { - var3[var4 + var9] += var8[var9] * var7; + var3[var9 + var4] += var8[var9] * var7; } var5 += this.outputRate; @@ -107,10 +112,10 @@ public class Decimator { return var1; } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(IB)I", - garbageValue = "65" + garbageValue = "124" ) @Export("scaleRate") int scaleRate(int var1) { @@ -121,199 +126,17 @@ public class Decimator { return var1; } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-548608122" + signature = "(IB)I", + garbageValue = "70" ) @Export("scalePosition") int scalePosition(int var1) { if (this.table != null) { - var1 = (int)((long)var1 * (long)this.outputRate / (long)this.inputRate) + 6; + var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate) + 6; } return var1; } - - @ObfuscatedName("m") - public static boolean method2635(long var0) { - return var0 != 0L && !WorldMapDecorationType.method4212(var0); - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "49819578" - ) - static int method2649(int var0, Script var1, boolean var2) { - boolean var3 = true; - Widget var4; - if (var0 >= 2000) { - var0 -= 1000; - var4 = MusicPatchNode.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - var3 = false; - } else { - var4 = var2 ? GrandExchangeOfferNameComparator.field115 : Interpreter.field1130; - } - - 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 = GrandExchangeOfferUnitPriceComparator.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.field2658 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 1309) { - --Interpreter.Interpreter_intStackSize; - 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]}; - FontName.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) { - MouseHandler.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]; - MouseHandler.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) { - class195.Widget_setKeyIgnoreHeld(var4, var11); - return 1; - } else { - throw new RuntimeException(); - } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { - var5 = 10; - class195.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) { - FontName.Widget_setKey(var4, var7, var8, var9); - return 1; - } else { - throw new RuntimeException(); - } - } - } - } - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "458877468" - ) - public static String method2636(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 = StructDefinition.method4589(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/DefaultsGroup.java b/runescape-client/src/main/java/DefaultsGroup.java index fba3cc7fd4..aca31065ee 100644 --- a/runescape-client/src/main/java/DefaultsGroup.java +++ b/runescape-client/src/main/java/DefaultsGroup.java @@ -4,26 +4,23 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lf") +@ObfuscatedName("lm") @Implements("DefaultsGroup") public class DefaultsGroup { - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Llf;" - ) - static final DefaultsGroup field3811; - @ObfuscatedName("z") - @Export("SpriteBuffer_spritePalette") - static int[] SpriteBuffer_spritePalette; @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Llm;" + ) + static final DefaultsGroup field3822; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1057296275 + intValue = -1462614597 ) @Export("group") final int group; static { - field3811 = new DefaultsGroup(3); + field3822 = 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 5a3d249892..aaad5f63c6 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("fl") +@ObfuscatedName("fr") @Implements("DemotingHashTable") public final class DemotingHashTable { - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("capacity") int capacity; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("remaining") int remaining; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lln;" + signature = "Llf;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Ljz;" + signature = "Ljq;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Les;" + signature = "Lee;" ) - class155 field1980; + class155 field1987; public DemotingHashTable(int var1, int var2) { this.queue = new IterableDualNodeQueue(); @@ -42,7 +42,7 @@ public final class DemotingHashTable { this.hashTable = new IterableNodeHashTable(var3); } - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("get") public Object get(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); @@ -73,16 +73,16 @@ public final class DemotingHashTable { } } - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("remove") void remove(long var1) { Wrapper var3 = (Wrapper)this.hashTable.get(var1); this.removeWrapper(var3); } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lfw;)V" + signature = "(Lfi;)V" ) @Export("removeWrapper") void removeWrapper(Wrapper var1) { @@ -94,7 +94,7 @@ public final class DemotingHashTable { } - @ObfuscatedName("d") + @ObfuscatedName("j") @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.field1980 != null) { - this.field1980.method3442(var5.get()); + if (this.field1987 != null) { + this.field1987.method3449(var5.get()); } } @@ -125,7 +125,7 @@ public final class DemotingHashTable { } } - @ObfuscatedName("w") + @ObfuscatedName("p") @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("v") + @ObfuscatedName("g") @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 ae6367650f..8c6144c099 100644 --- a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java +++ b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java @@ -4,38 +4,38 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mp") +@ObfuscatedName("ms") @Implements("DesktopPlatformInfoProvider") public class DesktopPlatformInfoProvider implements PlatformInfoProvider { - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -227672497 + intValue = 1476161003 ) - int field3923; - @ObfuscatedName("w") + int field3925; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1926127853 + intValue = 602625261 ) - int field3919; - @ObfuscatedName("v") + int field3926; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 326361045 + intValue = 35397071 ) - int field3924; + int field3927; - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)Lmq;", - garbageValue = "1" + signature = "(I)Lmc;", + garbageValue = "-1826697521" ) @Export("get") public PlatformInfo get() { byte var1; - if (class171.field2016.startsWith("win")) { + if (JagexCache.field2077.startsWith("win")) { var1 = 1; - } else if (class171.field2016.startsWith("mac")) { + } else if (JagexCache.field2077.startsWith("mac")) { var1 = 2; - } else if (class171.field2016.startsWith("linux")) { + } else if (JagexCache.field2077.startsWith("linux")) { var1 = 3; } else { var1 = 4; @@ -133,10 +133,10 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { var8 = 4; } - this.method6381(var5); + this.method6495(var5); int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1; int var11; - if (this.field3923 > 3) { + if (this.field3925 > 3) { var11 = Runtime.getRuntime().availableProcessors(); } else { var11 = 0; @@ -150,55 +150,64 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider { String var17 = ""; String var18 = ""; int[] var23 = new int[3]; - return new PlatformInfo(var1, var24, var7, var8, this.field3923, this.field3919, this.field3924, 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.field3925, this.field3926, this.field3927, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)V", + garbageValue = "-1686875071" + ) + void method6495(String var1) { + if (var1.startsWith("1.")) { + this.method6484(var1); + } else { + this.method6485(var1); + } + + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)V", + garbageValue = "-1385366754" + ) + void method6484(String var1) { + String[] var2 = var1.split("\\."); + + try { + this.field3925 = Integer.parseInt(var2[1]); + var2 = var2[2].split("_"); + this.field3926 = Integer.parseInt(var2[0]); + this.field3927 = Integer.parseInt(var2[1]); + } catch (Exception var4) { + } + + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;B)V", + garbageValue = "1" + ) + void method6485(String var1) { + String[] var2 = var1.split("\\."); + + try { + this.field3925 = Integer.parseInt(var2[0]); + this.field3926 = Integer.parseInt(var2[1]); + this.field3927 = Integer.parseInt(var2[2]); + } catch (Exception var4) { + } + } @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "-974517530" + signature = "(CI)Z", + garbageValue = "2111177426" ) - void method6381(String var1) { - if (var1.startsWith("1.")) { - this.method6379(var1); - } else { - this.method6380(var1); - } - - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "-312547772" - ) - void method6379(String var1) { - String[] var2 = var1.split("\\."); - - try { - this.field3923 = Integer.parseInt(var2[1]); - var2 = var2[2].split("_"); - this.field3919 = Integer.parseInt(var2[0]); - this.field3924 = Integer.parseInt(var2[1]); - } catch (Exception var4) { - } - - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "12" - ) - void method6380(String var1) { - String[] var2 = var1.split("\\."); - - try { - this.field3923 = Integer.parseInt(var2[0]); - this.field3919 = Integer.parseInt(var2[1]); - this.field3924 = Integer.parseInt(var2[2]); - } catch (Exception var4) { - } - + static final boolean method6481(char var0) { + return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-'; } } diff --git a/runescape-client/src/main/java/DevicePcmPlayer.java b/runescape-client/src/main/java/DevicePcmPlayer.java index 6b80dd7f9b..e3776aa6bd 100644 --- a/runescape-client/src/main/java/DevicePcmPlayer.java +++ b/runescape-client/src/main/java/DevicePcmPlayer.java @@ -9,77 +9,84 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bg") +@ObfuscatedName("bb") @Implements("DevicePcmPlayer") public class DevicePcmPlayer extends PcmPlayer { - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("format") AudioFormat format; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("line") SourceDataLine line; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1537774017 + intValue = -1034506245 ) @Export("capacity2") int capacity2; - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("byteSamples") byte[] byteSamples; DevicePcmPlayer() { } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-515177845" + garbageValue = "2128910021" ) @Export("init") protected void init() { - this.format = new AudioFormat((float)PcmPlayer.field1421, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false); - this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; + this.format = new AudioFormat((float)class237.field3113, 16, Messages.PcmPlayer_stereo ? 2 : 1, true, false); + this.byteSamples = new byte[256 << (Messages.PcmPlayer_stereo ? 2 : 1)]; } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1831392073" + signature = "(IB)V", + garbageValue = "-14" ) @Export("open") protected void open(int var1) throws LineUnavailableException { try { - Info var2 = new Info(SourceDataLine.class, this.format, var1 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); + Info var2 = new Info(SourceDataLine.class, this.format, var1 << (Messages.PcmPlayer_stereo ? 2 : 1)); this.line = (SourceDataLine)AudioSystem.getLine(var2); this.line.open(); this.line.start(); this.capacity2 = var1; - } catch (LineUnavailableException var3) { - if (Clock.method3590(var1) != 1) { - this.open(Calendar.method4033(var1)); + } catch (LineUnavailableException var5) { + if (DynamicObject.method2375(var1) != 1) { + int var4 = var1 - 1; + var4 |= var4 >>> 1; + var4 |= var4 >>> 2; + var4 |= var4 >>> 4; + var4 |= var4 >>> 8; + var4 |= var4 >>> 16; + int var3 = var4 + 1; + this.open(var3); } else { this.line = null; - throw var3; + throw var5; } } } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1722515255" + garbageValue = "1868944096" ) @Export("position") protected int position() { - return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); + return this.capacity2 - (this.line.available() >> (Messages.PcmPlayer_stereo ? 2 : 1)); } - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("write") protected void write() { int var1 = 256; - if (PcmPlayer.PcmPlayer_stereo) { + if (Messages.PcmPlayer_stereo) { var1 <<= 1; } @@ -96,10 +103,10 @@ public class DevicePcmPlayer extends PcmPlayer { this.line.write(this.byteSamples, 0, var1 << 1); } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-100" + signature = "(I)V", + garbageValue = "1900446281" ) @Export("close") protected void close() { @@ -110,10 +117,10 @@ public class DevicePcmPlayer extends PcmPlayer { } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-801705902" + garbageValue = "630637593" ) @Export("discard") protected void discard() { diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index aefc8a6ed1..89d5af0d68 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -1,99 +1,135 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bd") +@ObfuscatedName("be") @Implements("DevicePcmPlayerProvider") public class DevicePcmPlayerProvider implements PlayerProvider { + @ObfuscatedName("rr") + @ObfuscatedGetter( + intValue = 1326431277 + ) + static int field435; + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "Lhz;" + ) + @Export("musicTrack") + public static MusicTrack musicTrack; + DevicePcmPlayerProvider() { } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)Ldw;", - garbageValue = "65536" + signature = "(I)Ldt;", + garbageValue = "-1371983171" ) @Export("player") public PcmPlayer player() { return new DevicePcmPlayer(); } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", - garbageValue = "-989870675" + signature = "(Lkn;Ljava/lang/String;I)I", + garbageValue = "-420633495" ) - public static String method948(CharSequence var0) { - String var1 = Buffer.base37DecodeLong(NetCache.method4400(var0)); - if (var1 == null) { - var1 = ""; - } + public static int method917(Buffer var0, String var1) { + int var2 = var0.offset; + int var4 = var1.length(); + byte[] var5 = new byte[var4]; - return var1; - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "(Lch;Lch;IZB)I", - garbageValue = "1" - ) - @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; + for (int var6 = 0; var6 < var4; ++var6) { + char var7 = var1.charAt(var6); + if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { + var5[var6] = (byte)var7; + } else 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 { - return var0.activity.compareTo(var1.activity); + var5[var6] = 63; } - } else if (var2 == 4) { - return var0.method1871() ? (var1.method1871() ? 0 : 1) : (var1.method1871() ? -1 : 0); - } else if (var2 == 5) { - return var0.method1869() ? (var1.method1869() ? 0 : 1) : (var1.method1869() ? -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; } + + var0.writeSmartByteShort(var5.length); + var0.offset += class219.huffman.compress(var5, 0, var5.length, var0.array, var0.offset); + return var0.offset - var2; } - @ObfuscatedName("s") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "1003949082" + signature = "(Lkn;IB)V", + garbageValue = "-128" ) - static final void method946(String var0) { - GrandExchangeEvent.method165(var0 + " is already on your friend list"); + public static void method914(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("u") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(IIII)I", - garbageValue = "137174344" + garbageValue = "-422462480" ) @Export("hslToRgb") static final int hslToRgb(int var0, int var1, int var2) { @@ -116,4 +152,38 @@ public class DevicePcmPlayerProvider implements PlayerProvider { int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; return var3; } + + @ObfuscatedName("ie") + @ObfuscatedSignature( + signature = "(Lhd;B)Z", + garbageValue = "-86" + ) + @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 = Canvas.method923(var0, var1); + int var3 = var0.cs1ComparisonValues[var1]; + if (var0.cs1Comparisons[var1] == 2) { + if (var2 >= var3) { + return false; + } + } else if (var0.cs1Comparisons[var1] == 3) { + if (var2 <= var3) { + return false; + } + } else if (var0.cs1Comparisons[var1] == 4) { + if (var3 == var2) { + return false; + } + } else if (var2 != var3) { + return false; + } + } + + return true; + } + } } diff --git a/runescape-client/src/main/java/DirectByteArrayCopier.java b/runescape-client/src/main/java/DirectByteArrayCopier.java index d4b3daf9ad..b664d96452 100644 --- a/runescape-client/src/main/java/DirectByteArrayCopier.java +++ b/runescape-client/src/main/java/DirectByteArrayCopier.java @@ -4,29 +4,17 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hl") +@ObfuscatedName("hk") @Implements("DirectByteArrayCopier") public class DirectByteArrayCopier extends AbstractByteArrayCopier { - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "Lla;" - ) - @Export("rightTitleSprite") - static Sprite rightTitleSprite; - @ObfuscatedName("dh") - @ObfuscatedSignature( - signature = "Lih;" - ) - @Export("archive1") - static Archive archive1; - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("directBuffer") ByteBuffer directBuffer; - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)[B", - garbageValue = "1422436059" + garbageValue = "300747627" ) @Export("get") byte[] get() { @@ -36,10 +24,10 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { return var1; } - @ObfuscatedName("d") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "([BB)V", - garbageValue = "0" + garbageValue = "92" ) @Export("set") public void set(byte[] var1) { @@ -47,4 +35,13 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier { this.directBuffer.position(0); this.directBuffer.put(var1); } + + @ObfuscatedName("gl") + @ObfuscatedSignature( + signature = "(Lcc;II)V", + garbageValue = "1934042219" + ) + static final void method4090(Actor var0, int var1) { + HealthBar.worldToScreen(var0.x, var0.y, var1); + } } diff --git a/runescape-client/src/main/java/DirectWrapper.java b/runescape-client/src/main/java/DirectWrapper.java index 8ef9590906..aec604e0ce 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("fk") +@ObfuscatedName("fe") @Implements("DirectWrapper") public class DirectWrapper extends Wrapper { - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("obj") Object obj; @@ -14,13 +14,13 @@ public class DirectWrapper extends Wrapper { this.obj = var1; } - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("get") Object get() { return this.obj; } - @ObfuscatedName("m") + @ObfuscatedName("o") @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 0e697e34f8..770721fb1a 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("ge") +@ObfuscatedName("gf") @Implements("DualNode") public class DualNode extends Node { - @ObfuscatedName("cz") + @ObfuscatedName("cq") @Export("keyDual") public long keyDual; - @ObfuscatedName("cb") + @ObfuscatedName("co") @ObfuscatedSignature( - signature = "Lge;" + signature = "Lgf;" ) @Export("previousDual") public DualNode previousDual; - @ObfuscatedName("cy") + @ObfuscatedName("ca") @ObfuscatedSignature( - signature = "Lge;" + signature = "Lgf;" ) @Export("nextDual") public DualNode nextDual; - @ObfuscatedName("cz") + @ObfuscatedName("ci") @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 c5a66c0d62..363987d789 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("jl") +@ObfuscatedName("jd") @Implements("DualNodeDeque") public final class DualNodeDeque { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lge;" + signature = "Lgf;" ) @Export("sentinel") DualNode sentinel; @@ -19,9 +19,9 @@ public final class DualNodeDeque { this.sentinel.nextDual = this.sentinel; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lge;)V" + signature = "(Lgf;)V" ) @Export("addFirst") public void addFirst(DualNode var1) { @@ -35,9 +35,9 @@ public final class DualNodeDeque { var1.previousDual.nextDual = var1; } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lge;)V" + signature = "(Lgf;)V" ) @Export("addLast") public void addLast(DualNode var1) { @@ -51,9 +51,9 @@ public final class DualNodeDeque { var1.previousDual.nextDual = var1; } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "()Lge;" + signature = "()Lgf;" ) @Export("removeLast") public DualNode removeLast() { diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index bb4a7d2de8..3757bdd34f 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -4,66 +4,66 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cv") +@ObfuscatedName("cr") @Implements("DynamicObject") public class DynamicObject extends Entity { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -778595855 + intValue = 909997849 ) @Export("id") int id; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1719688801 + intValue = 2017652637 ) @Export("type") int type; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1645761999 + intValue = 1099859107 ) @Export("orientation") int orientation; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1021480433 + intValue = -1395519623 ) @Export("plane") int plane; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1939594765 + intValue = 1502042193 ) @Export("x") int x; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 456415143 + intValue = 1335019499 ) @Export("y") int y; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Ljc;" + signature = "Ljm;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -2053050533 + intValue = 521544259 ) @Export("frame") int frame; - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1933430481 + intValue = -1788666009 ) @Export("cycleStart") int cycleStart; @ObfuscatedSignature( - signature = "(IIIIIIIZLee;)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; @@ -73,10 +73,10 @@ public class DynamicObject extends Entity { this.x = var5; this.y = var6; if (var7 != -1) { - this.sequenceDefinition = SpotAnimationDefinition.SequenceDefinition_get(var7); + this.sequenceDefinition = NetSocket.SequenceDefinition_get(var7); this.frame = 0; this.cycleStart = Client.cycle - 1; - if (this.sequenceDefinition.field3525 == 0 && var9 != null && var9 instanceof DynamicObject) { + if (this.sequenceDefinition.field3561 == 0 && var9 != null && var9 instanceof DynamicObject) { DynamicObject var10 = (DynamicObject)var9; if (this.sequenceDefinition == var10.sequenceDefinition) { this.frame = var10.frame; @@ -93,10 +93,10 @@ public class DynamicObject extends Entity { } - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)Lel;", - garbageValue = "480835067" + signature = "(I)Lef;", + garbageValue = "1832696685" ) @Export("getModel") protected final Model getModel() { @@ -126,7 +126,7 @@ public class DynamicObject extends Entity { this.cycleStart = Client.cycle - var1; } - ObjectDefinition var12 = WorldMapSection2.getObjectDefinition(this.id); + ObjectDefinition var12 = Canvas.getObjectDefinition(this.id); if (var12.transforms != null) { var12 = var12.transform(); } @@ -149,34 +149,217 @@ 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[var4][var7] + var8[var5][var6] + var8[var4][var6] + var8[var5][var7] >> 2; + int var9 = var8[var5][var7] + var8[var5][var6] + var8[var4][var6] + var8[var4][var7] >> 2; int var10 = (this.x << 7) + (var2 << 6); int var11 = (this.y << 7) + (var3 << 6); return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame); } } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(ILlq;Lih;I)V", - garbageValue = "-389102765" + signature = "(II)I", + garbageValue = "1062154046" ) - static void method2342(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 method2375(int var0) { + var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); + var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); + var0 = var0 + (var0 >>> 4) & 252645135; + var0 += var0 >>> 8; + var0 += var0 >>> 16; + return var0 & 255; + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(Lkb;I)V", + garbageValue = "1312322364" + ) + static final void method2373(PacketBuffer var0) { + int var1 = 0; + var0.importIndex(); + + byte[] var10000; + int var2; + int var3; + int var4; + int var6; + int var7; + for (var2 = 0; var2 < Players.Players_count; ++var2) { + var3 = Players.Players_indices[var2]; + if ((Players.field1282[var3] & 1) == 0) { + if (var1 > 0) { + --var1; + var10000 = Players.field1282; + var10000[var3] = (byte)(var10000[var3] | 2); + } else { + var4 = var0.readBits(1); + if (var4 == 0) { + var6 = var0.readBits(2); + if (var6 == 0) { + var7 = 0; + } else if (var6 == 1) { + var7 = var0.readBits(5); + } else if (var6 == 2) { + var7 = var0.readBits(8); + } else { + var7 = var0.readBits(11); + } + + var1 = var7; + var10000 = Players.field1282; + var10000[var3] = (byte)(var10000[var3] | 2); + } else { + class92.readPlayerUpdate(var0, var3); + } } } } - if (var3 != null) { - var2.load(var1, var0, var3, true); + var0.exportIndex(); + if (var1 != 0) { + throw new RuntimeException(); } else { - byte[] var4 = var1.read(var0); - var2.load(var1, var0, var4, true); + var0.importIndex(); + + for (var2 = 0; var2 < Players.Players_count; ++var2) { + var3 = Players.Players_indices[var2]; + if ((Players.field1282[var3] & 1) != 0) { + if (var1 > 0) { + --var1; + var10000 = Players.field1282; + var10000[var3] = (byte)(var10000[var3] | 2); + } else { + var4 = var0.readBits(1); + if (var4 == 0) { + var6 = var0.readBits(2); + if (var6 == 0) { + var7 = 0; + } else if (var6 == 1) { + var7 = var0.readBits(5); + } else if (var6 == 2) { + var7 = var0.readBits(8); + } else { + var7 = var0.readBits(11); + } + + var1 = var7; + var10000 = Players.field1282; + var10000[var3] = (byte)(var10000[var3] | 2); + } else { + class92.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.field1282[var3] & 1) != 0) { + if (var1 > 0) { + --var1; + var10000 = Players.field1282; + var10000[var3] = (byte)(var10000[var3] | 2); + } else { + var4 = var0.readBits(1); + if (var4 == 0) { + var6 = var0.readBits(2); + if (var6 == 0) { + var7 = 0; + } else if (var6 == 1) { + var7 = var0.readBits(5); + } else if (var6 == 2) { + var7 = var0.readBits(8); + } else { + var7 = var0.readBits(11); + } + + var1 = var7; + var10000 = Players.field1282; + var10000[var3] = (byte)(var10000[var3] | 2); + } else if (ArchiveDiskAction.updateExternalPlayer(var0, var3)) { + var10000 = Players.field1282; + 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.field1282[var3] & 1) == 0) { + if (var1 > 0) { + --var1; + var10000 = Players.field1282; + var10000[var3] = (byte)(var10000[var3] | 2); + } else { + var4 = var0.readBits(1); + if (var4 == 0) { + var6 = var0.readBits(2); + if (var6 == 0) { + var7 = 0; + } else if (var6 == 1) { + var7 = var0.readBits(5); + } else if (var6 == 2) { + var7 = var0.readBits(8); + } else { + var7 = var0.readBits(11); + } + + var1 = var7; + var10000 = Players.field1282; + var10000[var3] = (byte)(var10000[var3] | 2); + } else if (ArchiveDiskAction.updateExternalPlayer(var0, var3)) { + var10000 = Players.field1282; + 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.field1282; + var10000[var2] = (byte)(var10000[var2] >> 1); + Player var8 = Client.players[var2]; + if (var8 != null) { + Players.Players_indices[++Players.Players_count - 1] = var2; + } else { + Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var2; + } + } + + } + } + } } } + + @ObfuscatedName("bq") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)I", + garbageValue = "-627685416" + ) + @Export("stringCp1252NullTerminatedByteSize") + public static int stringCp1252NullTerminatedByteSize(String var0) { + return var0.length() + 1; + } } diff --git a/runescape-client/src/main/java/Entity.java b/runescape-client/src/main/java/Entity.java index 6968fbee4b..4c5312883a 100644 --- a/runescape-client/src/main/java/Entity.java +++ b/runescape-client/src/main/java/Entity.java @@ -3,13 +3,14 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ee") +@ObfuscatedName("el") @Implements("Entity") public abstract class Entity extends DualNode { - @ObfuscatedName("ci") + @ObfuscatedName("cu") @ObfuscatedGetter( - intValue = 566997565 + intValue = -1335402999 ) @Export("height") public int height; @@ -18,17 +19,17 @@ public abstract class Entity extends DualNode { this.height = 1000; } - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)Lel;", - garbageValue = "480835067" + signature = "(I)Lef;", + garbageValue = "1832696685" ) @Export("getModel") protected Model getModel() { return null; } - @ObfuscatedName("cq") + @ObfuscatedName("cz") @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { Model var11 = this.getModel(); @@ -39,38 +40,299 @@ public abstract class Entity extends DualNode { } - @ObfuscatedName("x") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "-1030899417" + signature = "(B)V", + garbageValue = "67" ) - public static boolean method3374(int var0) { - return var0 >= WorldMapDecorationType.field2719.id && var0 <= WorldMapDecorationType.field2739.id; + public static void method3387() { + KitDefinition.KitDefinition_cached.clear(); } - @ObfuscatedName("x") + @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "([BILjava/lang/CharSequence;I)I", - garbageValue = "-304633818" + signature = "(ILcs;ZI)I", + garbageValue = "-1309600698" ) - public static int method3372(byte[] var0, int var1, CharSequence var2) { - int var3 = var2.length(); - int var4 = var1; + static int method3376(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.publicChatMode; + return 1; + } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { + UrlRequester.Interpreter_intStackSize -= 3; + Client.publicChatMode = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + World.privateChatMode = ItemContainer.method1232(Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]); + if (World.privateChatMode == null) { + World.privateChatMode = PrivateChatMode.field3818; + } - 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 & '?'); + Client.tradeChatMode = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2]; + PacketBufferNode var18 = UserComparator4.getPacketBufferNode(ClientPacket.field2324, Client.packetWriter.isaacCipher); + var18.packetBuffer.writeByte(Client.publicChatMode); + var18.packetBuffer.writeByte(World.privateChatMode.field3817); + var18.packetBuffer.writeByte(Client.tradeChatMode); + Client.packetWriter.addNode(var18); + return 1; + } else { + String var3; + int var4; + if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { + var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; + UrlRequester.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + int var5 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + PacketBufferNode var6 = UserComparator4.getPacketBufferNode(ClientPacket.field2341, Client.packetWriter.isaacCipher); + var6.packetBuffer.writeByte(DynamicObject.stringCp1252NullTerminatedByteSize(var3) + 2); + var6.packetBuffer.writeStringCp1252NullTerminated(var3); + var6.packetBuffer.writeByte(var4 - 1); + var6.packetBuffer.writeByte(var5); + Client.packetWriter.addNode(var6); + return 1; } else { - var0[var4++] = (byte)(224 | var6 >> '\f'); - var0[var4++] = (byte)(128 | var6 >> 6 & 63); - var0[var4++] = (byte)(128 | var6 & '?'); + int var10; + if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { + UrlRequester.Interpreter_intStackSize -= 2; + var10 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + Message var15 = class3.Messages_getByChannelAndID(var10, var4); + if (var15 != null) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var15.count; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var15.cycle; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var15.sender != null ? var15.sender : ""; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var15.prefix != null ? var15.prefix : ""; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var15.text != null ? var15.text : ""; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var15.isFromFriend() ? 1 : (var15.isFromIgnored() ? 2 : 0); + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { + var10 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + Message var16 = Language.Messages_getMessage(var10); + if (var16 != null) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var16.type; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var16.cycle; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var16.sender != null ? var16.sender : ""; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var16.prefix != null ? var16.prefix : ""; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var16.text != null ? var16.text : ""; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var16.isFromFriend() ? 1 : (var16.isFromIgnored() ? 2 : 0); + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { + if (World.privateChatMode == null) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = World.privateChatMode.field3817; + } + + return 1; + } else if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { + var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--UrlRequester.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 (UserComparator9.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 != UserComparator9.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 = UserComparator4.getPacketBufferNode(ClientPacket.field2273, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeByte(0); + int var9 = var8.packetBuffer.offset; + var8.packetBuffer.writeByte(var4); + var8.packetBuffer.writeByte(var17); + var8.packetBuffer.writeByte(var7); + DevicePcmPlayerProvider.method917(var8.packetBuffer, var3); + var8.packetBuffer.writeLengthByte(var8.packetBuffer.offset - var9); + Client.packetWriter.addNode(var8); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { + WorldMapEvent.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[WorldMapEvent.Interpreter_stringStackSize]; + String var12 = Interpreter.Interpreter_stringStack[WorldMapEvent.Interpreter_stringStackSize + 1]; + PacketBufferNode var11 = UserComparator4.getPacketBufferNode(ClientPacket.field2247, Client.packetWriter.isaacCipher); + var11.packetBuffer.writeShort(0); + int var13 = var11.packetBuffer.offset; + var11.packetBuffer.writeStringCp1252NullTerminated(var3); + DevicePcmPlayerProvider.method917(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[++UrlRequester.Interpreter_intStackSize - 1] = Client.tradeChatMode; + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { + var10 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = GrandExchangeEvent.Messages_getHistorySize(var10); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { + var10 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = class171.Messages_getNextChatID(var10); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { + var10 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = WorldMapLabel.Messages_getLastChatID(var10); + return 1; + } else if (var0 == ScriptOpcodes.DOCHEAT) { + var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; + WallDecoration.doCheat(var3); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { + Client.field755 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize].toLowerCase().trim(); + return 1; + } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = Client.field755; + return 1; + } else if (var0 == ScriptOpcodes.DEBUGMES) { + var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; + System.out.println(var3); + return 1; + } else { + return 2; + } + } else { + if (class60.localPlayer != null && class60.localPlayer.username != null) { + var3 = class60.localPlayer.username.getName(); + } else { + var3 = ""; + } + + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3; + return 1; + } } } + } - return var4 - var1; + @ObfuscatedName("kl") + @ObfuscatedSignature( + signature = "(Lhd;I)Z", + garbageValue = "-36347772" + ) + @Export("isComponentHidden") + static boolean isComponentHidden(Widget var0) { + return var0.isHidden; } } diff --git a/runescape-client/src/main/java/EnumDefinition.java b/runescape-client/src/main/java/EnumDefinition.java index cf4ecef07b..fb5ab51db0 100644 --- a/runescape-client/src/main/java/EnumDefinition.java +++ b/runescape-client/src/main/java/EnumDefinition.java @@ -4,49 +4,43 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ji") +@ObfuscatedName("jr") @Implements("EnumDefinition") public class EnumDefinition extends DualNode { - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Liy;" - ) - @Export("EnumDefinition_archive") - static AbstractArchive EnumDefinition_archive; - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "Leg;" + signature = "Lec;" ) @Export("EnumDefinition_cached") static EvictingDualNodeHashTable EnumDefinition_cached; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("inputType") public char inputType; - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("outputType") public char outputType; - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1168542031 + intValue = 296936223 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 744835807 + intValue = -306934909 ) @Export("outputCount") public int outputCount; - @ObfuscatedName("z") + @ObfuscatedName("u") @Export("keys") public int[] keys; - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("intVals") public int[] intVals; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("strVals") public String[] strVals; @@ -59,10 +53,10 @@ public class EnumDefinition extends DualNode { this.outputCount = 0; } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkb;I)V", - garbageValue = "1803562371" + signature = "(Lkn;I)V", + garbageValue = "1372956041" ) @Export("decode") void decode(Buffer var1) { @@ -76,10 +70,10 @@ public class EnumDefinition extends DualNode { } } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkb;II)V", - garbageValue = "-1795608149" + signature = "(Lkn;IB)V", + garbageValue = "63" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -116,45 +110,13 @@ public class EnumDefinition extends DualNode { } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1493924915" + signature = "(S)I", + garbageValue = "-24655" ) @Export("size") public int size() { return this.outputCount; } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-530273467" - ) - public static void method4614(int var0) { - if (var0 != -1) { - if (Widget.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; - } - - Widget.Widget_loadedInterfaces[var0] = false; - } - } - } - } } diff --git a/runescape-client/src/main/java/Enumerated.java b/runescape-client/src/main/java/Enumerated.java index b556511eed..aa6f4ed469 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("go") +@ObfuscatedName("gt") @Implements("Enumerated") public interface Enumerated { - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "56" + signature = "(I)I", + garbageValue = "-995092303" ) @Export("rsOrdinal") int rsOrdinal(); diff --git a/runescape-client/src/main/java/EvictingDualNodeHashTable.java b/runescape-client/src/main/java/EvictingDualNodeHashTable.java index b17746deeb..81119f6b2e 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("eg") +@ObfuscatedName("ec") @Implements("EvictingDualNodeHashTable") public final class EvictingDualNodeHashTable { - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lge;" - ) - DualNode field1973; @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Lgf;" + ) + DualNode field1978; + @ObfuscatedName("o") @Export("capacity") int capacity; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("remainingCapacity") int remainingCapacity; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lln;" + signature = "Llf;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Ljz;" + signature = "Ljq;" ) @Export("deque") IterableDualNodeQueue deque; public EvictingDualNodeHashTable(int var1) { - this.field1973 = new DualNode(); + this.field1978 = 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("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(J)Lge;" + signature = "(J)Lgf;" ) @Export("get") public DualNode get(long var1) { @@ -57,7 +57,7 @@ public final class EvictingDualNodeHashTable { return var3; } - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("remove") public void remove(long var1) { DualNode var3 = (DualNode)this.hashTable.get(var1); @@ -69,9 +69,9 @@ public final class EvictingDualNodeHashTable { } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lge;J)V" + signature = "(Lgf;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.field1973) { + if (var4 == this.field1978) { var4 = this.deque.removeLast(); var4.remove(); var4.removeDual(); @@ -92,12 +92,12 @@ public final class EvictingDualNodeHashTable { this.deque.add(var1); } - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("clear") public void clear() { this.deque.clear(); this.hashTable.clear(); - this.field1973 = new DualNode(); + this.field1978 = 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 c38bbdfe5b..829e84241f 100644 --- a/runescape-client/src/main/java/FaceNormal.java +++ b/runescape-client/src/main/java/FaceNormal.java @@ -4,30 +4,24 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("er") +@ObfuscatedName("ed") @Implements("FaceNormal") public class FaceNormal { - @ObfuscatedName("iz") - @ObfuscatedGetter( - intValue = -98471287 - ) - @Export("selectedItemId") - static int selectedItemId; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 62688093 - ) - @Export("y") - int y; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 152436141 + intValue = -552913965 ) @Export("x") int x; - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 567855277 + intValue = -1122069433 + ) + @Export("y") + int y; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -256548507 ) @Export("z") int z; @@ -37,140 +31,29 @@ public class FaceNormal { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lgn;Llp;I)Lgq;", - garbageValue = "-1746993437" + signature = "([Lgt;II)Lgt;", + garbageValue = "-707018179" ) - @Export("getPacketBufferNode") - public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { - PacketBufferNode var2 = UserComparator9.method3496(); - var2.clientPacket = var0; - var2.clientPacketLength = var0.length; - if (var2.clientPacketLength == -1) { - var2.packetBuffer = new PacketBuffer(260); - } else if (var2.clientPacketLength == -2) { - var2.packetBuffer = new PacketBuffer(10000); - } else if (var2.clientPacketLength <= 18) { - var2.packetBuffer = new PacketBuffer(20); - } else if (var2.clientPacketLength <= 98) { - var2.packetBuffer = new PacketBuffer(100); - } else { - var2.packetBuffer = new PacketBuffer(260); - } + @Export("findEnumerated") + public static Enumerated findEnumerated(Enumerated[] var0, int var1) { + Enumerated[] var2 = var0; - var2.packetBuffer.setIsaacCipher(var1); - var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); - var2.index = 0; - return var2; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "(CLgl;B)C", - garbageValue = "-64" - ) - @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'; + for (int var3 = 0; var3 < var2.length; ++var3) { + Enumerated var4 = var2[var3]; + if (var1 == var4.rsOrdinal()) { + return var4; } } - if (var0 == 338) { - return 'O'; - } else if (var0 == 339) { - return 'o'; - } else { - return var0 == 376 ? 'Y' : var0; - } + return null; } - @ObfuscatedName("v") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(ILiy;IIIZB)V", - garbageValue = "-88" + signature = "(I)Ljava/lang/String;", + garbageValue = "223741723" ) - @Export("playMusicTrack") - public static void playMusicTrack(int var0, AbstractArchive var1, int var2, int var3, int var4, boolean var5) { - class206.field2406 = 1; - class206.musicTrackArchive = var1; - class206.musicTrackGroupId = var2; - class206.musicTrackFileId = var3; - class219.musicTrackVolume = var4; - GrandExchangeOfferUnitPriceComparator.musicTrackBoolean = var5; - AttackOption.field1187 = var0; - } - - @ObfuscatedName("lk") - @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "2112938441" - ) - public static boolean method3379() { - return Client.staffModLevel >= 2; + static String method3392() { + return NetSocket.clientPreferences.hideUsername ? WorldMapRegion.method613(Login.Login_username) : Login.Login_username; } } diff --git a/runescape-client/src/main/java/FileSystem.java b/runescape-client/src/main/java/FileSystem.java index 51fbe5358d..6188e20fab 100644 --- a/runescape-client/src/main/java/FileSystem.java +++ b/runescape-client/src/main/java/FileSystem.java @@ -3,18 +3,17 @@ import java.util.Hashtable; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fe") +@ObfuscatedName("fl") @Implements("FileSystem") public class FileSystem { - @ObfuscatedName("x") - @Export("FileSystem_hasPermissions") - public static boolean FileSystem_hasPermissions; @ObfuscatedName("m") + @Export("FileSystem_hasPermissions") + static boolean FileSystem_hasPermissions; + @ObfuscatedName("o") @Export("FileSystem_cacheDir") - public static File FileSystem_cacheDir; - @ObfuscatedName("k") + static File FileSystem_cacheDir; + @ObfuscatedName("q") @Export("FileSystem_cacheFiles") static Hashtable FileSystem_cacheFiles; @@ -22,40 +21,4 @@ public class FileSystem { FileSystem_hasPermissions = false; FileSystem_cacheFiles = new Hashtable(16); } - - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "(IIB)Z", - garbageValue = "-28" - ) - static final boolean method3588(int var0, int var1) { - ObjectDefinition var2 = WorldMapSection2.getObjectDefinition(var0); - if (var1 == 11) { - var1 = 10; - } - - if (var1 >= 5 && var1 <= 8) { - var1 = 4; - } - - return var2.method4661(var1); - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - signature = "(Lds;S)V", - garbageValue = "4477" - ) - @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/FloorDecoration.java b/runescape-client/src/main/java/FloorDecoration.java index 199dbb498a..c9c00b8d06 100644 --- a/runescape-client/src/main/java/FloorDecoration.java +++ b/runescape-client/src/main/java/FloorDecoration.java @@ -4,42 +4,42 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eo") +@ObfuscatedName("eu") @Implements("FloorDecoration") public final class FloorDecoration { - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -1588480469 - ) - @Export("y") - int y; @ObfuscatedName("m") @ObfuscatedGetter( - longValue = -6831837537966124847L + longValue = 423292381861362449L ) @Export("tag") public long tag; - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -198900691 + intValue = 1344836879 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1743466221 + intValue = -732713561 ) @Export("x") int x; - @ObfuscatedName("w") + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -799217819 + ) + @Export("y") + int y; + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lee;" + signature = "Lel;" ) @Export("entity") public Entity entity; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1370776167 + intValue = -1173464785 ) @Export("flags") int flags; @@ -47,22 +47,8 @@ public final class FloorDecoration { FloorDecoration() { } - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "-95" - ) - public static void method2952(int var0, int var1) { - VarbitDefinition var2 = SpriteMask.method4061(var0); - int var3 = var2.baseVar; - int var4 = var2.startBit; - int var5 = var2.endBit; - int var6 = Varps.Varps_masks[var5 - var4]; - if (var1 < 0 || var1 > var6) { - var1 = 0; - } - - var6 <<= var4; - Varps.Varps_main[var3] = Varps.Varps_main[var3] & ~var6 | var1 << var4 & var6; + @ObfuscatedName("o") + static boolean method2977(long var0) { + return class171.method3571(var0) == 2; } } diff --git a/runescape-client/src/main/java/FloorOverlayDefinition.java b/runescape-client/src/main/java/FloorOverlayDefinition.java index 15cf07225a..16bb516031 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("jn") +@ObfuscatedName("jt") @Implements("FloorOverlayDefinition") public class FloorOverlayDefinition extends DualNode { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Liy;" + signature = "Lic;" ) @Export("FloorOverlayDefinition_archive") public static AbstractArchive FloorOverlayDefinition_archive; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Leg;" + signature = "Lec;" ) @Export("FloorOverlayDefinition_cached") - static EvictingDualNodeHashTable FloorOverlayDefinition_cached; - @ObfuscatedName("k") + public static EvictingDualNodeHashTable FloorOverlayDefinition_cached; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1157024387 + intValue = -1755156673 ) @Export("primaryRgb") public int primaryRgb; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 512679167 + intValue = 1396694897 ) @Export("texture") public int texture; - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("hideUnderlay") public boolean hideUnderlay; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1191999743 + intValue = 241976547 ) @Export("secondaryRgb") public int secondaryRgb; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 273345835 + intValue = 752648345 ) @Export("hue") public int hue; - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1834266941 + intValue = -1759175445 ) @Export("saturation") public int saturation; - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1392901101 + intValue = 1976855017 ) @Export("lightness") public int lightness; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1368031931 + intValue = -223897525 ) @Export("secondaryHue") public int secondaryHue; - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1913373455 + intValue = 1642260111 ) @Export("secondarySaturation") public int secondarySaturation; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 262091387 + intValue = 841175665 ) @Export("secondaryLightness") public int secondaryLightness; @@ -81,7 +81,7 @@ public class FloorOverlayDefinition extends DualNode { FloorOverlayDefinition_cached = new EvictingDualNodeHashTable(64); } - FloorOverlayDefinition() { + public FloorOverlayDefinition() { this.primaryRgb = 0; this.texture = -1; this.hideUnderlay = true; @@ -90,11 +90,11 @@ public class FloorOverlayDefinition extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1555097959" + signature = "(S)V", + garbageValue = "9136" ) @Export("postDecode") - void postDecode() { + public void postDecode() { if (this.secondaryRgb != -1) { this.setHsl(this.secondaryRgb); this.secondaryHue = this.hue; @@ -105,13 +105,13 @@ public class FloorOverlayDefinition extends DualNode { this.setHsl(this.primaryRgb); } - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkb;II)V", - garbageValue = "-1372531887" + signature = "(Lkn;II)V", + garbageValue = "1893541080" ) @Export("decode") - void decode(Buffer var1, int var2) { + public void decode(Buffer var1, int var2) { while (true) { int var3 = var1.readUnsignedByte(); if (var3 == 0) { @@ -122,10 +122,10 @@ public class FloorOverlayDefinition extends DualNode { } } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkb;IIB)V", - garbageValue = "109" + signature = "(Lkn;III)V", + garbageValue = "965813090" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { @@ -142,10 +142,10 @@ public class FloorOverlayDefinition extends DualNode { } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-726592820" + signature = "(IB)V", + garbageValue = "1" ) @Export("setHsl") void setHsl(int var1) { @@ -172,8 +172,8 @@ public class FloorOverlayDefinition extends DualNode { double var12 = 0.0D; double var14 = 0.0D; - double var16 = (var10 + var8) / 2.0D; - if (var8 != var10) { + double var16 = (var8 + var10) / 2.0D; + if (var10 != var8) { if (var16 < 0.5D) { var14 = (var10 - var8) / (var8 + var10); } @@ -182,19 +182,19 @@ public class FloorOverlayDefinition extends DualNode { var14 = (var10 - var8) / (2.0D - var10 - var8); } - if (var2 == var10) { + if (var10 == var2) { var12 = (var4 - var6) / (var10 - var8); - } else if (var4 == var10) { - var12 = (var6 - var2) / (var10 - var8) + 2.0D; + } else if (var10 == var4) { + var12 = 2.0D + (var6 - var2) / (var10 - var8); } else if (var10 == var6) { - var12 = (var2 - var4) / (var10 - var8) + 4.0D; + var12 = 4.0D + (var2 - var4) / (var10 - var8); } } var12 /= 6.0D; - this.hue = (int)(var12 * 256.0D); - this.saturation = (int)(var14 * 256.0D); - this.lightness = (int)(256.0D * var16); + this.hue = (int)(256.0D * var12); + this.saturation = (int)(256.0D * var14); + this.lightness = (int)(var16 * 256.0D); if (this.saturation < 0) { this.saturation = 0; } else if (this.saturation > 255) { @@ -209,26 +209,12 @@ public class FloorOverlayDefinition extends DualNode { } - @ObfuscatedName("m") + @ObfuscatedName("bk") @ObfuscatedSignature( - signature = "(IB)Ljq;", - garbageValue = "6" + signature = "([BII)I", + garbageValue = "-2091622873" ) - @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)); - } - - var1.postDecode(); - StructDefinition.StructDefinition_cached.put(var1, (long)var0); - return var1; - } + public static int method4936(byte[] var0, int var1) { + return Actor.method1822(var0, 0, var1); } } diff --git a/runescape-client/src/main/java/FloorUnderlayDefinition.java b/runescape-client/src/main/java/FloorUnderlayDefinition.java index cd20bd1079..60ab48c31e 100644 --- a/runescape-client/src/main/java/FloorUnderlayDefinition.java +++ b/runescape-client/src/main/java/FloorUnderlayDefinition.java @@ -1,51 +1,62 @@ +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; -@ObfuscatedName("if") +@ObfuscatedName("iw") @Implements("FloorUnderlayDefinition") public class FloorUnderlayDefinition extends DualNode { - @ObfuscatedName("x") + @ObfuscatedName("sh") @ObfuscatedSignature( - signature = "Liy;" + signature = "Llp;" + ) + @Export("masterDisk") + static ArchiveDisk masterDisk; + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Lic;" ) @Export("FloorUnderlayDefinition_archive") public static AbstractArchive FloorUnderlayDefinition_archive; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Leg;" + signature = "Lec;" ) @Export("FloorUnderlayDefinition_cached") public static EvictingDualNodeHashTable FloorUnderlayDefinition_cached; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -982291311 + intValue = 582353211 ) @Export("rgb") int rgb; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1361572975 + intValue = -50831355 ) @Export("hue") public int hue; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -932748815 + intValue = 88823617 ) @Export("saturation") public int saturation; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -26214431 + intValue = -1334094789 ) @Export("lightness") public int lightness; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -667494965 + intValue = 1647084533 ) @Export("hueMultiplier") public int hueMultiplier; @@ -54,27 +65,27 @@ public class FloorUnderlayDefinition extends DualNode { FloorUnderlayDefinition_cached = new EvictingDualNodeHashTable(64); } - FloorUnderlayDefinition() { + public FloorUnderlayDefinition() { this.rgb = 0; } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1794462402" + garbageValue = "-33176492" ) @Export("postDecode") - void postDecode() { + public void postDecode() { this.setHsl(this.rgb); } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkb;II)V", - garbageValue = "1422019917" + signature = "(Lkn;IB)V", + garbageValue = "17" ) @Export("decode") - void decode(Buffer var1, int var2) { + public void decode(Buffer var1, int var2) { while (true) { int var3 = var1.readUnsignedByte(); if (var3 == 0) { @@ -85,10 +96,10 @@ public class FloorUnderlayDefinition extends DualNode { } } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkb;III)V", - garbageValue = "-1237610564" + signature = "(Lkn;IIB)V", + garbageValue = "-93" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { @@ -98,10 +109,10 @@ public class FloorUnderlayDefinition extends DualNode { } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "2124532512" + signature = "(IB)V", + garbageValue = "-14" ) @Export("setHsl") void setHsl(int var1) { @@ -129,9 +140,9 @@ 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) / (var10 + var8); + var14 = (var10 - var8) / (var8 + var10); } if (var16 >= 0.5D) { @@ -141,15 +152,15 @@ public class FloorUnderlayDefinition extends DualNode { if (var2 == var10) { var12 = (var4 - var6) / (var10 - var8); } else if (var10 == var4) { - var12 = (var6 - var2) / (var10 - var8) + 2.0D; - } else if (var10 == var6) { + var12 = 2.0D + (var6 - var2) / (var10 - var8); + } else if (var6 == var10) { var12 = 4.0D + (var2 - var4) / (var10 - var8); } } var12 /= 6.0D; this.saturation = (int)(256.0D * var14); - this.lightness = (int)(var16 * 256.0D); + this.lightness = (int)(256.0D * var16); if (this.saturation < 0) { this.saturation = 0; } else if (this.saturation > 255) { @@ -163,7 +174,7 @@ public class FloorUnderlayDefinition extends DualNode { } if (var16 > 0.5D) { - this.hueMultiplier = (int)((1.0D - var16) * var14 * 512.0D); + this.hueMultiplier = (int)(512.0D * var14 * (1.0D - var16)); } else { this.hueMultiplier = (int)(512.0D * var16 * var14); } @@ -172,17 +183,81 @@ public class FloorUnderlayDefinition extends DualNode { this.hueMultiplier = 1; } - this.hue = (int)(var12 * (double)this.hueMultiplier); + this.hue = (int)((double)this.hueMultiplier * var12); } - @ObfuscatedName("w") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Liy;Ljava/lang/String;Ljava/lang/String;I)[Lla;", - garbageValue = "-1984453529" + signature = "([BI)Llz;", + garbageValue = "619951505" ) - public static Sprite[] method4507(AbstractArchive var0, String var1, String var2) { - int var3 = var0.getGroupId(var1); - int var4 = var0.getFileId(var3, var2); - return ClientPacket.method3688(var0, var3, var4); + @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) { + } + + return new Sprite(0, 0); + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(Ljava/lang/Object;ZB)[B", + garbageValue = "101" + ) + public static byte[] method4613(Object var0, boolean var1) { + if (var0 == null) { + return null; + } else if (var0 instanceof byte[]) { + byte[] var3 = (byte[])((byte[])var0); + return var1 ? class195.method3748(var3) : var3; + } else if (var0 instanceof AbstractByteArrayCopier) { + AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; + return var2.get(); + } else { + throw new IllegalArgumentException(); + } + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(Llf;ILjava/lang/String;I)Ljava/lang/String;", + garbageValue = "-1916318659" + ) + static String method4612(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; + } + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;IB)Z", + garbageValue = "3" + ) + static boolean method4608(String var0, int var1) { + return GrandExchangeOfferTotalQuantityComparator.method165(var0, var1, "openjs"); + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "(IB)Z", + garbageValue = "7" + ) + public static boolean method4615(int var0) { + return (var0 >> 30 & 1) != 0; } } diff --git a/runescape-client/src/main/java/Font.java b/runescape-client/src/main/java/Font.java index 9f6c93be74..fe9daa81e3 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("kx") +@ObfuscatedName("ko") @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("x") + @ObfuscatedName("m") @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("m") + @ObfuscatedName("o") @Export("drawGlyphAlpha") final void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7) { int var8 = var3 * Rasterizer2D.Rasterizer2D_width + var2; diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index 67fbf5963e..e969fdabb8 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -1,55 +1,50 @@ -import java.util.Iterator; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ka") +@ObfuscatedName("ke") @Implements("FontName") public class FontName { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lka;" + signature = "Lke;" ) @Export("FontName_plain11") public static final FontName FontName_plain11; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lka;" + signature = "Lke;" ) @Export("FontName_plain12") public static final FontName FontName_plain12; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lka;" + signature = "Lke;" ) @Export("FontName_bold12") public static final FontName FontName_bold12; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lka;" + signature = "Lke;" ) @Export("FontName_verdana11") public static final FontName FontName_verdana11; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lka;" + signature = "Lke;" ) @Export("FontName_verdana13") public static final FontName FontName_verdana13; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lka;" + signature = "Lke;" ) @Export("FontName_verdana15") public static final FontName FontName_verdana15; - @ObfuscatedName("do") - @ObfuscatedSignature( - signature = "Lih;" - ) - @Export("archive4") - static Archive archive4; - @ObfuscatedName("q") + @ObfuscatedName("n") @Export("name") String name; @@ -66,143 +61,95 @@ public class FontName { this.name = var1; } - @ObfuscatedName("x") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(I)[Lka;", - garbageValue = "-2101151753" + signature = "(B)Lch;", + garbageValue = "-18" ) - public static FontName[] method5387() { - return new FontName[]{FontName_bold12, FontName_verdana13, FontName_verdana11, FontName_plain11, FontName_plain12, FontName_verdana15}; + @Export("worldListStart") + static World worldListStart() { + World.World_listCount = 0; + return class3.getNextWorldListWorld(); } - @ObfuscatedName("d") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(IIII)V", - garbageValue = "-1439449778" + signature = "(Lhd;II)V", + garbageValue = "1462159307" ) - static final void method5385(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("v") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "27" - ) - static void method5388() { - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { - Login.currentLoginField = 1; + @Export("Widget_setKeyIgnoreHeld") + static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { + if (var0.field2647 == null) { + throw new RuntimeException(); } else { - Login.currentLoginField = 0; - } - - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(Lhe;I[B[BI)V", - garbageValue = "-481571835" - ) - @Export("Widget_setKey") - static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { - if (var0.field2555 == null) { - if (var2 == null) { - return; + if (var0.field2723 == null) { + var0.field2723 = new int[var0.field2647.length]; } - var0.field2555 = new byte[11][]; - var0.field2643 = new byte[11][]; - var0.field2644 = new int[11]; - var0.field2695 = new int[11]; + var0.field2723[var1] = Integer.MAX_VALUE; } + } - var0.field2555[var1] = var2; - if (var2 != null) { - var0.field2641 = true; - } else { - var0.field2641 = false; + @ObfuscatedName("ae") + @ObfuscatedSignature( + signature = "(Lfm;III)Ldt;", + garbageValue = "273987431" + ) + public static final PcmPlayer method5519(TaskHandler var0, int var1, int var2) { + if (class237.field3113 == 0) { + throw new IllegalStateException(); + } else if (var1 >= 0 && var1 < 2) { + if (var2 < 256) { + var2 = 256; + } - for (int var4 = 0; var4 < var0.field2555.length; ++var4) { - if (var0.field2555[var4] != null) { - var0.field2641 = true; - break; + try { + PcmPlayer var3 = HealthBarUpdate.pcmPlayerProvider.player(); + var3.samples = new int[256 * (Messages.PcmPlayer_stereo ? 2 : 1)]; + var3.field1443 = var2; + var3.init(); + var3.capacity = (var2 & -1024) + 1024; + if (var3.capacity > 16384) { + var3.capacity = 16384; } + + var3.open(var3.capacity); + if (UserComparator3.field2009 > 0 && PcmPlayer.soundSystem == null) { + PcmPlayer.soundSystem = new SoundSystem(); + class227.soundSystemExecutor = Executors.newScheduledThreadPool(1); + class227.soundSystemExecutor.scheduleAtFixedRate(PcmPlayer.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); + } + + if (PcmPlayer.soundSystem != null) { + if (PcmPlayer.soundSystem.players[var1] != null) { + throw new IllegalArgumentException(); + } + + PcmPlayer.soundSystem.players[var1] = var3; + } + + return var3; + } catch (Throwable var4) { + return new PcmPlayer(); } + } else { + throw new IllegalArgumentException(); } - - var0.field2643[var1] = var3; } - @ObfuscatedName("jv") - @ObfuscatedSignature( - signature = "(IIIIII)V", - garbageValue = "2092614789" - ) - @Export("drawScrollBar") - static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { - class232.scrollBarSprites[0].drawAt(var0, var1); - class232.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field742); - int var5 = var3 * (var3 - 32) / var4; - if (var5 < 8) { - var5 = 8; - } - - int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field747); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field745); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field745); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field745); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field745); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field744); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field744); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field744); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var5 + var6 + var1 + 14, 15, Client.field744); - } - - @ObfuscatedName("ku") + @ObfuscatedName("hk") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "78601767" + garbageValue = "1542752856" ) - @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 (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.invalidateIgnoreds(); - } - + @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/Fonts.java b/runescape-client/src/main/java/Fonts.java index 0078e76afa..25e1e7dda7 100644 --- a/runescape-client/src/main/java/Fonts.java +++ b/runescape-client/src/main/java/Fonts.java @@ -4,27 +4,36 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kf") +@ObfuscatedName("kv") @Implements("Fonts") public class Fonts { - @ObfuscatedName("x") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Liy;" + signature = "Llh;" + ) + @Export("titlebuttonSprite") + static IndexedSprite titlebuttonSprite; + @ObfuscatedName("a") + @Export("ByteArrayPool_arrays") + static byte[][][] ByteArrayPool_arrays; + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Lic;" ) @Export("spritesArchive") AbstractArchive spritesArchive; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Liy;" + signature = "Lic;" ) @Export("fontsArchive") AbstractArchive fontsArchive; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("map") HashMap map; @ObfuscatedSignature( - signature = "(Liy;Liy;)V" + signature = "(Lic;Lic;)V" ) public Fonts(AbstractArchive var1, AbstractArchive var2) { this.spritesArchive = var1; @@ -32,10 +41,10 @@ public class Fonts { this.map = new HashMap(); } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "([Lka;I)Ljava/util/HashMap;", - garbageValue = "-1813664222" + signature = "([Lke;B)Ljava/util/HashMap;", + garbageValue = "-100" ) @Export("createMap") public HashMap createMap(FontName[] var1) { @@ -47,7 +56,12 @@ public class Fonts { if (this.map.containsKey(var5)) { var2.put(var5, this.map.get(var5)); } else { - Font var6 = class39.method647(this.spritesArchive, this.fontsArchive, var5.name, ""); + AbstractArchive var7 = this.spritesArchive; + AbstractArchive var8 = this.fontsArchive; + String var9 = var5.name; + int var10 = var7.getGroupId(var9); + int var11 = var7.getFileId(var10, ""); + Font var6 = Frames.method3394(var7, var8, var10, var11); if (var6 != null) { this.map.put(var5, var6); var2.put(var5, var6); diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java index d6580ed87f..c4b5b8b658 100644 --- a/runescape-client/src/main/java/Frames.java +++ b/runescape-client/src/main/java/Frames.java @@ -1,20 +1,27 @@ import 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("eg") @Implements("Frames") public class Frames extends DualNode { - @ObfuscatedName("x") + @ObfuscatedName("lc") + @ObfuscatedGetter( + intValue = -2096850733 + ) + @Export("menuY") + static int menuY; + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "[Leh;" + signature = "[Les;" ) @Export("frames") Animation[] frames; @ObfuscatedSignature( - signature = "(Liy;Liy;IZ)V", + signature = "(Lic;Lic;IZ)V", garbageValue = "0" ) public Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { @@ -46,60 +53,207 @@ public class Frames extends DualNode { } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "861900150" + signature = "(IB)Z", + garbageValue = "-107" ) @Export("hasAlphaTransform") public boolean hasAlphaTransform(int var1) { return this.frames[var1].hasAlphaTransform; } - @ObfuscatedName("k") + @ObfuscatedName("m") + public static String method3398(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 (0L != var0) { + long var6 = var0; + var0 /= 37L; + var5.append(class298.base37Table[(int)(var6 - var0 * 37L)]); + } + + return var5.reverse().toString(); + } + } else { + return null; + } + } + + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lih;IIIBZI)V", - garbageValue = "-626508532" + signature = "(CLgz;I)C", + garbageValue = "-959977971" ) - @Export("requestNetFile") - static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { - long var6 = (long)((var1 << 16) + var2); - NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); - if (var8 == null) { - var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); - if (var8 == null) { - var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); - if (var8 != null) { - if (var5) { - var8.removeDual(); - NetCache.NetCache_pendingPriorityWrites.put(var8, var6); - --NetCache.NetCache_pendingWritesCount; - ++NetCache.NetCache_pendingPriorityWritesCount; + @Export("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("p") + @ObfuscatedSignature( + signature = "(Lic;Lic;III)Lko;", + garbageValue = "-2070991083" + ) + public static Font method3394(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { + byte[] var5 = var0.takeFile(var2, var3); + boolean var4; + if (var5 == null) { + var4 = false; + } else { + class3.SpriteBuffer_decode(var5); + var4 = true; + } + + return !var4 ? null : class90.method2168(var1.takeFile(var2, var3)); + } + + @ObfuscatedName("gw") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "150036680" + ) + static final void method3396() { + 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) { + int var2 = var0.objectId; + int var3 = var0.field957; + ObjectDefinition var4 = Canvas.getObjectDefinition(var2); + if (var3 == 11) { + var3 = 10; } - } else { - if (!var5) { - var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); - if (var8 != null) { - return; - } + if (var3 >= 5 && var3 <= 8) { + var3 = 4; } - 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; + boolean var1 = var4.method4786(var3); + if (!var1) { + continue; } + } + class1.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.objectId, var0.field956, var0.field957); + 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 || class7.method97(var0.id, var0.field962))) { + class1.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field962); + var0.delay = -1; + if (var0.id == var0.objectId && var0.objectId == -1) { + var0.remove(); + } else if (var0.objectId == var0.id && var0.field956 == var0.orientation && var0.field957 == var0.field962) { + var0.remove(); + } } } } + + } + + @ObfuscatedName("ku") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-179061034" + ) + static final void method3399() { + Client.field943 = Client.cycleCntr; + class4.ClanChat_inClanChat = true; } } diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java index 6b981174b3..547de358f0 100644 --- a/runescape-client/src/main/java/Friend.java +++ b/runescape-client/src/main/java/Friend.java @@ -1,29 +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("ky") +@ObfuscatedName("kl") @Implements("Friend") public class Friend extends Buddy { - @ObfuscatedName("rc") - @ObfuscatedGetter( - intValue = -1119785599 - ) - static int field3626; - @ObfuscatedName("x") - boolean field3625; @ObfuscatedName("m") - boolean field3623; + boolean field3655; + @ObfuscatedName("o") + boolean field3654; Friend() { } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lky;I)I", - garbageValue = "-1645564523" + signature = "(Lkl;I)I", + garbageValue = "-1139109616" ) @Export("compareToFriend") int compareToFriend(Friend var1) { @@ -35,23 +29,23 @@ public class Friend extends Buddy { return -1; } else if (var1.world != 0 && super.world == 0) { return 1; - } else if (this.field3625 && !var1.field3625) { + } else if (this.field3655 && !var1.field3655) { return -1; - } else if (!this.field3625 && var1.field3625) { + } else if (!this.field3655 && var1.field3655) { return 1; - } else if (this.field3623 && !var1.field3623) { + } else if (this.field3654 && !var1.field3654) { return -1; - } else if (!this.field3623 && var1.field3623) { + } else if (!this.field3654 && var1.field3654) { return 1; } else { return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2; } } - @ObfuscatedName("am") + @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(Ljd;I)I", - garbageValue = "-1956183743" + signature = "(Ljf;I)I", + garbageValue = "334051838" ) @Export("compareTo_user") public int compareTo_user(User var1) { @@ -61,4 +55,24 @@ public class Friend extends Buddy { public int compareTo(Object var1) { return this.compareToFriend((Friend)var1); } + + @ObfuscatedName("h") + @ObfuscatedSignature( + signature = "(Lch;I)V", + garbageValue = "-463373379" + ) + @Export("changeWorld") + static void changeWorld(World var0) { + if (var0.isMembersOnly() != Client.isMembersWorld) { + Client.isMembersWorld = var0.isMembersOnly(); + InvDefinition.method4523(var0.isMembersOnly()); + } + + class169.worldHost = var0.host; + Client.worldId = var0.id; + Client.worldProperties = var0.properties; + class90.port1 = Client.gameBuild == 0 ? 43594 : var0.id + 40000; + Client.port2 = Client.gameBuild == 0 ? 443 : var0.id + 50000; + WorldMapLabel.port3 = class90.port1; + } } diff --git a/runescape-client/src/main/java/FriendLoginUpdate.java b/runescape-client/src/main/java/FriendLoginUpdate.java index 52ae63de05..99b9bd980d 100644 --- a/runescape-client/src/main/java/FriendLoginUpdate.java +++ b/runescape-client/src/main/java/FriendLoginUpdate.java @@ -4,30 +4,128 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ki") +@ObfuscatedName("kd") @Implements("FriendLoginUpdate") public class FriendLoginUpdate extends Link { - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 1923420853 - ) - public int field3636; - @ObfuscatedName("d") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lku;" + signature = "Lfb;" + ) + @Export("clock") + protected static Clock clock; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 1885881665 + ) + public int field3667; + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "Lkq;" ) @Export("username") public Username username; - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("world") public short world; @ObfuscatedSignature( - signature = "(Lku;I)V" + signature = "(Lkq;I)V" ) FriendLoginUpdate(Username var1, int var2) { - this.field3636 = (int)(class217.currentTimeMillis() / 1000L); + this.field3667 = (int)(MilliClock.currentTimeMillis() / 1000L); this.username = var1; this.world = (short)var2; } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lgz;I)I", + garbageValue = "1283981780" + ) + @Export("compareStrings") + public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) { + int var3 = var0.length(); + int var4 = var1.length(); + int var5 = 0; + int var6 = 0; + char var7 = 0; + char var8 = 0; + + 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 = var7; + boolean var14 = false; + } else { + var9 = var0.charAt(var5++); + } + + char var10; + if (var8 != 0) { + var10 = var8; + boolean var15 = false; + } else { + var10 = var1.charAt(var6++); + } + + var7 = ModelData0.method3374(var9); + var8 = ModelData0.method3374(var10); + var9 = Frames.standardizeChar(var9, var2); + var10 = Frames.standardizeChar(var10, var2); + if (var10 != var9 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { + var9 = Character.toLowerCase(var9); + var10 = Character.toLowerCase(var10); + if (var10 != var9) { + return class1.lowercaseChar(var9, var2) - class1.lowercaseChar(var10, var2); + } + } + } + + int var16 = Math.min(var3, var4); + + char var12; + int var17; + for (var17 = 0; var17 < var16; ++var17) { + if (var2 == Language.Language_FR) { + var5 = var3 - 1 - var17; + var6 = var4 - 1 - var17; + } else { + var6 = var17; + var5 = var17; + } + + char var11 = var0.charAt(var5); + var12 = var1.charAt(var6); + if (var12 != var11 && Character.toUpperCase(var11) != Character.toUpperCase(var12)) { + var11 = Character.toLowerCase(var11); + var12 = Character.toLowerCase(var12); + if (var11 != var12) { + return class1.lowercaseChar(var11, var2) - class1.lowercaseChar(var12, var2); + } + } + } + + var17 = var3 - var4; + if (var17 != 0) { + return var17; + } else { + for (int var18 = 0; var18 < var16; ++var18) { + var12 = var0.charAt(var18); + char var13 = var1.charAt(var18); + if (var12 != var13) { + return class1.lowercaseChar(var12, var2) - class1.lowercaseChar(var13, var2); + } + } + + return 0; + } + } } diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index 9b7e7d67fb..1e93fa5c5d 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -1,93 +1,113 @@ +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("co") +@ObfuscatedName("cg") @Implements("FriendSystem") public class FriendSystem { - @ObfuscatedName("u") - static int[] field1086; - @ObfuscatedName("d") + @ObfuscatedName("q") + @ObfuscatedGetter( + longValue = 6990585350022661681L + ) + public static long field1093; + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lmx;" + signature = "Lmo;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lkr;" + signature = "Lki;" ) @Export("friendsList") public final FriendsList friendsList; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Ljb;" + signature = "Ljw;" ) @Export("ignoreList") public final IgnoreList ignoreList; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 429745001 + intValue = 132482079 ) - int field1092; + int field1094; @ObfuscatedSignature( - signature = "(Lmx;)V" + signature = "(Lmo;)V" ) FriendSystem(LoginType var1) { - this.field1092 = 0; + this.field1094 = 0; this.loginType = var1; this.friendsList = new FriendsList(var1); this.ignoreList = new IgnoreList(var1); } - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-1209289020" - ) - boolean method1952() { - return this.field1092 == 2; - } - @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "104" + signature = "(I)Z", + garbageValue = "-100444560" ) - final void method1953() { - this.field1092 = 1; + boolean method1923() { + return this.field1094 == 2; } - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkb;II)V", - garbageValue = "1535812566" + signature = "(S)V", + garbageValue = "-20972" + ) + final void method1981() { + this.field1094 = 1; + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(Lkn;II)V", + garbageValue = "-11966056" ) @Export("readUpdate") final void readUpdate(Buffer var1, int var2) { this.friendsList.read(var1, var2); - this.field1092 = 2; - class236.FriendSystem_invalidateFriends(); + this.field1094 = 2; + + for (int var3 = 0; var3 < Players.Players_count; ++var3) { + Player var4 = Client.players[Players.Players_indices[var3]]; + var4.clearIsFriend(); + } + + Iterator var5 = Messages.Messages_hashTable.iterator(); + + while (var5.hasNext()) { + Message var6 = (Message)var5.next(); + var6.clearIsFromFriend(); + } + + if (ClientPreferences.clanChat != null) { + ClientPreferences.clanChat.clearFriends(); + } + } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1051336580" + garbageValue = "892305960" ) @Export("processFriendUpdates") final void processFriendUpdates() { for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { - if ((long)var1.field3636 < class217.currentTimeMillis() / 1000L - 5L) { + if ((long)var1.field3667 < MilliClock.currentTimeMillis() / 1000L - 5L) { if (var1.world > 0) { - Skeleton.addGameMessage(5, "", var1.username + " has logged in."); + ObjectSound.addGameMessage(5, "", var1.username + " has logged in."); } if (var1.world == 0) { - Skeleton.addGameMessage(5, "", var1.username + " has logged out."); + ObjectSound.addGameMessage(5, "", var1.username + " has logged out."); } var1.remove(); @@ -96,38 +116,38 @@ public class FriendSystem { } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-589542332" + garbageValue = "2071426788" ) @Export("clear") final void clear() { - this.field1092 = 0; + this.field1094 = 0; this.friendsList.clear(); this.ignoreList.clear(); } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lku;ZI)Z", - garbageValue = "-1932720892" + signature = "(Lkq;ZI)Z", + garbageValue = "1031830697" ) @Export("isFriended") final boolean isFriended(Username var1, boolean var2) { if (var1 == null) { return false; - } else if (var1.equals(ByteArrayPool.localPlayer.username)) { + } else if (var1.equals(class60.localPlayer.username)) { return true; } else { return this.friendsList.isFriended(var1, var2); } } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Lku;B)Z", - garbageValue = "-60" + signature = "(Lkq;B)Z", + garbageValue = "41" ) @Export("isIgnored") final boolean isIgnored(Username var1) { @@ -138,10 +158,10 @@ public class FriendSystem { } } - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "-36" + signature = "(Ljava/lang/String;I)V", + garbageValue = "1198783878" ) @Export("addFriend") final void addFriend(String var1) { @@ -149,16 +169,16 @@ public class FriendSystem { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { if (this.friendsListIsFull()) { - LoginPacket.method3692(); - } else if (ByteArrayPool.localPlayer.username.equals(var2)) { - GrandExchangeEvent.method165("You can't add yourself to your own friend list"); + AbstractWorldMapData.method328(); + } else if (class60.localPlayer.username.equals(var2)) { + WorldMapLabelSize.method249(); } else if (this.isFriended(var2, false)) { - DevicePcmPlayerProvider.method946(var1); + Canvas.method927(var1); } else if (this.isIgnored(var2)) { - ClientPreferences.method1950(var1); + class7.method95(var1); } else { - PacketBufferNode var3 = FaceNormal.getPacketBufferNode(ClientPacket.field2290, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(class234.stringCp1252NullTerminatedByteSize(var1)); + PacketBufferNode var3 = UserComparator4.getPacketBufferNode(ClientPacket.field2336, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(DynamicObject.stringCp1252NullTerminatedByteSize(var1)); var3.packetBuffer.writeStringCp1252NullTerminated(var1); Client.packetWriter.addNode(var3); } @@ -166,37 +186,43 @@ public class FriendSystem { } } - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "2128609566" + garbageValue = "276950128" ) @Export("friendsListIsFull") final boolean friendsListIsFull() { - return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field798 != 1; + return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field791 != 1; } - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "-110" + signature = "(Ljava/lang/String;I)V", + garbageValue = "467200787" ) @Export("addIgnore") final void addIgnore(String var1) { if (var1 != null) { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { + Object var10000; + String var4; if (this.canAddIgnore()) { - GrandExchangeEvent.method165("Your ignore list is full. Max of 100 for free users, and 400 for members"); - } else if (ByteArrayPool.localPlayer.username.equals(var2)) { - ChatChannel.method2351(); + var10000 = null; + var4 = "Your ignore list is full. Max of 100 for free users, and 400 for members"; + ObjectSound.addGameMessage(30, "", var4); + } else if (class60.localPlayer.username.equals(var2)) { + var10000 = null; + var4 = "You can't add yourself to your own ignore list"; + ObjectSound.addGameMessage(30, "", var4); } else if (this.isIgnored(var2)) { - GrandExchangeEvent.method165(var1 + " is already on your ignore list"); + WorldMapSection1.method655(var1); } else if (this.isFriended(var2, false)) { - class195.method3696(var1); + TileItemPile.method2904(var1); } else { - PacketBufferNode var3 = FaceNormal.getPacketBufferNode(ClientPacket.field2216, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(class234.stringCp1252NullTerminatedByteSize(var1)); + PacketBufferNode var3 = UserComparator4.getPacketBufferNode(ClientPacket.field2316, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(DynamicObject.stringCp1252NullTerminatedByteSize(var1)); var3.packetBuffer.writeStringCp1252NullTerminated(var1); Client.packetWriter.addNode(var3); } @@ -204,20 +230,20 @@ public class FriendSystem { } } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "-46" + signature = "(I)Z", + garbageValue = "-516025853" ) @Export("canAddIgnore") final boolean canAddIgnore() { - return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field798 != 1; + return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field791 != 1; } - @ObfuscatedName("a") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "-31" + signature = "(Ljava/lang/String;I)V", + garbageValue = "-964450223" ) @Export("removeFriend") final void removeFriend(String var1) { @@ -225,22 +251,37 @@ public class FriendSystem { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { if (this.friendsList.removeByUsername(var2)) { - Clock.method3599(); - PacketBufferNode var3 = FaceNormal.getPacketBufferNode(ClientPacket.field2297, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(class234.stringCp1252NullTerminatedByteSize(var1)); + Client.field866 = Client.cycleCntr; + PacketBufferNode var3 = UserComparator4.getPacketBufferNode(ClientPacket.field2306, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(DynamicObject.stringCp1252NullTerminatedByteSize(var1)); var3.packetBuffer.writeStringCp1252NullTerminated(var1); Client.packetWriter.addNode(var3); } - class236.FriendSystem_invalidateFriends(); + for (int var5 = 0; var5 < Players.Players_count; ++var5) { + Player var4 = Client.players[Players.Players_indices[var5]]; + var4.clearIsFriend(); + } + + Iterator var6 = Messages.Messages_hashTable.iterator(); + + while (var6.hasNext()) { + Message var7 = (Message)var6.next(); + var7.clearIsFromFriend(); + } + + if (ClientPreferences.clanChat != null) { + ClientPreferences.clanChat.clearFriends(); + } + } } } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "-29" + signature = "(Ljava/lang/String;I)V", + garbageValue = "-1026417394" ) @Export("removeIgnore") final void removeIgnore(String var1) { @@ -248,26 +289,47 @@ public class FriendSystem { Username var2 = new Username(var1, this.loginType); if (var2.hasCleanName()) { if (this.ignoreList.removeByUsername(var2)) { - Clock.method3599(); - PacketBufferNode var3 = FaceNormal.getPacketBufferNode(ClientPacket.field2222, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(class234.stringCp1252NullTerminatedByteSize(var1)); + Client.field866 = Client.cycleCntr; + PacketBufferNode var3 = UserComparator4.getPacketBufferNode(ClientPacket.field2255, Client.packetWriter.isaacCipher); + var3.packetBuffer.writeByte(DynamicObject.stringCp1252NullTerminatedByteSize(var1)); var3.packetBuffer.writeStringCp1252NullTerminated(var1); Client.packetWriter.addNode(var3); } - FontName.FriendSystem_invalidateIgnoreds(); + WorldMapSprite.FriendSystem_invalidateIgnoreds(); } } } - @ObfuscatedName("f") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lku;I)Z", - garbageValue = "-407468573" + signature = "(Lkq;B)Z", + garbageValue = "-1" ) @Export("isFriendAndHasWorld") final boolean isFriendAndHasWorld(Username var1) { Friend var2 = (Friend)this.friendsList.getByUsername(var1); return var2 != null && var2.hasWorld(); } + + @ObfuscatedName("kq") + @ObfuscatedSignature( + signature = "(Lhd;B)Lhd;", + garbageValue = "74" + ) + static Widget method1994(Widget var0) { + int var1 = WorldMapDecoration.method402(KeyHandler.getWidgetClickMask(var0)); + if (var1 == 0) { + return null; + } else { + for (int var2 = 0; var2 < var1; ++var2) { + var0 = WorldMapSprite.getWidget(var0.parentId); + if (var0 == null) { + return null; + } + } + + return var0; + } + } } diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java index a5d697db35..ea2e89fab8 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("kr") +@ObfuscatedName("ki") @Implements("FriendsList") public class FriendsList extends UserList { - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lmx;" + signature = "Lmo;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -975708825 + intValue = -6873433 ) - int field3618; - @ObfuscatedName("s") + int field3648; + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Ljk;" + signature = "Ljn;" ) @Export("friendLoginUpdates") public LinkDeque friendLoginUpdates; @ObfuscatedSignature( - signature = "(Lmx;)V" + signature = "(Lmo;)V" ) public FriendsList(LoginType var1) { super(400); - this.field3618 = 1; + this.field3648 = 1; this.friendLoginUpdates = new LinkDeque(); this.loginType = var1; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)Ljd;", - garbageValue = "-1332552421" + signature = "(I)Ljf;", + garbageValue = "551595115" ) @Export("newInstance") User newInstance() { return new Friend(); } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)[Ljd;", - garbageValue = "-667029686" + signature = "(II)[Ljf;", + garbageValue = "1959965595" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new Friend[var1]; } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lku;ZI)Z", - garbageValue = "-141392117" + signature = "(Lkq;ZI)Z", + garbageValue = "2027561031" ) @Export("isFriended") public boolean isFriended(Username var1, boolean var2) { @@ -70,10 +70,10 @@ public class FriendsList extends UserList { } } - @ObfuscatedName("z") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(Lkb;IB)V", - garbageValue = "51" + signature = "(Lkn;II)V", + garbageValue = "-1956355163" ) @Export("read") public void read(Buffer var1, int var2) { @@ -98,7 +98,7 @@ public class FriendsList extends UserList { Friend var11 = (Friend)this.getByCurrentUsername(var4); if (var3) { Friend var12 = (Friend)this.getByCurrentUsername(var5); - if (var12 != null && var11 != var12) { + if (var12 != null && var12 != var11) { if (var11 != null) { this.remove(var12); } else { @@ -137,17 +137,17 @@ public class FriendsList extends UserList { } if (var6 != var11.world) { - var11.int2 = ++this.field3618 - 1; + var11.int2 = ++this.field3648 - 1; if (var11.world == -1 && var6 == 0) { - var11.int2 = -(var11.int2 * -1563374063) * 1414783729; + var11.int2 = -(var11.int2 * -1924610525) * 2013337995; } var11.world = var6; } var11.rank = var7; - var11.field3625 = var9; - var11.field3623 = var10; + var11.field3655 = var9; + var11.field3654 = var10; continue; } diff --git a/runescape-client/src/main/java/GZipDecompressor.java b/runescape-client/src/main/java/GZipDecompressor.java index 9bf4df67d5..505284d1a8 100644 --- a/runescape-client/src/main/java/GZipDecompressor.java +++ b/runescape-client/src/main/java/GZipDecompressor.java @@ -4,19 +4,17 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mw") +@ObfuscatedName("mu") @Implements("GZipDecompressor") public class GZipDecompressor { @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "Liy;" - ) - @Export("SequenceDefinition_animationsArchive") - public static AbstractArchive SequenceDefinition_animationsArchive; - @ObfuscatedName("x") @Export("inflater") Inflater inflater; + public GZipDecompressor() { + this(-1, 1000000, 1000000); + } + @ObfuscatedSignature( signature = "(III)V", garbageValue = "1000000" @@ -24,14 +22,10 @@ public class GZipDecompressor { GZipDecompressor(int var1, int var2, int var3) { } - public GZipDecompressor() { - this(-1, 1000000, 1000000); - } - - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkb;[BI)V", - garbageValue = "-631538696" + signature = "(Lkn;[BI)V", + garbageValue = "1767160394" ) @Export("decompress") public void decompress(Buffer var1, byte[] var2) { diff --git a/runescape-client/src/main/java/GameBuild.java b/runescape-client/src/main/java/GameBuild.java index ab0eba3184..d6805d5fdb 100644 --- a/runescape-client/src/main/java/GameBuild.java +++ b/runescape-client/src/main/java/GameBuild.java @@ -1,45 +1,53 @@ +import java.io.File; +import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ii") +@ObfuscatedName("ij") @Implements("GameBuild") public class GameBuild { - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lii;" - ) - @Export("LIVE") - static final GameBuild LIVE; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lii;" + signature = "Lij;" + ) + @Export("LIVE") + public static final GameBuild LIVE; + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "Lij;" ) @Export("BUILDLIVE") - static final GameBuild BUILDLIVE; - @ObfuscatedName("k") + public static final GameBuild BUILDLIVE; + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lii;" + signature = "Lij;" ) @Export("RC") - static final GameBuild RC; - @ObfuscatedName("d") + public static final GameBuild RC; + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lii;" + signature = "Lij;" ) @Export("WIP") - static final GameBuild WIP; - @ObfuscatedName("w") + public static final GameBuild WIP; + @ObfuscatedName("du") + @ObfuscatedSignature( + signature = "Lig;" + ) + @Export("archive13") + static Archive archive13; + @ObfuscatedName("p") @Export("name") public final String name; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1808149537 + intValue = -1136221783 ) @Export("buildId") - final int buildId; + public final int buildId; static { LIVE = new GameBuild("LIVE", 0); @@ -52,4 +60,59 @@ public class GameBuild { this.name = var1; this.buildId = var2; } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(I)[Lgl;", + garbageValue = "-290108173" + ) + public static class194[] method4291() { + return new class194[]{class194.field2357, class194.field2354, class194.field2355, class194.field2358, class194.field2353, class194.field2360, class194.field2359, class194.field2363, class194.field2361, class194.field2362}; + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;B)Ljava/io/File;", + garbageValue = "-93" + ) + @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(FileSystem.FileSystem_cacheDir, var0); + RandomAccessFile var3 = null; + + try { + File var4 = new File(var2.getParent()); + if (!var4.exists()) { + throw new RuntimeException(""); + } else { + var3 = new RandomAccessFile(var2, "rw"); + int var5 = var3.read(); + var3.seek(0L); + var3.write(var5); + var3.seek(0L); + var3.close(); + FileSystem.FileSystem_cacheFiles.put(var0, var2); + return var2; + } + } catch (Exception var8) { + try { + if (var3 != null) { + var3.close(); + var3 = null; + } + } catch (Exception var7) { + } + + throw new RuntimeException(); + } + } + } + } } diff --git a/runescape-client/src/main/java/GameObject.java b/runescape-client/src/main/java/GameObject.java index 3134204187..50090f07f7 100644 --- a/runescape-client/src/main/java/GameObject.java +++ b/runescape-client/src/main/java/GameObject.java @@ -1,103 +1,98 @@ -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.IOException; -import java.io.InvalidClassException; -import java.io.ObjectInputStream; -import java.io.OptionalDataException; -import java.io.StreamCorruptedException; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; -@ObfuscatedName("ek") +@ObfuscatedName("ev") @Implements("GameObject") public final class GameObject { - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -1812382241 + @ObfuscatedName("di") + @ObfuscatedSignature( + signature = "Llj;" ) - @Export("centerY") - int centerY; + @Export("js5Socket") + static AbstractSocket js5Socket; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1894508257 + intValue = -1824184779 ) @Export("orientation") int orientation; - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -67995329 + intValue = 1881172017 ) @Export("plane") int plane; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1055464323 + intValue = 1546680727 ) @Export("height") int height; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 733420337 + intValue = -49650103 ) @Export("centerX") int centerX; - @ObfuscatedName("v") + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -32489331 + ) + @Export("centerY") + int centerY; + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lee;" + signature = "Lel;" ) @Export("entity") public Entity entity; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1786771811 + intValue = -136322441 ) @Export("startX") int startX; - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 983334103 + intValue = 460055653 ) @Export("endX") int endX; - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 364744081 + intValue = 198720377 ) @Export("startY") int startY; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1023700223 + intValue = -1832139769 ) @Export("endY") int endY; - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1872697875 + intValue = 1766645403 ) - int field1950; - @ObfuscatedName("p") + int field1959; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -623014369 + intValue = -665577125 ) @Export("lastDrawn") int lastDrawn; - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedGetter( - longValue = 1416033697273847883L + longValue = -5581328528529906223L ) @Export("tag") public long tag; - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 837500395 + intValue = -234800787 ) @Export("flags") int flags; @@ -107,292 +102,13 @@ public final class GameObject { this.flags = 0; } - @ObfuscatedName("x") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(Ljava/io/File;Ljava/io/File;S)V", - garbageValue = "1603" + signature = "(CI)Z", + garbageValue = "1896739320" ) - public static void method3408(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("m") - public static String method3405(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(class298.base37Table[(int)(var6 - 37L * var0)]); - } - - return var5.reverse().toString(); - } - } else { - return null; - } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "(Lkj;I)V", - garbageValue = "-137749117" - ) - @Export("performReflectionCheck") - public static void performReflectionCheck(PacketBuffer var0) { - ReflectionCheck var1 = (ReflectionCheck)class105.reflectionChecks.last(); - if (var1 != null) { - int var2 = var0.offset; - var0.writeInt(var1.id); - - for (int var3 = 0; var3 < var1.size; ++var3) { - if (var1.creationErrors[var3] != 0) { - var0.writeByte(var1.creationErrors[var3]); - } else { - try { - int var4 = var1.operations[var3]; - Field var5; - int var6; - if (var4 == 0) { - var5 = var1.fields[var3]; - var6 = Reflection.getInt(var5, (Object)null); - var0.writeByte(0); - var0.writeInt(var6); - } else if (var4 == 1) { - var5 = var1.fields[var3]; - Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); - var0.writeByte(0); - } else if (var4 == 2) { - var5 = var1.fields[var3]; - var6 = var5.getModifiers(); - var0.writeByte(0); - var0.writeInt(var6); - } - - Method var25; - if (var4 != 3) { - if (var4 == 4) { - var25 = var1.methods[var3]; - var6 = var25.getModifiers(); - var0.writeByte(0); - var0.writeInt(var6); - } - } else { - var25 = var1.methods[var3]; - byte[][] var10 = var1.arguments[var3]; - Object[] var7 = new Object[var10.length]; - - for (int var8 = 0; var8 < var10.length; ++var8) { - ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); - var7[var8] = var9.readObject(); - } - - Object var11 = Reflection.invoke(var25, (Object)null, var7); - if (var11 == null) { - var0.writeByte(0); - } else if (var11 instanceof Number) { - var0.writeByte(1); - var0.writeLong(((Number)var11).longValue()); - } else if (var11 instanceof String) { - var0.writeByte(2); - var0.writeStringCp1252NullTerminated((String)var11); - } else { - var0.writeByte(4); - } - } - } catch (ClassNotFoundException var13) { - var0.writeByte(-10); - } catch (InvalidClassException var14) { - var0.writeByte(-11); - } catch (StreamCorruptedException var15) { - var0.writeByte(-12); - } catch (OptionalDataException var16) { - var0.writeByte(-13); - } catch (IllegalAccessException var17) { - var0.writeByte(-14); - } catch (IllegalArgumentException var18) { - var0.writeByte(-15); - } catch (InvocationTargetException var19) { - var0.writeByte(-16); - } catch (SecurityException var20) { - var0.writeByte(-17); - } catch (IOException var21) { - var0.writeByte(-18); - } catch (NullPointerException var22) { - var0.writeByte(-19); - } catch (Exception var23) { - var0.writeByte(-20); - } catch (Throwable var24) { - var0.writeByte(-21); - } - } - } - - var0.writeCrc(var2); - var1.remove(); - } - } - - @ObfuscatedName("fw") - @ObfuscatedSignature( - signature = "(Lih;Ljava/lang/String;B)V", - garbageValue = "-1" - ) - static void method3404(Archive var0, String var1) { - ArchiveLoader var2 = new ArchiveLoader(var0, var1); - Client.archiveLoaders.add(var2); - Client.field898 += var2.groupCount; - } - - @ObfuscatedName("hy") - @ObfuscatedSignature( - signature = "(ZLkj;I)V", - garbageValue = "1045938723" - ) - @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.readUnsignedShort(); - var3 = var1.method5564(); - var4 = var1.readUnsignedShort(); - UrlRequester.xteaKeys = new int[var4][4]; - - for (var5 = 0; var5 < var4; ++var5) { - for (var6 = 0; var6 < 4; ++var6) { - UrlRequester.xteaKeys[var5][var6] = var1.readInt(); - } - } - - StructDefinition.regions = new int[var4]; - KeyHandler.regionMapArchiveIds = new int[var4]; - WorldMapArea.regionLandArchiveIds = new int[var4]; - WorldMapData_0.regionLandArchives = new byte[var4][]; - class23.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)) { - StructDefinition.regions[var4] = var8; - KeyHandler.regionMapArchiveIds[var4] = WorldMapIcon_0.archive5.getGroupId("m" + var6 + "_" + var7); - WorldMapArea.regionLandArchiveIds[var4] = WorldMapIcon_0.archive5.getGroupId("l" + var6 + "_" + var7); - ++var4; - } - } - } - - GrandExchangeOfferNameComparator.method237(var3, var2, true); - } else { - boolean var15 = var1.readUnsignedByte() == 1; - var3 = var1.method5564(); - var4 = var1.method5614(); - 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(); - UrlRequester.xteaKeys = new int[var5][4]; - - for (var6 = 0; var6 < var5; ++var6) { - for (var7 = 0; var7 < 4; ++var7) { - UrlRequester.xteaKeys[var6][var7] = var1.readInt(); - } - } - - StructDefinition.regions = new int[var5]; - KeyHandler.regionMapArchiveIds = new int[var5]; - WorldMapArea.regionLandArchiveIds = new int[var5]; - WorldMapData_0.regionLandArchives = new byte[var5][]; - class23.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 (StructDefinition.regions[var13] == var12) { - var12 = -1; - break; - } - } - - if (var12 != -1) { - StructDefinition.regions[var5] = var12; - var13 = var12 >> 8 & 255; - int var14 = var12 & 255; - KeyHandler.regionMapArchiveIds[var5] = WorldMapIcon_0.archive5.getGroupId("m" + var13 + "_" + var14); - WorldMapArea.regionLandArchiveIds[var5] = WorldMapIcon_0.archive5.getGroupId("l" + var13 + "_" + var14); - ++var5; - } - } - } - } - } - - GrandExchangeOfferNameComparator.method237(var3, var4, !var15); - } - + @Export("isCharAlphabetic") + public static boolean isCharAlphabetic(char var0) { + return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; } } diff --git a/runescape-client/src/main/java/GameShell.java b/runescape-client/src/main/java/GameShell.java index b36ba023f1..4b7b927e32 100644 --- a/runescape-client/src/main/java/GameShell.java +++ b/runescape-client/src/main/java/GameShell.java @@ -2,6 +2,7 @@ import java.applet.Applet; import java.awt.Color; import java.awt.Container; import java.awt.EventQueue; +import java.awt.FontMetrics; import java.awt.Frame; import java.awt.Graphics; import java.awt.Insets; @@ -17,7 +18,8 @@ import java.awt.event.FocusListener; import java.awt.event.WindowEvent; import java.awt.event.WindowListener; import java.awt.image.ImageObserver; -import java.lang.management.GarbageCollectorMXBean; +import java.io.File; +import java.io.IOException; import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; @@ -25,164 +27,173 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("br") +@ObfuscatedName("bn") @Implements("GameShell") public abstract class GameShell extends Applet implements Runnable, FocusListener, WindowListener { - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lbr;" + signature = "Lbn;" ) @Export("gameShell") static GameShell gameShell; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1209606099 + intValue = 163534127 ) @Export("GameShell_redundantStartThreadCount") static int GameShell_redundantStartThreadCount; - @ObfuscatedName("v") + @ObfuscatedName("j") @ObfuscatedGetter( - longValue = -6369657706537563035L + longValue = -2327307276950282213L ) @Export("stopTimeMs") static long stopTimeMs; - @ObfuscatedName("q") + @ObfuscatedName("p") @Export("isKilled") static boolean isKilled; - @ObfuscatedName("e") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -513334835 + intValue = 922025779 + ) + @Export("gameCyclesToDo") + protected static int gameCyclesToDo; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -1298368225 ) @Export("cycleDurationMillis") static int cycleDurationMillis; - @ObfuscatedName("s") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -906950437 + intValue = -35847139 ) @Export("fiveOrOne") static int fiveOrOne; - @ObfuscatedName("p") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1495509389 + intValue = 1815625351 ) @Export("fps") protected static int fps; - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lfb;" + signature = "Llh;" ) - @Export("clock") - protected static Clock clock; - @ObfuscatedName("h") + @Export("options_buttons_2Sprite") + static IndexedSprite options_buttons_2Sprite; + @ObfuscatedName("k") @Export("graphicsTickTimes") protected static long[] graphicsTickTimes; - @ObfuscatedName("i") + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -713678755 + ) + @Export("graphicsTickTimeIdx") + static int graphicsTickTimeIdx; + @ObfuscatedName("s") @Export("clientTickTimes") protected static long[] clientTickTimes; - @ObfuscatedName("as") - @ObfuscatedGetter( - intValue = 1546513763 - ) - static int field491; - @ObfuscatedName("az") - @Export("volatileFocus") - static volatile boolean volatileFocus; - @ObfuscatedName("aj") - @Export("hasFocus") - protected static boolean hasFocus; - @ObfuscatedName("ay") - @Export("garbageCollector") - static GarbageCollectorMXBean garbageCollector; + @ObfuscatedName("ax") + @Export("loginScreenFontMetrics") + static FontMetrics loginScreenFontMetrics; @ObfuscatedName("ad") @ObfuscatedGetter( - longValue = -1164491573273793773L + intValue = -986046037 + ) + static int field486; + @ObfuscatedName("at") + @Export("volatileFocus") + static volatile boolean volatileFocus; + @ObfuscatedName("az") + @ObfuscatedGetter( + longValue = 8410184394094094231L ) @Export("garbageCollectorLastCollectionTime") static long garbageCollectorLastCollectionTime; - @ObfuscatedName("ac") + @ObfuscatedName("aq") @ObfuscatedGetter( - longValue = 6497847362101811913L + longValue = 3577293238906002649L ) @Export("garbageCollectorLastCheckTimeMs") static long garbageCollectorLastCheckTimeMs; - @ObfuscatedName("z") + @ObfuscatedName("g") @Export("hasErrored") boolean hasErrored; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1556533671 + intValue = 2146499721 ) @Export("contentWidth") protected int contentWidth; - @ObfuscatedName("l") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1571730911 + intValue = -1028356475 ) @Export("contentHeight") protected int contentHeight; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1057349717 + intValue = -1337229323 ) @Export("canvasX") int canvasX; - @ObfuscatedName("o") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -198261897 + intValue = -1367831001 ) @Export("canvasY") int canvasY; @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 347663265 + intValue = -895108673 ) - int field475; - @ObfuscatedName("ae") + int field462; + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = 618283515 + intValue = -1908584737 ) - int field488; - @ObfuscatedName("an") + int field479; + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = 1006498509 + intValue = -1319555883 ) @Export("maxCanvasWidth") int maxCanvasWidth; - @ObfuscatedName("ai") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -654124145 + intValue = -155636407 ) @Export("maxCanvasHeight") int maxCanvasHeight; - @ObfuscatedName("ar") + @ObfuscatedName("ag") @Export("frame") Frame frame; - @ObfuscatedName("af") + @ObfuscatedName("ab") @Export("canvas") java.awt.Canvas canvas; - @ObfuscatedName("at") - volatile boolean field493; @ObfuscatedName("am") + volatile boolean field482; + @ObfuscatedName("as") @Export("resizeCanvasNextFrame") boolean resizeCanvasNextFrame; - @ObfuscatedName("au") + @ObfuscatedName("ar") @Export("isCanvasInvalid") volatile boolean isCanvasInvalid; - @ObfuscatedName("ao") + @ObfuscatedName("ap") @ObfuscatedGetter( - longValue = 496005376701536871L + longValue = 3084699549014677093L ) - volatile long field497; - @ObfuscatedName("ak") + volatile long field489; + @ObfuscatedName("ac") @ObfuscatedSignature( - signature = "Lbc;" + signature = "Lbh;" ) @Export("mouseWheelHandler") MouseWheelHandler mouseWheelHandler; - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("clipboard") Clipboard clipboard; - @ObfuscatedName("ax") + @ObfuscatedName("af") @Export("eventQueue") final EventQueue eventQueue; @@ -196,7 +207,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene fps = 0; graphicsTickTimes = new long[32]; clientTickTimes = new long[32]; - field491 = 500; + field486 = 500; volatileFocus = true; garbageCollectorLastCollectionTime = -1L; garbageCollectorLastCheckTimeMs = -1L; @@ -206,10 +217,10 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.hasErrored = false; this.canvasX = 0; this.canvasY = 0; - this.field493 = true; + this.field482 = true; this.resizeCanvasNextFrame = false; this.isCanvasInvalid = false; - this.field497 = 0L; + this.field489 = 0L; EventQueue var1 = null; try { @@ -218,34 +229,34 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } this.eventQueue = var1; - ReflectionCheck.method2397(new DevicePcmPlayerProvider()); + NPC.method2144(new DevicePcmPlayerProvider()); } - @ObfuscatedName("v") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "133431336" + garbageValue = "-2030982939" ) @Export("setMaxCanvasSize") protected final void setMaxCanvasSize(int var1, int var2) { if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { - this.method1100(); + this.method1029(); } this.maxCanvasWidth = var1; this.maxCanvasHeight = var2; } - @ObfuscatedName("q") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(Ljava/lang/Object;I)V", - garbageValue = "2088668403" + garbageValue = "-876824322" ) @Export("post") final void post(Object var1) { if (this.eventQueue != null) { for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { - class169.sleepExact(1L); + SpriteMask.sleepExact(1L); } if (var1 != null) { @@ -255,10 +266,10 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } - @ObfuscatedName("z") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)Lfq;", - garbageValue = "-2143582784" + signature = "(I)Lfv;", + garbageValue = "-192453473" ) @Export("mouseWheel") protected MouseWheel mouseWheel() { @@ -270,62 +281,62 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene return this.mouseWheelHandler; } - @ObfuscatedName("t") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "9" + signature = "(I)V", + garbageValue = "-981291570" ) @Export("setUpClipboard") protected void setUpClipboard() { this.clipboard = this.getToolkit().getSystemClipboard(); } - @ObfuscatedName("e") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(Ljava/lang/String;I)V", - garbageValue = "-639881287" + garbageValue = "-2023298912" ) @Export("clipboardSetString") protected void clipboardSetString(String var1) { this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); } - @ObfuscatedName("s") + @ObfuscatedName("a") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1901343027" + garbageValue = "-316862367" ) @Export("setUpKeyboard") protected final void setUpKeyboard() { - Language.method3744(); + User.method5228(); java.awt.Canvas var1 = this.canvas; var1.setFocusTraversalKeysEnabled(false); var1.addKeyListener(KeyHandler.KeyHandler_instance); var1.addFocusListener(KeyHandler.KeyHandler_instance); } - @ObfuscatedName("p") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "0" + signature = "(I)V", + garbageValue = "196707341" ) @Export("setUpMouse") protected final void setUpMouse() { - GrandExchangeOfferTotalQuantityComparator.method179(this.canvas); + AbstractWorldMapData.method342(this.canvas); } - @ObfuscatedName("n") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "1" + signature = "(I)V", + garbageValue = "-752017845" ) @Export("resizeCanvas") final void resizeCanvas() { Container var1 = this.container(); if (var1 != null) { Bounds var2 = this.getFrameContentBounds(); - this.contentWidth = Math.max(var2.highX, this.field475); - this.contentHeight = Math.max(var2.highY, this.field488); + this.contentWidth = Math.max(var2.highX, this.field462); + this.contentHeight = Math.max(var2.highY, this.field479); if (this.contentWidth <= 0) { this.contentWidth = 1; } @@ -334,43 +345,43 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.contentHeight = 1; } - WorldMapLabel.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); - Varps.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); - this.canvasX = (this.contentWidth - WorldMapLabel.canvasWidth) / 2; + Varcs.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); + class52.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); + this.canvasX = (this.contentWidth - Varcs.canvasWidth) / 2; this.canvasY = 0; - this.canvas.setSize(WorldMapLabel.canvasWidth, Varps.canvasHeight); - class206.rasterProvider = new RasterProvider(WorldMapLabel.canvasWidth, Varps.canvasHeight, this.canvas); + this.canvas.setSize(Varcs.canvasWidth, class52.canvasHeight); + ArchiveLoader.rasterProvider = new RasterProvider(Varcs.canvasWidth, class52.canvasHeight, this.canvas); if (var1 == this.frame) { Insets var3 = this.frame.getInsets(); - this.canvas.setLocation(var3.left + this.canvasX, this.canvasY + var3.top); + this.canvas.setLocation(this.canvasX + var3.left, var3.top + this.canvasY); } else { this.canvas.setLocation(this.canvasX, this.canvasY); } - this.field493 = true; + this.field482 = true; this.resizeGame(); } } - @ObfuscatedName("u") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "108" + signature = "(I)V", + garbageValue = "1805213007" ) @Export("resizeGame") protected abstract void resizeGame(); - @ObfuscatedName("h") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1120637323" + garbageValue = "1664066560" ) @Export("clearBackground") void clearBackground() { int var1 = this.canvasX; int var2 = this.canvasY; - int var3 = this.contentWidth - WorldMapLabel.canvasWidth - var1; - int var4 = this.contentHeight - Varps.canvasHeight - var2; + int var3 = this.contentWidth - Varcs.canvasWidth - var1; + int var4 = this.contentHeight - class52.canvasHeight - var2; if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { try { Container var5 = this.container(); @@ -405,39 +416,43 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } - @ObfuscatedName("g") + @ObfuscatedName("h") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "-19" + garbageValue = "97" ) @Export("replaceCanvas") final void replaceCanvas() { java.awt.Canvas var1 = this.canvas; var1.removeKeyListener(KeyHandler.KeyHandler_instance); var1.removeFocusListener(KeyHandler.KeyHandler_instance); - KeyHandler.field429 = -1; - class329.method6078(this.canvas); + KeyHandler.field411 = -1; + java.awt.Canvas var2 = this.canvas; + var2.removeMouseListener(MouseHandler.MouseHandler_instance); + var2.removeMouseMotionListener(MouseHandler.MouseHandler_instance); + var2.removeFocusListener(MouseHandler.MouseHandler_instance); + MouseHandler.MouseHandler_currentButtonVolatile = 0; if (this.mouseWheelHandler != null) { this.mouseWheelHandler.removeFrom(this.canvas); } this.addCanvas(); - java.awt.Canvas var2 = this.canvas; - var2.setFocusTraversalKeysEnabled(false); - var2.addKeyListener(KeyHandler.KeyHandler_instance); - var2.addFocusListener(KeyHandler.KeyHandler_instance); - GrandExchangeOfferTotalQuantityComparator.method179(this.canvas); + java.awt.Canvas var3 = this.canvas; + var3.setFocusTraversalKeysEnabled(false); + var3.addKeyListener(KeyHandler.KeyHandler_instance); + var3.addFocusListener(KeyHandler.KeyHandler_instance); + AbstractWorldMapData.method342(this.canvas); if (this.mouseWheelHandler != null) { this.mouseWheelHandler.addTo(this.canvas); } - this.method1100(); + this.method1029(); } - @ObfuscatedName("an") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(IIII)V", - garbageValue = "-1396193082" + garbageValue = "-946150877" ) @Export("startThread") protected final void startThread(int var1, int var2, int var3) { @@ -454,26 +469,26 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } gameShell = this; - WorldMapLabel.canvasWidth = var1; - Varps.canvasHeight = var2; + Varcs.canvasWidth = var1; + class52.canvasHeight = var2; RunException.RunException_revision = var3; RunException.RunException_applet = this; - if (class227.taskHandler == null) { - class227.taskHandler = new TaskHandler(); + if (GrandExchangeOfferAgeComparator.taskHandler == null) { + GrandExchangeOfferAgeComparator.taskHandler = new TaskHandler(); } - class227.taskHandler.newThreadTask(this, 1); + GrandExchangeOfferAgeComparator.taskHandler.newThreadTask(this, 1); } catch (Exception var5) { - WorldMapDecorationType.RunException_sendStackTrace((String)null, var5); + class197.RunException_sendStackTrace((String)null, var5); this.error("crash"); } } - @ObfuscatedName("ai") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "2" + signature = "(I)V", + garbageValue = "799710409" ) @Export("addCanvas") final synchronized void addCanvas() { @@ -483,47 +498,47 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene var1.remove(this.canvas); } - WorldMapLabel.canvasWidth = Math.max(var1.getWidth(), this.field475); - Varps.canvasHeight = Math.max(var1.getHeight(), this.field488); + Varcs.canvasWidth = Math.max(var1.getWidth(), this.field462); + class52.canvasHeight = Math.max(var1.getHeight(), this.field479); Insets var2; if (this.frame != null) { var2 = this.frame.getInsets(); - WorldMapLabel.canvasWidth -= var2.left + var2.right; - Varps.canvasHeight -= var2.bottom + var2.top; + Varcs.canvasWidth -= var2.left + var2.right; + class52.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(WorldMapLabel.canvasWidth, Varps.canvasHeight); + this.canvas.setSize(Varcs.canvasWidth, class52.canvasHeight); this.canvas.setVisible(true); this.canvas.setBackground(Color.BLACK); if (var1 == this.frame) { var2 = this.frame.getInsets(); - this.canvas.setLocation(this.canvasX + var2.left, var2.top + this.canvasY); + this.canvas.setLocation(var2.left + this.canvasX, var2.top + this.canvasY); } else { this.canvas.setLocation(this.canvasX, this.canvasY); } this.canvas.addFocusListener(this); this.canvas.requestFocus(); - this.field493 = true; - if (class206.rasterProvider != null && WorldMapLabel.canvasWidth == class206.rasterProvider.width && Varps.canvasHeight == class206.rasterProvider.height) { - ((RasterProvider)class206.rasterProvider).setComponent(this.canvas); - class206.rasterProvider.drawFull(0, 0); + this.field482 = true; + if (ArchiveLoader.rasterProvider != null && Varcs.canvasWidth == ArchiveLoader.rasterProvider.width && class52.canvasHeight == ArchiveLoader.rasterProvider.height) { + ((RasterProvider)ArchiveLoader.rasterProvider).setComponent(this.canvas); + ArchiveLoader.rasterProvider.drawFull(0, 0); } else { - class206.rasterProvider = new RasterProvider(WorldMapLabel.canvasWidth, Varps.canvasHeight, this.canvas); + ArchiveLoader.rasterProvider = new RasterProvider(Varcs.canvasWidth, class52.canvasHeight, this.canvas); } this.isCanvasInvalid = false; - this.field497 = class217.currentTimeMillis(); + this.field489 = MilliClock.currentTimeMillis(); } - @ObfuscatedName("ap") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-2067681931" + garbageValue = "424530917" ) @Export("checkHost") protected final boolean checkHost() { @@ -552,52 +567,52 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } - @ObfuscatedName("ab") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "633792840" + garbageValue = "-311013157" ) @Export("clientTick") void clientTick() { - long var1 = class217.currentTimeMillis(); - long var3 = clientTickTimes[ClientPreferences.clientTickTimeIdx]; - clientTickTimes[ClientPreferences.clientTickTimeIdx] = var1; - ClientPreferences.clientTickTimeIdx = ClientPreferences.clientTickTimeIdx + 1 & 31; - if (0L != var3 && var1 > var3) { + long var1 = MilliClock.currentTimeMillis(); + long var3 = clientTickTimes[Clock.clientTickTimeIdx]; + clientTickTimes[Clock.clientTickTimeIdx] = var1; + Clock.clientTickTimeIdx = Clock.clientTickTimeIdx + 1 & 31; + if (var3 != 0L && var1 > var3) { } synchronized(this) { - hasFocus = volatileFocus; + WorldMapArea.hasFocus = volatileFocus; } this.doCycle(); } - @ObfuscatedName("ar") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1772330803" + garbageValue = "553684525" ) @Export("graphicsTick") void graphicsTick() { Container var1 = this.container(); - long var2 = class217.currentTimeMillis(); - long var4 = graphicsTickTimes[class60.graphicsTickTimeIdx]; - graphicsTickTimes[class60.graphicsTickTimeIdx] = var2; - class60.graphicsTickTimeIdx = class60.graphicsTickTimeIdx + 1 & 31; - if (0L != var4 && var2 > var4) { + long var2 = MilliClock.currentTimeMillis(); + long var4 = graphicsTickTimes[graphicsTickTimeIdx]; + graphicsTickTimes[graphicsTickTimeIdx] = var2; + graphicsTickTimeIdx = graphicsTickTimeIdx + 1 & 31; + if (var4 != 0L && var2 > var4) { int var6 = (int)(var2 - var4); fps = ((var6 >> 1) + 32000) / var6; } - if (++field491 - 1 > 50) { - field491 -= 50; - this.field493 = true; - this.canvas.setSize(WorldMapLabel.canvasWidth, Varps.canvasHeight); + if (++field486 - 1 > 50) { + field486 -= 50; + this.field482 = true; + this.canvas.setSize(Varcs.canvasWidth, class52.canvasHeight); this.canvas.setVisible(true); if (var1 == this.frame) { Insets var7 = this.frame.getInsets(); - this.canvas.setLocation(var7.left + this.canvasX, this.canvasY + var7.top); + this.canvas.setLocation(var7.left + this.canvasX, var7.top + this.canvasY); } else { this.canvas.setLocation(this.canvasX, this.canvasY); } @@ -607,42 +622,42 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.replaceCanvas(); } - this.method1033(); - this.draw(this.field493); - if (this.field493) { + this.method1004(); + this.draw(this.field482); + if (this.field482) { this.clearBackground(); } - this.field493 = false; + this.field482 = false; } - @ObfuscatedName("af") + @ObfuscatedName("ai") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "317204031" + garbageValue = "73839779" ) - final void method1033() { + final void method1004() { Bounds var1 = this.getFrameContentBounds(); - if (var1.highX != this.contentWidth || this.contentHeight != var1.highY || this.resizeCanvasNextFrame) { + if (this.contentWidth != var1.highX || var1.highY != this.contentHeight || this.resizeCanvasNextFrame) { this.resizeCanvas(); this.resizeCanvasNextFrame = false; } } - @ObfuscatedName("at") + @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-102" + signature = "(I)V", + garbageValue = "-2043772276" ) - final void method1100() { + final void method1029() { this.resizeCanvasNextFrame = true; } - @ObfuscatedName("as") + @ObfuscatedName("ae") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1478721255" + garbageValue = "-109609137" ) @Export("kill") final synchronized void kill() { @@ -666,98 +681,98 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } - if (class227.taskHandler != null) { + if (GrandExchangeOfferAgeComparator.taskHandler != null) { try { - class227.taskHandler.close(); + GrandExchangeOfferAgeComparator.taskHandler.close(); } catch (Exception var2) { } } - this.vmethod1400(); + this.vmethod1570(); } } - @ObfuscatedName("am") + @ObfuscatedName("ag") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-678556074" + garbageValue = "108465933" ) @Export("setUp") protected abstract void setUp(); - @ObfuscatedName("au") + @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-113" + signature = "(I)V", + garbageValue = "202919973" ) @Export("doCycle") protected abstract void doCycle(); - @ObfuscatedName("ao") + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(ZB)V", - garbageValue = "1" + signature = "(ZS)V", + garbageValue = "255" ) @Export("draw") protected abstract void draw(boolean var1); - @ObfuscatedName("aq") + @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "8226" + signature = "(I)V", + garbageValue = "1432958229" ) @Export("kill0") protected abstract void kill0(); - @ObfuscatedName("av") + @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "(ILjava/lang/String;ZI)V", - garbageValue = "-1925389891" + signature = "(ILjava/lang/String;ZS)V", + garbageValue = "-6486" ) @Export("drawInitial") protected final void drawInitial(int var1, String var2, boolean var3) { try { Graphics var4 = this.canvas.getGraphics(); - if (LoginScreenAnimation.fontHelvetica13 == null) { - LoginScreenAnimation.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); - Ignored.loginScreenFontMetrics = this.canvas.getFontMetrics(LoginScreenAnimation.fontHelvetica13); + if (class204.fontHelvetica13 == null) { + class204.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); + loginScreenFontMetrics = this.canvas.getFontMetrics(class204.fontHelvetica13); } if (var3) { var4.setColor(Color.black); - var4.fillRect(0, 0, WorldMapLabel.canvasWidth, Varps.canvasHeight); + var4.fillRect(0, 0, Varcs.canvasWidth, class52.canvasHeight); } Color var5 = new Color(140, 17, 17); try { - if (WorldMapArea.field265 == null) { - WorldMapArea.field265 = this.canvas.createImage(304, 34); + if (HealthBarUpdate.field1033 == null) { + HealthBarUpdate.field1033 = this.canvas.createImage(304, 34); } - Graphics var6 = WorldMapArea.field265.getGraphics(); + Graphics var6 = HealthBarUpdate.field1033.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(LoginScreenAnimation.fontHelvetica13); + var6.setFont(class204.fontHelvetica13); var6.setColor(Color.white); - var6.drawString(var2, (304 - Ignored.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); - var4.drawImage(WorldMapArea.field265, WorldMapLabel.canvasWidth / 2 - 152, Varps.canvasHeight / 2 - 18, (ImageObserver)null); + var6.drawString(var2, (304 - loginScreenFontMetrics.stringWidth(var2)) / 2, 22); + var4.drawImage(HealthBarUpdate.field1033, Varcs.canvasWidth / 2 - 152, class52.canvasHeight / 2 - 18, (ImageObserver)null); } catch (Exception var9) { - int var7 = WorldMapLabel.canvasWidth / 2 - 152; - int var8 = Varps.canvasHeight / 2 - 18; + int var7 = Varcs.canvasWidth / 2 - 152; + int var8 = class52.canvasHeight / 2 - 18; var4.setColor(var5); var4.drawRect(var7, var8, 303, 33); var4.fillRect(var7 + 2, var8 + 2, var1 * 3, 30); var4.setColor(Color.black); var4.drawRect(var7 + 1, var8 + 1, 301, 31); var4.fillRect(var7 + var1 * 3 + 2, var8 + 2, 300 - var1 * 3, 30); - var4.setFont(LoginScreenAnimation.fontHelvetica13); + var4.setFont(class204.fontHelvetica13); var4.setColor(Color.white); - var4.drawString(var2, var7 + (304 - Ignored.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); + var4.drawString(var2, var7 + (304 - loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); } } catch (Exception var10) { this.canvas.repaint(); @@ -765,21 +780,21 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } - @ObfuscatedName("ak") + @ObfuscatedName("as") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-104499552" + garbageValue = "-1038355483" ) - protected final void method1025() { - WorldMapArea.field265 = null; - LoginScreenAnimation.fontHelvetica13 = null; - Ignored.loginScreenFontMetrics = null; + protected final void method1017() { + HealthBarUpdate.field1033 = null; + class204.fontHelvetica13 = null; + loginScreenFontMetrics = null; } - @ObfuscatedName("aa") + @ObfuscatedName("ar") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "2133222215" + signature = "(Ljava/lang/String;S)V", + garbageValue = "23979" ) @Export("error") protected void error(String var1) { @@ -795,26 +810,26 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } - @ObfuscatedName("ax") + @ObfuscatedName("ap") @ObfuscatedSignature( signature = "(I)Ljava/awt/Container;", - garbageValue = "-875370329" + garbageValue = "1395544876" ) @Export("container") Container container() { return (Container)(this.frame != null ? this.frame : this); } - @ObfuscatedName("az") + @ObfuscatedName("al") @ObfuscatedSignature( - signature = "(B)Lld;", - garbageValue = "-26" + signature = "(S)Llv;", + garbageValue = "9055" ) @Export("getFrameContentBounds") Bounds getFrameContentBounds() { Container var1 = this.container(); - int var2 = Math.max(var1.getWidth(), this.field475); - int var3 = Math.max(var1.getHeight(), this.field488); + int var2 = Math.max(var1.getWidth(), this.field462); + int var3 = Math.max(var1.getHeight(), this.field479); if (this.frame != null) { Insets var4 = this.frame.getInsets(); var2 -= var4.left + var4.right; @@ -824,29 +839,29 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene return new Bounds(var2, var3); } - @ObfuscatedName("aj") + @ObfuscatedName("an") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-584501921" + garbageValue = "-2133416306" ) @Export("hasFrame") protected final boolean hasFrame() { return this.frame != null; } - @ObfuscatedName("ad") + @ObfuscatedName("av") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-277226112" + garbageValue = "-453140820" ) - protected abstract void vmethod1400(); + protected abstract void vmethod1570(); public final synchronized void paint(Graphics var1) { if (this == gameShell && !isKilled) { - this.field493 = true; - if (class217.currentTimeMillis() - this.field497 > 1000L) { + this.field482 = true; + if (MilliClock.currentTimeMillis() - this.field489 > 1000L) { Rectangle var2 = var1.getClipBounds(); - if (var2 == null || var2.width >= WorldMapLabel.canvasWidth && var2.height >= Varps.canvasHeight) { + if (var2 == null || var2.width >= Varcs.canvasWidth && var2.height >= class52.canvasHeight) { this.isCanvasInvalid = true; } } @@ -856,12 +871,17 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene public final void destroy() { if (this == gameShell && !isKilled) { - stopTimeMs = class217.currentTimeMillis(); - class169.sleepExact(5000L); + stopTimeMs = MilliClock.currentTimeMillis(); + SpriteMask.sleepExact(4999L); + SpriteMask.sleepExact(1L); this.kill(); } } + public final void focusLost(FocusEvent var1) { + volatileFocus = false; + } + public void run() { try { if (TaskHandler.javaVendor != null) { @@ -875,11 +895,11 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene if (var2.startsWith("1.6.0_")) { int var3; - for (var3 = 6; var3 < var2.length() && PcmPlayer.isDigit(var2.charAt(var3)); ++var3) { + for (var3 = 6; var3 < var2.length() && class296.isDigit(var2.charAt(var3)); ++var3) { } String var4 = var2.substring(6, var3); - if (MusicPatch.isNumber(var4) && Tiles.parseInt(var4) < 10) { + if (UserComparator7.isNumber(var4) && Tiles.parseInt(var4) < 10) { this.error("wrongjava"); return; } @@ -892,20 +912,28 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.setFocusCycleRoot(true); this.addCanvas(); this.setUp(); - clock = ApproximateRouteStrategy.method1326(); - while (0L == stopTimeMs || class217.currentTimeMillis() < stopTimeMs) { - ModelData0.gameCyclesToDo = clock.wait(cycleDurationMillis, fiveOrOne); + Object var8; + try { + var8 = new NanoClock(); + } catch (Throwable var6) { + var8 = new MilliClock(); + } - for (int var5 = 0; var5 < ModelData0.gameCyclesToDo; ++var5) { + FriendLoginUpdate.clock = (Clock)var8; + + while (stopTimeMs == 0L || MilliClock.currentTimeMillis() < stopTimeMs) { + gameCyclesToDo = FriendLoginUpdate.clock.wait(cycleDurationMillis, fiveOrOne); + + for (int var5 = 0; var5 < gameCyclesToDo; ++var5) { this.clientTick(); } this.graphicsTick(); this.post(this.canvas); } - } catch (Exception var6) { - WorldMapDecorationType.RunException_sendStackTrace((String)null, var6); + } catch (Exception var7) { + class197.RunException_sendStackTrace((String)null, var7); this.error("crash"); } @@ -920,7 +948,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene public final void stop() { if (this == gameShell && !isKilled) { - stopTimeMs = class217.currentTimeMillis() + 4000L; + stopTimeMs = MilliClock.currentTimeMillis() + 4000L; } } @@ -928,27 +956,9 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.paint(var1); } - public final void focusLost(FocusEvent var1) { - volatileFocus = false; - } - - public abstract void init(); - - public final void windowOpened(WindowEvent var1) { - } - - public final void windowActivated(WindowEvent var1) { - } - - public final void windowDeactivated(WindowEvent var1) { - } - - public final void windowClosed(WindowEvent var1) { - } - public final void focusGained(FocusEvent var1) { volatileFocus = true; - this.field493 = true; + this.field482 = true; } public final void windowClosing(WindowEvent var1) { @@ -961,13 +971,97 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene public final void windowIconified(WindowEvent var1) { } - @ObfuscatedName("n") + public final void windowOpened(WindowEvent var1) { + } + + public final void windowDeactivated(WindowEvent var1) { + } + + public final void windowClosed(WindowEvent var1) { + } + + public abstract void init(); + + public final void windowActivated(WindowEvent var1) { + } + + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1927353059" + signature = "(Ljava/lang/String;Ljava/lang/String;ZI)Lmy;", + garbageValue = "968663760" ) - public static final void method1155() { - ViewportMouse.ViewportMouse_isInViewport = false; - ViewportMouse.ViewportMouse_entityCount = 0; + @Export("getPreferencesFile") + public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { + File var3 = new File(JagexCache.cacheDir, "preferences" + var0 + ".dat"); + if (var3.exists()) { + try { + AccessFile var10 = new AccessFile(var3, "rw", 10000L); + return var10; + } catch (IOException var9) { + } + } + + String var4 = ""; + if (RouteStrategy.cacheGamebuild == 33) { + var4 = "_rc"; + } else if (RouteStrategy.cacheGamebuild == 34) { + var4 = "_wip"; + } + + File var5 = new File(ArchiveLoader.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); + AccessFile var6; + if (!var2 && var5.exists()) { + try { + var6 = new AccessFile(var5, "rw", 10000L); + return var6; + } catch (IOException var8) { + } + } + + try { + var6 = new AccessFile(var3, "rw", 10000L); + return var6; + } catch (IOException var7) { + throw new RuntimeException(); + } + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(Lic;III)Llz;", + garbageValue = "1598756055" + ) + @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 { + class3.SpriteBuffer_decode(var4); + var3 = true; + } + + if (!var3) { + return null; + } else { + Sprite var5 = new Sprite(); + var5.width = class335.SpriteBuffer_spriteWidth; + var5.height = UserComparator8.SpriteBuffer_spriteHeight; + var5.xOffset = class335.SpriteBuffer_xOffsets[0]; + var5.yOffset = NPC.SpriteBuffer_yOffsets[0]; + var5.subWidth = class335.SpriteBuffer_spriteWidths[0]; + var5.subHeight = class335.SpriteBuffer_spriteHeights[0]; + int var6 = var5.subWidth * var5.subHeight; + byte[] var7 = ItemDefinition.SpriteBuffer_pixels[0]; + var5.pixels = new int[var6]; + + for (int var8 = 0; var8 < var6; ++var8) { + var5.pixels[var8] = class335.SpriteBuffer_spritePalette[var7[var8] & 255]; + } + + GrandExchangeEvent.method158(); + return var5; + } } } diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index e470019eee..ee10d43580 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -1,56 +1,57 @@ +import java.awt.Toolkit; +import java.awt.datatransfer.Clipboard; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.Transferable; +import java.awt.datatransfer.UnsupportedFlavorException; +import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("i") +@ObfuscatedName("s") @Implements("GrandExchangeEvent") public class GrandExchangeEvent { - @ObfuscatedName("sx") + @ObfuscatedName("bq") @ObfuscatedSignature( - signature = "Lg;" + signature = "[Llh;" ) - @Export("grandExchangeEvents") - static GrandExchangeEvents grandExchangeEvents; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -1236605669 - ) - static int field75; - @ObfuscatedName("bt") + @Export("worldSelectArrows") + static IndexedSprite[] worldSelectArrows; + @ObfuscatedName("da") @ObfuscatedSignature( - signature = "[Lle;" + signature = "Lig;" ) - @Export("worldSelectFlagSprites") - static IndexedSprite[] worldSelectFlagSprites; - @ObfuscatedName("x") + @Export("archive8") + static Archive archive8; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 658095085 + intValue = -1238776823 ) @Export("world") public final int world; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = 2297014437459523259L + longValue = 2851107082298663307L ) @Export("age") public final long age; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lb;" + signature = "Ld;" ) @Export("grandExchangeOffer") public final GrandExchangeOffer grandExchangeOffer; - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("offerName") String offerName; - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("previousOfferName") String previousOfferName; @ObfuscatedSignature( - signature = "(Lkb;BI)V" + signature = "(Lkn;BI)V" ) GrandExchangeEvent(Buffer var1, byte var2, int var3) { this.offerName = var1.readStringCp1252NullTerminated(); @@ -60,8 +61,8 @@ public class GrandExchangeEvent { int var4 = var1.readInt(); int var5 = var1.readInt(); this.grandExchangeOffer = new GrandExchangeOffer(); - this.grandExchangeOffer.method211(2); - this.grandExchangeOffer.method187(var2); + this.grandExchangeOffer.method172(2); + this.grandExchangeOffer.method173(var2); this.grandExchangeOffer.unitPrice = var4; this.grandExchangeOffer.totalQuantity = var5; this.grandExchangeOffer.currentQuantity = 0; @@ -69,562 +70,675 @@ public class GrandExchangeEvent { this.grandExchangeOffer.id = var3; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I)Ljava/lang/String;", - garbageValue = "1636604960" + garbageValue = "-1910615045" ) @Export("getOfferName") public String getOfferName() { return this.offerName; } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(B)Ljava/lang/String;", - garbageValue = "-119" + signature = "(I)Ljava/lang/String;", + garbageValue = "-966567999" ) @Export("getPreviousOfferName") public String getPreviousOfferName() { return this.previousOfferName; } - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "([Lgo;II)Lgo;", - garbageValue = "-1609956543" + signature = "(IIIII)V", + garbageValue = "144078284" ) - @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("k") - @ObfuscatedSignature( - signature = "(IIIIIIB)I", - garbageValue = "30" - ) - public static int method166(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 var1; - } else if (var2 == 1) { - return 7 - var0 - (var3 - 1); - } else { - return var2 == 2 ? 7 - var1 - (var4 - 1) : var0; - } - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "62688093" - ) - static final void method165(String var0) { - Skeleton.addGameMessage(30, "", var0); - } - - @ObfuscatedName("hf") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-97" - ) - static final void method161() { - class303.method5397(false); - Client.field818 = 0; - boolean var0 = true; - - int var1; - for (var1 = 0; var1 < WorldMapData_0.regionLandArchives.length; ++var1) { - if (KeyHandler.regionMapArchiveIds[var1] != -1 && WorldMapData_0.regionLandArchives[var1] == null) { - WorldMapData_0.regionLandArchives[var1] = WorldMapIcon_0.archive5.takeFile(KeyHandler.regionMapArchiveIds[var1], 0); - if (WorldMapData_0.regionLandArchives[var1] == null) { - var0 = false; - ++Client.field818; - } - } - - if (WorldMapArea.regionLandArchiveIds[var1] != -1 && class23.regionMapArchives[var1] == null) { - class23.regionMapArchives[var1] = WorldMapIcon_0.archive5.takeFileEncrypted(WorldMapArea.regionLandArchiveIds[var1], 0, UrlRequester.xteaKeys[var1]); - if (class23.regionMapArchives[var1] == null) { - var0 = false; - ++Client.field818; - } - } - } - - if (!var0) { - Client.field899 = 1; - } else { - Client.field734 = 0; - var0 = true; - - int var3; - int var4; - Buffer var8; - int var9; - int var10; - int var11; - int var13; - int var14; - int var15; - int var16; - int var17; - int var18; - for (var1 = 0; var1 < WorldMapData_0.regionLandArchives.length; ++var1) { - byte[] var2 = class23.regionMapArchives[var1]; - if (var2 != null) { - var3 = (StructDefinition.regions[var1] >> 8) * 64 - class69.baseX; - var4 = (StructDefinition.regions[var1] & 255) * 64 - class89.baseY; - if (Client.isInInstance) { - var3 = 10; - var4 = 10; + static final void method153(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) { + class171.field2036[0][var5][var4] = 127; + if (var0 == var5 && var5 > 0) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; } - boolean var7 = true; - var8 = new Buffer(var2); - var9 = -1; + if (var0 + var2 == var5 && var5 < 103) { + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; + } - label645: + 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("p") + @ObfuscatedSignature( + signature = "(Lbn;I)V", + garbageValue = "-1052517513" + ) + @Export("doCycleTitle") + static void doCycleTitle(GameShell var0) { + if (Login.worldSelectOpen) { + Client.method1522(var0); + } else { + if ((MouseHandler.MouseHandler_lastButton == 1 || !ArchiveLoader.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { + NetSocket.clientPreferences.titleMusicDisabled = !NetSocket.clientPreferences.titleMusicDisabled; + SpriteMask.savePreferences(); + if (!NetSocket.clientPreferences.titleMusicDisabled) { + WorldMapSection1.method656(UserComparator7.archive6, "scape main", "", 255, false); + } else { + class89.method2161(); + } + } + + if (Client.gameState != 5) { + if (Login.field1204 == -1L) { + Login.field1204 = MilliClock.currentTimeMillis() + 1000L; + } + + long var1 = MilliClock.currentTimeMillis(); + boolean var3; + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { while (true) { - var10 = var8.method5589(); - if (var10 == 0) { - var0 &= var7; + if (Client.archiveLoadersDone >= Client.archiveLoaders.size()) { + var3 = true; break; } - var9 += var10; - var11 = 0; - boolean var12 = false; + ArchiveLoader var4 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); + if (!var4.isLoaded()) { + var3 = false; + break; + } - while (true) { - while (!var12) { - var13 = var8.readUShortSmart(); - if (var13 == 0) { - continue label645; + ++Client.archiveLoadersDone; + } + } else { + var3 = true; + } + + if (var3 && -1L == Login.field1211) { + Login.field1211 = var1; + if (Login.field1211 > Login.field1204) { + Login.field1204 = Login.field1211; + } + } + + if (Client.gameState == 10 || Client.gameState == 11) { + int var16; + if (UserComparator9.clientLanguage == Language.Language_EN) { + if (MouseHandler.MouseHandler_lastButton == 1 || !ArchiveLoader.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { + var16 = Login.xPadding + 5; + short var5 = 463; + byte var6 = 100; + byte var7 = 35; + if (MouseHandler.MouseHandler_lastPressedX >= var16 && MouseHandler.MouseHandler_lastPressedX <= var6 + var16 && MouseHandler.MouseHandler_lastPressedY >= var5 && MouseHandler.MouseHandler_lastPressedY <= var5 + var7) { + WorldMapRegion.method591(); + return; + } + } + + if (VertexNormal.World_request != null) { + WorldMapRegion.method591(); + } + } + + var16 = MouseHandler.MouseHandler_lastButton; + int var22 = MouseHandler.MouseHandler_lastPressedX; + int var23 = MouseHandler.MouseHandler_lastPressedY; + if (var16 == 0) { + var22 = MouseHandler.MouseHandler_x; + var23 = MouseHandler.MouseHandler_y; + } + + if (!ArchiveLoader.mouseCam && var16 == 4) { + var16 = 1; + } + + short var26; + int var27; + if (Login.loginIndex == 0) { + boolean var28 = false; + + while (WorldMapManager.isKeyDown()) { + if (SecureRandomCallable.field546 == 84) { + var28 = true; + } + } + + var27 = Login.loginBoxCenter - 80; + var26 = 291; + if (var16 == 1 && var22 >= var27 - 75 && var22 <= var27 + 75 && var23 >= var26 - 20 && var23 <= var26 + 20) { + WorldMapSectionType.openURL(HealthBarDefinition.method4669("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); + } + + var27 = Login.loginBoxCenter + 80; + if (var16 == 1 && var22 >= var27 - 75 && var22 <= var27 + 75 && var23 >= var26 - 20 && var23 <= var26 + 20 || var28) { + 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; + class22.method225(); + } 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."; } - var11 += var13 - 1; - var14 = var11 & 63; - var15 = var11 >> 6 & 63; - var16 = var8.readUnsignedByte() >> 2; - var17 = var3 + var15; - var18 = var14 + var4; - if (var17 > 0 && var18 > 0 && var17 < 103 && var18 < 103) { - ObjectDefinition var19 = WorldMapSection2.getObjectDefinition(var9); - if (var16 != 22 || !Client.isLowDetail || var19.int1 != 0 || var19.interactType == 1 || var19.boolean2) { - if (!var19.needsModelFiles()) { - ++Client.field734; - var7 = false; - } - - var12 = true; - } - } + Login.Login_response0 = "Warning!"; + Login.loginIndex = 1; + class22.method225(); + } 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; + class22.method225(); + } else { + WorldMapRectangle.Login_promptCredentials(false); } - - var13 = var8.readUShortSmart(); - if (var13 == 0) { - break; - } - - var8.readUnsignedByte(); } - } - } - } - - if (!var0) { - Client.field899 = 2; - } else { - if (Client.field899 != 0) { - AbstractByteArrayCopier.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); - } - - ChatChannel.playPcmPlayers(); - GrandExchangeOfferWorldComparator.scene.clear(); - - for (var1 = 0; var1 < 4; ++var1) { - Client.collisionMaps[var1].clear(); - } - - int var35; - for (var1 = 0; var1 < 4; ++var1) { - for (var35 = 0; var35 < 104; ++var35) { - for (var3 = 0; var3 < 104; ++var3) { - Tiles.Tiles_renderFlags[var1][var35][var3] = 0; - } - } - } - - ChatChannel.playPcmPlayers(); - UserComparator9.method3498(); - var1 = WorldMapData_0.regionLandArchives.length; - TriBool.method5249(); - class303.method5397(true); - int var5; - int var20; - int var21; - int var40; - int var51; - if (!Client.isInInstance) { - byte[] var36; - for (var35 = 0; var35 < var1; ++var35) { - var3 = (StructDefinition.regions[var35] >> 8) * 64 - class69.baseX; - var4 = (StructDefinition.regions[var35] & 255) * 64 - class89.baseY; - var36 = WorldMapData_0.regionLandArchives[var35]; - if (var36 != null) { - ChatChannel.playPcmPlayers(); - WorldMapData_0.method275(var36, var3, var4, class69.field585 * 8 - 48, MouseHandler.field529 * 8 - 48, Client.collisionMaps); - } - } - - for (var35 = 0; var35 < var1; ++var35) { - var3 = (StructDefinition.regions[var35] >> 8) * 64 - class69.baseX; - var4 = (StructDefinition.regions[var35] & 255) * 64 - class89.baseY; - var36 = WorldMapData_0.regionLandArchives[var35]; - if (var36 == null && MouseHandler.field529 < 800) { - ChatChannel.playPcmPlayers(); - WorldMapSprite.method514(var3, var4, 64, 64); - } - } - - class303.method5397(true); - - for (var35 = 0; var35 < var1; ++var35) { - byte[] var41 = class23.regionMapArchives[var35]; - if (var41 != null) { - var4 = (StructDefinition.regions[var35] >> 8) * 64 - class69.baseX; - var5 = (StructDefinition.regions[var35] & 255) * 64 - class89.baseY; - ChatChannel.playPcmPlayers(); - Scene var42 = GrandExchangeOfferWorldComparator.scene; - CollisionMap[] var43 = Client.collisionMaps; - var8 = new Buffer(var41); - var9 = -1; - + } else { + short var8; + int var24; + if (Login.loginIndex == 1) { while (true) { - var10 = var8.method5589(); - if (var10 == 0) { + if (!WorldMapManager.isKeyDown()) { + var24 = Login.loginBoxCenter - 80; + var8 = 321; + if (var16 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var8 - 20 && var23 <= var8 + 20) { + WorldMapRectangle.Login_promptCredentials(false); + } + + var24 = Login.loginBoxCenter + 80; + if (var16 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var8 - 20 && var23 <= var8 + 20) { + Login.loginIndex = 0; + } break; } - var9 += var10; - var11 = 0; + if (SecureRandomCallable.field546 == 84) { + WorldMapRectangle.Login_promptCredentials(false); + } else if (SecureRandomCallable.field546 == 13) { + Login.loginIndex = 0; + } + } + } else { + short var25; + if (Login.loginIndex == 2) { + var25 = 201; + var24 = var25 + 52; + if (var16 == 1 && var23 >= var24 - 12 && var23 < var24 + 2) { + Login.currentLoginField = 0; + } + + var24 += 15; + if (var16 == 1 && var23 >= var24 - 12 && var23 < var24 + 2) { + Login.currentLoginField = 1; + } + + var24 += 15; + var25 = 361; + if (ItemContainer.field567 != null) { + var27 = ItemContainer.field567.highX / 2; + if (var16 == 1 && var22 >= ItemContainer.field567.lowX - var27 && var22 <= var27 + ItemContainer.field567.lowX && var23 >= var25 - 15 && var23 < var25) { + switch(Login.field1213) { + case 1: + MusicPatchPcmStream.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: + WorldMapSectionType.openURL("https://support.runescape.com/hc/en-gb", true, false); + } + } + } + + var27 = Login.loginBoxCenter - 80; + var26 = 321; + if (var16 == 1 && var22 >= var27 - 75 && var22 <= var27 + 75 && var23 >= var26 - 20 && var23 <= var26 + 20) { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + MusicPatchPcmStream.setLoginResponseString("", "Please enter your username/email address.", ""); + return; + } + + if (Login.Login_password.length() == 0) { + MusicPatchPcmStream.setLoginResponseString("", "Please enter your password.", ""); + return; + } + + MusicPatchPcmStream.setLoginResponseString("", "Connecting to server...", ""); + SequenceDefinition.method4973(false); + ClientPreferences.updateGameState(20); + return; + } + + var27 = Login.loginBoxX + 180 + 80; + if (var16 == 1 && var22 >= var27 - 75 && var22 <= var27 + 75 && var23 >= var26 - 20 && var23 <= var26 + 20) { + Login.loginIndex = 0; + Login.Login_username = ""; + Login.Login_password = ""; + WorldMapSprite.field264 = 0; + ClanMate.otp = ""; + Login.field1223 = true; + } + + var27 = Login.loginBoxCenter + -117; + var26 = 277; + Login.field1209 = var22 >= var27 && var22 < var27 + ScriptEvent.field606 && var23 >= var26 && var23 < var26 + Skeleton.field1826; + if (var16 == 1 && Login.field1209) { + Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; + if (!Client.Login_isUsernameRemembered && NetSocket.clientPreferences.rememberedUsername != null) { + NetSocket.clientPreferences.rememberedUsername = null; + SpriteMask.savePreferences(); + } + } + + var27 = Login.loginBoxCenter + 24; + var26 = 277; + Login.field1231 = var22 >= var27 && var22 < var27 + ScriptEvent.field606 && var23 >= var26 && var23 < var26 + Skeleton.field1826; + if (var16 == 1 && Login.field1231) { + NetSocket.clientPreferences.hideUsername = !NetSocket.clientPreferences.hideUsername; + if (!NetSocket.clientPreferences.hideUsername) { + Login.Login_username = ""; + NetSocket.clientPreferences.rememberedUsername = null; + class22.method225(); + } + + SpriteMask.savePreferences(); + } while (true) { - var51 = var8.readUShortSmart(); - if (var51 == 0) { - break; - } - - var11 += var51 - 1; - var13 = var11 & 63; - var14 = var11 >> 6 & 63; - var15 = var11 >> 12; - var16 = var8.readUnsignedByte(); - var17 = var16 >> 2; - var18 = var16 & 3; - var40 = var14 + var4; - var20 = var13 + var5; - if (var40 > 0 && var20 > 0 && var40 < 103 && var20 < 103) { - var21 = var15; - if ((Tiles.Tiles_renderFlags[1][var40][var20] & 2) == 2) { - var21 = var15 - 1; - } - - CollisionMap var47 = null; - if (var21 >= 0) { - var47 = var43[var21]; - } - - PacketBuffer.method5554(var15, var40, var20, var9, var18, var17, var42, var47); - } - } - } - } - } - } - - int var6; - int var37; - int var50; - if (Client.isInInstance) { - int var22; - int var25; - int var27; - int var28; - int var29; - CollisionMap[] var39; - Buffer var52; - for (var35 = 0; var35 < 4; ++var35) { - ChatChannel.playPcmPlayers(); - - for (var3 = 0; var3 < 13; ++var3) { - for (var4 = 0; var4 < 13; ++var4) { - boolean var49 = false; - var6 = Client.instanceChunkTemplates[var35][var3][var4]; - if (var6 != -1) { - var50 = var6 >> 24 & 3; - var37 = var6 >> 1 & 3; - var9 = var6 >> 14 & 1023; - var10 = var6 >> 3 & 2047; - var11 = (var9 / 8 << 8) + var10 / 8; - - for (var51 = 0; var51 < StructDefinition.regions.length; ++var51) { - if (StructDefinition.regions[var51] == var11 && WorldMapData_0.regionLandArchives[var51] != null) { - byte[] var38 = WorldMapData_0.regionLandArchives[var51]; - var14 = var3 * 8; - var15 = var4 * 8; - var16 = (var9 & 7) * 8; - var17 = (var10 & 7) * 8; - var39 = Client.collisionMaps; - - for (var40 = 0; var40 < 8; ++var40) { - for (var20 = 0; var20 < 8; ++var20) { - if (var14 + var40 > 0 && var14 + var40 < 103 && var20 + var15 > 0 && var15 + var20 < 103) { - int[] var10000 = var39[var35].flags[var40 + var14]; - var10000[var20 + var15] &= -16777217; - } - } - } - - var52 = new Buffer(var38); - - for (var20 = 0; var20 < 4; ++var20) { - for (var21 = 0; var21 < 64; ++var21) { - for (var22 = 0; var22 < 64; ++var22) { - if (var50 == var20 && var21 >= var16 && var21 < var16 + 8 && var22 >= var17 && var22 < var17 + 8) { - var25 = var14 + WorldMapSection1.method663(var21 & 7, var22 & 7, var37); - var28 = var21 & 7; - var29 = var22 & 7; - int var30 = var37 & 3; - if (var30 == 0) { - var27 = var29; - } else if (var30 == 1) { - var27 = 7 - var28; - } else if (var30 == 2) { - var27 = 7 - var29; - } else { - var27 = var28; - } - - MusicPatchNode2.loadTerrain(var52, var35, var25, var27 + var15, 0, 0, var37); - } else { - MusicPatchNode2.loadTerrain(var52, 0, -1, -1, 0, 0, 0); - } - } - } - } - - var49 = true; - break; - } - } - } - - if (!var49) { - FontName.method5385(var35, var3 * 8, var4 * 8); - } - } - } - } - - for (var35 = 0; var35 < 13; ++var35) { - for (var3 = 0; var3 < 13; ++var3) { - var4 = Client.instanceChunkTemplates[0][var35][var3]; - if (var4 == -1) { - WorldMapSprite.method514(var35 * 8, var3 * 8, 8, 8); - } - } - } - - class303.method5397(true); - - for (var35 = 0; var35 < 4; ++var35) { - ChatChannel.playPcmPlayers(); - - for (var3 = 0; var3 < 13; ++var3) { - label473: - for (var4 = 0; var4 < 13; ++var4) { - var5 = Client.instanceChunkTemplates[var35][var3][var4]; - if (var5 != -1) { - var6 = var5 >> 24 & 3; - var50 = var5 >> 1 & 3; - var37 = var5 >> 14 & 1023; - var9 = var5 >> 3 & 2047; - var10 = (var37 / 8 << 8) + var9 / 8; - - for (var11 = 0; var11 < StructDefinition.regions.length; ++var11) { - if (StructDefinition.regions[var11] == var10 && class23.regionMapArchives[var11] != null) { - byte[] var44 = class23.regionMapArchives[var11]; - var13 = var3 * 8; - var14 = var4 * 8; - var15 = (var37 & 7) * 8; - var16 = (var9 & 7) * 8; - Scene var45 = GrandExchangeOfferWorldComparator.scene; - var39 = Client.collisionMaps; - var52 = new Buffer(var44); - var20 = -1; - - while (true) { - var21 = var52.method5589(); - if (var21 == 0) { - continue label473; - } - - var20 += var21; - var22 = 0; - + Transferable var11; + int var12; + do { + while (true) { + label875: + do { while (true) { - int var46 = var52.readUShortSmart(); - if (var46 == 0) { - break; - } - - var22 += var46 - 1; - int var24 = var22 & 63; - var25 = var22 >> 6 & 63; - int var26 = var22 >> 12; - var27 = var52.readUnsignedByte(); - var28 = var27 >> 2; - var29 = var27 & 3; - if (var6 == var26 && var25 >= var15 && var25 < var15 + 8 && var24 >= var16 && var24 < var16 + 8) { - ObjectDefinition var48 = WorldMapSection2.getObjectDefinition(var20); - int var31 = var13 + Language.method3749(var25 & 7, var24 & 7, var50, var48.sizeX, var48.sizeY, var29); - int var32 = var14 + method166(var25 & 7, var24 & 7, var50, var48.sizeX, var48.sizeY, var29); - if (var31 > 0 && var32 > 0 && var31 < 103 && var32 < 103) { - int var33 = var35; - if ((Tiles.Tiles_renderFlags[1][var31][var32] & 2) == 2) { - var33 = var35 - 1; + while (WorldMapManager.isKeyDown()) { + if (SecureRandomCallable.field546 != 13) { + if (Login.currentLoginField != 0) { + continue label875; } - CollisionMap var34 = null; - if (var33 >= 0) { - var34 = var39[var33]; + NetFileRequest.method4304(class58.field442); + if (SecureRandomCallable.field546 == 85 && Login.Login_username.length() > 0) { + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); } - PacketBuffer.method5554(var35, var31, var32, var20, var29 + var50 & 3, var28, var45, var34); + if (SecureRandomCallable.field546 == 84 || SecureRandomCallable.field546 == 80) { + Login.currentLoginField = 1; + } + + if (ModeWhere.method3810(class58.field442) && Login.Login_username.length() < 320) { + Login.Login_username = Login.Login_username + class58.field442; + } + } else { + Login.loginIndex = 0; + Login.Login_username = ""; + Login.Login_password = ""; + WorldMapSprite.field264 = 0; + ClanMate.otp = ""; + Login.field1223 = true; } } + + return; + } + } while(Login.currentLoginField != 1); + + if (SecureRandomCallable.field546 == 85 && Login.Login_password.length() > 0) { + Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); + } else if (SecureRandomCallable.field546 == 84 || SecureRandomCallable.field546 == 80) { + Login.currentLoginField = 0; + if (SecureRandomCallable.field546 == 84) { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + MusicPatchPcmStream.setLoginResponseString("", "Please enter your username/email address.", ""); + return; + } + + if (Login.Login_password.length() == 0) { + MusicPatchPcmStream.setLoginResponseString("", "Please enter your password.", ""); + return; + } + + MusicPatchPcmStream.setLoginResponseString("", "Connecting to server...", ""); + SequenceDefinition.method4973(false); + ClientPreferences.updateGameState(20); + return; } } + + if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && SecureRandomCallable.field546 == 67) { + Clipboard var10 = Toolkit.getDefaultToolkit().getSystemClipboard(); + var11 = var10.getContents(WorldMapSectionType.client); + var12 = 20 - Login.Login_password.length(); + break; + } + + if (ViewportMouse.method3071(class58.field442) && ModeWhere.method3810(class58.field442) && Login.Login_password.length() < 20) { + Login.Login_password = Login.Login_password + class58.field442; + } } + } while(var12 <= 0); + + try { + String var13 = (String)var11.getTransferData(DataFlavor.stringFlavor); + int var14 = Math.min(var12, var13.length()); + + for (int var15 = 0; var15 < var14; ++var15) { + if (!ViewportMouse.method3071(var13.charAt(var15)) || !ModeWhere.method3810(var13.charAt(var15))) { + Login.loginIndex = 3; + return; + } + } + + Login.Login_password = Login.Login_password + var13.substring(0, var14); + } catch (UnsupportedFlavorException var20) { + } catch (IOException var21) { + } + } + } else if (Login.loginIndex == 3) { + var24 = Login.loginBoxX + 180; + var8 = 276; + if (var16 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var8 - 20 && var23 <= var8 + 20) { + WorldMapRectangle.Login_promptCredentials(false); + } + + var24 = Login.loginBoxX + 180; + var8 = 326; + if (var16 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var8 - 20 && var23 <= var8 + 20) { + MusicPatchPcmStream.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 var17; + if (Login.loginIndex == 4) { + var24 = Login.loginBoxX + 180 - 80; + var8 = 321; + if (var16 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var8 - 20 && var23 <= var8 + 20) { + ClanMate.otp.trim(); + if (ClanMate.otp.length() != 6) { + MusicPatchPcmStream.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); + return; + } + + WorldMapSprite.field264 = Integer.parseInt(ClanMate.otp); + ClanMate.otp = ""; + SequenceDefinition.method4973(true); + MusicPatchPcmStream.setLoginResponseString("", "Connecting to server...", ""); + ClientPreferences.updateGameState(20); + return; + } + + if (var16 == 1 && var22 >= Login.loginBoxX + 180 - 9 && var22 <= Login.loginBoxX + 180 + 130 && var23 >= 263 && var23 <= 296) { + Login.field1223 = !Login.field1223; + } + + if (var16 == 1 && var22 >= Login.loginBoxX + 180 - 34 && var22 <= Login.loginBoxX + 34 + 180 && var23 >= 351 && var23 <= 363) { + WorldMapSectionType.openURL(HealthBarDefinition.method4669("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); + } + + var24 = Login.loginBoxX + 180 + 80; + if (var16 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var8 - 20 && var23 <= var8 + 20) { + Login.loginIndex = 0; + Login.Login_username = ""; + Login.Login_password = ""; + WorldMapSprite.field264 = 0; + ClanMate.otp = ""; + } + + while (WorldMapManager.isKeyDown()) { + boolean var9 = false; + + for (var17 = 0; var17 < "1234567890".length(); ++var17) { + if (class58.field442 == "1234567890".charAt(var17)) { + var9 = true; + break; + } + } + + if (SecureRandomCallable.field546 == 13) { + Login.loginIndex = 0; + Login.Login_username = ""; + Login.Login_password = ""; + WorldMapSprite.field264 = 0; + ClanMate.otp = ""; + } else { + if (SecureRandomCallable.field546 == 85 && ClanMate.otp.length() > 0) { + ClanMate.otp = ClanMate.otp.substring(0, ClanMate.otp.length() - 1); + } + + if (SecureRandomCallable.field546 == 84) { + ClanMate.otp.trim(); + if (ClanMate.otp.length() != 6) { + MusicPatchPcmStream.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); + return; + } + + WorldMapSprite.field264 = Integer.parseInt(ClanMate.otp); + ClanMate.otp = ""; + SequenceDefinition.method4973(true); + MusicPatchPcmStream.setLoginResponseString("", "Connecting to server...", ""); + ClientPreferences.updateGameState(20); + return; + } + + if (var9 && ClanMate.otp.length() < 6) { + ClanMate.otp = ClanMate.otp + class58.field442; + } + } + } + } else if (Login.loginIndex == 5) { + var24 = Login.loginBoxX + 180 - 80; + var8 = 321; + if (var16 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var8 - 20 && var23 <= var8 + 20) { + class89.method2159(); + return; + } + + var24 = Login.loginBoxX + 180 + 80; + if (var16 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var8 - 20 && var23 <= var8 + 20) { + WorldMapRectangle.Login_promptCredentials(true); + } + + var26 = 361; + if (GrandExchangeOffer.field87 != null) { + var17 = GrandExchangeOffer.field87.highX / 2; + if (var16 == 1 && var22 >= GrandExchangeOffer.field87.lowX - var17 && var22 <= var17 + GrandExchangeOffer.field87.lowX && var23 >= var26 - 15 && var23 < var26) { + WorldMapSectionType.openURL(HealthBarDefinition.method4669("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); + } + } + + while (WorldMapManager.isKeyDown()) { + boolean var29 = false; + + for (int var18 = 0; var18 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var18) { + if (class58.field442 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var18)) { + var29 = true; + break; + } + } + + if (SecureRandomCallable.field546 == 13) { + WorldMapRectangle.Login_promptCredentials(true); + } else { + if (SecureRandomCallable.field546 == 85 && Login.Login_username.length() > 0) { + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (SecureRandomCallable.field546 == 84) { + class89.method2159(); + return; + } + + if (var29 && Login.Login_username.length() < 320) { + Login.Login_username = Login.Login_username + class58.field442; + } + } + } + } else if (Login.loginIndex != 6) { + if (Login.loginIndex == 7) { + var24 = Login.loginBoxX + 180 - 80; + var8 = 321; + if (var16 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var8 - 20 && var23 <= var8 + 20) { + WorldMapSectionType.openURL(HealthBarDefinition.method4669("secure", true) + "m=dob/set_dob.ws", true, false); + MusicPatchPcmStream.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); + Login.loginIndex = 6; + return; + } + + var24 = Login.loginBoxX + 180 + 80; + if (var16 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var8 - 20 && var23 <= var8 + 20) { + WorldMapRectangle.Login_promptCredentials(true); + } + } else if (Login.loginIndex == 8) { + var24 = Login.loginBoxX + 180 - 80; + var8 = 321; + if (var16 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var8 - 20 && var23 <= var8 + 20) { + WorldMapSectionType.openURL("https://www.jagex.com/terms/privacy", true, false); + MusicPatchPcmStream.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); + Login.loginIndex = 6; + return; + } + + var24 = Login.loginBoxX + 180 + 80; + if (var16 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var8 - 20 && var23 <= var8 + 20) { + WorldMapRectangle.Login_promptCredentials(true); + } + } else if (Login.loginIndex == 12) { + String var19 = ""; + switch(Login.field1212) { + case 0: + var19 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; + break; + case 1: + var19 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; + break; + default: + WorldMapRectangle.Login_promptCredentials(false); + } + + var27 = Login.loginBoxX + 180; + var26 = 276; + if (var16 == 1 && var22 >= var27 - 75 && var22 <= var27 + 75 && var23 >= var26 - 20 && var23 <= var26 + 20) { + WorldMapSectionType.openURL(var19, true, false); + MusicPatchPcmStream.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); + Login.loginIndex = 6; + return; + } + + var27 = Login.loginBoxX + 180; + var26 = 326; + if (var16 == 1 && var22 >= var27 - 75 && var22 <= var27 + 75 && var23 >= var26 - 20 && var23 <= var26 + 20) { + WorldMapRectangle.Login_promptCredentials(false); + } + } else if (Login.loginIndex == 24) { + var24 = Login.loginBoxX + 180; + var8 = 301; + if (var16 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var8 - 20 && var23 <= var8 + 20) { + WorldMapRectangle.Login_promptCredentials(false); + } + } + } else { + while (true) { + do { + if (!WorldMapManager.isKeyDown()) { + var25 = 321; + if (var16 == 1 && var23 >= var25 - 20 && var23 <= var25 + 20) { + WorldMapRectangle.Login_promptCredentials(true); + } + + return; + } + } while(SecureRandomCallable.field546 != 84 && SecureRandomCallable.field546 != 13); + + WorldMapRectangle.Login_promptCredentials(true); } } } } } + } - - class303.method5397(true); - ChatChannel.playPcmPlayers(); - GrandExchangeOfferAgeComparator.method248(GrandExchangeOfferWorldComparator.scene, Client.collisionMaps); - class303.method5397(true); - var35 = Tiles.Tiles_minPlane; - if (var35 > ScriptEvent.Client_plane) { - var35 = ScriptEvent.Client_plane; - } - - if (var35 < ScriptEvent.Client_plane - 1) { - var35 = ScriptEvent.Client_plane - 1; - } - - if (Client.isLowDetail) { - GrandExchangeOfferWorldComparator.scene.init(Tiles.Tiles_minPlane); - } else { - GrandExchangeOfferWorldComparator.scene.init(0); - } - - for (var3 = 0; var3 < 104; ++var3) { - for (var4 = 0; var4 < 104; ++var4) { - World.updateItemPile(var3, var4); - } - } - - ChatChannel.playPcmPlayers(); - ScriptFrame.method1241(); - ObjectDefinition.ObjectDefinition_cachedModelData.clear(); - PacketBufferNode var53; - if (WorldMapSection1.client.hasFrame()) { - var53 = FaceNormal.getPacketBufferNode(ClientPacket.field2215, Client.packetWriter.isaacCipher); - var53.packetBuffer.writeInt(1057001181); - Client.packetWriter.addNode(var53); - } - - if (!Client.isInInstance) { - var3 = (class69.field585 - 6) / 8; - var4 = (class69.field585 + 6) / 8; - var5 = (MouseHandler.field529 - 6) / 8; - var6 = (MouseHandler.field529 + 6) / 8; - - for (var50 = var3 - 1; var50 <= var4 + 1; ++var50) { - for (var37 = var5 - 1; var37 <= var6 + 1; ++var37) { - if (var50 < var3 || var50 > var4 || var37 < var5 || var37 > var6) { - WorldMapIcon_0.archive5.loadRegionFromName("m" + var50 + "_" + var37); - WorldMapIcon_0.archive5.loadRegionFromName("l" + var50 + "_" + var37); - } - } - } - } - - MouseRecorder.updateGameState(30); - ChatChannel.playPcmPlayers(); - Tiles.field538 = null; - class348.field4061 = null; - Tiles.field539 = null; - Tiles.field540 = null; - WorldMapSection3.field404 = null; - SoundCache.field1462 = null; - Tiles.field545 = null; - GrandExchangeOfferAgeComparator.Tiles_hue = null; - UserComparator6.Tiles_saturation = null; - StructDefinition.Tiles_lightness = null; - Tiles.Tiles_hueMultiplier = null; - FriendSystem.field1086 = null; - var53 = FaceNormal.getPacketBufferNode(ClientPacket.field2241, Client.packetWriter.isaacCipher); - Client.packetWriter.addNode(var53); - GameShell.clock.mark(); - - for (var4 = 0; var4 < 32; ++var4) { - GameShell.graphicsTickTimes[var4] = 0L; - } - - for (var4 = 0; var4 < 32; ++var4) { - GameShell.clientTickTimes[var4] = 0L; - } - - ModelData0.gameCyclesToDo = 0; } } } - @ObfuscatedName("kn") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "209958068" + signature = "(IB)I", + garbageValue = "-55" ) - @Export("Clan_joinChat") - static final void Clan_joinChat(String var0) { - if (!var0.equals("")) { - PacketBufferNode var1 = FaceNormal.getPacketBufferNode(ClientPacket.field2236, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(class234.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); + @Export("Messages_getHistorySize") + static int Messages_getHistorySize(int var0) { + ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); + return var1 == null ? 0 : var1.size(); + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1823027767" + ) + static void method158() { + class335.SpriteBuffer_xOffsets = null; + NPC.SpriteBuffer_yOffsets = null; + class335.SpriteBuffer_spriteWidths = null; + class335.SpriteBuffer_spriteHeights = null; + class335.SpriteBuffer_spritePalette = null; + ItemDefinition.SpriteBuffer_pixels = null; + } + + @ObfuscatedName("hx") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "-1963470031" + ) + static final void method155(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]; + WorldMapSection0.menuAction(var1, var2, var3, var4, var5, var6, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); } } + + @ObfuscatedName("jp") + @ObfuscatedSignature( + signature = "(Lhd;I)Lhd;", + garbageValue = "-1293330124" + ) + static Widget method157(Widget var0) { + Widget var1 = FriendSystem.method1994(var0); + if (var1 == null) { + var1 = var0.parent; + } + + return var1; + } } diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java index 161c83a046..08ad8c315c 100644 --- a/runescape-client/src/main/java/GrandExchangeEvents.java +++ b/runescape-client/src/main/java/GrandExchangeEvents.java @@ -4,36 +4,25 @@ 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; -@ObfuscatedName("g") +@ObfuscatedName("r") @Implements("GrandExchangeEvents") public class GrandExchangeEvents { - @ObfuscatedName("nl") - @ObfuscatedSignature( - signature = "[Lhe;" - ) - static Widget[] field70; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("GrandExchangeEvents_ageComparator") public static Comparator GrandExchangeEvents_ageComparator; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("GrandExchangeEvents_priceComparator") public static Comparator GrandExchangeEvents_priceComparator; - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("GrandExchangeEvents_nameComparator") public static Comparator GrandExchangeEvents_nameComparator; - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("GrandExchangeEvents_quantityComparator") public static Comparator GrandExchangeEvents_quantityComparator; - @ObfuscatedName("er") - @ObfuscatedGetter( - intValue = 745968807 - ) - static int field71; - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("events") public final List events; @@ -46,7 +35,7 @@ public class GrandExchangeEvents { } @ObfuscatedSignature( - signature = "(Lkb;Z)V", + signature = "(Lkn;Z)V", garbageValue = "1" ) public GrandExchangeEvents(Buffer var1, boolean var2) { @@ -68,10 +57,10 @@ public class GrandExchangeEvents { } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(Ljava/util/Comparator;ZI)V", - garbageValue = "-1613593832" + garbageValue = "372755845" ) @Export("sort") public void sort(Comparator var1, boolean var2) { @@ -83,97 +72,27 @@ public class GrandExchangeEvents { } - @ObfuscatedName("e") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)Lef;", - garbageValue = "1600674213" + signature = "(CI)Z", + garbageValue = "819758583" ) - @Export("getFrames") - static Frames getFrames(int var0) { - Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); - if (var1 != null) { - return var1; - } else { - AbstractArchive var3 = GZipDecompressor.SequenceDefinition_animationsArchive; - AbstractArchive var4 = class92.SequenceDefinition_skeletonsArchive; - boolean var5 = true; - int[] var6 = var3.getGroupFileIds(var0); + public static boolean method148(char var0) { + if ((var0 <= 0 || var0 >= 128) && (var0 < 160 || var0 > 255)) { + if (var0 != 0) { + char[] var1 = class297.cp1252AsciiExtension; - 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; + for (int var2 = 0; var2 < var1.length; ++var2) { + char var3 = var1[var2]; + if (var0 == var3) { + return true; } } } - Frames var2; - if (!var5) { - var2 = null; - } else { - try { - var2 = new Frames(var3, var4, var0, false); - } catch (Exception var12) { - var2 = null; - } - } - - if (var2 != null) { - SequenceDefinition.SequenceDefinition_cachedFrames.put(var2, (long)var0); - } - - return var2; + return false; + } else { + return true; } } - - @ObfuscatedName("fx") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "23" - ) - static final void method155() { - class8.method109(); - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); - UserComparator5.method3520(); - PendingSpawn.method1838(); - class277.method5038(); - class257.method4558(); - class92.method2155(); - SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); - SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); - MusicPatch.method3979(); - VarpDefinition.VarpDefinition_cached.clear(); - HitSplatDefinition.HitSplatDefinition_cached.clear(); - HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); - HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); - HealthBarDefinition.HealthBarDefinition_cached.clear(); - HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); - ClientPacket.method3687(); - ParamDefinition.ParamDefinition_cached.clear(); - BuddyRankComparator.method3533(); - Huffman.method4048(); - 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(); - ArchiveDiskAction.archive0.clearFiles(); - DirectByteArrayCopier.archive1.clearFiles(); - WorldMapSprite.archive3.clearFiles(); - FontName.archive4.clearFiles(); - WorldMapIcon_0.archive5.clearFiles(); - AbstractWorldMapIcon.archive6.clearFiles(); - AbstractWorldMapIcon.archive7.clearFiles(); - class228.archive8.clearFiles(); - SecureRandomFuture.archive9.clearFiles(); - PlayerAppearance.archive10.clearFiles(); - WorldMapRegion.archive11.clearFiles(); - class41.archive12.clearFiles(); - } } diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java index a6219bc909..25a6d45989 100644 --- a/runescape-client/src/main/java/GrandExchangeOffer.java +++ b/runescape-client/src/main/java/GrandExchangeOffer.java @@ -5,51 +5,50 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("b") +@ObfuscatedName("d") @Implements("GrandExchangeOffer") public class GrandExchangeOffer { - @ObfuscatedName("q") + @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "Liy;" + signature = "Llv;" ) - @Export("ItemDefinition_modelArchive") - public static AbstractArchive ItemDefinition_modelArchive; - @ObfuscatedName("dk") + static Bounds field87; + @ObfuscatedName("db") @ObfuscatedSignature( - signature = "Lih;" + signature = "Lig;" ) - @Export("archive2") - static Archive archive2; - @ObfuscatedName("x") + @Export("archive4") + static Archive archive4; + @ObfuscatedName("m") @Export("state") byte state; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1191314621 + intValue = -1112039617 ) @Export("id") public int id; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1373983325 + intValue = 416176327 ) @Export("unitPrice") public int unitPrice; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -435168387 + intValue = -981210321 ) @Export("totalQuantity") public int totalQuantity; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1383495981 + intValue = 1341718687 ) @Export("currentQuantity") public int currentQuantity; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1519014469 + intValue = 1366605879 ) @Export("currentPrice") public int currentPrice; @@ -58,7 +57,7 @@ public class GrandExchangeOffer { } @ObfuscatedSignature( - signature = "(Lkb;Z)V", + signature = "(Lkn;Z)V", garbageValue = "0" ) public GrandExchangeOffer(Buffer var1, boolean var2) { @@ -70,42 +69,42 @@ public class GrandExchangeOffer { this.currentPrice = var1.readInt(); } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1689314705" + garbageValue = "271165601" ) @Export("status") public int status() { return this.state & 7; } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1922096625" + garbageValue = "-2130764898" ) @Export("type") public int type() { return (this.state & 8) == 8 ? 1 : 0; } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "587802237" + garbageValue = "-308953741" ) - void method211(int var1) { + void method172(int var1) { this.state &= -8; this.state = (byte)(this.state | var1 & 7); } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-582599399" + signature = "(IB)V", + garbageValue = "1" ) - void method187(int var1) { + void method173(int var1) { this.state &= -9; if (var1 == 1) { this.state = (byte)(this.state | 8); @@ -113,196 +112,244 @@ public class GrandExchangeOffer { } - @ObfuscatedName("m") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "([Ljava/lang/String;[SIII)V", - garbageValue = "922781737" + signature = "([Lch;II[I[II)V", + garbageValue = "-1520869912" ) - @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; + @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; - 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; + while (var5 < var6) { + boolean var9 = true; + + int var10; + int var11; + int var12; + do { + --var6; + + for (var10 = 0; var10 < 4; ++var10) { + if (var3[var10] == 2) { + var11 = var0[var6].index; + var12 = var8.index; + } else if (var3[var10] == 1) { + var11 = var0[var6].population; + var12 = var8.population; + if (var11 == -1 && var4[var10] == 1) { + var11 = 2001; + } + + if (var12 == -1 && var4[var10] == 1) { + var12 = 2001; + } + } else if (var3[var10] == 3) { + var11 = var0[var6].isMembersOnly() ? 1 : 0; + var12 = var8.isMembersOnly() ? 1 : 0; + } else { + var11 = var0[var6].id; + var12 = var8.id; + } + + if (var12 != var11) { + if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { + var9 = false; + } + break; + } + + if (var10 == 3) { + var9 = false; + } + } + } while(var9); + + var9 = true; + + do { + ++var5; + + for (var10 = 0; var10 < 4; ++var10) { + if (var3[var10] == 2) { + var11 = var0[var5].index; + var12 = var8.index; + } else if (var3[var10] == 1) { + var11 = var0[var5].population; + var12 = var8.population; + if (var11 == -1 && var4[var10] == 1) { + var11 = 2001; + } + + if (var12 == -1 && var4[var10] == 1) { + var12 = 2001; + } + } else if (var3[var10] == 3) { + var11 = var0[var5].isMembersOnly() ? 1 : 0; + var12 = var8.isMembersOnly() ? 1 : 0; + } else { + var11 = var0[var5].id; + var12 = var8.id; + } + + if (var12 != var11) { + if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { + var9 = false; + } + break; + } + + if (var10 == 3) { + var9 = false; + } + } + } while(var9); + + if (var5 < var6) { + World var13 = var0[var5]; + var0[var5] = var0[var6]; + var0[var6] = var13; } } - 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); + sortWorlds(var0, var1, var6, var3, var4); + sortWorlds(var0, var6 + 1, var2, var3, var4); } } - @ObfuscatedName("n") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(ILce;ZB)I", - garbageValue = "19" + signature = "(ILcs;ZI)I", + garbageValue = "-2096234716" ) - static int method191(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? GrandExchangeOfferNameComparator.field115 : Interpreter.field1130; - if (var0 == ScriptOpcodes.CC_GETX) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.x; + static int method194(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { + var3 = WorldMapSprite.getWidget(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.itemId; return 1; - } else if (var0 == ScriptOpcodes.CC_GETY) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.y; + } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { + var3 = WorldMapSprite.getWidget(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); + if (var3.itemId != -1) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + } + return 1; - } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.width; + } else if (var0 == ScriptOpcodes.IF_HASSUB) { + int var5 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var5); + if (var4 != null) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + } + 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; + } else if (var0 == ScriptOpcodes.IF_GETTOP) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.rootInterface; return 1; } else { return 2; } } - @ObfuscatedName("hj") + @ObfuscatedName("al") @ObfuscatedSignature( - signature = "(ZLkj;B)V", - garbageValue = "18" + signature = "(II)I", + garbageValue = "-1566307415" ) - @Export("updateNpcs") - static final void updateNpcs(boolean var0, PacketBuffer var1) { - Client.field801 = 0; - Client.field851 = 0; - WorldMapIcon_0.method304(); - - int var2; - while (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { - var2 = var1.readBits(15); - if (var2 == 32767) { - break; - } - - 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 = Client.defaultRotations[var1.readBits(3)]; - if (var3) { - var4.orientation = var4.rotation = var6; - } - - int var7 = var1.readBits(1); - int var8 = var1.readBits(1); - if (var8 == 1) { - Client.field725[++Client.field851 - 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 = class237.getNpcDefinition(var1.readBits(14)); - var4.field976 = var4.definition.size; - var4.field1026 = var4.definition.rotation; - if (var4.field1026 == 0) { - var4.rotation = 0; - } - - var4.walkSequence = var4.definition.walkSequence; - var4.walkBackSequence = var4.definition.walkBackSequence; - var4.walkLeftSequence = var4.definition.walkLeftSequence; - var4.walkRightSequence = var4.definition.walkRightSequence; - var4.idleSequence = var4.definition.idleSequence; - var4.turnLeftSequence = var4.definition.turnLeftSequence; - var4.turnRightSequence = var4.definition.turnRightSequence; - var4.method2136(ByteArrayPool.localPlayer.pathX[0] + var9, ByteArrayPool.localPlayer.pathY[0] + var5, var7 == 1); - } - - var1.exportIndex(); - WorldMapSection0.method335(var1); - - for (var2 = 0; var2 < Client.field801; ++var2) { - int var10 = Client.field918[var2]; - if (Client.npcs[var10].npcCycle != Client.cycle) { - Client.npcs[var10].definition = null; - Client.npcs[var10] = 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); - } - } - - } + static int method176(int var0) { + return (int)Math.pow(2.0D, (double)((float)var0 / 256.0F + 7.0F)); } - @ObfuscatedName("iz") + @ObfuscatedName("hp") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-21" + signature = "(I)V", + garbageValue = "-1931279198" ) @Export("Widget_runOnTargetLeave") static void Widget_runOnTargetLeave() { if (Client.isSpellSelected) { - Widget var0 = GrandExchangeOfferUnitPriceComparator.getWidgetChild(class7.selectedSpellWidget, Client.selectedSpellChildIndex); + Widget var0 = WorldMapLabelSize.getWidgetChild(ItemContainer.selectedSpellWidget, Client.selectedSpellChildIndex); if (var0 != null && var0.onTargetLeave != null) { ScriptEvent var1 = new ScriptEvent(); var1.widget = var0; var1.args = var0.onTargetLeave; - GrandExchangeOfferOwnWorldComparator.runScriptEvent(var1); + InterfaceParent.runScriptEvent(var1); } Client.isSpellSelected = false; - ItemContainer.invalidateWidget(var0); + class234.invalidateWidget(var0); } } + + @ObfuscatedName("jm") + @ObfuscatedSignature( + signature = "(III)V", + garbageValue = "2119897094" + ) + static void method189(int var0, int var1) { + SecureRandomCallable.method1205(class169.tempMenuAction, var0, var1); + class169.tempMenuAction = null; + } + + @ObfuscatedName("jf") + @ObfuscatedSignature( + signature = "(IIIILlz;Lhh;B)V", + garbageValue = "105" + ) + @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.method6408(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); + } + + } + } + } + + @ObfuscatedName("kp") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1908400826" + ) + @Export("Clan_leaveChat") + static final void Clan_leaveChat() { + PacketBufferNode var0 = UserComparator4.getPacketBufferNode(ClientPacket.field2292, Client.packetWriter.isaacCipher); + var0.packetBuffer.writeByte(0); + Client.packetWriter.addNode(var0); + } + + @ObfuscatedName("kj") + @ObfuscatedSignature( + signature = "(IIIZB)V", + garbageValue = "43" + ) + public static void method191(int var0, int var1, int var2, boolean var3) { + PacketBufferNode var4 = UserComparator4.getPacketBufferNode(ClientPacket.field2277, Client.packetWriter.isaacCipher); + var4.packetBuffer.method5753(var1); + var4.packetBuffer.writeInt(var3 ? Client.field836 * 1500794883 * -1503339861 : 0); + var4.packetBuffer.method5898(var0); + var4.packetBuffer.writeIntME(var2); + Client.packetWriter.addNode(var4); + } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java index ba480b009b..d50370e60f 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java @@ -1,9 +1,3 @@ -import java.awt.Toolkit; -import java.awt.datatransfer.Clipboard; -import java.awt.datatransfer.DataFlavor; -import java.awt.datatransfer.Transferable; -import java.awt.datatransfer.UnsupportedFlavorException; -import java.io.IOException; import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; @@ -11,29 +5,32 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("o") +@ObfuscatedName("t") @Implements("GrandExchangeOfferAgeComparator") final class GrandExchangeOfferAgeComparator implements Comparator { - @ObfuscatedName("sg") - @ObfuscatedSignature( - signature = "Lml;" - ) - @Export("worldMap") - static WorldMap worldMap; - @ObfuscatedName("e") - @Export("Tiles_hue") - static int[] Tiles_hue; - @ObfuscatedName("ee") + @ObfuscatedName("nf") @ObfuscatedGetter( - intValue = 1640375913 + intValue = 41408299 ) - @Export("port2") - static int port2; - - @ObfuscatedName("x") + @Export("widgetDragDuration") + static int widgetDragDuration; + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Li;Li;I)I", - garbageValue = "-720251669" + signature = "Lfm;" + ) + @Export("taskHandler") + protected static TaskHandler taskHandler; + @ObfuscatedName("o") + @Export("clearLoginScreen") + static boolean clearLoginScreen; + @ObfuscatedName("w") + @Export("Tiles_saturation") + static int[] Tiles_saturation; + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(Ls;Ls;I)I", + garbageValue = "-2089427647" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -48,1239 +45,56 @@ final class GrandExchangeOfferAgeComparator implements Comparator { return super.equals(var1); } - @ObfuscatedName("q") + @ObfuscatedName("gg") @ObfuscatedSignature( - signature = "(Lbr;I)V", - garbageValue = "1934352071" + signature = "(IIIIIIII)V", + garbageValue = "1928902850" ) - @Export("doCycleTitle") - static void doCycleTitle(GameShell var0) { - int var4; - if (Login.worldSelectOpen) { - while (true) { - if (!class22.isKeyDown()) { - if (MouseHandler.MouseHandler_lastButton != 1 && (class217.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) { - WorldMapSectionType.changeWorldSelectSorting(0, 0); - break; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - WorldMapSectionType.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) { - WorldMapSectionType.changeWorldSelectSorting(1, 0); - break; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - WorldMapSectionType.changeWorldSelectSorting(1, 1); - break; - } - - int var32 = Login.xPadding + 500; - if (MouseHandler.MouseHandler_lastPressedX >= var32 && MouseHandler.MouseHandler_lastPressedX <= var32 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - WorldMapSectionType.changeWorldSelectSorting(2, 0); - break; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var32 + 15 && MouseHandler.MouseHandler_lastPressedX <= var32 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - WorldMapSectionType.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) { - WorldMapSectionType.changeWorldSelectSorting(3, 0); - break; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - WorldMapSectionType.changeWorldSelectSorting(3, 1); - break; - } - - if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { - Login.worldSelectOpen = false; - Login.leftTitleSprite.drawAt(Login.xPadding, 0); - DirectByteArrayCopier.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - class3.logoSprite.drawAt(Login.xPadding + 382 - class3.logoSprite.subWidth / 2, 18); - break; - } - - if (Login.hoveredWorldIndex != -1) { - World var5 = UserComparator2.World_worlds[Login.hoveredWorldIndex]; - UserComparator3.changeWorld(var5); - Login.worldSelectOpen = false; - Login.leftTitleSprite.drawAt(Login.xPadding, 0); - DirectByteArrayCopier.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - class3.logoSprite.drawAt(Login.xPadding + 382 - class3.logoSprite.subWidth / 2, 18); - } else { - if (Login.worldSelectPage > 0 && class92.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= class92.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= Varps.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= Varps.canvasHeight / 2 + 50) { - --Login.worldSelectPage; - } - - if (Login.worldSelectPage < Login.worldSelectPagesCount && StructDefinition.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= WorldMapLabel.canvasWidth - StructDefinition.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= WorldMapLabel.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= Varps.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= Varps.canvasHeight / 2 + 50) { - ++Login.worldSelectPage; - } - } - break; - } - - if (class3.field16 == 13) { - HealthBar.method2124(); - break; - } - - if (class3.field16 == 96) { - if (Login.worldSelectPage > 0 && class92.worldSelectLeftSprite != null) { - --Login.worldSelectPage; - } - } else if (class3.field16 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && StructDefinition.worldSelectRightSprite != null) { - ++Login.worldSelectPage; - } - } - - } else { - if ((MouseHandler.MouseHandler_lastButton == 1 || !class217.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { - GrandExchangeOfferOwnWorldComparator.clientPreferences.titleMusicDisabled = !GrandExchangeOfferOwnWorldComparator.clientPreferences.titleMusicDisabled; - WorldMapArea.savePreferences(); - if (!GrandExchangeOfferOwnWorldComparator.clientPreferences.titleMusicDisabled) { - class105.method2394(AbstractWorldMapIcon.archive6, "scape main", "", 255, false); - } else { - Client.method1496(); - } - } - - if (Client.gameState != 5) { - if (Login.field1223 == -1L) { - Login.field1223 = class217.currentTimeMillis() + 1000L; - } - - long var21 = class217.currentTimeMillis(); - boolean var3; - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { - while (true) { - if (Client.archiveLoadersDone >= Client.archiveLoaders.size()) { - var3 = true; - break; - } - - ArchiveLoader var23 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); - if (!var23.isLoaded()) { - var3 = false; - break; - } - - ++Client.archiveLoadersDone; - } - } else { - var3 = true; - } - - if (var3 && -1L == Login.field1224) { - Login.field1224 = var21; - if (Login.field1224 > Login.field1223) { - Login.field1223 = Login.field1224; - } - } - - if (Client.gameState == 10 || Client.gameState == 11) { - if (IgnoreList.clientLanguage == Language.Language_EN) { - if (MouseHandler.MouseHandler_lastButton == 1 || !class217.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { - var4 = Login.xPadding + 5; - short var24 = 463; - byte var6 = 100; - byte var7 = 35; - if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var6 + var4 && MouseHandler.MouseHandler_lastPressedY >= var24 && MouseHandler.MouseHandler_lastPressedY <= var7 + var24) { - if (Language.loadWorlds()) { - Login.worldSelectOpen = true; - Login.worldSelectPage = 0; - Login.worldSelectPagesCount = 0; - } - - return; - } - } - - if (LoginPacket.World_request != null && Language.loadWorlds()) { - Login.worldSelectOpen = true; - Login.worldSelectPage = 0; - Login.worldSelectPagesCount = 0; - } - } - - var4 = MouseHandler.MouseHandler_lastButton; - int var46 = MouseHandler.MouseHandler_lastPressedX; - int var33 = MouseHandler.MouseHandler_lastPressedY; - if (var4 == 0) { - var46 = MouseHandler.MouseHandler_x; - var33 = MouseHandler.MouseHandler_y; - } - - if (!class217.mouseCam && var4 == 4) { - var4 = 1; - } - - short var36; - int var37; - if (Login.loginIndex == 0) { - boolean var44 = false; - - while (class22.isKeyDown()) { - if (class3.field16 == 84) { - var44 = true; - } - } - - var37 = PacketWriter.loginBoxCenter - 80; - var36 = 291; - if (var4 == 1 && var46 >= var37 - 75 && var46 <= var37 + 75 && var33 >= var36 - 20 && var33 <= var36 + 20) { - Script.openURL(class41.method654("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); - } - - var37 = PacketWriter.loginBoxCenter + 80; - if (var4 == 1 && var46 >= var37 - 75 && var46 <= var37 + 75 && var33 >= var36 - 20 && var33 <= var36 + 20 || var44) { - 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; - FontName.method5388(); - } 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; - FontName.method5388(); - } 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; - FontName.method5388(); - } else { - ObjectDefinition.Login_promptCredentials(false); - } - } - } else { - short var8; - int var34; - if (Login.loginIndex == 1) { - while (true) { - if (!class22.isKeyDown()) { - var34 = PacketWriter.loginBoxCenter - 80; - var8 = 321; - if (var4 == 1 && var46 >= var34 - 75 && var46 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { - ObjectDefinition.Login_promptCredentials(false); - } - - var34 = PacketWriter.loginBoxCenter + 80; - if (var4 == 1 && var46 >= var34 - 75 && var46 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { - Login.loginIndex = 0; - } - break; - } - - if (class3.field16 == 84) { - ObjectDefinition.Login_promptCredentials(false); - } else if (class3.field16 == 13) { - Login.loginIndex = 0; - } - } - } else { - int var11; - short var35; - boolean var38; - if (Login.loginIndex == 2) { - var35 = 201; - var34 = var35 + 52; - if (var4 == 1 && var33 >= var34 - 12 && var33 < var34 + 2) { - Login.currentLoginField = 0; - } - - var34 += 15; - if (var4 == 1 && var33 >= var34 - 12 && var33 < var34 + 2) { - Login.currentLoginField = 1; - } - - var34 += 15; - var35 = 361; - if (class41.field315 != null) { - var37 = class41.field315.highX / 2; - if (var4 == 1 && var46 >= class41.field315.lowX - var37 && var46 <= var37 + class41.field315.lowX && var33 >= var35 - 15 && var33 < var35) { - switch(Login.field1218) { - case 1: - HealthBarUpdate.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: - Script.openURL("https://support.runescape.com/hc/en-gb", true, false); - } - } - } - - var37 = PacketWriter.loginBoxCenter - 80; - var36 = 321; - if (var4 == 1 && var46 >= var37 - 75 && var46 <= var37 + 75 && var33 >= var36 - 20 && var33 <= var36 + 20) { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - HealthBarUpdate.setLoginResponseString("", "Please enter your username/email address.", ""); - return; - } - - if (Login.Login_password.length() == 0) { - HealthBarUpdate.setLoginResponseString("", "Please enter your password.", ""); - return; - } - - HealthBarUpdate.setLoginResponseString("", "Connecting to server...", ""); - GraphicsObject.method2122(false); - MouseRecorder.updateGameState(20); - return; - } - - var37 = Login.loginBoxX + 180 + 80; - if (var4 == 1 && var46 >= var37 - 75 && var46 <= var37 + 75 && var33 >= var36 - 20 && var33 <= var36 + 20) { - Login.loginIndex = 0; - Login.Login_username = ""; - Login.Login_password = ""; - GraphicsObject.field1141 = 0; - MilliClock.otp = ""; - Login.field1214 = true; - } - - var37 = PacketWriter.loginBoxCenter + -117; - var36 = 277; - Login.field1207 = var46 >= var37 && var46 < var37 + WorldMapLabelSize.field158 && var33 >= var36 && var33 < var36 + class219.field2515; - if (var4 == 1 && Login.field1207) { - Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; - if (!Client.Login_isUsernameRemembered && GrandExchangeOfferOwnWorldComparator.clientPreferences.rememberedUsername != null) { - GrandExchangeOfferOwnWorldComparator.clientPreferences.rememberedUsername = null; - WorldMapArea.savePreferences(); - } - } - - var37 = PacketWriter.loginBoxCenter + 24; - var36 = 277; - Login.field1212 = var46 >= var37 && var46 < var37 + WorldMapLabelSize.field158 && var33 >= var36 && var33 < var36 + class219.field2515; - if (var4 == 1 && Login.field1212) { - GrandExchangeOfferOwnWorldComparator.clientPreferences.hideUsername = !GrandExchangeOfferOwnWorldComparator.clientPreferences.hideUsername; - if (!GrandExchangeOfferOwnWorldComparator.clientPreferences.hideUsername) { - Login.Login_username = ""; - GrandExchangeOfferOwnWorldComparator.clientPreferences.rememberedUsername = null; - FontName.method5388(); - } - - WorldMapArea.savePreferences(); - } - - while (true) { - Transferable var26; - int var42; - do { - while (true) { - label1160: - do { - while (true) { - while (class22.isKeyDown()) { - if (class3.field16 != 13) { - if (Login.currentLoginField != 0) { - continue label1160; - } - - char var39 = Coord.field2531; - - for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length() && var39 != "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11); ++var11) { - } - - if (class3.field16 == 85 && Login.Login_username.length() > 0) { - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (class3.field16 == 84 || class3.field16 == 80) { - Login.currentLoginField = 1; - } - - char var12 = Coord.field2531; - boolean var40 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var12) != -1; - if (var40 && Login.Login_username.length() < 320) { - Login.Login_username = Login.Login_username + Coord.field2531; - } - } else { - Login.loginIndex = 0; - Login.Login_username = ""; - Login.Login_password = ""; - GraphicsObject.field1141 = 0; - MilliClock.otp = ""; - Login.field1214 = true; - } - } - - return; - } - } while(Login.currentLoginField != 1); - - if (class3.field16 == 85 && Login.Login_password.length() > 0) { - Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); - } else if (class3.field16 == 84 || class3.field16 == 80) { - Login.currentLoginField = 0; - if (class3.field16 == 84) { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - HealthBarUpdate.setLoginResponseString("", "Please enter your username/email address.", ""); - return; - } - - if (Login.Login_password.length() == 0) { - HealthBarUpdate.setLoginResponseString("", "Please enter your password.", ""); - return; - } - - HealthBarUpdate.setLoginResponseString("", "Connecting to server...", ""); - GraphicsObject.method2122(false); - MouseRecorder.updateGameState(20); - return; - } - } - - if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && class3.field16 == 67) { - Clipboard var25 = Toolkit.getDefaultToolkit().getSystemClipboard(); - var26 = var25.getContents(WorldMapSection1.client); - var42 = 20 - Login.Login_password.length(); - break; - } - - char var43 = Coord.field2531; - if ((var43 < ' ' || var43 >= 127) && (var43 <= 127 || var43 >= 160) && (var43 <= 160 || var43 > 255)) { - label1367: { - if (var43 != 0) { - char[] var27 = class297.cp1252AsciiExtension; - - for (int var28 = 0; var28 < var27.length; ++var28) { - char var14 = var27[var28]; - if (var43 == var14) { - var38 = true; - break label1367; - } - } - } - - var38 = false; - } - } else { - var38 = true; - } - - if (var38) { - char var47 = Coord.field2531; - boolean var41 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var47) != -1; - if (var41 && Login.Login_password.length() < 20) { - Login.Login_password = Login.Login_password + Coord.field2531; - } - } - } - } while(var42 <= 0); - - try { - String var13 = (String)var26.getTransferData(DataFlavor.stringFlavor); - int var45 = Math.min(var42, var13.length()); - - for (int var15 = 0; var15 < var45; ++var15) { - char var17 = var13.charAt(var15); - boolean var16; - if (var17 >= ' ' && var17 < 127 || var17 > 127 && var17 < 160 || var17 > 160 && var17 <= 255) { - var16 = true; - } else { - label1381: { - if (var17 != 0) { - char[] var18 = class297.cp1252AsciiExtension; - - for (int var19 = 0; var19 < var18.length; ++var19) { - char var20 = var18[var19]; - if (var20 == var17) { - var16 = true; - break label1381; - } - } - } - - var16 = false; - } - } - - if (!var16 || !WorldMapSection2.method433(var13.charAt(var15))) { - Login.loginIndex = 3; - return; - } - } - - Login.Login_password = Login.Login_password + var13.substring(0, var45); - } catch (UnsupportedFlavorException var30) { - } catch (IOException var31) { - } - } - } else if (Login.loginIndex == 3) { - var34 = Login.loginBoxX + 180; - var8 = 276; - if (var4 == 1 && var46 >= var34 - 75 && var46 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { - ObjectDefinition.Login_promptCredentials(false); - } - - var34 = Login.loginBoxX + 180; - var8 = 326; - if (var4 == 1 && var46 >= var34 - 75 && var46 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { - HealthBarUpdate.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 var10; - if (Login.loginIndex == 4) { - var34 = Login.loginBoxX + 180 - 80; - var8 = 321; - if (var4 == 1 && var46 >= var34 - 75 && var46 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { - MilliClock.otp.trim(); - if (MilliClock.otp.length() != 6) { - HealthBarUpdate.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); - return; - } - - GraphicsObject.field1141 = Integer.parseInt(MilliClock.otp); - MilliClock.otp = ""; - GraphicsObject.method2122(true); - HealthBarUpdate.setLoginResponseString("", "Connecting to server...", ""); - MouseRecorder.updateGameState(20); - return; - } - - if (var4 == 1 && var46 >= Login.loginBoxX + 180 - 9 && var46 <= Login.loginBoxX + 180 + 130 && var33 >= 263 && var33 <= 296) { - Login.field1214 = !Login.field1214; - } - - if (var4 == 1 && var46 >= Login.loginBoxX + 180 - 34 && var46 <= Login.loginBoxX + 34 + 180 && var33 >= 351 && var33 <= 363) { - Script.openURL(class41.method654("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); - } - - var34 = Login.loginBoxX + 180 + 80; - if (var4 == 1 && var46 >= var34 - 75 && var46 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { - Login.loginIndex = 0; - Login.Login_username = ""; - Login.Login_password = ""; - GraphicsObject.field1141 = 0; - MilliClock.otp = ""; - } - - while (class22.isKeyDown()) { - boolean var9 = false; - - for (var10 = 0; var10 < "1234567890".length(); ++var10) { - if (Coord.field2531 == "1234567890".charAt(var10)) { - var9 = true; - break; - } - } - - if (class3.field16 == 13) { - Login.loginIndex = 0; - Login.Login_username = ""; - Login.Login_password = ""; - GraphicsObject.field1141 = 0; - MilliClock.otp = ""; - } else { - if (class3.field16 == 85 && MilliClock.otp.length() > 0) { - MilliClock.otp = MilliClock.otp.substring(0, MilliClock.otp.length() - 1); - } - - if (class3.field16 == 84) { - MilliClock.otp.trim(); - if (MilliClock.otp.length() != 6) { - HealthBarUpdate.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); - return; - } - - GraphicsObject.field1141 = Integer.parseInt(MilliClock.otp); - MilliClock.otp = ""; - GraphicsObject.method2122(true); - HealthBarUpdate.setLoginResponseString("", "Connecting to server...", ""); - MouseRecorder.updateGameState(20); - return; - } - - if (var9 && MilliClock.otp.length() < 6) { - MilliClock.otp = MilliClock.otp + Coord.field2531; - } - } - } - } else if (Login.loginIndex == 5) { - var34 = Login.loginBoxX + 180 - 80; - var8 = 321; - if (var4 == 1 && var46 >= var34 - 75 && var46 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { - WorldMapEvent.method864(); - return; - } - - var34 = Login.loginBoxX + 180 + 80; - if (var4 == 1 && var46 >= var34 - 75 && var46 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { - ObjectDefinition.Login_promptCredentials(true); - } - - var36 = 361; - if (MusicPatchPcmStream.field2495 != null) { - var10 = MusicPatchPcmStream.field2495.highX / 2; - if (var4 == 1 && var46 >= MusicPatchPcmStream.field2495.lowX - var10 && var46 <= var10 + MusicPatchPcmStream.field2495.lowX && var33 >= var36 - 15 && var33 < var36) { - Script.openURL(class41.method654("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); - } - } - - while (class22.isKeyDown()) { - var38 = false; - - for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var11) { - if (Coord.field2531 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11)) { - var38 = true; - break; - } - } - - if (class3.field16 == 13) { - ObjectDefinition.Login_promptCredentials(true); - } else { - if (class3.field16 == 85 && Login.Login_username.length() > 0) { - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (class3.field16 == 84) { - WorldMapEvent.method864(); - return; - } - - if (var38 && Login.Login_username.length() < 320) { - Login.Login_username = Login.Login_username + Coord.field2531; - } - } - } - } else if (Login.loginIndex != 6) { - if (Login.loginIndex == 7) { - var34 = Login.loginBoxX + 180 - 80; - var8 = 321; - if (var4 == 1 && var46 >= var34 - 75 && var46 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { - Script.openURL(class41.method654("secure", true) + "m=dob/set_dob.ws", true, false); - HealthBarUpdate.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); - Login.loginIndex = 6; - return; - } - - var34 = Login.loginBoxX + 180 + 80; - if (var4 == 1 && var46 >= var34 - 75 && var46 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { - ObjectDefinition.Login_promptCredentials(true); - } - } else if (Login.loginIndex == 8) { - var34 = Login.loginBoxX + 180 - 80; - var8 = 321; - if (var4 == 1 && var46 >= var34 - 75 && var46 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { - Script.openURL("https://www.jagex.com/terms/privacy", true, false); - HealthBarUpdate.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); - Login.loginIndex = 6; - return; - } - - var34 = Login.loginBoxX + 180 + 80; - if (var4 == 1 && var46 >= var34 - 75 && var46 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { - ObjectDefinition.Login_promptCredentials(true); - } - } else if (Login.loginIndex == 12) { - String var29 = ""; - switch(Login.field1201) { - case 0: - var29 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; - break; - case 1: - var29 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; - break; - default: - ObjectDefinition.Login_promptCredentials(false); - } - - var37 = Login.loginBoxX + 180; - var36 = 276; - if (var4 == 1 && var46 >= var37 - 75 && var46 <= var37 + 75 && var33 >= var36 - 20 && var33 <= var36 + 20) { - Script.openURL(var29, true, false); - HealthBarUpdate.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); - Login.loginIndex = 6; - return; - } - - var37 = Login.loginBoxX + 180; - var36 = 326; - if (var4 == 1 && var46 >= var37 - 75 && var46 <= var37 + 75 && var33 >= var36 - 20 && var33 <= var36 + 20) { - ObjectDefinition.Login_promptCredentials(false); - } - } else if (Login.loginIndex == 24) { - var34 = Login.loginBoxX + 180; - var8 = 301; - if (var4 == 1 && var46 >= var34 - 75 && var46 <= var34 + 75 && var33 >= var8 - 20 && var33 <= var8 + 20) { - ObjectDefinition.Login_promptCredentials(false); - } - } - } else { - while (true) { - do { - if (!class22.isKeyDown()) { - var35 = 321; - if (var4 == 1 && var33 >= var35 - 20 && var33 <= var35 + 20) { - ObjectDefinition.Login_promptCredentials(true); - } - - return; - } - } while(class3.field16 != 84 && class3.field16 != 13); - - ObjectDefinition.Login_promptCredentials(true); - } - } - } - } - } - - } - } - } - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(Lej;[Lfm;I)V", - garbageValue = "-1662285695" - ) - static final void method248(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); - } - } - } - } + static final void method224(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + int var8 = var6 - 334; + if (var8 < 0) { + var8 = 0; + } else if (var8 > 100) { + var8 = 100; } - Tiles.field550 += (int)(Math.random() * 5.0D) - 2; - if (Tiles.field550 < -8) { - Tiles.field550 = -8; - } - - if (Tiles.field550 > 8) { - Tiles.field550 = 8; - } - - Tiles.field548 += (int)(Math.random() * 5.0D) - 2; - if (Tiles.field548 < -16) { - Tiles.field548 = -16; - } - - if (Tiles.field548 > 16) { - Tiles.field548 = 16; - } - - int var9; - int var10; - int var11; - int var12; + int var9 = (Client.zoomWidth - Client.zoomHeight) * var8 / 100 + Client.zoomHeight; + int var7 = var5 * var9 / 256; + var8 = 2048 - var3 & 2047; + var9 = 2048 - var4 & 2047; + int var10 = 0; + int var11 = 0; + int var12 = var7; int var13; int var14; int var15; - int var16; - int[] var10000; - int var17; - int var18; - for (var2 = 0; var2 < 4; ++var2) { - byte[][] var42 = SoundCache.field1462[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 = (var42[var12 - 1][var11] >> 2) + (var42[var12][var11 - 1] >> 2) + (var42[var12 + 1][var11] >> 3) + (var42[var12][var11 + 1] >> 3) + (var42[var12][var11] >> 1); - Tiles.field545[var12][var11] = var19 - var20; - } - } - - for (var11 = 0; var11 < 104; ++var11) { - Tiles_hue[var11] = 0; - UserComparator6.Tiles_saturation[var11] = 0; - StructDefinition.Tiles_lightness[var11] = 0; - Tiles.Tiles_hueMultiplier[var11] = 0; - FriendSystem.field1086[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.field538[var2][var13][var12] & 255; - if (var14 > 0) { - FloorUnderlayDefinition var43 = class60.method995(var14 - 1); - var10000 = Tiles_hue; - var10000[var12] += var43.hue; - var10000 = UserComparator6.Tiles_saturation; - var10000[var12] += var43.saturation; - var10000 = StructDefinition.Tiles_lightness; - var10000[var12] += var43.lightness; - var10000 = Tiles.Tiles_hueMultiplier; - var10000[var12] += var43.hueMultiplier; - var10002 = FriendSystem.field1086[var12]++; - } - } - - var14 = var11 - 5; - if (var14 >= 0 && var14 < 104) { - var15 = Tiles.field538[var2][var14][var12] & 255; - if (var15 > 0) { - FloorUnderlayDefinition var44 = class60.method995(var15 - 1); - var10000 = Tiles_hue; - var10000[var12] -= var44.hue; - var10000 = UserComparator6.Tiles_saturation; - var10000[var12] -= var44.saturation; - var10000 = StructDefinition.Tiles_lightness; - var10000[var12] -= var44.lightness; - var10000 = Tiles.Tiles_hueMultiplier; - var10000[var12] -= var44.hueMultiplier; - var10002 = FriendSystem.field1086[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_hue[var18]; - var13 += UserComparator6.Tiles_saturation[var18]; - var14 += StructDefinition.Tiles_lightness[var18]; - var15 += Tiles.Tiles_hueMultiplier[var18]; - var16 += FriendSystem.field1086[var18]; - } - - var19 = var17 - 5; - if (var19 >= 0 && var19 < 104) { - var12 -= Tiles_hue[var19]; - var13 -= UserComparator6.Tiles_saturation[var19]; - var14 -= StructDefinition.Tiles_lightness[var19]; - var15 -= Tiles.Tiles_hueMultiplier[var19]; - var16 -= FriendSystem.field1086[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.field538[var2][var11][var17] & 255; - int var21 = class348.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 = Tiles.field545[var11][var17]; - int var27 = Tiles.field545[var11 + 1][var17]; - int var28 = Tiles.field545[var11 + 1][var17 + 1]; - int var29 = Tiles.field545[var11][var17 + 1]; - int var30 = -1; - int var31 = -1; - int var32; - int var33; - if (var20 > 0) { - var32 = var12 * 256 / var15; - var33 = var13 / var16; - int var34 = var14 / var16; - var30 = DevicePcmPlayerProvider.hslToRgb(var32, var33, var34); - var32 = var32 + Tiles.field550 & 255; - var34 += Tiles.field548; - if (var34 < 0) { - var34 = 0; - } else if (var34 > 255) { - var34 = 255; - } - - var31 = DevicePcmPlayerProvider.hslToRgb(var32, var33, var34); - } - - if (var2 > 0) { - boolean var47 = true; - if (var20 == 0 && Tiles.field539[var2][var11][var17] != 0) { - var47 = false; - } - - if (var21 > 0 && !UserComparator9.FloorUnderlayDefinition_get(var21 - 1).hideUnderlay) { - var47 = false; - } - - if (var47 && var22 == var23 && var24 == var22 && var22 == var25) { - var10000 = WorldMapSection3.field404[var2][var11]; - var10000[var17] |= 2340; - } - } - - var32 = 0; - if (var31 != -1) { - var32 = Rasterizer3D.Rasterizer3D_colorPalette[Strings.method4220(var31, 96)]; - } - - if (var21 == 0) { - var0.addTile(var2, var11, var17, 0, 0, -1, var22, var23, var24, var25, Strings.method4220(var30, var26), Strings.method4220(var30, var27), Strings.method4220(var30, var28), Strings.method4220(var30, var29), 0, 0, 0, 0, var32, 0); - } else { - var33 = Tiles.field539[var2][var11][var17] + 1; - byte var48 = Tiles.field540[var2][var11][var17]; - FloorOverlayDefinition var35 = UserComparator9.FloorUnderlayDefinition_get(var21 - 1); - int var36 = var35.texture; - int var37; - int var38; - int var39; - int var40; - if (var36 >= 0) { - var38 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var36); - var37 = -1; - } else if (var35.primaryRgb == 16711935) { - var37 = -2; - var36 = -1; - var38 = -2; - } else { - var37 = DevicePcmPlayerProvider.hslToRgb(var35.hue, var35.saturation, var35.lightness); - var39 = var35.hue + Tiles.field550 & 255; - var40 = var35.lightness + Tiles.field548; - if (var40 < 0) { - var40 = 0; - } else if (var40 > 255) { - var40 = 255; - } - - var38 = DevicePcmPlayerProvider.hslToRgb(var39, var35.saturation, var40); - } - - var39 = 0; - if (var38 != -2) { - var39 = Rasterizer3D.Rasterizer3D_colorPalette[class297.method5332(var38, 96)]; - } - - if (var35.secondaryRgb != -1) { - var40 = var35.secondaryHue + Tiles.field550 & 255; - int var41 = var35.secondaryLightness + Tiles.field548; - if (var41 < 0) { - var41 = 0; - } else if (var41 > 255) { - var41 = 255; - } - - var38 = DevicePcmPlayerProvider.hslToRgb(var40, var35.secondarySaturation, var41); - var39 = Rasterizer3D.Rasterizer3D_colorPalette[class297.method5332(var38, 96)]; - } - - var0.addTile(var2, var11, var17, var33, var48, var36, var22, var23, var24, var25, Strings.method4220(var30, var26), Strings.method4220(var30, var27), Strings.method4220(var30, var28), Strings.method4220(var30, var29), class297.method5332(var37, var26), class297.method5332(var37, var27), class297.method5332(var37, var28), class297.method5332(var37, var29), var32, var39); - } - } - } - } - } - } - - for (var11 = 1; var11 < 103; ++var11) { - for (var12 = 1; var12 < 103; ++var12) { - if ((Tiles.Tiles_renderFlags[var2][var12][var11] & 8) != 0) { - var17 = 0; - } else if (var2 > 0 && (Tiles.Tiles_renderFlags[1][var12][var11] & 2) != 0) { - var17 = var2 - 1; - } else { - var17 = var2; - } - - var0.setTileMinPlane(var2, var12, var11, var17); - } - } - - Tiles.field538[var2] = null; - class348.field4061[var2] = null; - Tiles.field539[var2] = null; - Tiles.field540[var2] = null; - SoundCache.field1462[var2] = null; + if (var8 != 0) { + var13 = Rasterizer3D.Rasterizer3D_sine[var8]; + var14 = Rasterizer3D.Rasterizer3D_cosine[var8]; + var15 = var11 * var14 - var13 * var7 >> 16; + var12 = var13 * var11 + var7 * var14 >> 16; + var11 = var15; } - var0.method3262(-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); - } - } + if (var9 != 0) { + var13 = Rasterizer3D.Rasterizer3D_sine[var9]; + var14 = Rasterizer3D.Rasterizer3D_cosine[var9]; + var15 = var10 * var14 + var12 * var13 >> 16; + var12 = var14 * var12 - var13 * var10 >> 16; + var10 = var15; } - 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 var46; - if ((WorldMapSection3.field404[var6][var8][var7] & var2) != 0) { - var9 = var7; - var10 = var7; - var11 = var6; - - for (var12 = var6; var9 > 0 && (WorldMapSection3.field404[var6][var8][var9 - 1] & var2) != 0; --var9) { - } - - while (var10 < 104 && (WorldMapSection3.field404[var6][var8][var10 + 1] & var2) != 0) { - ++var10; - } - - label465: - while (var11 > 0) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((WorldMapSection3.field404[var11 - 1][var8][var13] & var2) == 0) { - break label465; - } - } - - --var11; - } - - label454: - while (var12 < var5) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((WorldMapSection3.field404[var12 + 1][var8][var13] & var2) == 0) { - break label454; - } - } - - ++var12; - } - - var13 = (var10 - var9 + 1) * (var12 + 1 - var11); - if (var13 >= 8) { - var46 = 240; - var15 = Tiles.Tiles_heights[var12][var8][var9] - var46; - 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 = WorldMapSection3.field404[var17][var8]; - var10000[var18] &= ~var2; - } - } - } - } - - if ((WorldMapSection3.field404[var6][var8][var7] & var3) != 0) { - var9 = var8; - var10 = var8; - var11 = var6; - - for (var12 = var6; var9 > 0 && (WorldMapSection3.field404[var6][var9 - 1][var7] & var3) != 0; --var9) { - } - - while (var10 < 104 && (WorldMapSection3.field404[var6][var10 + 1][var7] & var3) != 0) { - ++var10; - } - - label518: - while (var11 > 0) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((WorldMapSection3.field404[var11 - 1][var13][var7] & var3) == 0) { - break label518; - } - } - - --var11; - } - - label507: - while (var12 < var5) { - for (var13 = var9; var13 <= var10; ++var13) { - if ((WorldMapSection3.field404[var12 + 1][var13][var7] & var3) == 0) { - break label507; - } - } - - ++var12; - } - - var13 = (var12 + 1 - var11) * (var10 - var9 + 1); - if (var13 >= 8) { - var46 = 240; - var15 = Tiles.Tiles_heights[var12][var9][var7] - var46; - 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 = WorldMapSection3.field404[var17][var18]; - var10000[var7] &= ~var3; - } - } - } - } - - if ((WorldMapSection3.field404[var6][var8][var7] & var4) != 0) { - var9 = var8; - var10 = var8; - var11 = var7; - - for (var12 = var7; var11 > 0 && (WorldMapSection3.field404[var6][var8][var11 - 1] & var4) != 0; --var11) { - } - - while (var12 < 104 && (WorldMapSection3.field404[var6][var8][var12 + 1] & var4) != 0) { - ++var12; - } - - label571: - while (var9 > 0) { - for (var13 = var11; var13 <= var12; ++var13) { - if ((WorldMapSection3.field404[var6][var9 - 1][var13] & var4) == 0) { - break label571; - } - } - - --var9; - } - - label560: - while (var10 < 104) { - for (var13 = var11; var13 <= var12; ++var13) { - if ((WorldMapSection3.field404[var6][var10 + 1][var13] & var4) == 0) { - break label560; - } - } - - ++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 = WorldMapSection3.field404[var6][var14]; - var10000[var15] &= ~var4; - } - } - } - } - } - } - } + MouseHandler.cameraX = var0 - var10; + WorldMapSection3.cameraY = var1 - var11; + ObjectSound.cameraZ = var2 - var12; + TilePaint.cameraPitch = var3; + Canvas.cameraYaw = var4; + if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (class225.oculusOrbFocalPointX >> 7 != class60.localPlayer.x >> 7 || HealthBarDefinition.oculusOrbFocalPointY >> 7 != class60.localPlayer.y >> 7)) { + var13 = class60.localPlayer.plane; + var14 = (class225.oculusOrbFocalPointX >> 7) + class182.baseX; + var15 = (HealthBarDefinition.oculusOrbFocalPointY >> 7) + SecureRandomFuture.baseY; + GrandExchangeOffer.method191(var14, var15, var13, true); } } - - @ObfuscatedName("gs") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-2010586363" - ) - static final void method249() { - for (GraphicsObject var0 = (GraphicsObject)Client.graphicsObjects.last(); var0 != null; var0 = (GraphicsObject)Client.graphicsObjects.previous()) { - if (var0.plane == ScriptEvent.Client_plane && !var0.isFinished) { - if (Client.cycle >= var0.cycleStart) { - var0.advance(Client.field741); - if (var0.isFinished) { - var0.remove(); - } else { - GrandExchangeOfferWorldComparator.scene.drawEntity(var0.plane, var0.x, var0.y, var0.height, 60, var0, 0, -1L, false); - } - } - } else { - var0.remove(); - } - } - - } - - @ObfuscatedName("jw") - @ObfuscatedSignature( - signature = "(Lhe;I)Z", - garbageValue = "-74932209" - ) - @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 = Tiles.method1227(var0, var1); - int var3 = var0.cs1ComparisonValues[var1]; - if (var0.cs1Comparisons[var1] == 2) { - if (var2 >= var3) { - return false; - } - } else if (var0.cs1Comparisons[var1] == 3) { - if (var2 <= var3) { - return false; - } - } else if (var0.cs1Comparisons[var1] == 4) { - if (var3 == var2) { - return false; - } - } else if (var2 != var3) { - return false; - } - } - - return true; - } - } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java index 604574490a..995cc6f20d 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java @@ -3,33 +3,27 @@ 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("r") +@ObfuscatedName("l") @Implements("GrandExchangeOfferNameComparator") final class GrandExchangeOfferNameComparator implements Comparator { - @ObfuscatedName("u") + @ObfuscatedName("fv") @ObfuscatedSignature( - signature = "Lhe;" + signature = "Lko;" ) - static Widget field115; - @ObfuscatedName("ea") + @Export("fontBold12") + static Font fontBold12; + @ObfuscatedName("gt") @ObfuscatedSignature( - signature = "Lih;" + signature = "Llz;" ) - @Export("archive15") - static Archive archive15; - @ObfuscatedName("gp") - @ObfuscatedSignature( - signature = "Lla;" - ) - @Export("redHintArrowSprite") - static Sprite redHintArrowSprite; + @Export("compass") + static Sprite compass; - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Li;Li;I)I", - garbageValue = "-1993640176" + signature = "(Ls;Ls;I)I", + garbageValue = "1584423872" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -44,537 +38,47 @@ final class GrandExchangeOfferNameComparator implements Comparator { return super.equals(var1); } - @ObfuscatedName("q") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkj;ILbi;II)V", - garbageValue = "160137381" + signature = "(I)[Ljc;", + garbageValue = "491674021" ) - static final void method239(PacketBuffer var0, int var1, Player var2, int var3) { - byte var4 = -1; - if ((var3 & 512) != 0) { - var2.field990 = var0.readByte(); - var2.field1017 = var0.readByte(); - var2.field972 = var0.method5608(); - var2.field1018 = var0.method5606(); - var2.field1019 = var0.method5614() + Client.cycle; - var2.field1020 = var0.method5614() + Client.cycle; - var2.field1021 = var0.readUnsignedShort(); - if (var2.field670) { - var2.field990 += var2.tileX; - var2.field1017 += var2.tileY; - var2.field972 += var2.tileX; - var2.field1018 += var2.tileY; - var2.pathLength = 0; - } else { - var2.field990 += var2.pathX[0]; - var2.field1017 += var2.pathY[0]; - var2.field972 += var2.pathX[0]; - var2.field1018 += var2.pathY[0]; - var2.pathLength = 1; - } - - var2.field1032 = 0; - } - - int var5; - if ((var3 & 2048) != 0) { - var2.spotAnimation = var0.method5613(); - var5 = var0.method5619(); - var2.field1033 = var5 >> 16; - var2.field1013 = (var5 & 65535) + Client.cycle; - var2.spotAnimationFrame = 0; - var2.spotAnimationFrameCycle = 0; - if (var2.field1013 > Client.cycle) { - var2.spotAnimationFrame = -1; - } - - if (var2.spotAnimation == 65535) { - var2.spotAnimation = -1; - } - } - - int var6; - if ((var3 & 128) != 0) { - var5 = var0.method5564(); - if (var5 == 65535) { - var5 = -1; - } - - var6 = var0.method5604(); - GrandExchangeOfferWorldComparator.performPlayerAnimation(var2, var5, var6); - } - - if ((var3 & 2) != 0) { - var5 = var0.readUnsignedByte(); - byte[] var13 = new byte[var5]; - Buffer var7 = new Buffer(var13); - var0.method5622(var13, 0, var5); - Players.field1269[var1] = var7; - var2.read(var7); - } - - if ((var3 & 32) != 0) { - var2.overheadText = var0.readStringCp1252NullTerminated(); - if (var2.overheadText.charAt(0) == '~') { - var2.overheadText = var2.overheadText.substring(1); - Skeleton.addGameMessage(2, var2.username.getName(), var2.overheadText); - } else if (var2 == ByteArrayPool.localPlayer) { - Skeleton.addGameMessage(2, var2.username.getName(), var2.overheadText); - } - - var2.isAutoChatting = false; - var2.overheadTextColor = 0; - var2.overheadTextEffect = 0; - var2.overheadTextCyclesRemaining = 150; - } - - if ((var3 & 4) != 0) { - var2.targetIndex = var0.method5614(); - if (var2.targetIndex == 65535) { - var2.targetIndex = -1; - } - } - - if ((var3 & 4096) != 0) { - Players.field1273[var1] = var0.method5607(); - } - - int var8; - int var9; - int var12; - if ((var3 & 1) != 0) { - var5 = var0.method5613(); - PlayerType var18 = (PlayerType)GrandExchangeEvent.findEnumerated(InterfaceParent.PlayerType_values(), var0.method5604()); - boolean var14 = var0.method5604() == 1; - var8 = var0.method5603(); - var9 = var0.offset; - if (var2.username != null && var2.appearance != null) { - boolean var10 = false; - if (var18.isUser && Projectile.friendSystem.isIgnored(var2.username)) { - var10 = true; - } - - if (!var10 && Client.field794 == 0 && !var2.isHidden) { - Players.field1268.offset = 0; - var0.readBytes(Players.field1268.array, 0, var8); - Players.field1268.offset = 0; - String var11 = AbstractFont.escapeBrackets(Decimator.method2636(JagexCache.method3577(Players.field1268))); - var2.overheadText = var11.trim(); - var2.overheadTextColor = var5 >> 8; - var2.overheadTextEffect = var5 & 255; - var2.overheadTextCyclesRemaining = 150; - var2.isAutoChatting = var14; - var2.field988 = var2 != ByteArrayPool.localPlayer && var18.isUser && "" != Client.field814 && var11.toLowerCase().indexOf(Client.field814) == -1; - if (var18.isPrivileged) { - var12 = var14 ? 91 : 1; - } else { - var12 = var14 ? 90 : 2; - } - - if (var18.modIcon != -1) { - Skeleton.addGameMessage(var12, class1.method21(var18.modIcon) + var2.username.getName(), var11); - } else { - Skeleton.addGameMessage(var12, var2.username.getName(), var11); - } - } - } - - var0.offset = var9 + var8; - } - - if ((var3 & 256) != 0) { - for (var5 = 0; var5 < 3; ++var5) { - var2.actions[var5] = var0.readStringCp1252NullTerminated(); - } - } - - if ((var3 & 16) != 0) { - var5 = var0.readUnsignedByte(); - int var15; - int var17; - int var19; - if (var5 > 0) { - for (var6 = 0; var6 < var5; ++var6) { - var8 = -1; - var9 = -1; - var17 = -1; - var19 = var0.readUShortSmart(); - if (var19 == 32767) { - var19 = var0.readUShortSmart(); - var9 = var0.readUShortSmart(); - var8 = var0.readUShortSmart(); - var17 = var0.readUShortSmart(); - } else if (var19 != 32766) { - var9 = var0.readUShortSmart(); - } else { - var19 = -1; - } - - var15 = var0.readUShortSmart(); - var2.addHitSplat(var19, var9, var8, var17, Client.cycle, var15); - } - } - - var6 = var0.readUnsignedByte(); - if (var6 > 0) { - for (var19 = 0; var19 < var6; ++var19) { - var8 = var0.readUShortSmart(); - var9 = var0.readUShortSmart(); - if (var9 != 32767) { - var17 = var0.readUShortSmart(); - var15 = var0.readUnsignedByte(); - var12 = var9 > 0 ? var0.method5604() : var15; - var2.addHealthBar(var8, Client.cycle, var9, var17, var15, var12); - } else { - var2.removeHealthBar(var8); - } - } - } - } - - if ((var3 & 1024) != 0) { - var4 = var0.method5607(); - } - - if ((var3 & 8) != 0) { - var2.field1015 = var0.method5613(); - if (var2.pathLength == 0) { - var2.orientation = var2.field1015; - var2.field1015 = -1; - } - } - - if (var2.field670) { - if (var4 == 127) { - var2.resetPath(var2.tileX, var2.tileY); - } else { - byte var16; - if (var4 != -1) { - var16 = var4; - } else { - var16 = Players.field1273[var1]; - } - - var2.method1339(var2.tileX, var2.tileY, var16); - } - } - + static HorizontalAlignment[] method207() { + return new HorizontalAlignment[]{HorizontalAlignment.field3492, HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field3488}; } - @ObfuscatedName("ax") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(ILce;ZB)I", - garbageValue = "75" + signature = "(I)V", + garbageValue = "-678921308" ) - static int method238(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Language.loadWorlds() ? 1 : 0; - return 1; - } else { - World var3; - if (var0 == ScriptOpcodes.WORLDLIST_START) { - var3 = WorldMapDecoration.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 = MouseHandler.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 == UserComparator2.World_worlds[var5].id) { - var4 = UserComparator2.World_worlds[var5]; - break; - } - } - - 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; - Player.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 = IgnoreList.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class237.getNpcDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class237.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 = IgnoreList.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = WorldMapSection2.getObjectDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection2.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 = IgnoreList.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = AbstractWorldMapData.ItemDefinition_get(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = AbstractWorldMapData.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 = IgnoreList.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = FloorOverlayDefinition.StructDefinition_getStructDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = FloorOverlayDefinition.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 = UserComparator2.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; - } - } - } + static void method213() { + Login.loginIndex = 24; + MusicPatchPcmStream.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); } - @ObfuscatedName("hs") + @ObfuscatedName("kt") @ObfuscatedSignature( - signature = "(IIZI)V", - garbageValue = "-1462729636" + signature = "(Lkn;II)V", + garbageValue = "-350266063" ) - static final void method237(int var0, int var1, boolean var2) { - if (!var2 || var0 != class69.field585 || MouseHandler.field529 != var1) { - class69.field585 = var0; - MouseHandler.field529 = var1; - MouseRecorder.updateGameState(25); - AbstractByteArrayCopier.drawLoadingMessage("Loading - please wait.", true); - int var3 = class69.baseX; - int var4 = class89.baseY; - class69.baseX = (var0 - 6) * 8; - class89.baseY = (var1 - 6) * 8; - int var5 = class69.baseX - var3; - int var6 = class89.baseY - var4; - var3 = class69.baseX; - var4 = class89.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; - } - - 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; - } - - var21.x -= var5 * 128; - 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; var18 != var13; var13 += var22) { - for (var14 = var10; var14 != var11; var14 += var12) { - int var15 = var5 + var13; - int var16 = var14 + var6; - - for (int var17 = 0; var17 < 4; ++var17) { - if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { - Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; - } else { - Client.groundItems[var17][var13][var14] = null; - } - } - } - } - - for (PendingSpawn 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; - WorldMapRectangle.cameraX -= var5 << 7; - class200.cameraZ -= var6 << 7; - SoundSystem.oculusOrbFocalPointX -= var5 << 7; - ServerPacket.oculusOrbFocalPointY -= var6 << 7; - Client.field695 = -1; - Client.graphicsObjects.clear(); - Client.projectiles.clear(); - - for (var14 = 0; var14 < 4; ++var14) { - Client.collisionMaps[var14].clear(); - } - + static void method214(Buffer var0, int var1) { + byte[] var2 = var0.array; + if (Client.randomDatData == null) { + Client.randomDatData = new byte[24]; } + + class310.writeRandomDat(var2, var1, Client.randomDatData, 0, 24); + DevicePcmPlayerProvider.method914(var0, var1); + } + + @ObfuscatedName("kv") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-2098531910" + ) + static void method206() { + Client.packetWriter.addNode(UserComparator4.getPacketBufferNode(ClientPacket.field2339, Client.packetWriter.isaacCipher)); + Client.oculusOrbState = 0; } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java index 6ac244bdc9..0dd2944994 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java @@ -1,37 +1,30 @@ 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("bl") +@ObfuscatedName("bj") @Implements("GrandExchangeOfferOwnWorldComparator") public class GrandExchangeOfferOwnWorldComparator implements Comparator { - @ObfuscatedName("sb") - @ObfuscatedSignature( - signature = "Lcq;" + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -1758275927 ) - @Export("clientPreferences") - static ClientPreferences clientPreferences; - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "Lle;" - ) - @Export("titlebuttonSprite") - static IndexedSprite titlebuttonSprite; - @ObfuscatedName("n") - public static boolean field677; - @ObfuscatedName("x") + static int field666; + @ObfuscatedName("m") @Export("filterWorlds") boolean filterWorlds; GrandExchangeOfferOwnWorldComparator() { } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Li;Li;B)I", - garbageValue = "-63" + signature = "(Ls;Ls;I)I", + garbageValue = "646157510" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -52,70 +45,99 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { } } - 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("x") - @ObfuscatedSignature( - signature = "(Lbb;I)V", - garbageValue = "295215952" - ) - @Export("runScriptEvent") - public static void runScriptEvent(ScriptEvent var0) { - PlayerAppearance.runScript(var0, 500000); - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-459151232" - ) - @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; - } - - } + public boolean equals(Object var1) { + return super.equals(var1); } @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(IB)Ljava/lang/String;", - garbageValue = "120" + signature = "(ILcs;ZI)I", + garbageValue = "987190791" ) - static final String method1385(int var0) { - if (var0 < 100000) { - return "" + var0 + ""; + static int method1342(int var0, Script var1, boolean var2) { + int var3 = -1; + Widget var4; + if (var0 >= 2000) { + var0 -= 1000; + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + var4 = WorldMapSprite.getWidget(var3); } else { - return var0 < 10000000 ? "" + var0 / 1000 + "K" + "" : "" + var0 / 1000000 + "M" + ""; + var4 = var2 ? KeyHandler.field407 : SecureRandomCallable.field544; + } + + if (var0 == ScriptOpcodes.CC_SETPOSITION) { + UrlRequester.Interpreter_intStackSize -= 4; + var4.rawX = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var4.rawY = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + var4.xAlignment = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2]; + var4.yAlignment = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 3]; + class234.invalidateWidget(var4); + WorldMapSectionType.client.alignWidget(var4); + if (var3 != -1 && var4.type == 0) { + WorldMapIcon_0.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETSIZE) { + UrlRequester.Interpreter_intStackSize -= 4; + var4.rawWidth = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var4.rawHeight = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + var4.widthAlignment = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2]; + var4.heightAlignment = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 3]; + class234.invalidateWidget(var4); + WorldMapSectionType.client.alignWidget(var4); + if (var3 != -1 && var4.type == 0) { + WorldMapIcon_0.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETHIDE) { + boolean var5 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + if (var5 != var4.isHidden) { + var4.isHidden = var5; + class234.invalidateWidget(var4); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { + var4.noClickThrough = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { + var4.noScrollThrough = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + return 1; + } else { + return 2; } } - @ObfuscatedName("ff") + @ObfuscatedName("fq") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "-90506590" + signature = "(Ljm;IIII)V", + garbageValue = "1251688899" ) - static void method1396(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 = UserComparator4.method3482(var4); - int var6 = Rasterizer3D.Rasterizer3D_sine[var4]; - var5 = Varcs.method2295(var5, var1); - var2[var3] = var6 * var5 >> 16; + @Export("addSequenceSoundEffect") + static void addSequenceSoundEffect(SequenceDefinition var0, int var1, int var2, int var3) { + if (Client.soundEffectCount < 50 && Client.areaSoundEffectVolume != 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; + } + } } - - Scene.Scene_buildVisiblityMap(var2, 500, 800, var0 * 334 / var1, 334); } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java index e22ee5aae9..6239d18d48 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java @@ -1,27 +1,19 @@ -import java.awt.Component; -import java.lang.reflect.Field; -import java.lang.reflect.Method; +import java.applet.Applet; +import java.net.URL; 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.Reflection; +import netscape.javascript.JSObject; -@ObfuscatedName("a") +@ObfuscatedName("v") @Implements("GrandExchangeOfferTotalQuantityComparator") final class GrandExchangeOfferTotalQuantityComparator implements Comparator { - @ObfuscatedName("gy") - @ObfuscatedGetter( - intValue = -591154231 - ) - static int field91; - - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Li;Li;B)I", - garbageValue = "-105" + signature = "(Ls;Ls;I)I", + garbageValue = "-1370720727" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -36,150 +28,64 @@ final class GrandExchangeOfferTotalQuantityComparator implements Comparator { return super.equals(var1); } - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Ljava/awt/Component;I)V", - garbageValue = "-1200132301" + signature = "(Ljava/lang/String;ILjava/lang/String;B)Z", + garbageValue = "-68" ) - static void method179(Component var0) { - var0.addMouseListener(MouseHandler.MouseHandler_instance); - var0.addMouseMotionListener(MouseHandler.MouseHandler_instance); - var0.addFocusListener(MouseHandler.MouseHandler_instance); - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "(Lkb;IS)V", - garbageValue = "-19565" - ) - @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] = class2.loadClassFromDescriptor(var8[var12]); - } - - Class var22 = class2.loadClassFromDescriptor(var20); - if (class2.loadClassFromDescriptor(var5).getClassLoader() == null) { - throw new SecurityException(); - } - - Method[] var13 = class2.loadClassFromDescriptor(var5).getDeclaredMethods(); - Method[] var14 = var13; - - for (int var15 = 0; var15 < var14.length; ++var15) { - Method var16 = var14[var15]; - if (Reflection.getMethodName(var16).equals(var6)) { - Class[] var17 = Reflection.getParameterTypes(var16); - if (var21.length == var17.length) { - boolean var18 = true; - - for (int var19 = 0; var19 < var21.length; ++var19) { - if (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 (class2.loadClassFromDescriptor(var5).getClassLoader() == null) { - throw new SecurityException(); - } - - var2.fields[var3] = Reflection.findField(class2.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; - } - } - - class105.reflectionChecks.addFirst(var2); - } - - @ObfuscatedName("ka") - @ObfuscatedSignature( - signature = "(Lhe;B)Lhe;", - garbageValue = "-16" - ) - static Widget method181(Widget var0) { - int var1 = Canvas.method958(ScriptEvent.getWidgetClickMask(var0)); + static boolean method165(String var0, int var1, String var2) { if (var1 == 0) { - return null; - } else { - for (int var2 = 0; var2 < var1; ++var2) { - var0 = MusicPatchNode.getWidget(var0.parentId); - if (var0 == null) { - return null; + try { + if (!class60.field450.startsWith("win")) { + throw new Exception(); + } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { + throw new Exception(); + } else { + String var14 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; + + for (int var4 = 0; var4 < var0.length(); ++var4) { + if (var14.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 = class60.applet; + Object[] var5 = new Object[]{(new URL(class60.applet.getCodeBase(), var0)).toString()}; + Object var13 = JSObject.getWindow(var7).call(var2, var5); + return var13 != null; + } catch (Throwable var9) { + return false; + } + } else if (var1 == 2) { + try { + class60.applet.getAppletContext().showDocument(new URL(class60.applet.getCodeBase(), var0), "_blank"); + return true; + } catch (Exception var10) { + return false; + } + } else if (var1 == 3) { + try { + Applet var3 = class60.applet; + JSObject.getWindow(var3).call("loggedout", (Object[])null); + } catch (Throwable var12) { } - return var0; + try { + class60.applet.getAppletContext().showDocument(new URL(class60.applet.getCodeBase(), var0), "_top"); + return true; + } catch (Exception var11) { + return false; + } + } else { + throw new IllegalArgumentException(); } } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java index fdd7f61dac..2e5f75207d 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java @@ -1,21 +1,18 @@ -import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("l") +@ObfuscatedName("e") @Implements("GrandExchangeOfferUnitPriceComparator") final class GrandExchangeOfferUnitPriceComparator implements Comparator { - @ObfuscatedName("s") - @Export("musicTrackBoolean") - public static boolean musicTrackBoolean; - - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Li;Li;B)I", - garbageValue = "-48" + signature = "(Ls;Ls;B)I", + garbageValue = "0" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { @@ -30,145 +27,91 @@ final class GrandExchangeOfferUnitPriceComparator implements Comparator { return super.equals(var1); } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II)Ljv;", - garbageValue = "-600154853" + signature = "(Lic;Lic;B)V", + garbageValue = "15" ) - public static HitSplatDefinition method213(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)); - } + public static void method195(AbstractArchive var0, AbstractArchive var1) { + KitDefinition.KitDefinition_archive = var0; + KitDefinition.KitDefinition_modelsArchive = var1; + KitDefinition.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); + } - HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); - return var1; + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)Z", + garbageValue = "-1062830390" + ) + static boolean method204(String var0) { + if (var0 == null) { + return false; + } else { + try { + new URL(var0); + return true; + } catch (MalformedURLException var2) { + return false; + } } } - @ObfuscatedName("x") + @ObfuscatedName("ar") @ObfuscatedSignature( - signature = "(Llt;ZB)V", - garbageValue = "1" + signature = "(Ljg;S)Z", + garbageValue = "255" ) - public static void method222(AbstractSocket var0, boolean var1) { - if (NetCache.NetCache_socket != null) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var8) { - } + static boolean method202(ObjectDefinition var0) { + if (var0.transforms != null) { + int[] var1 = var0.transforms; - NetCache.NetCache_socket = null; - } - - NetCache.NetCache_socket = var0; - Buffer var2; - if (NetCache.NetCache_socket != null) { - try { - var2 = new Buffer(4); - var2.writeByte(var1 ? 2 : 3); - var2.writeMedium(0); - NetCache.NetCache_socket.write(var2.array, 0, 4); - } catch (IOException var7) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var6) { - } - - ++NetCache.NetCache_ioExceptions; - NetCache.NetCache_socket = null; - } - } - - NetCache.NetCache_responseHeaderBuffer.offset = 0; - NetCache.NetCache_currentResponse = null; - NetCache.NetCache_responseArchiveBuffer = null; - NetCache.field3178 = 0; - - while (true) { - NetFileRequest var9 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); - if (var9 == null) { - while (true) { - var9 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); - if (var9 == null) { - if (NetCache.field3163 != 0) { - try { - var2 = new Buffer(4); - var2.writeByte(4); - var2.writeByte(NetCache.field3163); - var2.writeShort(0); - NetCache.NetCache_socket.write(var2.array, 0, 4); - } catch (IOException var5) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var4) { - } - - ++NetCache.NetCache_ioExceptions; - NetCache.NetCache_socket = null; - } - } - - NetCache.NetCache_loadTime = 0; - NetCache.field3165 = class217.currentTimeMillis(); - return; - } - - NetCache.NetCache_pendingWritesQueue.addLast(var9); - NetCache.NetCache_pendingWrites.put(var9, var9.key); - ++NetCache.NetCache_pendingWritesCount; - --NetCache.NetCache_pendingResponsesCount; + for (int var2 = 0; var2 < var1.length; ++var2) { + int var3 = var1[var2]; + ObjectDefinition var4 = Canvas.getObjectDefinition(var3); + if (var4.mapIconId != -1) { + return true; + } + } + } else if (var0.mapIconId != -1) { + return true; + } + + return false; + } + + @ObfuscatedName("ix") + @ObfuscatedSignature( + signature = "([Lhd;IIIZB)V", + garbageValue = "0" + ) + @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) { + UserComparator3.alignWidgetSize(var6, var2, var3, var4); + WorldMapLabel.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) { + WorldMapIcon_0.revalidateWidgetScroll(var0, var6, var4); } } - - NetCache.NetCache_pendingPriorityWrites.put(var9, var9.key); - ++NetCache.NetCache_pendingPriorityWritesCount; - --NetCache.NetCache_pendingPriorityResponsesCount; - } - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "(III)Lhe;", - garbageValue = "166208311" - ) - @Export("getWidgetChild") - public static Widget getWidgetChild(int var0, int var1) { - Widget var2 = MusicPatchNode.getWidget(var0); - if (var1 == -1) { - return var2; - } else { - return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; - } - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "-1968739504" - ) - public static boolean method218(int var0) { - return (var0 >> 20 & 1) != 0; - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - signature = "([BII)I", - garbageValue = "-1953007669" - ) - public static int method225(byte[] var0, int var1) { - int var3 = -1; - - for (int var4 = 0; var4 < var1; ++var4) { - var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; } - var3 = ~var3; - return var3; } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java index 76004fbab5..e3b6dbe94c 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java @@ -1,167 +1,173 @@ 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("h") +@ObfuscatedName("k") @Implements("GrandExchangeOfferWorldComparator") final class GrandExchangeOfferWorldComparator implements Comparator { - @ObfuscatedName("rb") - @ObfuscatedGetter( - intValue = 587221949 - ) - static int field64; - @ObfuscatedName("gq") + @ObfuscatedName("bf") @ObfuscatedSignature( - signature = "Lej;" + signature = "Lib;" ) - @Export("scene") - static Scene scene; - @ObfuscatedName("hk") - @ObfuscatedGetter( - intValue = -1477050145 - ) - @Export("cameraY") - static int cameraY; + static StudioGame field54; - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Li;Li;I)I", - garbageValue = "590840268" + signature = "(Ls;Ls;B)I", + garbageValue = "-1" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { return var1.world < var2.world ? -1 : (var2.world == var1.world ? 0 : 1); } - public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); - } - public boolean equals(Object var1) { return super.equals(var1); } + public int compare(Object var1, Object var2) { + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + } + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "1020131485" + signature = "(ILcs;ZI)I", + garbageValue = "1613064985" ) static int method137(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? GrandExchangeOfferNameComparator.field115 : Interpreter.field1130; - 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; + boolean var3 = true; + Widget var4; + if (var0 >= 2000) { + var0 -= 1000; + var4 = WorldMapSprite.getWidget(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); + var3 = false; } else { - return 2; + var4 = var2 ? KeyHandler.field407 : SecureRandomCallable.field544; } - } - @ObfuscatedName("fl") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-965659136" - ) - static int method147() { - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { - int var0 = 0; - - for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { - var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; + int var11; + if (var0 == ScriptOpcodes.CC_SETOP) { + var11 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] - 1; + if (var11 >= 0 && var11 <= 9) { + var4.setAction(var11, Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]); + return 1; + } else { + --WorldMapEvent.Interpreter_stringStackSize; + return 1; } - - return var0 * 10000 / Client.field898; } else { - return 10000; - } - } + int var6; + if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { + UrlRequester.Interpreter_intStackSize -= 2; + var11 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var6 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + var4.parent = WorldMapLabelSize.getWidgetChild(var11, var6); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { + var4.isScrollBar = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { + var4.dragZoneSize = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { + var4.dragThreshold = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { + var4.dataText = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { + var4.spellActionName = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; + return 1; + } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { + var4.actions = null; + return 1; + } else if (var0 == 1308) { + var4.field2744 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 1309) { + --UrlRequester.Interpreter_intStackSize; + return 1; + } else { + int var7; + byte[] var9; + if (var0 != ScriptOpcodes.CC_SETOPKEY) { + byte var5; + if (var0 == ScriptOpcodes.CC_SETOPTKEY) { + UrlRequester.Interpreter_intStackSize -= 2; + var5 = 10; + var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]}; + byte[] var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]}; + PendingSpawn.Widget_setKey(var4, var5, var9, var10); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { + UrlRequester.Interpreter_intStackSize -= 3; + var11 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize] - 1; + var6 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + var7 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2]; + if (var11 >= 0 && var11 <= 9) { + WorldMapRectangle.Widget_setKeyRate(var4, var11, var6, var7); + return 1; + } else { + throw new RuntimeException(); + } + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { + var5 = 10; + var6 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + WorldMapRectangle.Widget_setKeyRate(var4, var5, var6, var7); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { + --UrlRequester.Interpreter_intStackSize; + var11 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize] - 1; + if (var11 >= 0 && var11 <= 9) { + FontName.Widget_setKeyIgnoreHeld(var4, var11); + return 1; + } else { + throw new RuntimeException(); + } + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { + var5 = 10; + FontName.Widget_setKeyIgnoreHeld(var4, var5); + return 1; + } else { + return 2; + } + } else { + byte[] var8 = null; + var9 = null; + if (var3) { + UrlRequester.Interpreter_intStackSize -= 10; - @ObfuscatedName("gu") - @ObfuscatedSignature( - signature = "(Lbi;IIB)V", - garbageValue = "8" - ) - @Export("performPlayerAnimation") - static void performPlayerAnimation(Player var0, int var1, int var2) { - if (var0.sequence == var1 && var1 != -1) { - int var3 = SpotAnimationDefinition.SequenceDefinition_get(var1).field3525; - if (var3 == 1) { - var0.sequenceFrame = 0; - var0.sequenceFrameCycle = 0; - var0.sequenceDelay = var2; - var0.field1011 = 0; + for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + UrlRequester.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 + UrlRequester.Interpreter_intStackSize]; + var9[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + UrlRequester.Interpreter_intStackSize + 1]; + } + } + } else { + UrlRequester.Interpreter_intStackSize -= 2; + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]}; + var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]}; + } + + var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] - 1; + if (var7 >= 0 && var7 <= 9) { + PendingSpawn.Widget_setKey(var4, var7, var8, var9); + return 1; + } else { + throw new RuntimeException(); + } + } } - - if (var3 == 2) { - var0.field1011 = 0; - } - } else if (var1 == -1 || var0.sequence == -1 || SpotAnimationDefinition.SequenceDefinition_get(var1).field3519 >= SpotAnimationDefinition.SequenceDefinition_get(var0.sequence).field3519) { - var0.sequence = var1; - var0.sequenceFrame = 0; - var0.sequenceFrameCycle = 0; - var0.sequenceDelay = var2; - var0.field1011 = 0; - var0.field1032 = var0.pathLength; } - - } - - @ObfuscatedName("kl") - @ObfuscatedSignature( - signature = "(IIIZI)V", - garbageValue = "1791023210" - ) - public static void method148(int var0, int var1, int var2, boolean var3) { - PacketBufferNode var4 = FaceNormal.getPacketBufferNode(ClientPacket.field2224, Client.packetWriter.isaacCipher); - var4.packetBuffer.method5727(var2); - var4.packetBuffer.writeInt(var3 ? Client.field762 * 166950687 * 1356416223 : 0); - var4.packetBuffer.method5609(var0); - var4.packetBuffer.writeIntME(var1); - Client.packetWriter.addNode(var4); } } diff --git a/runescape-client/src/main/java/GraphicsDefaults.java b/runescape-client/src/main/java/GraphicsDefaults.java index 7039b00ab6..5060616be0 100644 --- a/runescape-client/src/main/java/GraphicsDefaults.java +++ b/runescape-client/src/main/java/GraphicsDefaults.java @@ -4,90 +4,90 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lx") +@ObfuscatedName("lq") @Implements("GraphicsDefaults") public class GraphicsDefaults { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 281653791 + intValue = -1290598403 ) @Export("compass") public int compass; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1495832325 + intValue = 569826969 ) - public int field3824; - @ObfuscatedName("k") + public int field3825; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 465334207 + intValue = -2129341785 ) @Export("mapScenes") public int mapScenes; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1124129299 + intValue = -971970549 ) @Export("headIconsPk") public int headIconsPk; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -392532665 + intValue = 495160215 ) - public int field3817; - @ObfuscatedName("v") + public int field3828; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 505847237 + intValue = 600923109 ) - public int field3818; - @ObfuscatedName("q") + public int field3829; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -322608503 + intValue = -1832791717 ) - public int field3819; + public int field3830; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 1676542437 + ) + public int field3831; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 25471689 + ) + public int field3834; @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 91782019 + intValue = -1227004577 ) - public int field3820; - @ObfuscatedName("t") + public int field3824; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -918755557 + intValue = -575308385 ) - public int field3821; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -1836222511 - ) - public int field3822; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -581916301 - ) - public int field3823; + public int field3832; public GraphicsDefaults() { this.compass = -1; - this.field3824 = -1; + this.field3825 = -1; this.mapScenes = -1; this.headIconsPk = -1; - this.field3817 = -1; - this.field3818 = -1; - this.field3819 = -1; - this.field3820 = -1; - this.field3821 = -1; - this.field3822 = -1; - this.field3823 = -1; + this.field3828 = -1; + this.field3829 = -1; + this.field3830 = -1; + this.field3831 = -1; + this.field3834 = -1; + this.field3824 = -1; + this.field3832 = -1; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Liy;I)V", - garbageValue = "-1759254165" + signature = "(Lic;B)V", + garbageValue = "0" ) @Export("decode") public void decode(AbstractArchive var1) { - byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3811.group); + byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3822.group); Buffer var3 = new Buffer(var2); while (true) { @@ -101,38 +101,18 @@ public class GraphicsDefaults { var3.readMedium(); break; case 2: - this.compass = var3.method5591(); - this.field3824 = var3.method5591(); - this.mapScenes = var3.method5591(); - this.headIconsPk = var3.method5591(); - this.field3817 = var3.method5591(); - this.field3818 = var3.method5591(); - this.field3819 = var3.method5591(); - this.field3820 = var3.method5591(); - this.field3821 = var3.method5591(); - this.field3822 = var3.method5591(); - this.field3823 = var3.method5591(); + this.compass = var3.method5843(); + this.field3825 = var3.method5843(); + this.mapScenes = var3.method5843(); + this.headIconsPk = var3.method5843(); + this.field3828 = var3.method5843(); + this.field3829 = var3.method5843(); + this.field3830 = var3.method5843(); + this.field3831 = var3.method5843(); + this.field3834 = var3.method5843(); + this.field3824 = var3.method5843(); + this.field3832 = var3.method5843(); } } } - - @ObfuscatedName("x") - static double method5968(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("x") - @ObfuscatedSignature( - signature = "(Lkb;Ljava/lang/String;B)I", - garbageValue = "77" - ) - public static int method5966(Buffer var0, String var1) { - int var2 = var0.offset; - byte[] var3 = WorldMapCacheName.method715(var1); - var0.writeSmartByteShort(var3.length); - var0.offset += class219.huffman.compress(var3, 0, var3.length, var0.array, var0.offset); - return var0.offset - var2; - } } diff --git a/runescape-client/src/main/java/GraphicsObject.java b/runescape-client/src/main/java/GraphicsObject.java index 166d7f37d1..e09cfd9b83 100644 --- a/runescape-client/src/main/java/GraphicsObject.java +++ b/runescape-client/src/main/java/GraphicsObject.java @@ -1,74 +1,78 @@ -import java.io.IOException; -import java.util.LinkedHashMap; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cs") +@ObfuscatedName("cj") @Implements("GraphicsObject") public final class GraphicsObject extends Entity { - @ObfuscatedName("aw") + @ObfuscatedName("si") @ObfuscatedGetter( - intValue = 2069035029 + longValue = 4282492011964986707L ) - static int field1141; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -1892453991 + static long field1139; + @ObfuscatedName("dz") + @ObfuscatedSignature( + signature = "Lig;" ) - @Export("y") - int y; + @Export("archive10") + static Archive archive10; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -760249917 + intValue = 555151267 ) @Export("id") int id; - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1800328217 + intValue = 953571075 ) @Export("cycleStart") int cycleStart; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1899634503 + intValue = 35157473 ) @Export("plane") int plane; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1416163877 + intValue = 1616692737 ) @Export("x") int x; - @ObfuscatedName("v") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1568421589 + intValue = -2135993151 + ) + @Export("y") + int y; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -1585173771 ) @Export("height") int height; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Ljc;" + signature = "Ljm;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 137908093 + intValue = 1643713967 ) @Export("frame") int frame; - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1659950887 + intValue = 1415873335 ) @Export("frameCycle") int frameCycle; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("isFinished") boolean isFinished; @@ -82,20 +86,20 @@ public final class GraphicsObject extends Entity { this.y = var4; this.height = var5; this.cycleStart = var7 + var6; - int var8 = MouseHandler.SpotAnimationDefinition_get(this.id).sequence; + int var8 = class4.SpotAnimationDefinition_get(this.id).sequence; if (var8 != -1) { this.isFinished = false; - this.sequenceDefinition = SpotAnimationDefinition.SequenceDefinition_get(var8); + this.sequenceDefinition = NetSocket.SequenceDefinition_get(var8); } else { this.isFinished = true; } } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-937691597" + garbageValue = "-1084299452" ) @Export("advance") final void advance(int var1) { @@ -114,14 +118,14 @@ public final class GraphicsObject extends Entity { } } - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)Lel;", - garbageValue = "480835067" + signature = "(I)Lef;", + garbageValue = "1832696685" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = MouseHandler.SpotAnimationDefinition_get(this.id); + SpotAnimationDefinition var1 = class4.SpotAnimationDefinition_get(this.id); Model var2; if (!this.isFinished) { var2 = var1.getModel(this.frame); @@ -131,69 +135,4 @@ public final class GraphicsObject extends Entity { return var2 == null ? null : var2; } - - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-22" - ) - public static void method2121() { - if (MouseHandler.MouseHandler_instance != null) { - synchronized(MouseHandler.MouseHandler_instance) { - MouseHandler.MouseHandler_instance = null; - } - } - - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "(I)[B", - garbageValue = "1774574647" - ) - public static byte[] method2120() { - byte[] var0 = new byte[24]; - - try { - JagexCache.JagexCache_randomDat.seek(0L); - JagexCache.JagexCache_randomDat.readFully(var0); - - int var1; - for (var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) { - } - - if (var1 >= 24) { - throw new IOException(); - } - } catch (Exception var4) { - for (int var2 = 0; var2 < 24; ++var2) { - var0[var2] = -1; - } - } - - return var0; - } - - @ObfuscatedName("ft") - @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "1004007010" - ) - static final void method2122(boolean var0) { - if (var0) { - Client.field715 = Login.field1214 ? class169.field2007 : class169.field2006; - } else { - LinkedHashMap var1 = GrandExchangeOfferOwnWorldComparator.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.field715 = var1.containsKey(var5) ? class169.field2012 : class169.field2008; - } - - } } diff --git a/runescape-client/src/main/java/HealthBar.java b/runescape-client/src/main/java/HealthBar.java index c3f4c7668d..67d6c3713d 100644 --- a/runescape-client/src/main/java/HealthBar.java +++ b/runescape-client/src/main/java/HealthBar.java @@ -1,42 +1,45 @@ +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("cg") +@ObfuscatedName("ck") @Implements("HealthBar") public class HealthBar extends Node { - @ObfuscatedName("rf") - @ObfuscatedGetter( - intValue = -1163501961 - ) - static int field1145; - @ObfuscatedName("k") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lid;" + signature = "Llh;" + ) + @Export("titleboxSprite") + static IndexedSprite titleboxSprite; + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "Lik;" ) @Export("definition") HealthBarDefinition definition; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Ljm;" + signature = "Ljx;" ) @Export("updates") IterableNodeDeque updates; @ObfuscatedSignature( - signature = "(Lid;)V" + signature = "(Lik;)V" ) HealthBar(HealthBarDefinition var1) { this.updates = new IterableNodeDeque(); this.definition = var1; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(IIIIB)V", - garbageValue = "86" + garbageValue = "-61" ) @Export("put") void put(int var1, int var2, int var3, int var4) { @@ -69,10 +72,10 @@ public class HealthBar extends Node { } } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)Lcc;", - garbageValue = "1772939720" + signature = "(II)Lcb;", + garbageValue = "-200581175" ) @Export("get") HealthBarUpdate get(int var1) { @@ -83,7 +86,7 @@ public class HealthBar extends Node { var2 = var3; } - if (this.definition.int5 + var2.cycle + var2.cycleOffset > var1) { + if (this.definition.int5 + var2.cycleOffset + var2.cycle > var1) { return var2; } else { var2.remove(); @@ -94,25 +97,672 @@ public class HealthBar extends Node { } } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "1327552245" + garbageValue = "1424696628" ) @Export("isEmpty") boolean isEmpty() { - return this.updates.method4891(); + return this.updates.method5014(); } - @ObfuscatedName("h") + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;Ljava/lang/String;III)V", + garbageValue = "1011181344" + ) + public static void method2137(String var0, String var1, int var2, int var3) throws IOException { + WorldMapDecoration.idxCount = var3; + RouteStrategy.cacheGamebuild = var2; + + try { + class225.field2587 = System.getProperty("os.name"); + } catch (Exception var29) { + class225.field2587 = "Unknown"; + } + + JagexCache.field2077 = class225.field2587.toLowerCase(); + + try { + ArchiveLoader.userHomeDirectory = System.getProperty("user.home"); + if (ArchiveLoader.userHomeDirectory != null) { + ArchiveLoader.userHomeDirectory = ArchiveLoader.userHomeDirectory + "/"; + } + } catch (Exception var28) { + } + + try { + if (JagexCache.field2077.startsWith("win")) { + if (ArchiveLoader.userHomeDirectory == null) { + ArchiveLoader.userHomeDirectory = System.getenv("USERPROFILE"); + } + } else if (ArchiveLoader.userHomeDirectory == null) { + ArchiveLoader.userHomeDirectory = System.getenv("HOME"); + } + + if (ArchiveLoader.userHomeDirectory != null) { + ArchiveLoader.userHomeDirectory = ArchiveLoader.userHomeDirectory + "/"; + } + } catch (Exception var27) { + } + + if (ArchiveLoader.userHomeDirectory == null) { + ArchiveLoader.userHomeDirectory = "~/"; + } + + class234.field3096 = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", ArchiveLoader.userHomeDirectory, "/tmp/", ""}; + InterfaceParent.field590 = new String[]{".jagex_cache_" + RouteStrategy.cacheGamebuild, ".file_store_" + RouteStrategy.cacheGamebuild}; + int var18 = 0; + + label248: + while (var18 < 4) { + String var6 = var18 == 0 ? "" : "" + var18; + JagexCache.JagexCache_locationFile = new File(ArchiveLoader.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var6 + ".dat"); + String var7 = null; + String var8 = null; + boolean var9 = false; + int var12; + int var14; + File var34; + if (JagexCache.JagexCache_locationFile.exists()) { + try { + AccessFile var10 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); + + Buffer var11; + for (var11 = new Buffer((int)var10.length()); var11.offset < var11.array.length; var11.offset += var12) { + var12 = var10.read(var11.array, var11.offset, var11.array.length - var11.offset); + if (var12 == -1) { + throw new IOException(); + } + } + + var11.offset = 0; + var12 = var11.readUnsignedByte(); + if (var12 < 1 || var12 > 3) { + throw new IOException("" + var12); + } + + int var13 = 0; + if (var12 > 1) { + var13 = var11.readUnsignedByte(); + } + + if (var12 <= 2) { + var7 = var11.readStringCp1252NullCircumfixed(); + if (var13 == 1) { + var8 = var11.readStringCp1252NullCircumfixed(); + } + } else { + var7 = var11.readCESU8(); + if (var13 == 1) { + var8 = var11.readCESU8(); + } + } + + var10.close(); + } catch (IOException var31) { + var31.printStackTrace(); + } + + if (var7 != null) { + var34 = new File(var7); + if (!var34.exists()) { + var7 = null; + } + } + + if (var7 != null) { + var34 = new File(var7, "test.dat"); + + boolean var37; + try { + RandomAccessFile var19 = new RandomAccessFile(var34, "rw"); + var14 = var19.read(); + var19.seek(0L); + var19.write(var14); + var19.seek(0L); + var19.close(); + var34.delete(); + var37 = true; + } catch (Exception var26) { + var37 = false; + } + + if (!var37) { + var7 = null; + } + } + } + + if (var7 == null && var18 == 0) { + label223: + for (int var20 = 0; var20 < InterfaceParent.field590.length; ++var20) { + for (int var21 = 0; var21 < class234.field3096.length; ++var21) { + File var22 = new File(class234.field3096[var21] + InterfaceParent.field590[var20] + File.separatorChar + var0 + File.separatorChar); + if (var22.exists() && class4.method58(new File(var22, "test.dat"), true)) { + var7 = var22.toString(); + var9 = true; + break label223; + } + } + } + } + + if (var7 == null) { + var7 = ArchiveLoader.userHomeDirectory + File.separatorChar + "jagexcache" + var6 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; + var9 = true; + } + + if (var8 != null) { + File var33 = new File(var8); + var34 = new File(var7); + + try { + File[] var40 = var33.listFiles(); + File[] var38 = var40; + + for (var14 = 0; var14 < var38.length; ++var14) { + File var15 = var38[var14]; + File var16 = new File(var34, var15.getName()); + boolean var17 = var15.renameTo(var16); + if (!var17) { + throw new IOException(); + } + } + } catch (Exception var30) { + var30.printStackTrace(); + } + + var9 = true; + } + + if (var9) { + Client.method1803(new File(var7), (File)null); + } + + File var5 = new File(var7); + JagexCache.cacheDir = var5; + if (!JagexCache.cacheDir.exists()) { + JagexCache.cacheDir.mkdirs(); + } + + File[] var32 = JagexCache.cacheDir.listFiles(); + if (var32 != null) { + File[] var35 = var32; + + for (int var23 = 0; var23 < var35.length; ++var23) { + File var24 = var35[var23]; + + boolean var39; + try { + RandomAccessFile var36 = new RandomAccessFile(var24, "rw"); + var12 = var36.read(); + var36.seek(0L); + var36.write(var12); + var36.seek(0L); + var36.close(); + var39 = true; + } catch (Exception var25) { + var39 = false; + } + + if (!var39) { + ++var18; + continue label248; + } + } + } + break; + } + + MusicPatch.method4025(JagexCache.cacheDir); + MusicPatchNode.method3970(); + JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(GameBuild.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); + JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(GameBuild.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); + JagexCache.JagexCache_idxFiles = new BufferedFile[WorldMapDecoration.idxCount]; + + for (var18 = 0; var18 < WorldMapDecoration.idxCount; ++var18) { + JagexCache.JagexCache_idxFiles[var18] = new BufferedFile(new AccessFile(GameBuild.getFile("main_file_cache.idx" + var18), "rw", 1048576L), 6000, 0); + } + + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(Lic;IIB)[Llh;", + garbageValue = "-91" + ) + public static IndexedSprite[] method2125(AbstractArchive var0, int var1, int var2) { + byte[] var4 = var0.takeFile(var1, var2); + boolean var3; + if (var4 == null) { + var3 = false; + } else { + class3.SpriteBuffer_decode(var4); + var3 = true; + } + + return !var3 ? null : class232.method4279(); + } + + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1544257049" + garbageValue = "-631398790" ) - static void method2124() { - Login.worldSelectOpen = false; - Login.leftTitleSprite.drawAt(Login.xPadding, 0); - DirectByteArrayCopier.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - class3.logoSprite.drawAt(Login.xPadding + 382 - class3.logoSprite.subWidth / 2, 18); + public static void method2133() { + VarpDefinition.VarpDefinition_cached.clear(); + } + + @ObfuscatedName("eb") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "-57" + ) + @Export("load") + static void load() { + int var0; + if (Client.titleLoadingStage == 0) { + UserComparator3.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); + + for (var0 = 0; var0 < 4; ++var0) { + Client.collisionMaps[var0] = new CollisionMap(104, 104); + } + + class3.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) { + MilliClock.archive0 = WorldMapSection3.newArchive(0, false, true, true); + Message.archive1 = WorldMapSection3.newArchive(1, false, true, true); + Clock.archive2 = WorldMapSection3.newArchive(2, true, false, true); + class105.archive3 = WorldMapSection3.newArchive(3, false, true, true); + GrandExchangeOffer.archive4 = WorldMapSection3.newArchive(4, false, true, true); + WorldMapRectangle.archive5 = WorldMapSection3.newArchive(5, true, true, true); + UserComparator7.archive6 = WorldMapSection3.newArchive(6, true, true, true); + Projectile.archive7 = WorldMapSection3.newArchive(7, false, true, true); + GrandExchangeEvent.archive8 = WorldMapSection3.newArchive(8, false, true, true); + Tile.archive9 = WorldMapSection3.newArchive(9, false, true, true); + GraphicsObject.archive10 = WorldMapSection3.newArchive(10, false, true, true); + WorldMapData_0.archive11 = WorldMapSection3.newArchive(11, false, true, true); + Message.archive12 = WorldMapSection3.newArchive(12, false, true, true); + GameBuild.archive13 = WorldMapSection3.newArchive(13, true, false, true); + WorldMapIcon_1.archive14 = WorldMapSection3.newArchive(14, false, true, true); + WorldMapLabel.archive15 = WorldMapSection3.newArchive(15, false, true, true); + AbstractWorldMapIcon.archive17 = WorldMapSection3.newArchive(17, true, true, true); + VarcInt.archive18 = WorldMapSection3.newArchive(18, false, true, true); + WorldMapData_0.archive19 = WorldMapSection3.newArchive(19, false, true, true); + ClientPacket.archive20 = WorldMapSection3.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 var28 = 0; + var0 = var28 + MilliClock.archive0.percentage() * 4 / 100; + var0 += Message.archive1.percentage() * 4 / 100; + var0 += Clock.archive2.percentage() * 2 / 100; + var0 += class105.archive3.percentage() * 2 / 100; + var0 += GrandExchangeOffer.archive4.percentage() * 6 / 100; + var0 += WorldMapRectangle.archive5.percentage() * 4 / 100; + var0 += UserComparator7.archive6.percentage() * 2 / 100; + var0 += Projectile.archive7.percentage() * 56 / 100; + var0 += GrandExchangeEvent.archive8.percentage() * 2 / 100; + var0 += Tile.archive9.percentage() * 2 / 100; + var0 += GraphicsObject.archive10.percentage() * 2 / 100; + var0 += WorldMapData_0.archive11.percentage() * 2 / 100; + var0 += Message.archive12.percentage() * 2 / 100; + var0 += GameBuild.archive13.percentage() * 2 / 100; + var0 += WorldMapIcon_1.archive14.percentage() * 2 / 100; + var0 += WorldMapLabel.archive15.percentage() * 2 / 100; + var0 += WorldMapData_0.archive19.percentage() / 100; + var0 += VarcInt.archive18.percentage() / 100; + var0 += ClientPacket.archive20.percentage() / 100; + var0 += AbstractWorldMapIcon.archive17.method4456() && AbstractWorldMapIcon.archive17.isFullyLoaded() ? 1 : 0; + if (var0 != 100) { + if (var0 != 0) { + Login.Login_loadingText = "Checking for updates - " + var0 + "%"; + } + + Login.Login_loadingPercent = 30; + } else { + WorldMapSprite.method481(MilliClock.archive0, "Animations"); + WorldMapSprite.method481(Message.archive1, "Skeletons"); + WorldMapSprite.method481(GrandExchangeOffer.archive4, "Sound FX"); + WorldMapSprite.method481(WorldMapRectangle.archive5, "Maps"); + WorldMapSprite.method481(UserComparator7.archive6, "Music Tracks"); + WorldMapSprite.method481(Projectile.archive7, "Models"); + WorldMapSprite.method481(GrandExchangeEvent.archive8, "Sprites"); + WorldMapSprite.method481(WorldMapData_0.archive11, "Music Jingles"); + WorldMapSprite.method481(WorldMapIcon_1.archive14, "Music Samples"); + WorldMapSprite.method481(WorldMapLabel.archive15, "Music Patches"); + WorldMapSprite.method481(WorldMapData_0.archive19, "World Map"); + WorldMapSprite.method481(VarcInt.archive18, "World Map Geography"); + WorldMapSprite.method481(ClientPacket.archive20, "World Map Ground"); + UserComparator10.spriteIds = new GraphicsDefaults(); + UserComparator10.spriteIds.decode(AbstractWorldMapIcon.archive17); + Login.Login_loadingText = "Loaded update list"; + Login.Login_loadingPercent = 30; + Client.titleLoadingStage = 45; + } + } else { + Archive var1; + Archive var2; + if (Client.titleLoadingStage == 45) { + class200.method3803(22050, !Client.isLowDetail, 2); + MidiPcmStream var31 = new MidiPcmStream(); + var31.method3935(9, 128); + class2.pcmPlayer0 = FontName.method5519(GrandExchangeOfferAgeComparator.taskHandler, 0, 22050); + class2.pcmPlayer0.setStream(var31); + var1 = WorldMapLabel.archive15; + var2 = WorldMapIcon_1.archive14; + Archive var27 = GrandExchangeOffer.archive4; + class206.musicPatchesArchive = var1; + class206.musicSamplesArchive = var2; + class206.soundEffectsArchive = var27; + WorldMapSprite.midiPcmStream = var31; + class58.pcmPlayer1 = FontName.method5519(GrandExchangeOfferAgeComparator.taskHandler, 1, 2048); + class60.pcmStreamMixer = new PcmStreamMixer(); + class58.pcmPlayer1.setStream(class60.pcmStreamMixer); + class197.decimator = new Decimator(22050, class237.field3113); + Login.Login_loadingText = "Prepared sound engine"; + Login.Login_loadingPercent = 35; + Client.titleLoadingStage = 50; + WorldMapSection0.WorldMapElement_fonts = new Fonts(GrandExchangeEvent.archive8, GameBuild.archive13); + } else { + int var22; + if (Client.titleLoadingStage == 50) { + FontName[] var30 = new FontName[]{FontName.FontName_plain12, FontName.FontName_verdana13, FontName.FontName_bold12, FontName.FontName_verdana11, FontName.FontName_verdana15, FontName.FontName_plain11}; + var22 = var30.length; + Fonts var26 = WorldMapSection0.WorldMapElement_fonts; + FontName[] var3 = new FontName[]{FontName.FontName_plain12, FontName.FontName_verdana13, FontName.FontName_bold12, FontName.FontName_verdana11, FontName.FontName_verdana15, FontName.FontName_plain11}; + Client.fontsMap = var26.createMap(var3); + if (Client.fontsMap.size() < var22) { + Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var22 + "%"; + Login.Login_loadingPercent = 40; + } else { + WorldMapLabel.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); + MusicPatchNode2.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); + GrandExchangeOfferNameComparator.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); + class13.platformInfo = Client.platformInfoProvider.get(); + Login.Login_loadingText = "Loaded fonts"; + Login.Login_loadingPercent = 40; + Client.titleLoadingStage = 60; + } + } else if (Client.titleLoadingStage == 60) { + var0 = ArchiveDiskActionHandler.method4429(GraphicsObject.archive10, GrandExchangeEvent.archive8); + byte var32 = 12; + if (var0 < var32) { + Login.Login_loadingText = "Loading title screen - " + var0 * 100 / var32 + "%"; + Login.Login_loadingPercent = 50; + } else { + Login.Login_loadingText = "Loaded title screen"; + Login.Login_loadingPercent = 50; + ClientPreferences.updateGameState(5); + Client.titleLoadingStage = 70; + } + } else if (Client.titleLoadingStage == 70) { + if (!Clock.archive2.isFullyLoaded()) { + Login.Login_loadingText = "Loading config - " + Clock.archive2.loadPercent() + "%"; + Login.Login_loadingPercent = 60; + } else { + Archive var29 = Clock.archive2; + FloorOverlayDefinition.FloorOverlayDefinition_archive = var29; + ObjectSound.method1999(Clock.archive2); + GrandExchangeOfferUnitPriceComparator.method195(Clock.archive2, Projectile.archive7); + var1 = Clock.archive2; + var2 = Projectile.archive7; + boolean var33 = Client.isLowDetail; + ObjectDefinition.ObjectDefinition_archive = var1; + ObjectDefinition.ObjectDefinition_modelsArchive = var2; + ObjectDefinition.ObjectDefinition_isLowDetail = var33; + Archive var4 = Clock.archive2; + Archive var5 = Projectile.archive7; + NPCDefinition.NpcDefinition_archive = var4; + NPCDefinition.NpcDefinition_modelArchive = var5; + class197.method3771(Clock.archive2); + UserComparator3.method3548(Clock.archive2, Projectile.archive7, Client.isMembersWorld, WorldMapLabel.fontPlain11); + Archive var6 = Clock.archive2; + Archive var7 = MilliClock.archive0; + Archive var8 = Message.archive1; + SequenceDefinition.SequenceDefinition_archive = var6; + SequenceDefinition.SequenceDefinition_animationsArchive = var7; + SequenceDefinition.SequenceDefinition_skeletonsArchive = var8; + MenuAction.method2171(Clock.archive2, Projectile.archive7); + Archive var9 = Clock.archive2; + VarbitDefinition.VarbitDefinition_archive = var9; + TileItem.method2256(Clock.archive2); + UserComparator4.method3495(class105.archive3, Projectile.archive7, GrandExchangeEvent.archive8, GameBuild.archive13); + Archive var10 = Clock.archive2; + InvDefinition.InvDefinition_archive = var10; + UserComparator8.method3520(Clock.archive2); + Archive var11 = Clock.archive2; + VarcInt.VarcInt_archive = var11; + class8.method103(Clock.archive2); + AttackOption.varcs = new Varcs(); + Archive var12 = Clock.archive2; + Archive var13 = GrandExchangeEvent.archive8; + Archive var14 = GameBuild.archive13; + HitSplatDefinition.HitSplatDefinition_archive = var12; + HitSplatDefinition.field3356 = var13; + HitSplatDefinition.HitSplatDefinition_fontsArchive = var14; + Archive var15 = Clock.archive2; + Archive var16 = GrandExchangeEvent.archive8; + HealthBarDefinition.HealthBarDefinition_archive = var15; + HealthBarDefinition.HitSplatDefinition_spritesArchive = var16; + Archive var17 = Clock.archive2; + Archive var18 = GrandExchangeEvent.archive8; + WorldMapElement.WorldMapElement_archive = var18; + if (var17.isFullyLoaded()) { + WorldMapElement.WorldMapElement_count = var17.getGroupFileCount(35); + class257.WorldMapElement_cached = new WorldMapElement[WorldMapElement.WorldMapElement_count]; + + for (int var19 = 0; var19 < WorldMapElement.WorldMapElement_count; ++var19) { + byte[] var20 = var17.takeFile(35, var19); + class257.WorldMapElement_cached[var19] = new WorldMapElement(var19); + if (var20 != null) { + class257.WorldMapElement_cached[var19].decode(new Buffer(var20)); + class257.WorldMapElement_cached[var19].method4548(); + } + } + } + + Login.Login_loadingText = "Loaded config"; + Login.Login_loadingPercent = 60; + Client.titleLoadingStage = 80; + } + } else if (Client.titleLoadingStage == 80) { + var0 = 0; + if (GrandExchangeOfferNameComparator.compass == null) { + GrandExchangeOfferNameComparator.compass = GameShell.SpriteBuffer_getSprite(GrandExchangeEvent.archive8, UserComparator10.spriteIds.compass, 0); + } else { + ++var0; + } + + if (UrlRequester.redHintArrowSprite == null) { + UrlRequester.redHintArrowSprite = GameShell.SpriteBuffer_getSprite(GrandExchangeEvent.archive8, UserComparator10.spriteIds.field3825, 0); + } else { + ++var0; + } + + if (UserComparator6.mapSceneSprites == null) { + UserComparator6.mapSceneSprites = method2125(GrandExchangeEvent.archive8, UserComparator10.spriteIds.mapScenes, 0); + } else { + ++var0; + } + + if (CollisionMap.headIconPkSprites == null) { + CollisionMap.headIconPkSprites = class217.method4091(GrandExchangeEvent.archive8, UserComparator10.spriteIds.headIconsPk, 0); + } else { + ++var0; + } + + if (KeyHandler.headIconPrayerSprites == null) { + KeyHandler.headIconPrayerSprites = class217.method4091(GrandExchangeEvent.archive8, UserComparator10.spriteIds.field3828, 0); + } else { + ++var0; + } + + if (SoundSystem.headIconHintSprites == null) { + SoundSystem.headIconHintSprites = class217.method4091(GrandExchangeEvent.archive8, UserComparator10.spriteIds.field3829, 0); + } else { + ++var0; + } + + if (class9.mapMarkerSprites == null) { + class9.mapMarkerSprites = class217.method4091(GrandExchangeEvent.archive8, UserComparator10.spriteIds.field3830, 0); + } else { + ++var0; + } + + if (Timer.crossSprites == null) { + Timer.crossSprites = class217.method4091(GrandExchangeEvent.archive8, UserComparator10.spriteIds.field3831, 0); + } else { + ++var0; + } + + if (AttackOption.mapDotSprites == null) { + AttackOption.mapDotSprites = class217.method4091(GrandExchangeEvent.archive8, UserComparator10.spriteIds.field3834, 0); + } else { + ++var0; + } + + if (WorldMapElement.scrollBarSprites == null) { + WorldMapElement.scrollBarSprites = method2125(GrandExchangeEvent.archive8, UserComparator10.spriteIds.field3824, 0); + } else { + ++var0; + } + + if (class4.modIconSprites == null) { + class4.modIconSprites = method2125(GrandExchangeEvent.archive8, UserComparator10.spriteIds.field3832, 0); + } else { + ++var0; + } + + if (var0 < 11) { + Login.Login_loadingText = "Loading sprites - " + var0 * 100 / 12 + "%"; + Login.Login_loadingPercent = 70; + } else { + AbstractFont.AbstractFont_modIconSprites = class4.modIconSprites; + UrlRequester.redHintArrowSprite.normalize(); + var22 = (int)(Math.random() * 21.0D) - 10; + int var23 = (int)(Math.random() * 21.0D) - 10; + int var24 = (int)(Math.random() * 21.0D) - 10; + int var25 = (int)(Math.random() * 41.0D) - 20; + UserComparator6.mapSceneSprites[0].shiftColors(var25 + var22, var25 + var23, var25 + var24); + Login.Login_loadingText = "Loaded sprites"; + Login.Login_loadingPercent = 70; + Client.titleLoadingStage = 90; + } + } else if (Client.titleLoadingStage == 90) { + if (!Tile.archive9.isFullyLoaded()) { + Login.Login_loadingText = "Loading textures - " + "0%"; + Login.Login_loadingPercent = 90; + } else { + UserComparator3.textureProvider = new TextureProvider(Tile.archive9, GrandExchangeEvent.archive8, 20, 0.8D, Client.isLowDetail ? 64 : 128); + Rasterizer3D.Rasterizer3D_setTextureLoader(UserComparator3.textureProvider); + Rasterizer3D.Rasterizer3D_setBrightness(0.8D); + Client.titleLoadingStage = 100; + } + } else if (Client.titleLoadingStage == 100) { + var0 = UserComparator3.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) { + class219.mouseRecorder = new MouseRecorder(); + GrandExchangeOfferAgeComparator.taskHandler.newThreadTask(class219.mouseRecorder, 10); + Login.Login_loadingText = "Loaded input handler"; + Login.Login_loadingPercent = 92; + Client.titleLoadingStage = 120; + } else if (Client.titleLoadingStage == 120) { + if (!GraphicsObject.archive10.tryLoadFileByNames("huffman", "")) { + Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; + Login.Login_loadingPercent = 94; + } else { + Huffman var21 = new Huffman(GraphicsObject.archive10.takeFileByNames("huffman", "")); + class219.huffman = var21; + Login.Login_loadingText = "Loaded wordpack"; + Login.Login_loadingPercent = 94; + Client.titleLoadingStage = 130; + } + } else if (Client.titleLoadingStage == 130) { + if (!class105.archive3.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + class105.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 (!GameBuild.archive13.isFullyLoaded()) { + Login.Login_loadingText = "Loading interfaces - " + (96 + GameBuild.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 (!WorldMapData_0.archive19.tryLoadGroupByName(WorldMapCacheName.field322.name)) { + Login.Login_loadingText = "Loading world map - " + WorldMapData_0.archive19.groupLoadPercentByName(WorldMapCacheName.field322.name) / 10 + "%"; + } else { + if (class228.worldMap == null) { + class228.worldMap = new WorldMap(); + class228.worldMap.init(WorldMapData_0.archive19, VarcInt.archive18, ClientPacket.archive20, GrandExchangeOfferNameComparator.fontBold12, Client.fontsMap, UserComparator6.mapSceneSprites); + } + + Login.Login_loadingText = "Loaded world map"; + Client.titleLoadingStage = 150; + } + } else if (Client.titleLoadingStage == 150) { + ClientPreferences.updateGameState(10); + } + } + } + } + + @ObfuscatedName("go") + @ObfuscatedSignature( + signature = "(IIIS)V", + garbageValue = "3305" + ) + @Export("worldToScreen") + static final void worldToScreen(int var0, int var1, int var2) { + if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { + int var3 = Language.getTileHeight(var0, var1, TileItemPile.Client_plane) - var2; + var0 -= MouseHandler.cameraX; + var3 -= WorldMapSection3.cameraY; + var1 -= ObjectSound.cameraZ; + int var4 = Rasterizer3D.Rasterizer3D_sine[TilePaint.cameraPitch]; + int var5 = Rasterizer3D.Rasterizer3D_cosine[TilePaint.cameraPitch]; + int var6 = Rasterizer3D.Rasterizer3D_sine[Canvas.cameraYaw]; + int var7 = Rasterizer3D.Rasterizer3D_cosine[Canvas.cameraYaw]; + int var8 = var0 * var7 + var6 * var1 >> 16; + var1 = var7 * var1 - var0 * var6 >> 16; + var0 = var8; + var8 = var5 * var3 - var4 * var1 >> 16; + var1 = var5 * var1 + var3 * var4 >> 16; + if (var1 >= 50) { + Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; + Client.viewportTempY = Client.viewportHeight / 2 + var8 * Client.viewportZoom / var1; + } else { + Client.viewportTempX = -1; + Client.viewportTempY = -1; + } + + } else { + Client.viewportTempX = -1; + Client.viewportTempY = -1; + } } } diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java index 75df72efa6..6495c3e949 100644 --- a/runescape-client/src/main/java/HealthBarDefinition.java +++ b/runescape-client/src/main/java/HealthBarDefinition.java @@ -4,82 +4,94 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("id") +@ObfuscatedName("ik") @Implements("HealthBarDefinition") public class HealthBarDefinition extends DualNode { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Liy;" + signature = "Lic;" ) @Export("HealthBarDefinition_archive") public static AbstractArchive HealthBarDefinition_archive; - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Leg;" + signature = "Lic;" + ) + @Export("HitSplatDefinition_spritesArchive") + public static AbstractArchive HitSplatDefinition_spritesArchive; + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "Lec;" ) @Export("HealthBarDefinition_cached") public static EvictingDualNodeHashTable HealthBarDefinition_cached; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Leg;" + signature = "Lec;" ) @Export("HealthBarDefinition_cachedSprites") - public static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; - @ObfuscatedName("w") + static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; + @ObfuscatedName("io") @ObfuscatedGetter( - intValue = -418379087 + intValue = 1914428317 ) - public int field3276; - @ObfuscatedName("z") + @Export("oculusOrbFocalPointY") + static int oculusOrbFocalPointY; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 257214369 + intValue = -762582303 + ) + public int field3312; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -1405603789 ) @Export("int1") public int int1; - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1626711481 + intValue = 66041617 ) @Export("int2") public int int2; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -519347749 + intValue = -1238341031 ) @Export("int3") public int int3; - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 125223577 + intValue = 428453315 ) - public int field3272; - @ObfuscatedName("p") + public int field3317; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -211627759 + intValue = -724830045 ) @Export("int5") public int int5; - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1469087681 + intValue = 1257354687 ) @Export("frontSpriteID") int frontSpriteID; - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1575037275 + intValue = -705085889 ) @Export("backSpriteID") int backSpriteID; - @ObfuscatedName("h") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 411601749 + intValue = -1995580379 ) @Export("width") public int width; - @ObfuscatedName("g") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1992936291 + intValue = -907123185 ) @Export("widthPadding") public int widthPadding; @@ -93,7 +105,7 @@ public class HealthBarDefinition extends DualNode { this.int1 = 255; this.int2 = 255; this.int3 = -1; - this.field3272 = 1; + this.field3317 = 1; this.int5 = 70; this.frontSpriteID = -1; this.backSpriteID = -1; @@ -101,10 +113,10 @@ public class HealthBarDefinition extends DualNode { this.widthPadding = 0; } - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkb;I)V", - garbageValue = "-1815085637" + signature = "(Lkn;I)V", + garbageValue = "-2036090908" ) @Export("decode") public void decode(Buffer var1) { @@ -118,10 +130,10 @@ public class HealthBarDefinition extends DualNode { } } - @ObfuscatedName("m") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkb;II)V", - garbageValue = "1931441853" + signature = "(Lkn;II)V", + garbageValue = "-2145351852" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -138,9 +150,9 @@ public class HealthBarDefinition extends DualNode { } else if (var2 == 6) { var1.readUnsignedByte(); } else if (var2 == 7) { - this.frontSpriteID = var1.method5591(); + this.frontSpriteID = var1.method5843(); } else if (var2 == 8) { - this.backSpriteID = var1.method5591(); + this.backSpriteID = var1.method5843(); } else if (var2 == 11) { this.int3 = var1.readUnsignedShort(); } else if (var2 == 14) { @@ -151,10 +163,10 @@ public class HealthBarDefinition extends DualNode { } - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(S)Lla;", - garbageValue = "1701" + signature = "(I)Llz;", + garbageValue = "65535" ) @Export("getFrontSprite") public Sprite getFrontSprite() { @@ -165,7 +177,7 @@ public class HealthBarDefinition extends DualNode { if (var1 != null) { return var1; } else { - var1 = MusicPatchNode2.SpriteBuffer_getSprite(UserComparator1.HitSplatDefinition_spritesArchive, this.frontSpriteID, 0); + var1 = GameShell.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.frontSpriteID, 0); if (var1 != null) { HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID); } @@ -175,10 +187,10 @@ public class HealthBarDefinition extends DualNode { } } - @ObfuscatedName("d") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)Lla;", - garbageValue = "1861000233" + signature = "(I)Llz;", + garbageValue = "1675324789" ) @Export("getBackSprite") public Sprite getBackSprite() { @@ -189,7 +201,7 @@ public class HealthBarDefinition extends DualNode { if (var1 != null) { return var1; } else { - var1 = MusicPatchNode2.SpriteBuffer_getSprite(UserComparator1.HitSplatDefinition_spritesArchive, this.backSpriteID, 0); + var1 = GameShell.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0); if (var1 != null) { HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); } @@ -199,20 +211,45 @@ public class HealthBarDefinition extends DualNode { } } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)I", - garbageValue = "-906146296" + signature = "(IIB)I", + garbageValue = "-32" ) - @Export("hashString") - public static int hashString(CharSequence var0) { - int var1 = var0.length(); - int var2 = 0; + static int method4673(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; + } + } - for (int var3 = 0; var3 < var1; ++var3) { - var2 = (var2 << 5) - var2 + TaskHandler.charToByteCp1252(var0.charAt(var3)); + @ObfuscatedName("kd") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;ZI)Ljava/lang/String;", + garbageValue = "-1975463268" + ) + static String method4669(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"; } - return var2; + String var3 = ""; + if (Client.field871 != null) { + var3 = "/p=" + Client.field871; + } + + String var4 = "runescape.com"; + return var2 + var0 + "." + var4 + "/l=" + UserComparator9.clientLanguage + "/a=" + class228.field2754 + var3 + "/"; } } diff --git a/runescape-client/src/main/java/HealthBarUpdate.java b/runescape-client/src/main/java/HealthBarUpdate.java index 46b1b7531c..ec6264e43c 100644 --- a/runescape-client/src/main/java/HealthBarUpdate.java +++ b/runescape-client/src/main/java/HealthBarUpdate.java @@ -1,33 +1,44 @@ +import java.awt.Image; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cc") +@ObfuscatedName("cb") @Implements("HealthBarUpdate") public class HealthBarUpdate extends Node { - @ObfuscatedName("x") + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "Ldh;" + ) + @Export("pcmPlayerProvider") + static PlayerProvider pcmPlayerProvider; + @ObfuscatedName("k") + static int[][][] field1031; + @ObfuscatedName("ak") + static Image field1033; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -186864867 + intValue = -166528229 ) @Export("cycle") int cycle; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 134168981 + intValue = 1062047839 ) @Export("health") int health; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1066019297 + intValue = -374720445 ) @Export("health2") int health2; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 442713571 + intValue = 257618229 ) @Export("cycleOffset") int cycleOffset; @@ -39,10 +50,10 @@ public class HealthBarUpdate extends Node { this.cycleOffset = var4; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(IIIII)V", - garbageValue = "-2054467883" + garbageValue = "880697270" ) @Export("set") void set(int var1, int var2, int var3, int var4) { @@ -51,16 +62,4 @@ public class HealthBarUpdate extends Node { this.health2 = var3; this.cycleOffset = var4; } - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V", - garbageValue = "87" - ) - @Export("setLoginResponseString") - static void setLoginResponseString(String var0, String var1, String var2) { - Login.Login_response1 = var0; - Login.Login_response2 = var1; - Login.Login_response3 = var2; - } } diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index 74f546ca22..7b1ef0720d 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -4,114 +4,126 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jv") +@ObfuscatedName("js") @Implements("HitSplatDefinition") public class HitSplatDefinition extends DualNode { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Liy;" + signature = "Lic;" ) @Export("HitSplatDefinition_archive") public static AbstractArchive HitSplatDefinition_archive; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Liy;" + signature = "Lic;" ) - public static AbstractArchive field3322; - @ObfuscatedName("d") + public static AbstractArchive field3356; + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Leg;" + signature = "Lic;" + ) + @Export("HitSplatDefinition_fontsArchive") + public static AbstractArchive HitSplatDefinition_fontsArchive; + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "Lec;" ) @Export("HitSplatDefinition_cached") public static EvictingDualNodeHashTable HitSplatDefinition_cached; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Leg;" + signature = "Lec;" ) @Export("HitSplatDefinition_cachedSprites") public static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Leg;" + signature = "Lec;" ) @Export("HitSplatDefinition_cachedFonts") public static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; - @ObfuscatedName("p") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1275511307 + intValue = 554677393 + ) + @Export("ItemDefinition_fileCount") + public static int ItemDefinition_fileCount; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = 1528040183 ) @Export("fontId") int fontId; - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1688289147 + intValue = 1665504671 ) @Export("textColor") public int textColor; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 500240173 - ) - public int field3329; @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1934317107 + intValue = -1892048919 ) - int field3330; - @ObfuscatedName("g") + public int field3364; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -26542295 + intValue = 1862744257 ) - int field3331; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = -907663429 - ) - int field3332; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = 1874324581 - ) - int field3333; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = 1914060719 - ) - public int field3338; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 56695995 - ) - public int field3341; + int field3365; @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -990470317 + intValue = 173475991 ) - public int field3334; - @ObfuscatedName("o") - String field3337; - @ObfuscatedName("c") + int field3366; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1652547133 + intValue = 1837345819 ) - public int field3327; - @ObfuscatedName("j") + int field3378; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -6083753 + intValue = 275308627 ) - public int field3339; - @ObfuscatedName("y") + int field3368; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 1590717975 + ) + public int field3369; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -1198049763 + ) + public int field3370; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -796375423 + ) + public int field3363; + @ObfuscatedName("t") + String field3372; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -1600290491 + ) + public int field3373; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -1529892703 + ) + public int field3374; + @ObfuscatedName("i") @Export("transforms") public int[] transforms; @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 752219759 + intValue = 34744135 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("ae") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -250584565 + intValue = -84298271 ) @Export("transformVarp") int transformVarp; @@ -122,31 +134,31 @@ public class HitSplatDefinition extends DualNode { HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(20); } - HitSplatDefinition() { + public HitSplatDefinition() { this.fontId = -1; this.textColor = 16777215; - this.field3329 = 70; - this.field3330 = -1; - this.field3331 = -1; - this.field3332 = -1; - this.field3333 = -1; - this.field3338 = 0; - this.field3341 = 0; - this.field3334 = -1; - this.field3337 = ""; - this.field3327 = -1; - this.field3339 = 0; + this.field3364 = 70; + this.field3365 = -1; + this.field3366 = -1; + this.field3378 = -1; + this.field3368 = -1; + this.field3369 = 0; + this.field3370 = 0; + this.field3363 = -1; + this.field3372 = ""; + this.field3373 = -1; + this.field3374 = 0; this.transformVarbit = -1; this.transformVarp = -1; } @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkb;I)V", - garbageValue = "1621555289" + signature = "(Lkn;B)V", + garbageValue = "-108" ) @Export("decode") - void decode(Buffer var1) { + public void decode(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { @@ -157,41 +169,41 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkb;II)V", - garbageValue = "575571509" + signature = "(Lkn;II)V", + garbageValue = "-2104480969" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { - this.fontId = var1.method5591(); + this.fontId = var1.method5843(); } else if (var2 == 2) { this.textColor = var1.readMedium(); } else if (var2 == 3) { - this.field3330 = var1.method5591(); + this.field3365 = var1.method5843(); } else if (var2 == 4) { - this.field3332 = var1.method5591(); + this.field3378 = var1.method5843(); } else if (var2 == 5) { - this.field3331 = var1.method5591(); + this.field3366 = var1.method5843(); } else if (var2 == 6) { - this.field3333 = var1.method5591(); + this.field3368 = var1.method5843(); } else if (var2 == 7) { - this.field3338 = var1.readShort(); + this.field3369 = var1.readShort(); } else if (var2 == 8) { - this.field3337 = var1.readStringCp1252NullCircumfixed(); + this.field3372 = var1.readStringCp1252NullCircumfixed(); } else if (var2 == 9) { - this.field3329 = var1.readUnsignedShort(); + this.field3364 = var1.readUnsignedShort(); } else if (var2 == 10) { - this.field3341 = var1.readShort(); + this.field3370 = var1.readShort(); } else if (var2 == 11) { - this.field3334 = 0; + this.field3363 = 0; } else if (var2 == 12) { - this.field3327 = var1.readUnsignedByte(); + this.field3373 = var1.readUnsignedByte(); } else if (var2 == 13) { - this.field3339 = var1.readShort(); + this.field3374 = var1.readShort(); } else if (var2 == 14) { - this.field3334 = var1.readUnsignedShort(); + this.field3363 = var1.readUnsignedShort(); } else if (var2 == 17 || var2 == 18) { this.transformVarbit = var1.readUnsignedShort(); if (this.transformVarbit == 65535) { @@ -226,16 +238,16 @@ public class HitSplatDefinition extends DualNode { } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)Ljv;", - garbageValue = "-951570117" + signature = "(S)Ljs;", + garbageValue = "24687" ) @Export("transform") public final HitSplatDefinition transform() { int var1 = -1; if (this.transformVarbit != -1) { - var1 = Projectile.getVarbit(this.transformVarbit); + var1 = Widget.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -247,17 +259,36 @@ public class HitSplatDefinition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? GrandExchangeOfferUnitPriceComparator.method213(var2) : null; + if (var2 != -1) { + HitSplatDefinition var4 = (HitSplatDefinition)HitSplatDefinition_cached.get((long)var2); + HitSplatDefinition var3; + if (var4 != null) { + var3 = var4; + } else { + byte[] var5 = HitSplatDefinition_archive.takeFile(32, var2); + var4 = new HitSplatDefinition(); + if (var5 != null) { + var4.decode(new Buffer(var5)); + } + + HitSplatDefinition_cached.put(var4, (long)var2); + var3 = var4; + } + + return var3; + } else { + return null; + } } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(II)Ljava/lang/String;", - garbageValue = "-940233797" + garbageValue = "2134005517" ) @Export("getString") public String getString(int var1) { - String var2 = this.field3337; + String var2 = this.field3372; while (true) { int var3 = var2.indexOf("%1"); @@ -265,26 +296,26 @@ public class HitSplatDefinition extends DualNode { return var2; } - var2 = var2.substring(0, var3) + class280.intToString(var1, false) + var2.substring(var3 + 2); + var2 = var2.substring(0, var3) + class298.intToString(var1, false) + var2.substring(var3 + 2); } } - @ObfuscatedName("v") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(I)Lla;", - garbageValue = "1656176054" + signature = "(B)Llz;", + garbageValue = "85" ) - public Sprite method4642() { - if (this.field3330 < 0) { + public Sprite method4755() { + if (this.field3365 < 0) { return null; } else { - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3330); + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3365); if (var1 != null) { return var1; } else { - var1 = MusicPatchNode2.SpriteBuffer_getSprite(field3322, this.field3330, 0); + var1 = GameShell.SpriteBuffer_getSprite(field3356, this.field3365, 0); if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3330); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3365); } return var1; @@ -292,22 +323,22 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("q") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)Lla;", - garbageValue = "-743591767" + signature = "(I)Llz;", + garbageValue = "-2111693825" ) - public Sprite method4631() { - if (this.field3331 < 0) { + public Sprite method4756() { + if (this.field3366 < 0) { return null; } else { - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3331); + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3366); if (var1 != null) { return var1; } else { - var1 = MusicPatchNode2.SpriteBuffer_getSprite(field3322, this.field3331, 0); + var1 = GameShell.SpriteBuffer_getSprite(field3356, this.field3366, 0); if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3331); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3366); } return var1; @@ -315,22 +346,22 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("z") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(I)Lla;", - garbageValue = "-1442192880" + signature = "(B)Llz;", + garbageValue = "1" ) - public Sprite method4632() { - if (this.field3332 < 0) { + public Sprite method4752() { + if (this.field3378 < 0) { return null; } else { - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3332); + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3378); if (var1 != null) { return var1; } else { - var1 = MusicPatchNode2.SpriteBuffer_getSprite(field3322, this.field3332, 0); + var1 = GameShell.SpriteBuffer_getSprite(field3356, this.field3378, 0); if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3332); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3378); } return var1; @@ -338,22 +369,22 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("t") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(I)Lla;", - garbageValue = "-2137932181" + signature = "(I)Llz;", + garbageValue = "148088504" ) - public Sprite method4633() { - if (this.field3333 < 0) { + public Sprite method4763() { + if (this.field3368 < 0) { return null; } else { - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3333); + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3368); if (var1 != null) { return var1; } else { - var1 = MusicPatchNode2.SpriteBuffer_getSprite(field3322, this.field3333, 0); + var1 = GameShell.SpriteBuffer_getSprite(field3356, this.field3368, 0); if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3333); + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3368); } return var1; @@ -361,10 +392,10 @@ public class HitSplatDefinition extends DualNode { } } - @ObfuscatedName("e") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)Lkx;", - garbageValue = "607832420" + signature = "(B)Lko;", + garbageValue = "-13" ) @Export("getFont") public Font getFont() { @@ -375,22 +406,59 @@ public class HitSplatDefinition extends DualNode { if (var1 != null) { return var1; } else { - AbstractArchive var3 = field3322; - AbstractArchive var4 = class296.HitSplatDefinition_fontsArchive; - int var5 = this.fontId; - Font var2; - if (!UserComparator7.method3516(var3, var5, 0)) { - var2 = null; - } else { - var2 = VertexNormal.method3094(var4.takeFile(var5, 0)); + var1 = Frames.method3394(field3356, HitSplatDefinition_fontsArchive, this.fontId, 0); + if (var1 != null) { + HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId); } - if (var2 != null) { - HitSplatDefinition_cachedFonts.put(var2, (long)this.fontId); - } - - return var2; + return var1; } } } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(Lkb;B)V", + garbageValue = "121" + ) + @Export("updatePlayer") + static final void updatePlayer(PacketBuffer var0) { + var0.importIndex(); + int var1 = Client.localPlayerIndex; + Player var2 = class60.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 - class182.baseX; + var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); + var2.pathY[0] = var6 - SecureRandomFuture.baseY; + var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); + TileItemPile.Client_plane = var2.plane = var4; + if (Players.field1279[var1] != null) { + var2.read(Players.field1279[var1]); + } + + Players.Players_count = 0; + Players.Players_indices[++Players.Players_count - 1] = var1; + Players.field1282[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.field1282[var7] = 0; + } + } + + var0.exportIndex(); + } } diff --git a/runescape-client/src/main/java/HorizontalAlignment.java b/runescape-client/src/main/java/HorizontalAlignment.java index e6d396bdfa..b4494ac759 100644 --- a/runescape-client/src/main/java/HorizontalAlignment.java +++ b/runescape-client/src/main/java/HorizontalAlignment.java @@ -4,40 +4,38 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("je") +@ObfuscatedName("jc") @Implements("HorizontalAlignment") public enum HorizontalAlignment implements Enumerated { - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lje;" - ) - field3458(2, 0), @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lje;" + signature = "Ljc;" + ) + field3488(2, 0), + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "Ljc;" ) @Export("HorizontalAlignment_centered") - HorizontalAlignment_centered(0, 1), - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Lje;" - ) - field3453(1, 2); - + HorizontalAlignment_centered(1, 1), @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -1684971179 + @ObfuscatedSignature( + signature = "Ljc;" ) - static int field3456; - @ObfuscatedName("d") + field3492(0, 2); + + @ObfuscatedName("bq") + @Export("worldListURL") + static String worldListURL; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1294886119 + intValue = -1908984303 ) @Export("value") public final int value; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 834302777 + intValue = 1088861253 ) @Export("id") final int id; @@ -47,34 +45,13 @@ public enum HorizontalAlignment implements Enumerated { this.id = var4; } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "56" + signature = "(I)I", + garbageValue = "-995092303" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(IIIB)J", - garbageValue = "3" - ) - static long method4777(int var0, int var1, int var2) { - return (long)(var2 << 16 | var0 << 8 | var1); - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "([BI)[B", - garbageValue = "-1597872585" - ) - public static byte[] method4782(byte[] var0) { - int var1 = var0.length; - byte[] var2 = new byte[var1]; - System.arraycopy(var0, 0, var2, 0, var1); - return var2; - } } diff --git a/runescape-client/src/main/java/Huffman.java b/runescape-client/src/main/java/Huffman.java index 49c74ea63a..a7007c2285 100644 --- a/runescape-client/src/main/java/Huffman.java +++ b/runescape-client/src/main/java/Huffman.java @@ -1,21 +1,25 @@ -import java.io.File; -import java.io.IOException; -import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("hb") +@ObfuscatedName("he") @Implements("Huffman") public class Huffman { - @ObfuscatedName("x") + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "Lic;" + ) + @Export("musicTrackArchive") + public static AbstractArchive musicTrackArchive; + @ObfuscatedName("m") @Export("masks") int[] masks; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("bits") byte[] bits; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("keys") int[] keys; @@ -102,10 +106,10 @@ public class Huffman { } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "([BII[BIB)I", - garbageValue = "77" + signature = "([BII[BII)I", + garbageValue = "1506774655" ) @Export("compress") int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) { @@ -123,7 +127,7 @@ public class Huffman { int var11 = var7 >> 3; int var12 = var7 & 7; var6 &= -var12 >> 31; - int var13 = (var10 + var12 - 1 >> 3) + var11; + int var13 = (var12 + var10 - 1 >> 3) + var11; var12 += 24; var4[var11] = (byte)(var6 |= var9 >>> var12); if (var11 < var13) { @@ -153,10 +157,10 @@ public class Huffman { return (var7 + 7 >> 3) - var5; } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "([BI[BIIB)I", - garbageValue = "-45" + signature = "([BI[BIII)I", + garbageValue = "-417422425" ) @Export("decompress") int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) { @@ -297,221 +301,33 @@ public class Huffman { } } - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lgl;I)I", - garbageValue = "1131255315" - ) - @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 = FaceNormal.standardizeChar(var9, var2); - var10 = FaceNormal.standardizeChar(var10, var2); - if (var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { - var9 = Character.toLowerCase(var9); - var10 = Character.toLowerCase(var10); - if (var9 != var10) { - return lowercaseChar(var9, var2) - 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 lowercaseChar(var18, var2) - 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 (var20 != var13) { - return lowercaseChar(var20, var2) - lowercaseChar(var13, var2); - } - } - - return 0; - } - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1338498163" - ) - public static void method4045() { - try { - File var0 = new File(AbstractWorldMapData.userHomeDirectory, "random.dat"); - int var2; - if (var0.exists()) { - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); - } else { - label35: - for (int var1 = 0; var1 < AbstractRasterProvider.field3871.length; ++var1) { - for (var2 = 0; var2 < Varps.field2522.length; ++var2) { - File var3 = new File(Varps.field2522[var2] + AbstractRasterProvider.field3871[var1] + File.separatorChar + "random.dat"); - if (var3.exists()) { - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0); - break label35; - } - } - } - } - - 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("k") - @ObfuscatedSignature( - signature = "(CLgl;I)I", - garbageValue = "1882549296" - ) - @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("e") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1258139515" + signature = "(ILcs;ZI)I", + garbageValue = "-2030952139" ) - public static void method4048() { - PlayerAppearance.PlayerAppearance_cachedModels.clear(); - } - - @ObfuscatedName("fp") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1871725154" - ) - @Export("logOut") - static final void logOut() { - Client.packetWriter.close(); - GrandExchangeEvents.method155(); - GrandExchangeOfferWorldComparator.scene.clear(); - - for (int var0 = 0; var0 < 4; ++var0) { - Client.collisionMaps[var0].clear(); + static int method4099(int var0, Script var1, boolean var2) { + Widget var3 = WorldMapSprite.getWidget(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); + if (var0 == ScriptOpcodes.IF_GETX) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.x; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETY) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.y; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.width; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.height; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETHIDE) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.IF_GETLAYER) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.parentId; + return 1; + } else { + return 2; } - - System.gc(); - class206.field2406 = 1; - class206.musicTrackArchive = null; - class206.musicTrackGroupId = -1; - class206.musicTrackFileId = -1; - class219.musicTrackVolume = 0; - GrandExchangeOfferUnitPriceComparator.musicTrackBoolean = false; - AttackOption.field1187 = 2; - Client.currentTrackGroupId = -1; - Client.field915 = false; - TriBool.method5249(); - MouseRecorder.updateGameState(10); } } diff --git a/runescape-client/src/main/java/IgnoreList.java b/runescape-client/src/main/java/IgnoreList.java index 4a9c86f2b8..8b4a4ed8fd 100644 --- a/runescape-client/src/main/java/IgnoreList.java +++ b/runescape-client/src/main/java/IgnoreList.java @@ -2,56 +2,49 @@ 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("jb") +@ObfuscatedName("jw") @Implements("IgnoreList") public class IgnoreList extends UserList { - @ObfuscatedName("bt") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lgl;" - ) - @Export("clientLanguage") - static Language clientLanguage; - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Lmx;" + signature = "Lmo;" ) @Export("loginType") final LoginType loginType; @ObfuscatedSignature( - signature = "(Lmx;)V" + signature = "(Lmo;)V" ) public IgnoreList(LoginType var1) { super(400); this.loginType = var1; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)Ljd;", - garbageValue = "-1332552421" + signature = "(I)Ljf;", + garbageValue = "551595115" ) @Export("newInstance") User newInstance() { return new Ignored(); } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)[Ljd;", - garbageValue = "-667029686" + signature = "(II)[Ljf;", + garbageValue = "1959965595" ) @Export("newTypedArray") User[] newTypedArray(int var1) { return new Ignored[var1]; } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkb;II)V", - garbageValue = "1156120193" + signature = "(Lkn;IB)V", + garbageValue = "77" ) @Export("read") public void read(Buffer var1, int var2) { @@ -66,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 { @@ -94,394 +87,4 @@ public class IgnoreList extends UserList { return; } } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(IB)Lis;", - garbageValue = "44" - ) - @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 = 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; - } - } - - @ObfuscatedName("az") - @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "-372062346" - ) - static int method5130(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 6600) { - var3 = ScriptEvent.Client_plane; - int var9 = (ByteArrayPool.localPlayer.x >> 7) + class69.baseX; - int var5 = (ByteArrayPool.localPlayer.y >> 7) + class89.baseY; - class13.getWorldMap().method6524(var3, var9, var5, true); - return 1; - } else { - WorldMapArea var11; - if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - String var16 = ""; - var11 = class13.getWorldMap().getMapArea(var3); - if (var11 != null) { - var16 = var11.getExternalName(); - } - - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16; - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - class13.getWorldMap().setCurrentMapAreaId(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class13.getWorldMap().getZoomLevel(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - class13.getWorldMap().setZoomPercentage(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class13.getWorldMap().isCacheLoaded() ? 1 : 0; - return 1; - } else { - Coord var15; - if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { - var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - class13.getWorldMap().setWorldMapPositionTarget(var15.x, var15.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { - var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - class13.getWorldMap().setWorldMapPositionTargetInstant(var15.x, var15.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { - var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - class13.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]); - class13.getWorldMap().jumpToSourceCoordInstant(var15.plane, var15.x, var15.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class13.getWorldMap().getDisplayX(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class13.getWorldMap().getDisplayY(); - return 1; - } else { - WorldMapArea var13; - if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var13 = class13.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 = class13.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 = class13.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 = class13.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 = class13.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] = class13.getWorldMap().currentMapAreaId(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { - var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - var13 = class13.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; - } - } else { - Coord var7; - if (var0 == 6618) { - var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - var13 = class13.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(); - } - - return 1; - } - } 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]); - class3.method57(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]); - class3.method57(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 = class13.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] = class13.getWorldMap().getDisplayWith(); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class13.getWorldMap().getDisplayHeight(); - return 1; - } else if (var0 == 6623) { - var15 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - var13 = class13.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) { - class13.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - return 1; - } else if (var0 == 6625) { - class13.getWorldMap().resetMaxFlashCount(); - return 1; - } else if (var0 == 6626) { - class13.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - return 1; - } else if (var0 == 6627) { - class13.getWorldMap().resetCyclesPerFlash(); - return 1; - } else { - boolean var10; - if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class13.getWorldMap().setPerpetualFlash(var10); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - class13.getWorldMap().flashElement(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - class13.getWorldMap().flashCategory(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { - class13.getWorldMap().stopCurrentFlashes(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { - var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - class13.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; - class13.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; - class13.getWorldMap().setCategoryDisabled(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class13.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] = class13.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] = class13.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 = class13.getWorldMap().method6470(var3, var12); - if (var7 == null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.packed(); - } - - return 1; - } else { - AbstractWorldMapIcon var8; - if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { - var8 = class13.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(); - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { - var8 = class13.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(); - } - - return 1; - } else { - WorldMapElement var6; - if (var0 == ScriptOpcodes.MEC_TEXT) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var6 = class25.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 = class25.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 = class25.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 = class25.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] = TileItem.worldMapEvent.mapElement; - return 1; - } else if (var0 == 6698) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = TileItem.worldMapEvent.coord1.packed(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = TileItem.worldMapEvent.coord2.packed(); - return 1; - } else { - return 2; - } - } - } - } - } - } - } - } - } - } - } - - @ObfuscatedName("ix") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;IIIIB)V", - garbageValue = "114" - ) - @Export("insertMenuItemNoShift") - public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { - ScriptFrame.insertMenuItem(var0, var1, var2, var3, var4, var5, false); - } } diff --git a/runescape-client/src/main/java/Ignored.java b/runescape-client/src/main/java/Ignored.java index d421e10a36..d0cc731af1 100644 --- a/runescape-client/src/main/java/Ignored.java +++ b/runescape-client/src/main/java/Ignored.java @@ -1,19 +1,15 @@ -import java.awt.FontMetrics; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("km") +@ObfuscatedName("kc") @Implements("Ignored") public class Ignored extends User { - @ObfuscatedName("ab") - @Export("loginScreenFontMetrics") - static FontMetrics loginScreenFontMetrics; - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1613598915 + intValue = 1754728745 ) @Export("id") int id; @@ -21,20 +17,20 @@ public class Ignored extends User { Ignored() { } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkm;I)I", - garbageValue = "105996759" + signature = "(Lkc;I)I", + garbageValue = "-857572865" ) @Export("compareTo_ignored") int compareTo_ignored(Ignored var1) { return this.id - var1.id; } - @ObfuscatedName("am") + @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(Ljd;I)I", - garbageValue = "-1956183743" + signature = "(Ljf;I)I", + garbageValue = "334051838" ) @Export("compareTo_user") public int compareTo_user(User var1) { @@ -44,18 +40,4 @@ public class Ignored extends User { public int compareTo(Object var1) { return this.compareTo_ignored((Ignored)var1); } - - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-54" - ) - static void method5235() { - class335.SpriteBuffer_xOffsets = null; - StructDefinition.SpriteBuffer_yOffsets = null; - class335.SpriteBuffer_spriteWidths = null; - class335.SpriteBuffer_spriteHeights = null; - DefaultsGroup.SpriteBuffer_spritePalette = null; - class4.SpriteBuffer_pixels = null; - } } diff --git a/runescape-client/src/main/java/IndexedSprite.java b/runescape-client/src/main/java/IndexedSprite.java index 4c1ac52032..bdf4ff90b6 100644 --- a/runescape-client/src/main/java/IndexedSprite.java +++ b/runescape-client/src/main/java/IndexedSprite.java @@ -2,38 +2,38 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("le") +@ObfuscatedName("lh") @Implements("IndexedSprite") public final class IndexedSprite extends Rasterizer2D { - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("pixels") public byte[] pixels; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("palette") public int[] palette; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("subWidth") public int subWidth; - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("subHeight") public int subHeight; - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("xOffset") public int xOffset; - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("yOffset") public int yOffset; - @ObfuscatedName("q") + @ObfuscatedName("n") @Export("width") public int width; - @ObfuscatedName("z") + @ObfuscatedName("u") @Export("height") public int height; IndexedSprite() { } - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("normalize") public void normalize() { if (this.subWidth != this.width || this.subHeight != this.height) { @@ -54,7 +54,7 @@ public final class IndexedSprite extends Rasterizer2D { } } - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("shiftColors") public void shiftColors(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.palette.length; ++var4) { @@ -87,7 +87,7 @@ public final class IndexedSprite extends Rasterizer2D { } - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("drawAt") public void drawAt(int var1, int var2) { var1 += this.xOffset; @@ -133,8 +133,8 @@ public final class IndexedSprite extends Rasterizer2D { } } - @ObfuscatedName("w") - public void method6211(int var1, int var2, int var3, int var4) { + @ObfuscatedName("p") + public void method6322(int var1, int var2, int var3, int var4) { int var5 = this.subWidth; int var6 = this.subHeight; int var7 = 0; @@ -195,7 +195,7 @@ public final class IndexedSprite extends Rasterizer2D { IndexedSprite_something(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var7, var8, var13, var14, var3, var4, var11, var12, var5); } - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("IndexedSprite_two") static void IndexedSprite_two(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9 = -(var5 >> 2); @@ -249,7 +249,7 @@ public final class IndexedSprite extends Rasterizer2D { } - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("IndexedSprite_something") static void IndexedSprite_something(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { int var12 = var3; diff --git a/runescape-client/src/main/java/Instrument.java b/runescape-client/src/main/java/Instrument.java index d2f3a08cdb..6850733a63 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("dp") +@ObfuscatedName("dq") @Implements("Instrument") public class Instrument { - @ObfuscatedName("a") + @ObfuscatedName("v") @Export("Instrument_samples") static int[] Instrument_samples; - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("Instrument_noise") static int[] Instrument_noise; - @ObfuscatedName("l") + @ObfuscatedName("e") @Export("Instrument_sine") static int[] Instrument_sine; - @ObfuscatedName("o") + @ObfuscatedName("t") @Export("Instrument_phases") static int[] Instrument_phases; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("Instrument_delays") static int[] Instrument_delays; - @ObfuscatedName("j") + @ObfuscatedName("b") @Export("Instrument_volumeSteps") static int[] Instrument_volumeSteps; - @ObfuscatedName("y") + @ObfuscatedName("i") @Export("Instrument_pitchSteps") static int[] Instrument_pitchSteps; @ObfuscatedName("f") @Export("Instrument_pitchBaseSteps") static int[] Instrument_pitchBaseSteps; - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lde;" + signature = "Lds;" ) @Export("pitch") SoundEnvelope pitch; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lde;" + signature = "Lds;" ) @Export("volume") SoundEnvelope volume; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lde;" + signature = "Lds;" ) @Export("pitchModifier") SoundEnvelope pitchModifier; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lde;" + signature = "Lds;" ) @Export("pitchModifierAmplitude") SoundEnvelope pitchModifierAmplitude; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lde;" + signature = "Lds;" ) @Export("volumeMultiplier") SoundEnvelope volumeMultiplier; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lde;" + signature = "Lds;" ) @Export("volumeMultiplierAmplitude") SoundEnvelope volumeMultiplierAmplitude; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lde;" + signature = "Lds;" ) @Export("release") SoundEnvelope release; - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lde;" + signature = "Lds;" ) @Export("attack") SoundEnvelope attack; - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("oscillatorVolume") int[] oscillatorVolume; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("oscillatorPitch") int[] oscillatorPitch; - @ObfuscatedName("s") + @ObfuscatedName("w") @Export("oscillatorDelays") int[] oscillatorDelays; - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("delayTime") int delayTime; - @ObfuscatedName("n") + @ObfuscatedName("c") @Export("delayDecay") int delayDecay; - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Ldc;" + signature = "Lda;" ) @Export("filter") AudioFilter filter; - @ObfuscatedName("h") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lde;" + signature = "Lds;" ) @Export("filterEnvelope") SoundEnvelope filterEnvelope; - @ObfuscatedName("g") + @ObfuscatedName("r") @Export("duration") int duration; - @ObfuscatedName("i") + @ObfuscatedName("s") @Export("offset") int offset; @@ -146,7 +146,7 @@ public class Instrument { this.offset = 0; } - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("synthesize") final int[] synthesize(int var1, int var2) { class310.clearIntArray(Instrument_samples, 0, var1); @@ -353,7 +353,7 @@ public class Instrument { } } - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("evaluateWave") final int evaluateWave(int var1, int var2, int var3) { if (var3 == 1) { @@ -367,9 +367,9 @@ public class Instrument { } } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkb;)V" + signature = "(Lkn;)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.method2813(var1, this.filterEnvelope); + this.filter.method2829(var1, this.filterEnvelope); } } diff --git a/runescape-client/src/main/java/IntHashTable.java b/runescape-client/src/main/java/IntHashTable.java index 8c2146359b..aee4fde898 100644 --- a/runescape-client/src/main/java/IntHashTable.java +++ b/runescape-client/src/main/java/IntHashTable.java @@ -3,12 +3,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mj") +@ObfuscatedName("mh") @Implements("IntHashTable") public class IntHashTable { - @ObfuscatedName("t") - static int[] field4034; - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("array") int[] array; @@ -34,10 +32,10 @@ public class IntHashTable { } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "1863702029" + signature = "(IB)I", + garbageValue = "-57" ) @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 0392ebec61..5194213a1b 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("gz") +@ObfuscatedName("gc") @Implements("IntegerNode") public class IntegerNode extends Node { - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("integer") public int integer; diff --git a/runescape-client/src/main/java/InterfaceParent.java b/runescape-client/src/main/java/InterfaceParent.java index 7171fedcee..9ad5735860 100644 --- a/runescape-client/src/main/java/InterfaceParent.java +++ b/runescape-client/src/main/java/InterfaceParent.java @@ -4,174 +4,48 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bm") +@ObfuscatedName("bz") @Implements("InterfaceParent") public class InterfaceParent extends Node { - @ObfuscatedName("pd") - @ObfuscatedSignature( - signature = "Lko;" - ) - @Export("clanChat") - static ClanChat clanChat; @ObfuscatedName("v") + static String[] field590; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1870800307 - ) - @Export("idxCount") - public static int idxCount; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 1326721365 + intValue = -228767789 ) @Export("group") int group; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1502247593 + intValue = -109575985 ) @Export("type") int type; - @ObfuscatedName("k") - boolean field594; + @ObfuscatedName("q") + boolean field587; InterfaceParent() { - this.field594 = false; + this.field587 = false; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)[Liz;", - garbageValue = "101" + signature = "(IIIB)Llz;", + garbageValue = "-72" ) - @Export("PlayerType_values") - public static PlayerType[] PlayerType_values() { - return new PlayerType[]{PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_normal, PlayerType.PlayerType_ironman, PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_ultimateIronman, PlayerType.PlayerType_playerModerator}; + static Sprite method1233(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("iq") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lbi;IIII)V", - garbageValue = "713738223" + signature = "(Lbu;I)V", + garbageValue = "-764301386" ) - @Export("addPlayerToMenu") - static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { - if (ByteArrayPool.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 = ByteArrayPool.localPlayer.combatLevel; - int var9 = var8 - var7; - String var6; - if (var9 < -9) { - var6 = class297.colorStartTag(16711680); - } else if (var9 < -6) { - var6 = class297.colorStartTag(16723968); - } else if (var9 < -3) { - var6 = class297.colorStartTag(16740352); - } else if (var9 < 0) { - var6 = class297.colorStartTag(16756736); - } else if (var9 > 9) { - var6 = class297.colorStartTag(65280); - } else if (var9 > 6) { - var6 = class297.colorStartTag(4259584); - } else if (var9 > 3) { - var6 = class297.colorStartTag(8453888); - } else if (var9 > 0) { - var6 = class297.colorStartTag(12648192); - } else { - var6 = class297.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) { - IgnoreList.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class297.colorStartTag(16777215) + var4, 14, var1, var2, var3); - } else if (Client.isSpellSelected) { - if ((AbstractWorldMapIcon.selectedSpellFlags & 8) == 8) { - IgnoreList.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class297.colorStartTag(16777215) + var4, 15, var1, var2, var3); - } - } else { - for (var10 = 7; var10 >= 0; --var10) { - if (Client.playerMenuActions[var10] != null) { - short var11 = 0; - if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) { - if (AttackOption.AttackOption_hidden == Client.playerAttackOption) { - continue; - } - - if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || AttackOption.AttackOption_dependsOnCombatLevels == Client.playerAttackOption && var0.combatLevel > ByteArrayPool.localPlayer.combatLevel) { - var11 = 2000; - } - - if (ByteArrayPool.localPlayer.team != 0 && var0.team != 0) { - if (var0.team == ByteArrayPool.localPlayer.team) { - var11 = 2000; - } else { - var11 = 0; - } - } - } else if (Client.playerOptionsPriorities[var10]) { - var11 = 2000; - } - - boolean var12 = false; - var7 = Client.playerMenuOpcodes[var10] + var11; - IgnoreList.insertMenuItemNoShift(Client.playerMenuActions[var10], class297.colorStartTag(16777215) + var4, var7, var1, var2, var3); - } - } - } - - for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) { - if (Client.menuOpcodes[var10] == 23) { - Client.menuTargets[var10] = class297.colorStartTag(16777215) + var4; - break; - } - } - - } - } - } - - @ObfuscatedName("iu") - @ObfuscatedSignature( - signature = "([Lhe;IIIZI)V", - garbageValue = "-1930613556" - ) - @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) { - WorldMapAreaData.alignWidgetSize(var6, var2, var3, var4); - WorldMapLabelSize.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) { - MouseHandler.revalidateWidgetScroll(var0, var6, var4); - } - } - } - + @Export("runScriptEvent") + public static void runScriptEvent(ScriptEvent var0) { + WorldMapLabel.runScript(var0, 500000); } } diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index e7a83e761a..4da4cdaea1 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -4,70 +4,56 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cu") +@ObfuscatedName("ce") @Implements("Interpreter") public class Interpreter { - @ObfuscatedName("d") + @ObfuscatedName("q") + @Export("Interpreter_intLocals") + static int[] Interpreter_intLocals; + @ObfuscatedName("j") @Export("Interpreter_stringLocals") static String[] Interpreter_stringLocals; - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("Interpreter_arrayLengths") static int[] Interpreter_arrayLengths; - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("Interpreter_arrays") static int[][] Interpreter_arrays; - @ObfuscatedName("q") + @ObfuscatedName("n") @Export("Interpreter_intStack") static int[] Interpreter_intStack; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 1080849523 - ) - @Export("Interpreter_intStackSize") - static int Interpreter_intStackSize; - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("Interpreter_stringStack") static String[] Interpreter_stringStack; - @ObfuscatedName("e") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 691433523 - ) - @Export("Interpreter_stringStackSize") - static int Interpreter_stringStackSize; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -1685756683 + intValue = 1436904999 ) @Export("Interpreter_frameDepth") static int Interpreter_frameDepth; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "[Lbv;" + signature = "[Lbp;" ) @Export("Interpreter_frames") static ScriptFrame[] Interpreter_frames; - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "Lhe;" - ) - static Widget field1130; - @ObfuscatedName("h") + @ObfuscatedName("k") @Export("Interpreter_calendar") static java.util.Calendar Interpreter_calendar; - @ObfuscatedName("g") + @ObfuscatedName("r") @Export("Interpreter_MONTHS") static final String[] Interpreter_MONTHS; - @ObfuscatedName("a") + @ObfuscatedName("v") static boolean field1125; - @ObfuscatedName("b") - static boolean field1126; - @ObfuscatedName("l") + @ObfuscatedName("d") + static boolean field1118; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 2091837547 + intValue = 544842363 ) - static int field1127; - @ObfuscatedName("j") - static final double field1128; + static int field1132; + @ObfuscatedName("b") + static final double field1126; static { Interpreter_arrayLengths = new int[5]; @@ -79,33 +65,115 @@ public class Interpreter { Interpreter_calendar = java.util.Calendar.getInstance(); Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; field1125 = false; - field1126 = false; - field1127 = 0; - field1128 = Math.log(2.0D); + field1118 = false; + field1132 = 0; + field1126 = Math.log(2.0D); } - @ObfuscatedName("q") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1189048729" + signature = "(IILga;Lfz;S)Z", + garbageValue = "-8766" ) - static void method2112() { - Messages.Messages_channels.clear(); - Messages.Messages_hashTable.clear(); - Messages.Messages_queue.clear(); - Messages.Messages_count = 0; - } + static final boolean method2112(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; + class182.directions[var6][var7] = 99; + class182.distances[var6][var7] = 0; + byte var10 = 0; + int var11 = 0; + class182.bufferX[var10] = var0; + byte var10001 = var10; + int var18 = var10 + 1; + class182.bufferY[var10001] = var1; + int[][] var12 = var3.flags; - @ObfuscatedName("kj") - @ObfuscatedSignature( - signature = "([BII)V", - garbageValue = "632066186" - ) - static void method2113(byte[] var0, int var1) { - if (Client.randomDatData == null) { - Client.randomDatData = new byte[24]; + while (var11 != var18) { + var4 = class182.bufferX[var11]; + var5 = class182.bufferY[var11]; + var11 = var11 + 1 & 4095; + int var16 = var4 - var8; + int var17 = var5 - var9; + int var13 = var4 - var3.xInset; + int var14 = var5 - var3.yInset; + if (var2.hasArrived(1, var4, var5, var3)) { + class182.field2132 = var4; + GrandExchangeOfferOwnWorldComparator.field666 = var5; + return true; + } + + int var15 = class182.distances[var16][var17] + 1; + if (var16 > 0 && class182.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136776) == 0) { + class182.bufferX[var18] = var4 - 1; + class182.bufferY[var18] = var5; + var18 = var18 + 1 & 4095; + class182.directions[var16 - 1][var17] = 2; + class182.distances[var16 - 1][var17] = var15; + } + + if (var16 < 127 && class182.directions[var16 + 1][var17] == 0 && (var12[var13 + 1][var14] & 19136896) == 0) { + class182.bufferX[var18] = var4 + 1; + class182.bufferY[var18] = var5; + var18 = var18 + 1 & 4095; + class182.directions[var16 + 1][var17] = 8; + class182.distances[var16 + 1][var17] = var15; + } + + if (var17 > 0 && class182.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { + class182.bufferX[var18] = var4; + class182.bufferY[var18] = var5 - 1; + var18 = var18 + 1 & 4095; + class182.directions[var16][var17 - 1] = 1; + class182.distances[var16][var17 - 1] = var15; + } + + if (var17 < 127 && class182.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { + class182.bufferX[var18] = var4; + class182.bufferY[var18] = var5 + 1; + var18 = var18 + 1 & 4095; + class182.directions[var16][var17 + 1] = 4; + class182.distances[var16][var17 + 1] = var15; + } + + if (var16 > 0 && var17 > 0 && class182.directions[var16 - 1][var17 - 1] == 0 && (var12[var13 - 1][var14 - 1] & 19136782) == 0 && (var12[var13 - 1][var14] & 19136776) == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { + class182.bufferX[var18] = var4 - 1; + class182.bufferY[var18] = var5 - 1; + var18 = var18 + 1 & 4095; + class182.directions[var16 - 1][var17 - 1] = 3; + class182.distances[var16 - 1][var17 - 1] = var15; + } + + if (var16 < 127 && var17 > 0 && class182.directions[var16 + 1][var17 - 1] == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0 && (var12[var13 + 1][var14] & 19136896) == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { + class182.bufferX[var18] = var4 + 1; + class182.bufferY[var18] = var5 - 1; + var18 = var18 + 1 & 4095; + class182.directions[var16 + 1][var17 - 1] = 9; + class182.distances[var16 + 1][var17 - 1] = var15; + } + + if (var16 > 0 && var17 < 127 && class182.directions[var16 - 1][var17 + 1] == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0 && (var12[var13 - 1][var14] & 19136776) == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { + class182.bufferX[var18] = var4 - 1; + class182.bufferY[var18] = var5 + 1; + var18 = var18 + 1 & 4095; + class182.directions[var16 - 1][var17 + 1] = 6; + class182.distances[var16 - 1][var17 + 1] = var15; + } + + if (var16 < 127 && var17 < 127 && class182.directions[var16 + 1][var17 + 1] == 0 && (var12[var13 + 1][var14 + 1] & 19136992) == 0 && (var12[var13 + 1][var14] & 19136896) == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { + class182.bufferX[var18] = var4 + 1; + class182.bufferY[var18] = var5 + 1; + var18 = var18 + 1 & 4095; + class182.directions[var16 + 1][var17 + 1] = 12; + class182.distances[var16 + 1][var17 + 1] = var15; + } } - class310.writeRandomDat(var0, var1, Client.randomDatData, 0, 24); + class182.field2132 = var4; + GrandExchangeOfferOwnWorldComparator.field666 = var5; + return false; } } diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java index 40b11ed9de..e42481558d 100644 --- a/runescape-client/src/main/java/InvDefinition.java +++ b/runescape-client/src/main/java/InvDefinition.java @@ -3,25 +3,26 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("iq") +@ObfuscatedName("il") @Implements("InvDefinition") public class InvDefinition extends DualNode { - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Liy;" - ) - @Export("InvDefinition_archive") - static AbstractArchive InvDefinition_archive; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Leg;" + signature = "Lic;" + ) + @Export("InvDefinition_archive") + public static AbstractArchive InvDefinition_archive; + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "Lec;" ) @Export("InvDefinition_cached") static EvictingDualNodeHashTable InvDefinition_cached; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -307651921 + intValue = 1649709869 ) @Export("size") public int size; @@ -34,10 +35,10 @@ public class InvDefinition extends DualNode { this.size = 0; } - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkb;I)V", - garbageValue = "117570412" + signature = "(Lkn;B)V", + garbageValue = "-52" ) @Export("decode") void decode(Buffer var1) { @@ -51,10 +52,10 @@ public class InvDefinition extends DualNode { } } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkb;II)V", - garbageValue = "-72548916" + signature = "(Lkn;II)V", + garbageValue = "2103513845" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -64,77 +65,206 @@ public class InvDefinition extends DualNode { } - @ObfuscatedName("fe") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "566997565" + signature = "(ILcs;ZI)I", + garbageValue = "1737706956" ) - static final void method4443() { - if (ScriptEvent.Client_plane != Client.field695) { - Client.field695 = ScriptEvent.Client_plane; - int var0 = ScriptEvent.Client_plane; - int[] var1 = ArchiveDisk.sceneMinimapSprite.pixels; - int var2 = var1.length; + static int method4530(int var0, Script var1, boolean var2) { + int var4 = -1; + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var4 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + var3 = WorldMapSprite.getWidget(var4); + } else { + var3 = var2 ? KeyHandler.field407 : SecureRandomCallable.field544; + } - int var3; - for (var3 = 0; var3 < var2; ++var3) { - var1[var3] = 0; + if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { + UrlRequester.Interpreter_intStackSize -= 2; + var3.scrollX = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + if (var3.scrollX > var3.scrollWidth - var3.width) { + var3.scrollX = var3.scrollWidth - var3.width; } - int var4; - int var5; - for (var3 = 1; var3 < 103; ++var3) { - var4 = (103 - var3) * 2048 + 24628; + if (var3.scrollX < 0) { + var3.scrollX = 0; + } - for (var5 = 1; var5 < 103; ++var5) { - if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { - GrandExchangeOfferWorldComparator.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3); - } + var3.scrollY = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + if (var3.scrollY > var3.scrollHeight - var3.height) { + var3.scrollY = var3.scrollHeight - var3.height; + } - if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { - GrandExchangeOfferWorldComparator.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3); - } + if (var3.scrollY < 0) { + var3.scrollY = 0; + } - var4 += 4; + class234.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { + var3.color = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + class234.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETFILL) { + var3.fill = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + class234.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTRANS) { + var3.transparencyTop = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + class234.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { + var3.lineWid = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + class234.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { + var3.spriteId2 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + class234.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { + var3.spriteAngle = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + class234.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTILING) { + var3.spriteTiling = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + class234.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETMODEL) { + var3.modelType = 1; + var3.modelId = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + class234.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { + UrlRequester.Interpreter_intStackSize -= 6; + var3.modelOffsetX = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var3.modelOffsetY = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + var3.modelAngleX = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2]; + var3.modelAngleY = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 3]; + var3.modelAngleZ = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 4]; + var3.modelZoom = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 5]; + class234.invalidateWidget(var3); + return 1; + } else { + int var8; + if (var0 == ScriptOpcodes.CC_SETMODELANIM) { + var8 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + if (var8 != var3.sequenceId) { + var3.sequenceId = var8; + var3.modelFrame = 0; + var3.modelFrameCycle = 0; + class234.invalidateWidget(var3); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { + var3.modelOrthog = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + class234.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTEXT) { + String var7 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; + if (!var7.equals(var3.text)) { + var3.text = var7; + class234.invalidateWidget(var3); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { + var3.fontId = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + class234.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { + UrlRequester.Interpreter_intStackSize -= 3; + var3.textXAlignment = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var3.textYAlignment = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + var3.textLineHeight = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2]; + class234.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { + var3.textShadowed = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + class234.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { + var3.outline = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + class234.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { + var3.spriteShadow = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + class234.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { + var3.spriteFlipV = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + class234.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { + var3.spriteFlipH = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + class234.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { + UrlRequester.Interpreter_intStackSize -= 2; + var3.scrollWidth = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var3.scrollHeight = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + class234.invalidateWidget(var3); + if (var4 != -1 && var3.type == 0) { + WorldMapIcon_0.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var4 >> 16], var3, false); + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { + WorldMapArea.resumePauseWidget(var3.id, var3.childIndex); + Client.meslayerContinueWidget = var3; + class234.invalidateWidget(var3); + return 1; + } else if (var0 == 1122) { + var3.spriteId = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + class234.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { + var3.color2 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + class234.invalidateWidget(var3); + return 1; + } else if (var0 == 1124) { + var3.transparencyBot = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + class234.invalidateWidget(var3); + return 1; + } else if (var0 == ScriptOpcodes.CC_SETFILLMODE) { + var8 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + class332 var6 = (class332)FaceNormal.findEnumerated(MusicPatch.FillMode_values(), var8); + if (var6 != null) { + var3.fillMode = var6; + class234.invalidateWidget(var3); + } + + return 1; + } else { + boolean var5; + if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { + var5 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + var3.field2633 = var5; + return 1; + } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { + var5 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + var3.modelTransparency = var5; + return 1; + } else { + return 2; } } + } + } - 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; - ArchiveDisk.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) { - ScriptFrame.drawObject(var0, var6, var5, var3, var4); - } - - if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { - ScriptFrame.drawObject(var0 + 1, var6, var5, var3, var4); - } - } - } - - Client.mapIconCount = 0; - - for (var5 = 0; var5 < 104; ++var5) { - for (var6 = 0; var6 < 104; ++var6) { - long var7 = GrandExchangeOfferWorldComparator.scene.getFloorDecorationTag(ScriptEvent.Client_plane, var5, var6); - if (0L != var7) { - int var9 = WorldMapRectangle.Entity_unpackID(var7); - int var10 = WorldMapSection2.getObjectDefinition(var9).mapIconId; - if (var10 >= 0) { - Client.mapIcons[Client.mapIconCount] = class25.WorldMapElement_get(var10).getSpriteBool(false); - Client.mapIconXs[Client.mapIconCount] = var5; - Client.mapIconYs[Client.mapIconCount] = var6; - ++Client.mapIconCount; - } - } - } - } - - class206.rasterProvider.apply(); + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(ZB)V", + garbageValue = "93" + ) + public static void method4523(boolean var0) { + if (var0 != SoundCache.ItemDefinition_inMembersWorld) { + ItemDefinition.ItemDefinition_cached.clear(); + ItemDefinition.ItemDefinition_cachedModels.clear(); + ItemDefinition.ItemDefinition_cachedSprites.clear(); + SoundCache.ItemDefinition_inMembersWorld = var0; } } diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java index a070069e2d..c23bce97f9 100644 --- a/runescape-client/src/main/java/IsaacCipher.java +++ b/runescape-client/src/main/java/IsaacCipher.java @@ -4,36 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lp") +@ObfuscatedName("lb") @Implements("IsaacCipher") public final class IsaacCipher { - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1307848851 + intValue = 10918611 ) @Export("valuesRemaining") int valuesRemaining; - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("results") int[] results; - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("mm") int[] mm; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1312590211 + intValue = 1198902383 ) @Export("aa") int aa; - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1716852745 + intValue = 976024717 ) @Export("bb") int bb; - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1213332247 + intValue = -2134869821 ) @Export("cc") int cc; @@ -46,13 +46,13 @@ public final class IsaacCipher { this.results[var2] = var1[var2]; } - this.method6363(); + this.method6476(); } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-1944633806" + signature = "(B)I", + garbageValue = "-51" ) @Export("nextInt") public final int nextInt() { @@ -64,12 +64,12 @@ public final class IsaacCipher { return this.results[--this.valuesRemaining]; } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1112251479" + garbageValue = "-1026117939" ) - public final int method6364() { + public final int method6467() { if (this.valuesRemaining == 0) { this.generateMoreResults(); this.valuesRemaining = 256; @@ -78,10 +78,10 @@ public final class IsaacCipher { return this.results[this.valuesRemaining - 1]; } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1611356921" + garbageValue = "2064479197" ) @Export("generateMoreResults") final void generateMoreResults() { @@ -109,12 +109,12 @@ public final class IsaacCipher { } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "2132925629" + garbageValue = "1036873606" ) - final void method6363() { + final void method6476() { int var9 = -1640531527; int var8 = -1640531527; int var7 = -1640531527; @@ -241,19 +241,4 @@ public final class IsaacCipher { this.generateMoreResults(); this.valuesRemaining = 256; } - - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "(IIIZII)J", - garbageValue = "-462754013" - ) - @Export("calculateTag") - public static long calculateTag(int var0, int var1, int var2, boolean var3, int var4) { - long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17; - if (var3) { - var5 |= 65536L; - } - - return var5; - } } diff --git a/runescape-client/src/main/java/ItemContainer.java b/runescape-client/src/main/java/ItemContainer.java index dde0caa63c..7138a1892d 100644 --- a/runescape-client/src/main/java/ItemContainer.java +++ b/runescape-client/src/main/java/ItemContainer.java @@ -1,35 +1,39 @@ -import java.applet.Applet; -import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import netscape.javascript.JSObject; -@ObfuscatedName("bs") +@ObfuscatedName("bv") @Implements("ItemContainer") public class ItemContainer extends Node { - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Llv;" - ) - @Export("itemContainers") - static NodeHashTable itemContainers; - @ObfuscatedName("bq") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lle;" ) - static IndexedSprite field572; - @ObfuscatedName("fr") + @Export("itemContainers") + static NodeHashTable itemContainers; + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lkf;" + signature = "Llz;" ) - @Export("WorldMapElement_fonts") - static Fonts WorldMapElement_fonts; - @ObfuscatedName("m") + @Export("rightTitleSprite") + static Sprite rightTitleSprite; + @ObfuscatedName("ak") + @ObfuscatedSignature( + signature = "Llv;" + ) + static Bounds field567; + @ObfuscatedName("ma") + @ObfuscatedGetter( + intValue = -1890638997 + ) + @Export("selectedSpellWidget") + static int selectedSpellWidget; + @ObfuscatedName("o") @Export("ids") int[] ids; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("quantities") int[] quantities; @@ -42,111 +46,71 @@ public class ItemContainer extends Node { this.quantities = new int[]{0}; } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljava/lang/String;ILjava/lang/String;B)Z", - garbageValue = "17" + signature = "(II)Lls;", + garbageValue = "-1724420240" ) - static boolean method1274(String var0, int var1, String var2) { - if (var1 == 0) { - try { - if (!class60.field462.startsWith("win")) { - throw new Exception(); - } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { - throw new Exception(); - } else { - String var13 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; + public static PrivateChatMode method1232(int var0) { + PrivateChatMode[] var1 = new PrivateChatMode[]{PrivateChatMode.field3818, PrivateChatMode.field3820, PrivateChatMode.field3819}; + PrivateChatMode[] var2 = var1; - for (int var4 = 0; var4 < var0.length(); ++var4) { - if (var13.indexOf(var0.charAt(var4)) == -1) { - throw new Exception(); - } - } + for (int var3 = 0; var3 < var2.length; ++var3) { + PrivateChatMode var4 = var2[var3]; + if (var0 == var4.field3817) { + return var4; + } + } - Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); - return true; - } - } catch (Throwable var8) { - return false; - } - } else if (var1 == 1) { - try { - Applet var7 = class60.applet; - Object[] var5 = new Object[]{(new URL(class60.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 { - class60.applet.getAppletContext().showDocument(new URL(class60.applet.getCodeBase(), var0), "_blank"); - return true; - } catch (Exception var10) { - return false; - } - } else if (var1 == 3) { - try { - class56.method950(class60.applet, "loggedout"); - } catch (Throwable var12) { - } + return null; + } - try { - class60.applet.getAppletContext().showDocument(new URL(class60.applet.getCodeBase(), var0), "_top"); - return true; - } catch (Exception var11) { - return false; - } + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(II)Ljava/lang/String;", + garbageValue = "1507611056" + ) + @Export("colorStartTag") + static String colorStartTag(int var0) { + return ""; + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(II)Ljr;", + garbageValue = "2131303603" + ) + @Export("getEnum") + public static EnumDefinition getEnum(int var0) { + EnumDefinition var1 = (EnumDefinition)EnumDefinition.EnumDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; } else { - throw new IllegalArgumentException(); - } - } - - @ObfuscatedName("je") - @ObfuscatedSignature( - signature = "(Lhe;Ljx;IIZI)V", - garbageValue = "1190936651" - ) - @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; + byte[] var2 = class349.EnumDefinition_archive.takeFile(8, var0); + var1 = new EnumDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); } - var7 = var5[var3]; - } else if (var3 == 4) { - var6 = 37; - var7 = "Drop"; + EnumDefinition.EnumDefinition_cached.put(var1, (long)var0); + return var1; } - - if (var6 != -1 && var7 != null) { - ScriptFrame.insertMenuItem(var7, class297.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); - } - } - @ObfuscatedName("jo") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lhe;I)V", - garbageValue = "514293783" + signature = "(Lch;Lch;IZIZI)I", + garbageValue = "-1532099004" ) - @Export("invalidateWidget") - static void invalidateWidget(Widget var0) { - if (var0.cycle == Client.field884) { - Client.field679[var0.rootIndex] = true; + static int method1225(World var0, World var1, int var2, boolean var3, int var4, boolean var5) { + int var6 = Actor.compareWorlds(var0, var1, var2, var3); + if (var6 != 0) { + return var3 ? -var6 : var6; + } else if (var4 == -1) { + return 0; + } else { + int var7 = Actor.compareWorlds(var0, var1, var4, var5); + return var5 ? -var7 : var7; } - } } diff --git a/runescape-client/src/main/java/ItemDefinition.java b/runescape-client/src/main/java/ItemDefinition.java index b68a2e63a7..a3abe66595 100644 --- a/runescape-client/src/main/java/ItemDefinition.java +++ b/runescape-client/src/main/java/ItemDefinition.java @@ -4,273 +4,282 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jx") +@ObfuscatedName("jo") @Implements("ItemDefinition") public class ItemDefinition extends DualNode { - @ObfuscatedName("e") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Leg;" + signature = "Lic;" + ) + @Export("ItemDefinition_modelArchive") + static AbstractArchive ItemDefinition_modelArchive; + @ObfuscatedName("a") + @Export("SpriteBuffer_pixels") + static byte[][] SpriteBuffer_pixels; + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "Lec;" ) @Export("ItemDefinition_cached") - static EvictingDualNodeHashTable ItemDefinition_cached; - @ObfuscatedName("s") + public static EvictingDualNodeHashTable ItemDefinition_cached; + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Leg;" + signature = "Lec;" ) @Export("ItemDefinition_cachedModels") - static EvictingDualNodeHashTable ItemDefinition_cachedModels; - @ObfuscatedName("p") + public static EvictingDualNodeHashTable ItemDefinition_cachedModels; + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Leg;" + signature = "Lec;" ) @Export("ItemDefinition_cachedSprites") public static EvictingDualNodeHashTable ItemDefinition_cachedSprites; - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -32704117 + intValue = -387734495 ) @Export("id") public int id; - @ObfuscatedName("h") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1028533167 + intValue = 1846336697 ) @Export("model") int model; - @ObfuscatedName("g") + @ObfuscatedName("r") @Export("name") public String name; - @ObfuscatedName("i") + @ObfuscatedName("s") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("a") + @ObfuscatedName("v") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("l") + @ObfuscatedName("e") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 790198705 + intValue = -757926125 ) @Export("zoom2d") public int zoom2d; - @ObfuscatedName("o") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -512511795 + intValue = 1898813449 ) @Export("xan2d") public int xan2d; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1120938463 + intValue = -1438796167 ) @Export("yan2d") public int yan2d; - @ObfuscatedName("j") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -2126697049 + intValue = 1360428013 ) @Export("zan2d") public int zan2d; - @ObfuscatedName("y") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 2124715319 + intValue = 722443685 ) @Export("offsetX2d") public int offsetX2d; @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1998077465 + intValue = -1309918665 ) @Export("offsetY2d") public int offsetY2d; - @ObfuscatedName("ae") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -496150603 + intValue = 1307428521 ) @Export("isStackable") public int isStackable; - @ObfuscatedName("an") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = -1128123323 + intValue = 1345886409 ) @Export("price") public int price; - @ObfuscatedName("ai") + @ObfuscatedName("ao") @Export("isMembersOnly") public boolean isMembersOnly; - @ObfuscatedName("ap") + @ObfuscatedName("ae") @Export("groundActions") public String[] groundActions; - @ObfuscatedName("ab") + @ObfuscatedName("ax") @Export("inventoryActions") public String[] inventoryActions; - @ObfuscatedName("af") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 2022658475 + intValue = 1852422487 ) @Export("shiftClickIndex") int shiftClickIndex; - @ObfuscatedName("at") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -198787353 + intValue = 1683383921 ) @Export("maleModel") int maleModel; - @ObfuscatedName("al") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -1595882143 + intValue = 203809743 ) @Export("maleModel1") int maleModel1; - @ObfuscatedName("as") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -1755438589 + intValue = 1331375069 ) @Export("maleOffset") int maleOffset; - @ObfuscatedName("am") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 384600509 + intValue = -1572881273 ) @Export("femaleModel") int femaleModel; - @ObfuscatedName("au") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 1401958483 + intValue = -2104915687 ) @Export("femaleModel1") int femaleModel1; - @ObfuscatedName("ao") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -289691561 + intValue = -860403817 ) @Export("femaleOffset") int femaleOffset; - @ObfuscatedName("aq") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 270064135 + intValue = -1286326291 ) @Export("maleModel2") int maleModel2; - @ObfuscatedName("av") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -2092220545 + intValue = 68314197 ) @Export("femaleModel2") int femaleModel2; - @ObfuscatedName("ak") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -687751073 + intValue = -896933211 ) @Export("maleHeadModel") int maleHeadModel; - @ObfuscatedName("aa") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = -726951563 + intValue = -1972414089 ) @Export("maleHeadModel2") int maleHeadModel2; - @ObfuscatedName("ax") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 515679975 + intValue = 614455691 ) @Export("femaleHeadModel") int femaleHeadModel; - @ObfuscatedName("az") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 54393855 + intValue = -92317883 ) @Export("femaleHeadModel2") int femaleHeadModel2; - @ObfuscatedName("aj") + @ObfuscatedName("aa") @Export("countobj") int[] countobj; - @ObfuscatedName("ay") + @ObfuscatedName("aw") @Export("countco") int[] countco; - @ObfuscatedName("ad") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 1943254675 + intValue = -1033402307 ) @Export("note") public int note; - @ObfuscatedName("ac") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 1721963949 + intValue = -833610513 ) @Export("noteTemplate") public int noteTemplate; - @ObfuscatedName("ah") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -1325952823 + intValue = 2144457461 ) @Export("resizeX") int resizeX; - @ObfuscatedName("ag") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 1293336691 + intValue = 132826193 ) @Export("resizeY") int resizeY; - @ObfuscatedName("aw") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -2092594315 + intValue = 477946841 ) @Export("resizeZ") int resizeZ; - @ObfuscatedName("bf") + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = 701446973 + intValue = 37898747 ) @Export("ambient") public int ambient; - @ObfuscatedName("bc") + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = 1489802711 + intValue = -1234802265 ) @Export("contrast") public int contrast; - @ObfuscatedName("bo") + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = -499099671 + intValue = -1542522067 ) @Export("team") public int team; - @ObfuscatedName("bd") + @ObfuscatedName("be") @ObfuscatedSignature( - signature = "Lln;" + signature = "Llf;" ) @Export("params") IterableNodeHashTable params; - @ObfuscatedName("bk") + @ObfuscatedName("bf") @Export("isTradable") public boolean isTradable; - @ObfuscatedName("bu") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = -997556147 + intValue = -265652873 ) @Export("unnotedId") int unnotedId; - @ObfuscatedName("be") + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = -1745550989 + intValue = -721013975 ) @Export("notedId") int notedId; - @ObfuscatedName("bg") + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = -355307627 + intValue = 101881603 ) @Export("placeholder") public int placeholder; - @ObfuscatedName("bt") + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = 1596605635 + intValue = 1978644905 ) @Export("placeholderTemplate") public int placeholderTemplate; @@ -322,19 +331,19 @@ public class ItemDefinition extends DualNode { this.placeholderTemplate = -1; } - @ObfuscatedName("m") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1255281949" + garbageValue = "-196322626" ) @Export("post") void post() { } - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkb;I)V", - garbageValue = "-160078979" + signature = "(Lkn;I)V", + garbageValue = "1671660410" ) @Export("decode") void decode(Buffer var1) { @@ -348,10 +357,10 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("d") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Lkb;II)V", - garbageValue = "-1270586282" + signature = "(Lkn;II)V", + garbageValue = "2109543922" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -470,16 +479,16 @@ public class ItemDefinition extends DualNode { } else if (var2 == 149) { this.placeholderTemplate = var1.readUnsignedShort(); } else if (var2 == 249) { - this.params = NetCache.readStringIntParameters(var1, this.params); + this.params = WorldMapElement.readStringIntParameters(var1, this.params); } } } - @ObfuscatedName("w") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Ljx;Ljx;B)V", - garbageValue = "98" + signature = "(Ljo;Ljo;I)V", + garbageValue = "1175603747" ) @Export("genCert") void genCert(ItemDefinition var1, ItemDefinition var2) { @@ -500,10 +509,10 @@ public class ItemDefinition extends DualNode { this.isStackable = 1; } - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Ljx;Ljx;I)V", - garbageValue = "2110553543" + signature = "(Ljo;Ljo;B)V", + garbageValue = "12" ) @Export("genBought") void genBought(ItemDefinition var1, ItemDefinition var2) { @@ -544,10 +553,10 @@ public class ItemDefinition extends DualNode { this.price = 0; } - @ObfuscatedName("q") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Ljx;Ljx;I)V", - garbageValue = "231591867" + signature = "(Ljo;Ljo;I)V", + garbageValue = "-1279749968" ) @Export("genPlaceholder") void genPlaceholder(ItemDefinition var1, ItemDefinition var2) { @@ -569,10 +578,10 @@ public class ItemDefinition extends DualNode { this.isTradable = false; } - @ObfuscatedName("z") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(II)Lea;", - garbageValue = "-1152870229" + signature = "(IB)Lek;", + garbageValue = "3" ) @Export("getModelData") public final ModelData getModelData(int var1) { @@ -587,11 +596,11 @@ public class ItemDefinition extends DualNode { } if (var2 != -1) { - return AbstractWorldMapData.ItemDefinition_get(var2).getModelData(1); + return KitDefinition.ItemDefinition_get(var2).getModelData(1); } } - ModelData var4 = ModelData.ModelData_get(GrandExchangeOffer.ItemDefinition_modelArchive, this.model, 0); + ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); if (var4 == null) { return null; } else { @@ -615,10 +624,10 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(IB)Lel;", - garbageValue = "-60" + signature = "(II)Lef;", + garbageValue = "1775717489" ) @Export("getModel") public final Model getModel(int var1) { @@ -632,7 +641,7 @@ public class ItemDefinition extends DualNode { } if (var2 != -1) { - return AbstractWorldMapData.ItemDefinition_get(var2).getModel(1); + return KitDefinition.ItemDefinition_get(var2).getModel(1); } } @@ -640,7 +649,7 @@ public class ItemDefinition extends DualNode { if (var5 != null) { return var5; } else { - ModelData var6 = ModelData.ModelData_get(GrandExchangeOffer.ItemDefinition_modelArchive, this.model, 0); + ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); if (var6 == null) { return null; } else { @@ -669,10 +678,10 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("e") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(II)Ljx;", - garbageValue = "-2117466306" + signature = "(II)Ljo;", + garbageValue = "-539705094" ) @Export("getCountObj") public ItemDefinition getCountObj(int var1) { @@ -686,17 +695,17 @@ public class ItemDefinition extends DualNode { } if (var2 != -1) { - return AbstractWorldMapData.ItemDefinition_get(var2); + return KitDefinition.ItemDefinition_get(var2); } } return this; } - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(ZI)Z", - garbageValue = "1659080166" + signature = "(ZB)Z", + garbageValue = "118" ) @Export("hasNoValidModel") public final boolean hasNoValidModel(boolean var1) { @@ -713,15 +722,15 @@ public class ItemDefinition extends DualNode { return true; } else { boolean var5 = true; - if (!GrandExchangeOffer.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { + if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { var5 = false; } - if (var3 != -1 && !GrandExchangeOffer.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { + if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { var5 = false; } - if (var4 != -1 && !GrandExchangeOffer.ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { + if (var4 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { var5 = false; } @@ -729,12 +738,12 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(ZI)Lea;", - garbageValue = "475767309" + signature = "(ZI)Lek;", + garbageValue = "-952045746" ) - public final ModelData method4722(boolean var1) { + public final ModelData method4839(boolean var1) { int var2 = this.maleModel; int var3 = this.maleModel1; int var4 = this.maleModel2; @@ -747,11 +756,11 @@ public class ItemDefinition extends DualNode { if (var2 == -1) { return null; } else { - ModelData var5 = ModelData.ModelData_get(GrandExchangeOffer.ItemDefinition_modelArchive, var2, 0); + ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); if (var3 != -1) { - ModelData var6 = ModelData.ModelData_get(GrandExchangeOffer.ItemDefinition_modelArchive, var3, 0); + ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); if (var4 != -1) { - ModelData var7 = ModelData.ModelData_get(GrandExchangeOffer.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 { @@ -785,12 +794,12 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("h") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(ZI)Z", - garbageValue = "-846973377" + garbageValue = "-209072389" ) - public final boolean method4772(boolean var1) { + public final boolean method4840(boolean var1) { int var2 = this.maleHeadModel; int var3 = this.maleHeadModel2; if (var1) { @@ -802,11 +811,11 @@ public class ItemDefinition extends DualNode { return true; } else { boolean var4 = true; - if (!GrandExchangeOffer.ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { + if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { var4 = false; } - if (var3 != -1 && !GrandExchangeOffer.ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { + if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { var4 = false; } @@ -814,12 +823,12 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("g") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(ZI)Lea;", - garbageValue = "2065185270" + signature = "(ZB)Lek;", + garbageValue = "52" ) - public final ModelData method4724(boolean var1) { + public final ModelData method4841(boolean var1) { int var2 = this.maleHeadModel; int var3 = this.maleHeadModel2; if (var1) { @@ -830,9 +839,9 @@ public class ItemDefinition extends DualNode { if (var2 == -1) { return null; } else { - ModelData var4 = ModelData.ModelData_get(GrandExchangeOffer.ItemDefinition_modelArchive, var2, 0); + ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); if (var3 != -1) { - ModelData var5 = ModelData.ModelData_get(GrandExchangeOffer.ItemDefinition_modelArchive, var3, 0); + ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); ModelData[] var6 = new ModelData[]{var4, var5}; var4 = new ModelData(var6, 2); } @@ -854,49 +863,36 @@ public class ItemDefinition extends DualNode { } } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "1313437382" + signature = "(IIB)I", + garbageValue = "2" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - IterableNodeHashTable var4 = this.params; - int var3; - if (var4 == null) { - var3 = var2; - } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); - if (var5 == null) { - var3 = var2; - } else { - var3 = var5.integer; - } - } - - return var3; + return Language.method3801(this.params, var1, var2); } - @ObfuscatedName("a") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "1527088310" + garbageValue = "2076909967" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return class9.method122(this.params, var1, var2); + return FloorUnderlayDefinition.method4612(this.params, var1, var2); } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "782275365" + garbageValue = "269605013" ) @Export("getShiftClickIndex") public int getShiftClickIndex() { if (this.shiftClickIndex != -1 && this.inventoryActions != null) { if (this.shiftClickIndex >= 0) { - return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * 2022658475 * -2124340989 : -1; + return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * 1852422487 * -1191034265 : -1; } else { return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; } diff --git a/runescape-client/src/main/java/IterableDualNodeQueue.java b/runescape-client/src/main/java/IterableDualNodeQueue.java index 44510d1dc5..e34ab98db2 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("jz") +@ObfuscatedName("jq") @Implements("IterableDualNodeQueue") public class IterableDualNodeQueue implements Iterable { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lge;" + signature = "Lgf;" ) @Export("sentinel") public DualNode sentinel; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lge;" + signature = "Lgf;" ) @Export("head") DualNode head; @@ -26,7 +26,7 @@ public class IterableDualNodeQueue implements Iterable { this.sentinel.nextDual = this.sentinel; } - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("clear") public void clear() { while (this.sentinel.previousDual != this.sentinel) { @@ -35,9 +35,9 @@ public class IterableDualNodeQueue implements Iterable { } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lge;)V" + signature = "(Lgf;)V" ) @Export("add") public void add(DualNode var1) { @@ -51,9 +51,9 @@ public class IterableDualNodeQueue implements Iterable { var1.previousDual.nextDual = var1; } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "()Lge;" + signature = "()Lgf;" ) @Export("removeLast") public DualNode removeLast() { @@ -66,18 +66,18 @@ public class IterableDualNodeQueue implements Iterable { } } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "()Lge;" + signature = "()Lgf;" ) @Export("last") public DualNode last() { return this.previousOrLast((DualNode)null); } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lge;)Lge;" + signature = "(Lgf;)Lgf;" ) @Export("previousOrLast") DualNode previousOrLast(DualNode var1) { @@ -97,9 +97,9 @@ public class IterableDualNodeQueue implements Iterable { } } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "()Lge;" + signature = "()Lgf;" ) @Export("previous") public DualNode previous() { @@ -117,9 +117,9 @@ public class IterableDualNodeQueue implements Iterable { return new IterableDualNodeQueueIterator(this); } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lge;Lge;)V" + signature = "(Lgf;Lgf;)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 a38e57d37c..4add6e0f02 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("jg") +@ObfuscatedName("jl") @Implements("IterableDualNodeQueueIterator") public class IterableDualNodeQueueIterator implements Iterator { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Ljz;" + signature = "Ljq;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lge;" + signature = "Lgf;" ) @Export("head") DualNode head; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lge;" + signature = "Lgf;" ) @Export("last") DualNode last; @ObfuscatedSignature( - signature = "(Ljz;)V" + signature = "(Ljq;)V" ) IterableDualNodeQueueIterator(IterableDualNodeQueue var1) { this.last = null; @@ -41,8 +41,12 @@ public class IterableDualNodeQueueIterator implements Iterator { } public void remove() { - this.last.removeDual(); - this.last = null; + if (this.last == null) { + throw new IllegalStateException(); + } else { + this.last.removeDual(); + this.last = null; + } } public Object next() { diff --git a/runescape-client/src/main/java/IterableNodeDeque.java b/runescape-client/src/main/java/IterableNodeDeque.java index 8f0d00aec6..36bc483374 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("jm") +@ObfuscatedName("jx") @Implements("IterableNodeDeque") public class IterableNodeDeque implements Iterable, Collection { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lga;" + signature = "Lgr;" ) @Export("sentinel") Node sentinel; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lga;" + signature = "Lgr;" ) - Node field3530; + Node field3565; public IterableNodeDeque() { this.sentinel = new Node(); @@ -26,7 +26,7 @@ public class IterableNodeDeque implements Iterable, Collection { this.sentinel.next = this.sentinel; } - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("rsClear") public void rsClear() { while (this.sentinel.previous != this.sentinel) { @@ -35,9 +35,9 @@ public class IterableNodeDeque implements Iterable, Collection { } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lga;)V" + signature = "(Lgr;)V" ) @Export("addFirst") public void addFirst(Node var1) { @@ -51,9 +51,9 @@ public class IterableNodeDeque implements Iterable, Collection { var1.previous.next = var1; } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lga;)V" + signature = "(Lgr;)V" ) @Export("addLast") public void addLast(Node var1) { @@ -67,20 +67,20 @@ public class IterableNodeDeque implements Iterable, Collection { var1.previous.next = var1; } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "()Lga;" + signature = "()Lgr;" ) @Export("last") public Node last() { - return this.method4895((Node)null); + return this.method5064((Node)null); } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lga;)Lga;" + signature = "(Lgr;)Lgr;" ) - Node method4895(Node var1) { + Node method5064(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.field3530 = null; + this.field3565 = null; return null; } else { - this.field3530 = var2.previous; + this.field3565 = var2.previous; return var2; } } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "()Lga;" + signature = "()Lgr;" ) @Export("previous") public Node previous() { - Node var1 = this.field3530; + Node var1 = this.field3565; if (var1 == this.sentinel) { - this.field3530 = null; + this.field3565 = null; return null; } else { - this.field3530 = var1.previous; + this.field3565 = var1.previous; return var1; } } - @ObfuscatedName("z") - int method4927() { + @ObfuscatedName("u") + int method5008() { 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("t") - public boolean method4891() { + @ObfuscatedName("a") + public boolean method5014() { return this.sentinel.previous == this.sentinel; } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "()[Lga;" + signature = "()[Lgr;" ) - Node[] method4888() { - Node[] var1 = new Node[this.method4927()]; + Node[] method5010() { + Node[] var1 = new Node[this.method5008()]; int var2 = 0; for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { @@ -144,43 +144,31 @@ public class IterableNodeDeque implements Iterable, Collection { return var1; } - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lga;)Z" + signature = "(Lgr;)Z" ) - boolean method4883(Node var1) { + boolean method5012(Node var1) { this.addFirst(var1); return true; } - public int hashCode() { - return super.hashCode(); - } - public Iterator iterator() { return new IterableNodeDequeDescendingIterator(this); } - public boolean equals(Object var1) { - return super.equals(var1); - } - - public boolean removeAll(Collection var1) { - throw new RuntimeException(); - } - public int size() { - return this.method4927(); + return this.method5008(); + } + + public boolean isEmpty() { + return this.method5014(); } public boolean contains(Object var1) { throw new RuntimeException(); } - public Object[] toArray() { - return this.method4888(); - } - public Object[] toArray(Object[] var1) { int var2 = 0; @@ -195,7 +183,11 @@ public class IterableNodeDeque implements Iterable, Collection { throw new RuntimeException(); } - public boolean containsAll(Collection var1) { + public boolean addAll(Collection var1) { + throw new RuntimeException(); + } + + public boolean removeAll(Collection var1) { throw new RuntimeException(); } @@ -203,25 +195,33 @@ public class IterableNodeDeque implements Iterable, Collection { throw new RuntimeException(); } + public boolean add(Object var1) { + return this.method5012((Node)var1); + } + + public int hashCode() { + return super.hashCode(); + } + + public boolean containsAll(Collection var1) { + throw new RuntimeException(); + } + public void clear() { this.rsClear(); } - public boolean add(Object var1) { - return this.method4883((Node)var1); + public Object[] toArray() { + return this.method5010(); } - public boolean isEmpty() { - return this.method4891(); + public boolean equals(Object var1) { + return super.equals(var1); } - public boolean addAll(Collection var1) { - throw new RuntimeException(); - } - - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lga;Lga;)V" + signature = "(Lgr;Lgr;)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 cb3f386cf8..0fb4451f7e 100644 --- a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java +++ b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java @@ -7,35 +7,35 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ju") @Implements("IterableNodeDequeDescendingIterator") public class IterableNodeDequeDescendingIterator implements Iterator { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Ljm;" + signature = "Ljx;" ) @Export("deque") IterableNodeDeque deque; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lga;" + signature = "Lgr;" ) - Node field3539; - @ObfuscatedName("k") + Node field3573; + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lga;" + signature = "Lgr;" ) @Export("last") Node last; @ObfuscatedSignature( - signature = "(Ljm;)V" + signature = "(Ljx;)V" ) IterableNodeDequeDescendingIterator(IterableNodeDeque var1) { this.last = null; this.setDeque(var1); } - @ObfuscatedName("q") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Ljm;)V" + signature = "(Ljx;)V" ) @Export("setDeque") void setDeque(IterableNodeDeque var1) { @@ -43,30 +43,30 @@ public class IterableNodeDequeDescendingIterator implements Iterator { this.start(); } - @ObfuscatedName("z") + @ObfuscatedName("n") @Export("start") void start() { - this.field3539 = this.deque != null ? this.deque.sentinel.previous : null; + this.field3573 = this.deque != null ? this.deque.sentinel.previous : null; this.last = null; } + public boolean hasNext() { + return this.deque.sentinel != this.field3573; + } + public Object next() { - Node var1 = this.field3539; + Node var1 = this.field3573; if (var1 == this.deque.sentinel) { var1 = null; - this.field3539 = null; + this.field3573 = null; } else { - this.field3539 = var1.previous; + this.field3573 = var1.previous; } this.last = var1; return var1; } - public boolean hasNext() { - return this.deque.sentinel != this.field3539; - } - 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 5d25156502..1572653f5c 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("lf") @Implements("IterableNodeHashTable") public final class IterableNodeHashTable implements Iterable { - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("size") int size; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "[Lga;" + signature = "[Lgr;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lga;" + signature = "Lgr;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lga;" + signature = "Lgr;" ) @Export("current") Node current; - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("index") int index; @@ -45,9 +45,9 @@ public final class IterableNodeHashTable implements Iterable { } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(J)Lga;" + signature = "(J)Lgr;" ) @Export("get") public Node get(long var1) { @@ -65,9 +65,9 @@ public final class IterableNodeHashTable implements Iterable { return null; } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lga;J)V" + signature = "(Lgr;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("k") + @ObfuscatedName("q") @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("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "()Lga;" + signature = "()Lgr;" ) @Export("first") public Node first() { @@ -113,9 +113,9 @@ public final class IterableNodeHashTable implements Iterable { return this.next(); } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "()Lga;" + signature = "()Lgr;" ) @Export("next") public Node next() { diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java index fbba1f265c..2893a1ceb9 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("lw") +@ObfuscatedName("ln") @Implements("IterableNodeHashTableIterator") public class IterableNodeHashTableIterator implements Iterator { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lln;" + signature = "Llf;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lga;" + signature = "Lgr;" ) @Export("head") Node head; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("index") int index; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lga;" + signature = "Lgr;" ) @Export("last") Node last; @ObfuscatedSignature( - signature = "(Lln;)V" + signature = "(Llf;)V" ) IterableNodeHashTableIterator(IterableNodeHashTable var1) { this.last = null; @@ -38,7 +38,7 @@ public class IterableNodeHashTableIterator implements Iterator { this.start(); } - @ObfuscatedName("q") + @ObfuscatedName("g") @Export("start") void start() { this.head = this.hashTable.buckets[0].previous; @@ -46,6 +46,23 @@ public class IterableNodeHashTableIterator implements Iterator { this.last = null; } + public boolean hasNext() { + if (this.hashTable.buckets[this.index - 1] != this.head) { + return true; + } else { + while (this.index < this.hashTable.size) { + if (this.hashTable.buckets[this.index++].previous != this.hashTable.buckets[this.index - 1]) { + this.head = this.hashTable.buckets[this.index - 1].previous; + return true; + } + + this.head = this.hashTable.buckets[this.index - 1]; + } + + return false; + } + } + public void remove() { if (this.last == null) { throw new IllegalStateException(); @@ -76,21 +93,4 @@ public class IterableNodeHashTableIterator implements Iterator { return var1; } } - - public boolean hasNext() { - if (this.hashTable.buckets[this.index - 1] != this.head) { - return true; - } else { - while (this.index < this.hashTable.size) { - if (this.hashTable.buckets[this.index++].previous != this.hashTable.buckets[this.index - 1]) { - this.head = this.hashTable.buckets[this.index - 1].previous; - return true; - } - - this.head = this.hashTable.buckets[this.index - 1]; - } - - return false; - } - } } diff --git a/runescape-client/src/main/java/JagexCache.java b/runescape-client/src/main/java/JagexCache.java index baccbffca6..4df637ab30 100644 --- a/runescape-client/src/main/java/JagexCache.java +++ b/runescape-client/src/main/java/JagexCache.java @@ -4,30 +4,41 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fh") +@ObfuscatedName("fj") @Implements("JagexCache") public class JagexCache { - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("JagexCache_locationFile") - public static File JagexCache_locationFile; + static File JagexCache_locationFile; @ObfuscatedName("p") + @Export("cacheDir") + static File cacheDir; + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lms;" + signature = "Lmn;" ) @Export("JagexCache_randomDat") public static BufferedFile JagexCache_randomDat; - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lms;" + signature = "Lmn;" ) @Export("JagexCache_dat2File") public static BufferedFile JagexCache_dat2File; - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Lms;" + signature = "Lmn;" ) @Export("JagexCache_idx255File") public static BufferedFile JagexCache_idx255File; + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "[Lmn;" + ) + @Export("JagexCache_idxFiles") + public static BufferedFile[] JagexCache_idxFiles; + @ObfuscatedName("l") + public static String field2077; static { JagexCache_randomDat = null; @@ -35,27 +46,78 @@ public class JagexCache { JagexCache_idx255File = null; } - @ObfuscatedName("m") + @ObfuscatedName("fn") @ObfuscatedSignature( - signature = "(Lkb;I)Ljava/lang/String;", - garbageValue = "677991921" + signature = "(I)V", + garbageValue = "201331676" ) - public static String method3577(Buffer var0) { - String var1; - try { - int var2 = var0.readUShortSmart(); - if (var2 > 32767) { - var2 = 32767; + static final void method3625() { + if (Client.field937 != TileItemPile.Client_plane) { + Client.field937 = TileItemPile.Client_plane; + int var0 = TileItemPile.Client_plane; + int[] var1 = class3.sceneMinimapSprite.pixels; + int var2 = var1.length; + + int var3; + for (var3 = 0; var3 < var2; ++var3) { + var1[var3] = 0; } - byte[] var3 = new byte[var2]; - var0.offset += class219.huffman.decompress(var0.array, var0.offset, var3, 0, var2); - String var4 = WorldMapArea.decodeStringCp1252(var3, 0, var2); - var1 = var4; - } catch (Exception var6) { - var1 = "Cabbage"; + 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) { + UserComparator3.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3); + } + + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { + UserComparator3.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3); + } + + var4 += 4; + } + } + + 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; + class3.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) { + class307.drawObject(var0, var6, var5, var3, var4); + } + + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { + class307.drawObject(var0 + 1, var6, var5, var3, var4); + } + } + } + + Client.mapIconCount = 0; + + for (var5 = 0; var5 < 104; ++var5) { + for (var6 = 0; var6 < 104; ++var6) { + long var7 = UserComparator3.scene.getFloorDecorationTag(TileItemPile.Client_plane, var5, var6); + if (0L != var7) { + int var9 = Language.Entity_unpackID(var7); + int var10 = Canvas.getObjectDefinition(var9).mapIconId; + if (var10 >= 0) { + Client.mapIcons[Client.mapIconCount] = Client.WorldMapElement_get(var10).getSpriteBool(false); + Client.mapIconXs[Client.mapIconCount] = var5; + Client.mapIconYs[Client.mapIconCount] = var6; + ++Client.mapIconCount; + } + } + } + } + + ArchiveLoader.rasterProvider.apply(); } - return var1; } } diff --git a/runescape-client/src/main/java/KeyHandler.java b/runescape-client/src/main/java/KeyHandler.java index 088268ec68..8fdd245d9d 100644 --- a/runescape-client/src/main/java/KeyHandler.java +++ b/runescape-client/src/main/java/KeyHandler.java @@ -2,90 +2,102 @@ import java.awt.event.FocusEvent; import java.awt.event.FocusListener; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; -import java.io.File; -import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bo") +@ObfuscatedName("bg") @Implements("KeyHandler") public final class KeyHandler implements KeyListener, FocusListener { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lbo;" + signature = "Lbg;" ) @Export("KeyHandler_instance") - public static KeyHandler KeyHandler_instance; - @ObfuscatedName("cg") + static KeyHandler KeyHandler_instance; + @ObfuscatedName("h") + @ObfuscatedSignature( + signature = "Lhd;" + ) + static Widget field407; + @ObfuscatedName("ck") @Export("KeyHandler_pressedKeys") public static boolean[] KeyHandler_pressedKeys; - @ObfuscatedName("cn") - public static int[] field427; @ObfuscatedName("ci") + static int[] field409; + @ObfuscatedName("cu") @ObfuscatedGetter( - intValue = 2127581229 + intValue = 1257927323 ) - public static int field439; - @ObfuscatedName("cz") + static int field414; + @ObfuscatedName("cq") @ObfuscatedGetter( - intValue = -462249185 + intValue = 535895155 ) - public static int field429; - @ObfuscatedName("cb") - static char[] field424; - @ObfuscatedName("cy") - static int[] field414; - @ObfuscatedName("ct") - public static int[] field432; + static int field411; + @ObfuscatedName("co") + static char[] field415; + @ObfuscatedName("ca") + static int[] field413; + @ObfuscatedName("cm") + public static int[] field429; @ObfuscatedName("cf") @ObfuscatedGetter( - intValue = 1915642037 + intValue = 244616371 ) - public static int field417; - @ObfuscatedName("ca") + public static int field425; + @ObfuscatedName("ct") @ObfuscatedGetter( - intValue = 664645249 + intValue = -564210989 ) - public static int field434; - @ObfuscatedName("cj") + static int field416; + @ObfuscatedName("cd") @ObfuscatedGetter( - intValue = -1397351623 + intValue = 1367616829 ) - public static int field433; - @ObfuscatedName("cp") + static int field417; + @ObfuscatedName("cy") @ObfuscatedGetter( - intValue = 1677444807 + intValue = -1700039391 ) - public static int field436; - @ObfuscatedName("ck") + static int field421; + @ObfuscatedName("cx") @ObfuscatedGetter( - intValue = 301071653 + intValue = 448116129 ) @Export("KeyHandler_idleCycles") public static volatile int KeyHandler_idleCycles; - @ObfuscatedName("ce") + @ObfuscatedName("cs") @Export("KeyHandler_keyCodes") static int[] KeyHandler_keyCodes; - @ObfuscatedName("gv") - @Export("regionMapArchiveIds") - static int[] regionMapArchiveIds; + @ObfuscatedName("gw") + @ObfuscatedSignature( + signature = "[Llz;" + ) + @Export("headIconPrayerSprites") + static Sprite[] headIconPrayerSprites; + @ObfuscatedName("ju") + @ObfuscatedSignature( + signature = "Lhd;" + ) + @Export("dragInventoryWidget") + static Widget dragInventoryWidget; static { KeyHandler_instance = new KeyHandler(); KeyHandler_pressedKeys = new boolean[112]; - field427 = new int[128]; - field439 = 0; - field429 = 0; - field424 = new char[128]; - field414 = new int[128]; - field432 = new int[128]; + field409 = new int[128]; + field414 = 0; + field411 = 0; + field415 = new char[128]; + field413 = new int[128]; + field429 = new int[128]; + field425 = 0; + field416 = 0; field417 = 0; - field434 = 0; - field433 = 0; - field436 = 0; + field421 = 0; KeyHandler_idleCycles = 0; KeyHandler_keyCodes = new int[]{-1, -1, -1, -1, -1, -1, -1, -1, 85, 80, 84, -1, 91, -1, -1, -1, 81, 82, 86, -1, -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, -1, -1, 83, 104, 105, 103, 102, 96, 98, 97, 99, -1, -1, -1, -1, -1, -1, -1, 25, 16, 17, 18, 19, 20, 21, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, 48, 68, 66, 50, 34, 51, 52, 53, 39, 54, 55, 56, 70, 69, 40, 41, 32, 35, 49, 36, 38, 67, 33, 65, 37, 64, -1, -1, -1, -1, -1, 228, 231, 227, 233, 224, 219, 225, 230, 226, 232, 89, 87, -1, 88, 229, 90, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, -1, -1, -1, 101, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 100, -1, 87, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; } @@ -102,11 +114,11 @@ public final class KeyHandler implements KeyListener, FocusListener { var2 = -1; } - if (field429 >= 0 && var2 >= 0) { - field427[field429] = ~var2; - field429 = field429 + 1 & 127; - if (field439 == field429) { - field429 = -1; + if (field411 >= 0 && var2 >= 0) { + field409[field411] = ~var2; + field411 = field411 + 1 & 127; + if (field414 == field411) { + field411 = -1; } } } @@ -114,6 +126,29 @@ public final class KeyHandler implements KeyListener, FocusListener { var1.consume(); } + public final void keyTyped(KeyEvent var1) { + if (KeyHandler_instance != null) { + char var2 = var1.getKeyChar(); + if (var2 != 0 && var2 != '\uffff' && GrandExchangeEvents.method148(var2)) { + int var3 = field417 + 1 & 127; + if (var3 != field416) { + field413[field417] = -1; + field415[field417] = var2; + field417 = var3; + } + } + } + + var1.consume(); + } + + public final synchronized void focusLost(FocusEvent var1) { + if (KeyHandler_instance != null) { + field411 = -1; + } + + } + public final void focusGained(FocusEvent var1) { } @@ -129,21 +164,21 @@ public final class KeyHandler implements KeyListener, FocusListener { var2 = -1; } - if (field429 >= 0 && var2 >= 0) { - field427[field429] = var2; - field429 = field429 + 1 & 127; - if (field429 == field439) { - field429 = -1; + if (field411 >= 0 && var2 >= 0) { + field409[field411] = var2; + field411 = field411 + 1 & 127; + if (field411 == field414) { + field411 = -1; } } int var3; if (var2 >= 0) { - var3 = field433 + 1 & 127; - if (var3 != field434) { - field414[field433] = var2; - field424[field433] = 0; - field433 = var3; + var3 = field417 + 1 & 127; + if (var3 != field416) { + field413[field417] = var2; + field415[field417] = 0; + field417 = var3; } } @@ -155,118 +190,475 @@ public final class KeyHandler implements KeyListener, FocusListener { } - public final void keyTyped(KeyEvent var1) { - if (KeyHandler_instance != null) { - char var2 = var1.getKeyChar(); - if (var2 != 0 && var2 != '\uffff') { - boolean var3; - if (var2 > 0 && var2 < 128 || var2 >= 160 && var2 <= 255) { - var3 = true; - } else { - label59: { - if (var2 != 0) { - char[] var7 = class297.cp1252AsciiExtension; + @ObfuscatedName("fz") + @ObfuscatedSignature( + signature = "(IIIIB)V", + garbageValue = "98" + ) + @Export("drawEntities") + static final void drawEntities(int var0, int var1, int var2, int var3) { + ++Client.viewportDrawCount; + Canvas.method925(); + UserComparator6.method3564(); + WorldMapScaleHandler.method812(); + WorldMapIcon_0.addNpcsToScene(true); + ScriptFrame.method1201(); + WorldMapIcon_0.addNpcsToScene(false); - for (int var5 = 0; var5 < var7.length; ++var5) { - char var6 = var7[var5]; - if (var6 == var2) { - var3 = true; - break label59; + int var6; + for (Projectile var4 = (Projectile)Client.projectiles.last(); var4 != null; var4 = (Projectile)Client.projectiles.previous()) { + if (var4.plane == TileItemPile.Client_plane && Client.cycle <= var4.cycleEnd) { + if (Client.cycle >= var4.cycleStart) { + if (var4.targetIndex > 0) { + NPC var29 = Client.npcs[var4.targetIndex - 1]; + if (var29 != null && var29.x >= 0 && var29.x < 13312 && var29.y >= 0 && var29.y < 13312) { + var4.setDestination(var29.x, var29.y, Language.getTileHeight(var29.x, var29.y, var4.plane) - var4.endHeight, Client.cycle); + } + } + + if (var4.targetIndex < 0) { + var6 = -var4.targetIndex - 1; + Player var34; + if (var6 == Client.localPlayerIndex) { + var34 = class60.localPlayer; + } else { + var34 = Client.players[var6]; + } + + if (var34 != null && var34.x >= 0 && var34.x < 13312 && var34.y >= 0 && var34.y < 13312) { + var4.setDestination(var34.x, var34.y, Language.getTileHeight(var34.x, var34.y, var4.plane) - var4.endHeight, Client.cycle); + } + } + + var4.advance(Client.field747); + UserComparator3.scene.drawEntity(TileItemPile.Client_plane, (int)var4.x, (int)var4.y, (int)var4.z, 60, var4, var4.yaw, -1L, false); + } + } else { + var4.remove(); + } + } + + for (GraphicsObject var32 = (GraphicsObject)Client.graphicsObjects.last(); var32 != null; var32 = (GraphicsObject)Client.graphicsObjects.previous()) { + if (var32.plane == TileItemPile.Client_plane && !var32.isFinished) { + if (Client.cycle >= var32.cycleStart) { + var32.advance(Client.field747); + if (var32.isFinished) { + var32.remove(); + } else { + UserComparator3.scene.drawEntity(var32.plane, var32.x, var32.y, var32.height, 60, var32, 0, -1L, false); + } + } + } else { + var32.remove(); + } + } + + WorldMapID.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 var11; + int var28; + if (!Client.isCameraLocked) { + var28 = Client.camAngleX; + if (Client.field881 / 256 > var28) { + var28 = Client.field881 / 256; + } + + if (Client.field918[4] && Client.field775[4] + 128 > var28) { + var28 = Client.field775[4] + 128; + } + + var5 = Client.camAngleY & 2047; + var6 = class225.oculusOrbFocalPointX; + var7 = WorldMapDecoration.field234; + var8 = HealthBarDefinition.oculusOrbFocalPointY; + var11 = var28 * 3 + 600; + GrandExchangeOfferAgeComparator.method224(var6, var7, var8, var28, var5, var11, var3); + } + + int var9; + int var10; + int var12; + int var13; + int var14; + if (!Client.isCameraLocked) { + if (NetSocket.clientPreferences.roofsHidden) { + var5 = TileItemPile.Client_plane; + } else { + label668: { + var6 = 3; + if (TilePaint.cameraPitch < 310) { + if (Client.oculusOrbState == 1) { + var7 = class225.oculusOrbFocalPointX >> 7; + var8 = HealthBarDefinition.oculusOrbFocalPointY >> 7; + } else { + var7 = class60.localPlayer.x >> 7; + var8 = class60.localPlayer.y >> 7; + } + + var9 = MouseHandler.cameraX >> 7; + var10 = ObjectSound.cameraZ >> 7; + if (var9 < 0 || var10 < 0 || var9 >= 104 || var10 >= 104) { + var5 = TileItemPile.Client_plane; + break label668; + } + + if (var7 < 0 || var8 < 0 || var7 >= 104 || var8 >= 104) { + var5 = TileItemPile.Client_plane; + break label668; + } + + if ((Tiles.Tiles_renderFlags[TileItemPile.Client_plane][var9][var10] & 4) != 0) { + var6 = TileItemPile.Client_plane; + } + + if (var7 > var9) { + var11 = var7 - var9; + } else { + var11 = var9 - var7; + } + + if (var8 > var10) { + var12 = var8 - var10; + } else { + var12 = var10 - var8; + } + + if (var11 > var12) { + var13 = var12 * 65536 / var11; + var14 = 32768; + + while (var9 != var7) { + if (var9 < var7) { + ++var9; + } else if (var9 > var7) { + --var9; + } + + if ((Tiles.Tiles_renderFlags[TileItemPile.Client_plane][var9][var10] & 4) != 0) { + var6 = TileItemPile.Client_plane; + } + + var14 += var13; + if (var14 >= 65536) { + var14 -= 65536; + if (var10 < var8) { + ++var10; + } else if (var10 > var8) { + --var10; + } + + if ((Tiles.Tiles_renderFlags[TileItemPile.Client_plane][var9][var10] & 4) != 0) { + var6 = TileItemPile.Client_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[TileItemPile.Client_plane][var9][var10] & 4) != 0) { + var6 = TileItemPile.Client_plane; + } + + var14 += var13; + if (var14 >= 65536) { + var14 -= 65536; + if (var9 < var7) { + ++var9; + } else if (var9 > var7) { + --var9; + } + + if ((Tiles.Tiles_renderFlags[TileItemPile.Client_plane][var9][var10] & 4) != 0) { + var6 = TileItemPile.Client_plane; + } } } } + } - var3 = false; + if (class60.localPlayer.x >= 0 && class60.localPlayer.y >= 0 && class60.localPlayer.x < 13312 && class60.localPlayer.y < 13312) { + if ((Tiles.Tiles_renderFlags[TileItemPile.Client_plane][class60.localPlayer.x >> 7][class60.localPlayer.y >> 7] & 4) != 0) { + var6 = TileItemPile.Client_plane; + } + + var5 = var6; + } else { + var5 = TileItemPile.Client_plane; } } + } - if (var3) { - int var4 = field433 + 1 & 127; - if (var4 != field434) { - field414[field433] = -1; - field424[field433] = var2; - field433 = var4; + var28 = var5; + } else { + var28 = AbstractArchive.method4411(); + } + + var5 = MouseHandler.cameraX; + var6 = WorldMapSection3.cameraY; + var7 = ObjectSound.cameraZ; + var8 = TilePaint.cameraPitch; + var9 = Canvas.cameraYaw; + + for (var10 = 0; var10 < 5; ++var10) { + if (Client.field918[var10]) { + var11 = (int)(Math.random() * (double)(Client.field919[var10] * 2 + 1) - (double)Client.field919[var10] + Math.sin((double)Client.field922[var10] * ((double)Client.field778[var10] / 100.0D)) * (double)Client.field775[var10]); + if (var10 == 0) { + MouseHandler.cameraX += var11; + } + + if (var10 == 1) { + WorldMapSection3.cameraY += var11; + } + + if (var10 == 2) { + ObjectSound.cameraZ += var11; + } + + if (var10 == 3) { + Canvas.cameraYaw = var11 + Canvas.cameraYaw & 2047; + } + + if (var10 == 4) { + TilePaint.cameraPitch += var11; + if (TilePaint.cameraPitch < 128) { + TilePaint.cameraPitch = 128; + } + + if (TilePaint.cameraPitch > 383) { + TilePaint.cameraPitch = 383; } } } } - var1.consume(); - } - - public final synchronized void focusLost(FocusEvent var1) { - if (KeyHandler_instance != null) { - field429 = -1; + var10 = MouseHandler.MouseHandler_x; + var11 = MouseHandler.MouseHandler_y; + if (MouseHandler.MouseHandler_lastButton != 0) { + var10 = MouseHandler.MouseHandler_lastPressedX; + var11 = MouseHandler.MouseHandler_lastPressedY; } - } + if (var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) { + var12 = var10 - var0; + var13 = var11 - var1; + ViewportMouse.ViewportMouse_x = var12; + ViewportMouse.ViewportMouse_y = var13; + ViewportMouse.ViewportMouse_isInViewport = true; + ViewportMouse.ViewportMouse_entityCount = 0; + ViewportMouse.ViewportMouse_false0 = false; + } else { + WorldMapSection0.method299(); + } - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(B)[Lgv;", - garbageValue = "34" - ) - @Export("ServerPacket_values") - public static ServerPacket[] ServerPacket_values() { - return new ServerPacket[]{ServerPacket.field2131, ServerPacket.field2119, ServerPacket.field2149, ServerPacket.field2121, ServerPacket.field2122, ServerPacket.field2123, ServerPacket.field2124, ServerPacket.field2169, ServerPacket.field2126, ServerPacket.field2127, ServerPacket.field2197, ServerPacket.field2186, ServerPacket.field2128, ServerPacket.field2132, ServerPacket.field2125, ServerPacket.field2133, ServerPacket.field2134, ServerPacket.field2139, ServerPacket.field2204, ServerPacket.field2137, ServerPacket.field2172, ServerPacket.field2163, ServerPacket.field2140, ServerPacket.field2118, ServerPacket.field2142, ServerPacket.field2143, ServerPacket.field2144, ServerPacket.field2145, ServerPacket.field2151, ServerPacket.field2147, ServerPacket.field2148, ServerPacket.field2136, ServerPacket.field2150, ServerPacket.field2141, ServerPacket.field2129, ServerPacket.field2153, ServerPacket.field2154, ServerPacket.field2155, ServerPacket.field2159, ServerPacket.field2157, ServerPacket.field2158, ServerPacket.field2178, ServerPacket.field2160, ServerPacket.field2161, ServerPacket.field2192, ServerPacket.field2168, ServerPacket.field2164, ServerPacket.field2165, ServerPacket.field2166, ServerPacket.field2167, ServerPacket.field2203, ServerPacket.field2162, ServerPacket.field2170, ServerPacket.field2171, ServerPacket.field2138, ServerPacket.field2173, ServerPacket.field2179, ServerPacket.field2175, ServerPacket.field2176, ServerPacket.field2194, ServerPacket.field2146, ServerPacket.field2152, ServerPacket.field2180, ServerPacket.field2181, ServerPacket.field2182, ServerPacket.field2183, ServerPacket.field2184, ServerPacket.field2120, ServerPacket.field2185, ServerPacket.field2187, ServerPacket.field2188, ServerPacket.field2177, ServerPacket.field2190, ServerPacket.field2191, ServerPacket.field2189, ServerPacket.field2193, ServerPacket.field2130, ServerPacket.field2195, ServerPacket.field2196, ServerPacket.field2174, ServerPacket.field2198, ServerPacket.field2199, ServerPacket.field2200, ServerPacket.field2201, ServerPacket.field2202, ServerPacket.field2156}; - } + Timer.playPcmPlayers(); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); + Timer.playPcmPlayers(); + var12 = Rasterizer3D.Rasterizer3D_zoom; + Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; + UserComparator3.scene.draw(MouseHandler.cameraX, WorldMapSection3.cameraY, ObjectSound.cameraZ, TilePaint.cameraPitch, Canvas.cameraYaw, var28); + Rasterizer3D.Rasterizer3D_zoom = var12; + Timer.playPcmPlayers(); + UserComparator3.scene.clearTempGameObjects(); + Client.overheadTextCount = 0; + boolean var33 = false; + var14 = -1; + int var15 = -1; + int var16 = Players.Players_count; + int[] var17 = Players.Players_indices; - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(Liy;I)V", - garbageValue = "-689678627" - ) - public static void method940(AbstractArchive var0) { - StructDefinition.StructDefinition_archive = var0; - } + int var18; + for (var18 = 0; var18 < var16 + Client.npcCount; ++var18) { + Object var19; + if (var18 < var16) { + var19 = Client.players[var17[var18]]; + if (var17[var18] == Client.combatTargetPlayerIndex) { + var33 = true; + var14 = var18; + continue; + } - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;ZI)Lmb;", - garbageValue = "1960314155" - ) - @Export("getPreferencesFile") - public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { - File var3 = new File(class92.cacheDir, "preferences" + var0 + ".dat"); - if (var3.exists()) { - try { - AccessFile var10 = new AccessFile(var3, "rw", 10000L); - return var10; - } catch (IOException var9) { + if (var19 == class60.localPlayer) { + var15 = var18; + continue; + } + } else { + var19 = Client.npcs[Client.npcIndices[var18 - var16]]; + } + + Timer.drawActor2d((Actor)var19, var18, var0, var1, var2, var3); + } + + if (Client.renderSelf && var15 != -1) { + Timer.drawActor2d(class60.localPlayer, var15, var0, var1, var2, var3); + } + + if (var33) { + Timer.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var14, var0, var1, var2, var3); + } + + for (var18 = 0; var18 < Client.overheadTextCount; ++var18) { + int var30 = Client.overheadTextXs[var18]; + int var20 = Client.overheadTextYs[var18]; + int var21 = Client.overheadTextXOffsets[var18]; + int var22 = Client.overheadTextAscents[var18]; + boolean var23 = true; + + while (var23) { + var23 = false; + + for (int var24 = 0; var24 < var18; ++var24) { + if (var20 + 2 > Client.overheadTextYs[var24] - Client.overheadTextAscents[var24] && var20 - var22 < Client.overheadTextYs[var24] + 2 && var30 - var21 < Client.overheadTextXOffsets[var24] + Client.overheadTextXs[var24] && var30 + var21 > Client.overheadTextXs[var24] - Client.overheadTextXOffsets[var24] && Client.overheadTextYs[var24] - Client.overheadTextAscents[var24] < var20) { + var20 = Client.overheadTextYs[var24] - Client.overheadTextAscents[var24]; + var23 = true; + } + } + } + + Client.viewportTempX = Client.overheadTextXs[var18]; + Client.viewportTempY = Client.overheadTextYs[var18] = var20; + String var31 = Client.overheadText[var18]; + if (Client.chatEffects == 0) { + int var25 = 16776960; + if (Client.overheadTextColors[var18] < 6) { + var25 = Client.field888[Client.overheadTextColors[var18]]; + } + + if (Client.overheadTextColors[var18] == 6) { + var25 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; + } + + if (Client.overheadTextColors[var18] == 7) { + var25 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; + } + + if (Client.overheadTextColors[var18] == 8) { + var25 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016; + } + + int var26; + if (Client.overheadTextColors[var18] == 9) { + var26 = 150 - Client.overheadTextCyclesRemaining[var18]; + if (var26 < 50) { + var25 = var26 * 1280 + 16711680; + } else if (var26 < 100) { + var25 = 16776960 - (var26 - 50) * 327680; + } else if (var26 < 150) { + var25 = (var26 - 100) * 5 + 65280; + } + } + + if (Client.overheadTextColors[var18] == 10) { + var26 = 150 - Client.overheadTextCyclesRemaining[var18]; + if (var26 < 50) { + var25 = var26 * 5 + 16711680; + } else if (var26 < 100) { + var25 = 16711935 - (var26 - 50) * 327680; + } else if (var26 < 150) { + var25 = (var26 - 100) * 327680 + 255 - (var26 - 100) * 5; + } + } + + if (Client.overheadTextColors[var18] == 11) { + var26 = 150 - Client.overheadTextCyclesRemaining[var18]; + if (var26 < 50) { + var25 = 16777215 - var26 * 327685; + } else if (var26 < 100) { + var25 = (var26 - 50) * 327685 + 65280; + } else if (var26 < 150) { + var25 = 16777215 - (var26 - 100) * 327680; + } + } + + if (Client.overheadTextEffects[var18] == 0) { + GrandExchangeOfferNameComparator.fontBold12.drawCentered(var31, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0); + } + + if (Client.overheadTextEffects[var18] == 1) { + GrandExchangeOfferNameComparator.fontBold12.drawCenteredWave(var31, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var18] == 2) { + GrandExchangeOfferNameComparator.fontBold12.drawCenteredWave2(var31, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var18] == 3) { + GrandExchangeOfferNameComparator.fontBold12.drawCenteredShake(var31, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var18]); + } + + if (Client.overheadTextEffects[var18] == 4) { + var26 = (150 - Client.overheadTextCyclesRemaining[var18]) * (GrandExchangeOfferNameComparator.fontBold12.stringWidth(var31) + 100) / 150; + Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); + GrandExchangeOfferNameComparator.fontBold12.draw(var31, var0 + Client.viewportTempX + 50 - var26, Client.viewportTempY + var1, var25, 0); + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); + } + + if (Client.overheadTextEffects[var18] == 5) { + var26 = 150 - Client.overheadTextCyclesRemaining[var18]; + int var27 = 0; + if (var26 < 25) { + var27 = var26 - 25; + } else if (var26 > 125) { + var27 = var26 - 125; + } + + Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - GrandExchangeOfferNameComparator.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); + GrandExchangeOfferNameComparator.fontBold12.drawCentered(var31, var0 + Client.viewportTempX, var27 + Client.viewportTempY + var1, var25, 0); + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); + } + } else { + GrandExchangeOfferNameComparator.fontBold12.drawCentered(var31, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); } } - String var4 = ""; - if (class8.cacheGamebuild == 33) { - var4 = "_rc"; - } else if (class8.cacheGamebuild == 34) { - var4 = "_wip"; - } - - File var5 = new File(AbstractWorldMapData.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); - AccessFile var6; - if (!var2 && var5.exists()) { - try { - var6 = new AccessFile(var5, "rw", 10000L); - return var6; - } catch (IOException var8) { + if (Client.hintArrowType == 2) { + HealthBar.worldToScreen((Client.hintArrowX - class182.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - SecureRandomFuture.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); + if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { + SoundSystem.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); } } - try { - var6 = new AccessFile(var3, "rw", 10000L); - return var6; - } catch (IOException var7) { - throw new RuntimeException(); + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field747); + UrlRequest.method3432(var0, var1, var2, var3); + MouseHandler.cameraX = var5; + WorldMapSection3.cameraY = var6; + ObjectSound.cameraZ = var7; + TilePaint.cameraPitch = var8; + Canvas.cameraYaw = var9; + if (Client.isLoading && ModeWhere.method3809(true, false) == 0) { + Client.isLoading = false; } + + if (Client.isLoading) { + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); + ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait.", false); + } + } - @ObfuscatedName("gr") + @ObfuscatedName("ki") @ObfuscatedSignature( - signature = "(Lcw;IB)V", - garbageValue = "3" + signature = "(Lhd;I)I", + garbageValue = "-1756984804" ) - static final void method939(Actor var0, int var1) { - WorldMapSection0.worldToScreen(var0.x, var0.y, var1); + @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/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index 959916d936..6459f78394 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -4,63 +4,61 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ib") +@ObfuscatedName("ir") @Implements("KitDefinition") public class KitDefinition extends DualNode { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Liy;" + signature = "Lic;" ) @Export("KitDefinition_archive") static AbstractArchive KitDefinition_archive; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Liy;" + signature = "Lic;" ) @Export("KitDefinition_modelsArchive") static AbstractArchive KitDefinition_modelsArchive; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1436575363 + intValue = -413504447 ) @Export("KitDefinition_fileCount") public static int KitDefinition_fileCount; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Leg;" + signature = "Lec;" ) @Export("KitDefinition_cached") static EvictingDualNodeHashTable KitDefinition_cached; - @ObfuscatedName("bq") + @ObfuscatedName("i") + @Export("BZip2Decompressor_block") + static int[] BZip2Decompressor_block; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -724929863 - ) - static int field3271; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -1932693097 + intValue = 1201846847 ) @Export("bodypartID") public int bodypartID; - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("models2") int[] models2; - @ObfuscatedName("q") + @ObfuscatedName("n") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("z") + @ObfuscatedName("u") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("s") + @ObfuscatedName("w") @Export("models") int[] models; - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("nonSelectable") public boolean nonSelectable; @@ -74,10 +72,10 @@ public class KitDefinition extends DualNode { this.nonSelectable = false; } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkb;I)V", - garbageValue = "1401612766" + signature = "(Lkn;I)V", + garbageValue = "856121726" ) @Export("decode") void decode(Buffer var1) { @@ -91,10 +89,10 @@ public class KitDefinition extends DualNode { } } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkb;IB)V", - garbageValue = "53" + signature = "(Lkn;IB)V", + garbageValue = "-72" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -137,10 +135,10 @@ public class KitDefinition extends DualNode { } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "1" + signature = "(I)Z", + garbageValue = "1376663595" ) @Export("ready") public boolean ready() { @@ -159,10 +157,10 @@ public class KitDefinition extends DualNode { } } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)Lea;", - garbageValue = "-898584179" + signature = "(I)Lek;", + garbageValue = "-730489630" ) @Export("getModelData") public ModelData getModelData() { @@ -199,12 +197,12 @@ public class KitDefinition extends DualNode { } } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "1856166332" + garbageValue = "1413999109" ) - public boolean method4523() { + public boolean method4636() { boolean var1 = true; for (int var2 = 0; var2 < 5; ++var2) { @@ -216,10 +214,10 @@ public class KitDefinition extends DualNode { return var1; } - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(I)Lea;", - garbageValue = "2142658297" + signature = "(B)Lek;", + garbageValue = "-127" ) @Export("getKitDefinitionModels") public ModelData getKitDefinitionModels() { @@ -249,17 +247,152 @@ public class KitDefinition extends DualNode { return var5; } - @ObfuscatedName("jp") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lhe;B)Lhe;", - garbageValue = "-1" + signature = "(II)Ljo;", + garbageValue = "1649830223" ) - static Widget method4538(Widget var0) { - Widget var1 = GrandExchangeOfferTotalQuantityComparator.method181(var0); - if (var1 == null) { - var1 = var0.parent; - } + @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 = VarcInt.ItemDefinition_archive.takeFile(10, var0); + var1 = new ItemDefinition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); + } - return var1; + 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 (!SoundCache.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 = VarbitDefinition.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("q") + @ObfuscatedSignature( + signature = "(CB)C", + garbageValue = "0" + ) + static char method4650(char var0) { + switch(var0) { + case ' ': + case '-': + case '_': + case ' ': + return '_'; + case '#': + case '[': + case ']': + return var0; + case 'À': + case 'Á': + case 'Â': + case 'Ã': + case 'Ä': + case 'à': + case 'á': + case 'â': + case 'ã': + case 'ä': + return 'a'; + case 'Ç': + case 'ç': + return 'c'; + case 'È': + case 'É': + case 'Ê': + case 'Ë': + case 'è': + case 'é': + case 'ê': + case 'ë': + return 'e'; + case 'Í': + case 'Î': + case 'Ï': + case 'í': + case 'î': + case 'ï': + return 'i'; + case 'Ñ': + case 'ñ': + return 'n'; + case 'Ò': + case 'Ó': + case 'Ô': + case 'Õ': + case 'Ö': + case 'ò': + case 'ó': + case 'ô': + case 'õ': + case 'ö': + return 'o'; + case 'Ù': + case 'Ú': + case 'Û': + case 'Ü': + case 'ù': + case 'ú': + case 'û': + case 'ü': + return 'u'; + case 'ß': + return 'b'; + case 'ÿ': + case 'Ÿ': + return 'y'; + default: + return Character.toLowerCase(var0); + } + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1137606481" + ) + public static void method4624() { + VarbitDefinition.VarbitDefinition_cached.clear(); } } diff --git a/runescape-client/src/main/java/Language.java b/runescape-client/src/main/java/Language.java index b99515f580..333012d4ca 100644 --- a/runescape-client/src/main/java/Language.java +++ b/runescape-client/src/main/java/Language.java @@ -1,4 +1,3 @@ -import java.net.URL; import java.util.Locale; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; @@ -6,83 +5,78 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gl") +@ObfuscatedName("gz") @Implements("Language") public class Language implements Enumerated { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lgl;" + signature = "Lgz;" ) @Export("Language_EN") public static final Language Language_EN; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgl;" + signature = "Lgz;" ) @Export("Language_DE") static final Language Language_DE; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lgl;" + signature = "Lgz;" ) @Export("Language_FR") public static final Language Language_FR; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lgl;" + signature = "Lgz;" ) @Export("Language_PT") static final Language Language_PT; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lgl;" + signature = "Lgz;" ) @Export("Language_NL") static final Language Language_NL; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lgl;" + signature = "Lgz;" ) @Export("Language_ES") public static final Language Language_ES; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lgl;" + signature = "Lgz;" ) @Export("Language_ES_MX") static final Language Language_ES_MX; - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "[Lgl;" + signature = "[Lgz;" ) @Export("Language_valuesOrdered") static final Language[] Language_valuesOrdered; - @ObfuscatedName("lr") - @ObfuscatedSignature( - signature = "Lhe;" - ) - static Widget field2368; - @ObfuscatedName("z") - final String field2364; - @ObfuscatedName("t") + @ObfuscatedName("u") + final String field2396; + @ObfuscatedName("a") @Export("language") final String language; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 2085500911 + intValue = -1862658961 ) @Export("id") final int id; static { - Language_EN = new Language("EN", "en", "English", ModeWhere.field2375, 0, "GB"); - Language_DE = new Language("DE", "de", "German", ModeWhere.field2375, 1, "DE"); - Language_FR = new Language("FR", "fr", "French", ModeWhere.field2375, 2, "FR"); - Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field2375, 3, "BR"); - Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field2376, 4, "NL"); - Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field2376, 5, "ES"); - Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field2375, 6, "MX"); - Language[] var0 = method3733(); + Language_EN = new Language("EN", "en", "English", ModeWhere.field2412, 0, "GB"); + Language_DE = new Language("DE", "de", "German", ModeWhere.field2412, 1, "DE"); + Language_FR = new Language("FR", "fr", "French", ModeWhere.field2412, 2, "FR"); + Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field2412, 3, "BR"); + Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field2405, 4, "NL"); + Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field2405, 5, "ES"); + Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field2412, 6, "MX"); + Language[] var0 = method3783(); Language_valuesOrdered = new Language[var0.length]; Language[] var1 = var0; @@ -98,10 +92,10 @@ public class Language implements Enumerated { } @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lgd;ILjava/lang/String;)V" + signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lge;ILjava/lang/String;)V" ) Language(String var1, String var2, String var3, ModeWhere var4, int var5, String var6) { - this.field2364 = var1; + this.field2396 = var1; this.language = var2; this.id = var5; if (var6 != null) { @@ -114,151 +108,359 @@ public class Language implements Enumerated { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)Ljava/lang/String;", - garbageValue = "-1528954067" - ) - @Export("getLanguage") - String getLanguage() { - return this.language; - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "56" + signature = "(I)I", + garbageValue = "-995092303" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "(B)Ljava/lang/String;", + garbageValue = "-15" + ) + @Export("getLanguage") + String getLanguage() { + return this.language; + } + public String toString() { return this.getLanguage().toLowerCase(Locale.ENGLISH); } - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "75" + signature = "(Llf;III)I", + garbageValue = "924911925" ) - static void method3744() { - 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; + static int method3801(IterableNodeHashTable var0, int var1, int var2) { + if (var0 == null) { + return var2; } 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; - } - - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(I)[Lii;", - garbageValue = "806638344" - ) - static GameBuild[] method3751() { - return new GameBuild[]{GameBuild.BUILDLIVE, GameBuild.WIP, GameBuild.RC, GameBuild.LIVE}; - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(B)[Lgl;", - garbageValue = "-1" - ) - static Language[] method3733() { - return new Language[]{Language_FR, Language_EN, Language_ES, Language_NL, Language_PT, Language_DE, Language_ES_MX}; - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-1084912738" - ) - @Export("loadWorlds") - static boolean loadWorlds() { - try { - if (LoginPacket.World_request == null) { - LoginPacket.World_request = WorldMapLabel.urlRequester.request(new URL(ModeWhere.worldListURL)); - } else if (LoginPacket.World_request.isDone()) { - byte[] var0 = LoginPacket.World_request.getResponse(); - Buffer var1 = new Buffer(var0); - var1.readInt(); - World.World_count = var1.readUnsignedShort(); - UserComparator2.World_worlds = new World[World.World_count]; - - World var3; - for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { - var3 = UserComparator2.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(); - } - - UserComparator9.sortWorlds(UserComparator2.World_worlds, 0, UserComparator2.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); - LoginPacket.World_request = null; - return true; - } - } catch (Exception var4) { - var4.printStackTrace(); - LoginPacket.World_request = null; - } - - return false; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "(IIIIIII)I", - garbageValue = "-583824694" - ) - public static int method3749(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; - } else { - return var2 == 2 ? 7 - var0 - (var3 - 1) : 7 - var1 - (var4 - 1); + IntegerNode var3 = (IntegerNode)var0.get((long)var1); + return var3 == null ? var2 : var3.integer; } } - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)Lgl;", - garbageValue = "-1926428299" + signature = "(I)[Lgz;", + garbageValue = "1898345943" + ) + static Language[] method3783() { + return new Language[]{Language_EN, Language_DE, Language_ES, Language_ES_MX, Language_PT, Language_FR, Language_NL}; + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(IB)Lbr;", + garbageValue = "-87" + ) + @Export("Messages_getMessage") + static Message Messages_getMessage(int var0) { + return (Message)Messages.Messages_hashTable.get((long)var0); + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "(IB)Lgz;", + garbageValue = "-67" ) @Export("Language_get") public static Language Language_get(int var0) { return var0 >= 0 && var0 < Language_valuesOrdered.length ? Language_valuesOrdered[var0] : null; } + + @ObfuscatedName("u") + @Export("Entity_unpackID") + public static int Entity_unpackID(long var0) { + return (int)(var0 >>> 17 & 4294967295L); + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "(Lko;Lko;I)V", + garbageValue = "916076858" + ) + static void method3786(Font var0, Font var1) { + int var4; + int var5; + if (class90.worldSelectBackSprites == null) { + Archive var3 = GrandExchangeEvent.archive8; + var4 = var3.getGroupId("sl_back"); + var5 = var3.getFileId(var4, ""); + Sprite[] var2 = class217.method4091(var3, var4, var5); + class90.worldSelectBackSprites = var2; + } + + if (SpotAnimationDefinition.worldSelectFlagSprites == null) { + SpotAnimationDefinition.worldSelectFlagSprites = PendingSpawn.method1806(GrandExchangeEvent.archive8, "sl_flags", ""); + } + + if (GrandExchangeEvent.worldSelectArrows == null) { + GrandExchangeEvent.worldSelectArrows = PendingSpawn.method1806(GrandExchangeEvent.archive8, "sl_arrows", ""); + } + + if (class228.worldSelectStars == null) { + class228.worldSelectStars = PendingSpawn.method1806(GrandExchangeEvent.archive8, "sl_stars", ""); + } + + if (class13.worldSelectLeftSprite == null) { + class13.worldSelectLeftSprite = class329.SpriteBuffer_getIndexedSpriteByName(GrandExchangeEvent.archive8, "leftarrow", ""); + } + + if (ClientPreferences.worldSelectRightSprite == null) { + ClientPreferences.worldSelectRightSprite = class329.SpriteBuffer_getIndexedSpriteByName(GrandExchangeEvent.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 (class228.worldSelectStars != null) { + class228.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); + var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); + class228.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); + var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); + } + + if (GrandExchangeEvent.worldSelectArrows != null) { + int var22 = Login.xPadding + 280; + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { + GrandExchangeEvent.worldSelectArrows[2].drawAt(var22, 4); + } else { + GrandExchangeEvent.worldSelectArrows[0].drawAt(var22, 4); + } + + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { + GrandExchangeEvent.worldSelectArrows[3].drawAt(var22 + 15, 4); + } else { + GrandExchangeEvent.worldSelectArrows[1].drawAt(var22 + 15, 4); + } + + var0.draw("World", var22 + 32, 17, 16777215, -1); + int var23 = Login.xPadding + 390; + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { + GrandExchangeEvent.worldSelectArrows[2].drawAt(var23, 4); + } else { + GrandExchangeEvent.worldSelectArrows[0].drawAt(var23, 4); + } + + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { + GrandExchangeEvent.worldSelectArrows[3].drawAt(var23 + 15, 4); + } else { + GrandExchangeEvent.worldSelectArrows[1].drawAt(var23 + 15, 4); + } + + var0.draw("Players", var23 + 32, 17, 16777215, -1); + var4 = Login.xPadding + 500; + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { + GrandExchangeEvent.worldSelectArrows[2].drawAt(var4, 4); + } else { + GrandExchangeEvent.worldSelectArrows[0].drawAt(var4, 4); + } + + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { + GrandExchangeEvent.worldSelectArrows[3].drawAt(var4 + 15, 4); + } else { + GrandExchangeEvent.worldSelectArrows[1].drawAt(var4 + 15, 4); + } + + var0.draw("Location", var4 + 32, 17, 16777215, -1); + var5 = Login.xPadding + 610; + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { + GrandExchangeEvent.worldSelectArrows[2].drawAt(var5, 4); + } else { + GrandExchangeEvent.worldSelectArrows[0].drawAt(var5, 4); + } + + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { + GrandExchangeEvent.worldSelectArrows[3].drawAt(var5 + 15, 4); + } else { + GrandExchangeEvent.worldSelectArrows[1].drawAt(var5 + 15, 4); + } + + var0.draw("Type", var5 + 32, 17, 16777215, -1); + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); + var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); + Login.hoveredWorldIndex = -1; + if (class90.worldSelectBackSprites != null) { + byte var26 = 88; + byte var27 = 19; + var4 = 765 / (var26 + 1) - 1; + var5 = 480 / (var27 + 1); + + int var6; + int var7; + do { + var6 = var5; + var7 = var4; + if (var5 * (var4 - 1) >= World.World_count) { + --var4; + } + + if (var4 * (var5 - 1) >= World.World_count) { + --var5; + } + + if (var4 * (var5 - 1) >= World.World_count) { + --var5; + } + } while(var6 != var5 || var7 != var4); + + var6 = (765 - var4 * var26) / (var4 + 1); + if (var6 > 5) { + var6 = 5; + } + + var7 = (480 - var27 * var5) / (var5 + 1); + if (var7 > 5) { + var7 = 5; + } + + int var8 = (765 - var26 * var4 - var6 * (var4 - 1)) / 2; + int var9 = (480 - var5 * var27 - var7 * (var5 - 1)) / 2; + int var10 = (var5 + World.World_count - 1) / var5; + Login.worldSelectPagesCount = var10 - var4; + if (class13.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { + class13.worldSelectLeftSprite.drawAt(8, class52.canvasHeight / 2 - class13.worldSelectLeftSprite.subHeight / 2); + } + + if (ClientPreferences.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { + ClientPreferences.worldSelectRightSprite.drawAt(Varcs.canvasWidth - ClientPreferences.worldSelectRightSprite.subWidth - 8, class52.canvasHeight / 2 - ClientPreferences.worldSelectRightSprite.subHeight / 2); + } + + int var11 = var9 + 23; + int var12 = var8 + Login.xPadding; + int var13 = 0; + boolean var14 = false; + int var15 = Login.worldSelectPage; + + int var16; + for (var16 = var15 * var5; var16 < World.World_count && var15 - Login.worldSelectPage < var4; ++var16) { + World var24 = class13.World_worlds[var16]; + boolean var18 = true; + String var19 = Integer.toString(var24.population); + if (var24.population == -1) { + var19 = "OFF"; + var18 = false; + } else if (var24.population > 1980) { + var19 = "FULL"; + var18 = false; + } + + int var21 = 0; + byte var20; + if (var24.isBeta()) { + if (var24.isMembersOnly()) { + var20 = 7; + } else { + var20 = 6; + } + } else if (var24.isDeadman()) { + var21 = 16711680; + if (var24.isMembersOnly()) { + var20 = 5; + } else { + var20 = 4; + } + } else if (var24.method1835()) { + if (var24.isMembersOnly()) { + var20 = 9; + } else { + var20 = 8; + } + } else if (var24.isPvp()) { + if (var24.isMembersOnly()) { + var20 = 3; + } else { + var20 = 2; + } + } else if (var24.isMembersOnly()) { + var20 = 1; + } else { + var20 = 0; + } + + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var11 && MouseHandler.MouseHandler_x < var12 + var26 && MouseHandler.MouseHandler_y < var27 + var11 && var18) { + Login.hoveredWorldIndex = var16; + class90.worldSelectBackSprites[var20].drawTransOverlayAt(var12, var11, 128, 16777215); + var14 = true; + } else { + class90.worldSelectBackSprites[var20].drawAt(var12, var11); + } + + if (SpotAnimationDefinition.worldSelectFlagSprites != null) { + SpotAnimationDefinition.worldSelectFlagSprites[(var24.isMembersOnly() ? 8 : 0) + var24.location].drawAt(var12 + 29, var11); + } + + var0.drawCentered(Integer.toString(var24.id), var12 + 15, var27 / 2 + var11 + 5, var21, -1); + var1.drawCentered(var19, var12 + 60, var27 / 2 + var11 + 5, 268435455, -1); + var11 = var11 + var27 + var7; + ++var13; + if (var13 >= var5) { + var11 = var9 + 23; + var12 = var12 + var6 + var26; + var13 = 0; + ++var15; + } + } + + if (var14) { + var16 = var1.stringWidth(class13.World_worlds[Login.hoveredWorldIndex].activity) + 6; + int var17 = var1.ascent + 8; + int var25 = MouseHandler.MouseHandler_y + 25; + if (var17 + var25 > 480) { + var25 = MouseHandler.MouseHandler_y - 25 - var17; + } + + Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var16 / 2, var25, var16, var17, 16777120); + Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var16 / 2, var25, var16, var17, 0); + var1.drawCentered(class13.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var25 + var1.ascent + 4, 0, -1); + } + } + + ArchiveLoader.rasterProvider.drawFull(0, 0); + } + + @ObfuscatedName("gj") + @ObfuscatedSignature( + signature = "(IIII)I", + garbageValue = "179125696" + ) + @Export("getTileHeight") + static final int getTileHeight(int var0, int var1, int var2) { + int var3 = var0 >> 7; + int var4 = var1 >> 7; + if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { + int var5 = var2; + if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { + var5 = var2 + 1; + } + + int var6 = var0 & 127; + int var7 = var1 & 127; + int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4] >> 7; + int var9 = Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] >> 7; + return var9 * var7 + var8 * (128 - var7) >> 7; + } else { + return 0; + } + } + + @ObfuscatedName("jg") + @ObfuscatedSignature( + signature = "(III)V", + garbageValue = "-1826045916" + ) + @Export("runIntfCloseListeners") + static final void runIntfCloseListeners(int var0, int var1) { + if (UserComparator4.loadInterface(var0)) { + Skeleton.runComponentCloseListeners(Widget.Widget_interfaceComponents[var0], var1); + } + } } diff --git a/runescape-client/src/main/java/Link.java b/runescape-client/src/main/java/Link.java index b6538ab0b2..9cd542bddd 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("gt") +@ObfuscatedName("gd") @Implements("Link") public class Link { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lgt;" + signature = "Lgd;" ) @Export("previous") public Link previous; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgt;" + signature = "Lgd;" ) @Export("next") public Link next; - @ObfuscatedName("x") + @ObfuscatedName("m") @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 8a9d404db8..a4e55df494 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("jk") +@ObfuscatedName("jn") @Implements("LinkDeque") public class LinkDeque { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lgt;" + signature = "Lgd;" ) @Export("sentinel") Link sentinel; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgt;" + signature = "Lgd;" ) @Export("current") Link current; @@ -25,9 +25,9 @@ public class LinkDeque { this.sentinel.next = this.sentinel; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lgt;)V" + signature = "(Lgd;)V" ) @Export("addFirst") public void addFirst(Link var1) { @@ -41,9 +41,9 @@ public class LinkDeque { var1.previous.next = var1; } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "()Lgt;" + signature = "()Lgd;" ) @Export("last") public Link last() { @@ -57,9 +57,9 @@ public class LinkDeque { } } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "()Lgt;" + signature = "()Lgd;" ) @Export("previous") public Link previous() { diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java index 71e84b0c9c..7183c0cc4a 100644 --- a/runescape-client/src/main/java/Login.java +++ b/runescape-client/src/main/java/Login.java @@ -5,141 +5,151 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cy") +@ObfuscatedName("ca") @Implements("Login") public class Login { - @ObfuscatedName("m") - @Export("clearLoginScreen") - static boolean clearLoginScreen; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1204959409 + intValue = -708549225 ) @Export("xPadding") static int xPadding; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "[Lle;" + signature = "[Llh;" ) @Export("runesSprite") static IndexedSprite[] runesSprite; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lla;" + signature = "Llz;" ) @Export("leftTitleSprite") static Sprite leftTitleSprite; - @ObfuscatedName("n") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Lle;" + signature = "Llh;" ) - @Export("options_buttons_2Sprite") - static IndexedSprite options_buttons_2Sprite; - @ObfuscatedName("u") + @Export("logoSprite") + static IndexedSprite logoSprite; + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lle;" + signature = "Llh;" ) - static IndexedSprite field1195; - @ObfuscatedName("l") + @Export("options_buttons_0Sprite") + static IndexedSprite options_buttons_0Sprite; + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Lcw;" + ) + @Export("loginScreenRunesAnimation") + static LoginScreenAnimation loginScreenRunesAnimation; + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 677991921 + intValue = -104867267 ) @Export("loginBoxX") static int loginBoxX; - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 351147085 + intValue = -332178951 + ) + @Export("loginBoxCenter") + static int loginBoxCenter; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -910177377 ) @Export("Login_loadingPercent") static int Login_loadingPercent; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("Login_loadingText") static String Login_loadingText; - @ObfuscatedName("ap") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 811959291 + intValue = -1417433861 ) - static int field1201; - @ObfuscatedName("af") + static int field1212; + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -1263209859 + intValue = 641478857 ) - static int field1218; - @ObfuscatedName("am") + static int field1213; + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -1027214845 + intValue = 1431585767 ) @Export("loginIndex") static int loginIndex; - @ObfuscatedName("au") + @ObfuscatedName("ar") @Export("Login_response0") static String Login_response0; - @ObfuscatedName("ao") + @ObfuscatedName("ap") @Export("Login_response1") static String Login_response1; - @ObfuscatedName("aq") + @ObfuscatedName("al") @Export("Login_response2") static String Login_response2; - @ObfuscatedName("av") + @ObfuscatedName("an") @Export("Login_response3") static String Login_response3; - @ObfuscatedName("ak") + @ObfuscatedName("ac") @Export("Login_username") static String Login_username; - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("Login_password") static String Login_password; - @ObfuscatedName("ah") - static boolean field1207; - @ObfuscatedName("ag") - static boolean field1212; - @ObfuscatedName("bc") - static boolean field1214; - @ObfuscatedName("bo") + @ObfuscatedName("ay") + static boolean field1209; + @ObfuscatedName("au") + static boolean field1231; + @ObfuscatedName("bh") + static boolean field1223; + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = 463020899 + intValue = 543223437 ) @Export("currentLoginField") static int currentLoginField; - @ObfuscatedName("be") + @ObfuscatedName("bd") @Export("worldSelectOpen") static boolean worldSelectOpen; - @ObfuscatedName("bx") + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = 1533382117 + intValue = -2023703181 ) @Export("hoveredWorldIndex") static int hoveredWorldIndex; - @ObfuscatedName("bz") + @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = 623076751 + intValue = 1751937613 ) @Export("worldSelectPage") static int worldSelectPage; - @ObfuscatedName("bs") + @ObfuscatedName("bv") @ObfuscatedGetter( - intValue = 1665656509 + intValue = 212340177 ) @Export("worldSelectPagesCount") static int worldSelectPagesCount; - @ObfuscatedName("bm") + @ObfuscatedName("bz") @ObfuscatedGetter( - longValue = 7899458563171084207L + longValue = -3011856150050162759L ) - static long field1223; - @ObfuscatedName("bb") + static long field1204; + @ObfuscatedName("bu") @ObfuscatedGetter( - longValue = -6287034345881583105L + longValue = -7097171070724115481L ) - static long field1224; + static long field1211; static { xPadding = 0; loginBoxX = xPadding + 202; Login_loadingPercent = 10; Login_loadingText = ""; - field1201 = -1; - field1218 = 1; + field1212 = -1; + field1213 = 1; loginIndex = 0; Login_response0 = ""; Login_response1 = ""; @@ -147,9 +157,9 @@ public class Login { Login_response3 = ""; Login_username = ""; Login_password = ""; - field1207 = false; - field1212 = false; - field1214 = true; + field1209 = false; + field1231 = false; + field1223 = true; currentLoginField = 0; worldSelectOpen = false; hoveredWorldIndex = -1; @@ -157,26 +167,231 @@ public class Login { worldSelectPagesCount = 0; new DecimalFormat("##0.00"); new class171(); - field1223 = -1L; - field1224 = -1L; + field1204 = -1L; + field1211 = -1L; } - @ObfuscatedName("lo") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-2118716971" + signature = "(IIILga;Lfz;Z[I[IB)I", + garbageValue = "0" ) - static void method2177() { - if (WorldMapRectangle.field222 != null) { - Client.field891 = Client.cycle; - WorldMapRectangle.field222.method4406(); - - for (int var0 = 0; var0 < Client.players.length; ++var0) { - if (Client.players[var0] != null) { - WorldMapRectangle.field222.method4405((Client.players[var0].x >> 7) + class69.baseX, (Client.players[var0].y >> 7) + class89.baseY); - } + public static int method2235(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) { + class182.directions[var8][var9] = 0; + class182.distances[var8][var9] = 99999999; } } + boolean var27; + if (var2 == 1) { + var27 = Interpreter.method2112(var0, var1, var3, var4); + } else if (var2 == 2) { + var27 = method2234(var0, var1, var3, var4); + } else { + var27 = World.method1856(var0, var1, var2, var3, var4); + } + + var9 = var0 - 64; + int var10 = var1 - 64; + int var11 = class182.field2132; + int var12 = GrandExchangeOfferOwnWorldComparator.field666; + int var13; + int var14; + int var16; + if (!var27) { + var13 = Integer.MAX_VALUE; + var14 = Integer.MAX_VALUE; + byte var15 = 10; + var16 = var3.approxDestinationX; + int var17 = var3.approxDestinationY; + int var18 = var3.approxDestinationSizeX; + int var19 = var3.approxDestinationSizeY; + + for (int var20 = var16 - var15; var20 <= var16 + var15; ++var20) { + for (int var21 = var17 - var15; var21 <= var17 + var15; ++var21) { + int var22 = var20 - var9; + int var23 = var21 - var10; + if (var22 >= 0 && var23 >= 0 && var22 < 128 && var23 < 128 && class182.distances[var22][var23] < 100) { + int var24 = 0; + if (var20 < var16) { + var24 = var16 - var20; + } else if (var20 > var18 + var16 - 1) { + var24 = var20 - (var16 + var18 - 1); + } + + int var25 = 0; + if (var21 < var17) { + var25 = var17 - var21; + } else if (var21 > var19 + var17 - 1) { + var25 = var21 - (var19 + var17 - 1); + } + + int var26 = var24 * var24 + var25 * var25; + if (var26 < var13 || var13 == var26 && class182.distances[var22][var23] < var14) { + var13 = var26; + var14 = class182.distances[var22][var23]; + var11 = var20; + var12 = var21; + } + } + } + } + + if (var13 == Integer.MAX_VALUE) { + return -1; + } + } + + if (var0 == var11 && var12 == var1) { + return 0; + } else { + byte var28 = 0; + class182.bufferX[var28] = var11; + var13 = var28 + 1; + class182.bufferY[var28] = var12; + + int var29; + for (var14 = var29 = class182.directions[var11 - var9][var12 - var10]; var0 != var11 || var12 != var1; var14 = class182.directions[var11 - var9][var12 - var10]) { + if (var14 != var29) { + var29 = var14; + class182.bufferX[var13] = var11; + class182.bufferY[var13++] = var12; + } + + if ((var14 & 2) != 0) { + ++var11; + } else if ((var14 & 8) != 0) { + --var11; + } + + if ((var14 & 1) != 0) { + ++var12; + } else if ((var14 & 4) != 0) { + --var12; + } + } + + var16 = 0; + + while (var13-- > 0) { + var6[var16] = class182.bufferX[var13]; + var7[var16++] = class182.bufferY[var13]; + if (var16 >= var6.length) { + break; + } + } + + return var16; + } + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(IILga;Lfz;I)Z", + garbageValue = "783701635" + ) + static final boolean method2234(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; + class182.directions[var6][var7] = 99; + class182.distances[var6][var7] = 0; + byte var10 = 0; + int var11 = 0; + class182.bufferX[var10] = var0; + byte var10001 = var10; + int var18 = var10 + 1; + class182.bufferY[var10001] = var1; + int[][] var12 = var3.flags; + + while (var11 != var18) { + var4 = class182.bufferX[var11]; + var5 = class182.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)) { + class182.field2132 = var4; + GrandExchangeOfferOwnWorldComparator.field666 = var5; + return true; + } + + int var15 = class182.distances[var16][var17] + 1; + if (var16 > 0 && class182.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) { + class182.bufferX[var18] = var4 - 1; + class182.bufferY[var18] = var5; + var18 = var18 + 1 & 4095; + class182.directions[var16 - 1][var17] = 2; + class182.distances[var16 - 1][var17] = var15; + } + + if (var16 < 126 && class182.directions[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) { + class182.bufferX[var18] = var4 + 1; + class182.bufferY[var18] = var5; + var18 = var18 + 1 & 4095; + class182.directions[var16 + 1][var17] = 8; + class182.distances[var16 + 1][var17] = var15; + } + + if (var17 > 0 && class182.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) { + class182.bufferX[var18] = var4; + class182.bufferY[var18] = var5 - 1; + var18 = var18 + 1 & 4095; + class182.directions[var16][var17 - 1] = 1; + class182.distances[var16][var17 - 1] = var15; + } + + if (var17 < 126 && class182.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) { + class182.bufferX[var18] = var4; + class182.bufferY[var18] = var5 + 1; + var18 = var18 + 1 & 4095; + class182.directions[var16][var17 + 1] = 4; + class182.distances[var16][var17 + 1] = var15; + } + + if (var16 > 0 && var17 > 0 && class182.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) { + class182.bufferX[var18] = var4 - 1; + class182.bufferY[var18] = var5 - 1; + var18 = var18 + 1 & 4095; + class182.directions[var16 - 1][var17 - 1] = 3; + class182.distances[var16 - 1][var17 - 1] = var15; + } + + if (var16 < 126 && var17 > 0 && class182.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) { + class182.bufferX[var18] = var4 + 1; + class182.bufferY[var18] = var5 - 1; + var18 = var18 + 1 & 4095; + class182.directions[var16 + 1][var17 - 1] = 9; + class182.distances[var16 + 1][var17 - 1] = var15; + } + + if (var16 > 0 && var17 < 126 && class182.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) { + class182.bufferX[var18] = var4 - 1; + class182.bufferY[var18] = var5 + 1; + var18 = var18 + 1 & 4095; + class182.directions[var16 - 1][var17 + 1] = 6; + class182.distances[var16 - 1][var17 + 1] = var15; + } + + if (var16 < 126 && var17 < 126 && class182.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) { + class182.bufferX[var18] = var4 + 1; + class182.bufferY[var18] = var5 + 1; + var18 = var18 + 1 & 4095; + class182.directions[var16 + 1][var17 + 1] = 12; + class182.distances[var16 + 1][var17 + 1] = var15; + } + } + + class182.field2132 = var4; + GrandExchangeOfferOwnWorldComparator.field666 = var5; + return false; } } diff --git a/runescape-client/src/main/java/LoginPacket.java b/runescape-client/src/main/java/LoginPacket.java index 7e92386715..d137e0171b 100644 --- a/runescape-client/src/main/java/LoginPacket.java +++ b/runescape-client/src/main/java/LoginPacket.java @@ -4,67 +4,61 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gb") +@ObfuscatedName("gx") @Implements("LoginPacket") public class LoginPacket implements class190 { - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lgb;" - ) - public static final LoginPacket field2315; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgx;" ) - static final LoginPacket field2311; - @ObfuscatedName("k") + public static final LoginPacket field2352; + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgx;" ) - public static final LoginPacket field2317; - @ObfuscatedName("d") + static final LoginPacket field2350; + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgx;" ) - public static final LoginPacket field2313; - @ObfuscatedName("w") + public static final LoginPacket field2347; + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgx;" ) - public static final LoginPacket field2314; - @ObfuscatedName("v") + public static final LoginPacket field2348; + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lgb;" + signature = "Lgx;" ) - static final LoginPacket field2319; - @ObfuscatedName("z") + public static final LoginPacket field2345; + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "[Lgb;" + signature = "Lgx;" + ) + static final LoginPacket field2346; + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "[Lgx;" ) @Export("LoginPacket_indexedValues") static final LoginPacket[] LoginPacket_indexedValues; - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lew;" - ) - @Export("World_request") - static UrlRequest World_request; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 774244909 + intValue = -444496991 ) @Export("id") public final int id; static { - field2315 = new LoginPacket(14, 0); - field2311 = new LoginPacket(15, 4); - field2317 = new LoginPacket(16, -2); - field2313 = new LoginPacket(18, -2); - field2314 = new LoginPacket(19, -2); - field2319 = new LoginPacket(27, 0); + field2352 = new LoginPacket(14, 0); + field2350 = new LoginPacket(15, 4); + field2347 = new LoginPacket(16, -2); + field2348 = new LoginPacket(18, -2); + field2345 = new LoginPacket(19, -2); + field2346 = new LoginPacket(27, 0); LoginPacket_indexedValues = new LoginPacket[32]; - LoginPacket[] var0 = WorldMapSection3.method895(); + LoginPacket[] var0 = UserComparator9.method3512(); for (int var1 = 0; var1 < var0.length; ++var1) { LoginPacket_indexedValues[var0[var1].id] = var0[var1]; @@ -80,12 +74,24 @@ public class LoginPacket implements class190 { this.id = var1; } - @ObfuscatedName("e") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1902674476" + signature = "(II)Lik;", + garbageValue = "-729077438" ) - static final void method3692() { - GrandExchangeEvent.method165("Your friend list is full. Max of 200 for free users, and 400 for members"); + public static HealthBarDefinition method3745(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; + } } } diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java index 3a4575e6f9..1f6a8ffff9 100644 --- a/runescape-client/src/main/java/LoginScreenAnimation.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -3,212 +3,216 @@ 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("cr") +@ObfuscatedName("cw") @Implements("LoginScreenAnimation") public class LoginScreenAnimation { - @ObfuscatedName("ap") - @Export("fontHelvetica13") - static java.awt.Font fontHelvetica13; - @ObfuscatedName("x") + @ObfuscatedName("mc") + @ObfuscatedGetter( + intValue = -1226274359 + ) + @Export("selectedItemSlot") + static int selectedItemSlot; + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "[Lle;" + signature = "[Llh;" ) @Export("sprites") IndexedSprite[] sprites; - @ObfuscatedName("q") - int[] field1059; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -860296683 - ) - int field1060; - @ObfuscatedName("t") - int[] field1074; - @ObfuscatedName("e") - int[] field1062; - @ObfuscatedName("s") - int[] field1065; - @ObfuscatedName("p") - int[] field1064; @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 1214831443 - ) - int field1063; + int[] field1075; @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 44096223 + intValue = -1093888655 + ) + int field1070; + @ObfuscatedName("a") + int[] field1062; + @ObfuscatedName("z") + int[] field1063; + @ObfuscatedName("w") + int[] field1061; + @ObfuscatedName("y") + int[] field1065; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -1116180601 ) int field1066; @ObfuscatedName("h") - int[] field1057; - @ObfuscatedName("g") - int[] field1068; - @ObfuscatedName("i") - int[] field1069; - @ObfuscatedName("a") - int[] field1070; - @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -702282245 + intValue = 2041048793 ) - int field1055; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = 1031102693 - ) - int field1072; + int field1064; + @ObfuscatedName("k") + int[] field1056; @ObfuscatedName("r") + int[] field1069; + @ObfuscatedName("s") + int[] field1067; + @ObfuscatedName("v") + int[] field1071; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1396943377 + intValue = -1998997321 + ) + int field1068; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -2027294175 ) int field1073; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1633825307 + ) + int field1074; @ObfuscatedSignature( - signature = "([Lle;)V" + signature = "([Llh;)V" ) LoginScreenAnimation(IndexedSprite[] var1) { - this.field1059 = new int[256]; - this.field1060 = 0; - this.field1063 = 0; + this.field1075 = new int[256]; + this.field1070 = 0; this.field1066 = 0; - this.field1055 = 0; - this.field1072 = 0; + this.field1064 = 0; + this.field1068 = 0; this.field1073 = 0; + this.field1074 = 0; this.sprites = var1; this.initColors(); } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-542018665" + signature = "(B)V", + garbageValue = "-16" ) @Export("initColors") void initColors() { - this.field1062 = new int[256]; + this.field1063 = new int[256]; int var1; for (var1 = 0; var1 < 64; ++var1) { - this.field1062[var1] = var1 * 262144; + this.field1063[var1] = var1 * 262144; } for (var1 = 0; var1 < 64; ++var1) { - this.field1062[var1 + 64] = var1 * 1024 + 16711680; + this.field1063[var1 + 64] = var1 * 1024 + 16711680; } for (var1 = 0; var1 < 64; ++var1) { - this.field1062[var1 + 128] = var1 * 4 + 16776960; + this.field1063[var1 + 128] = var1 * 4 + 16776960; } for (var1 = 0; var1 < 64; ++var1) { - this.field1062[var1 + 192] = 16777215; + this.field1063[var1 + 192] = 16777215; + } + + this.field1061 = new int[256]; + + for (var1 = 0; var1 < 64; ++var1) { + this.field1061[var1] = var1 * 1024; + } + + for (var1 = 0; var1 < 64; ++var1) { + this.field1061[var1 + 64] = var1 * 4 + 65280; + } + + for (var1 = 0; var1 < 64; ++var1) { + this.field1061[var1 + 128] = var1 * 262144 + 65535; + } + + for (var1 = 0; var1 < 64; ++var1) { + this.field1061[var1 + 192] = 16777215; } this.field1065 = new int[256]; for (var1 = 0; var1 < 64; ++var1) { - this.field1065[var1] = var1 * 1024; + this.field1065[var1] = var1 * 4; } for (var1 = 0; var1 < 64; ++var1) { - this.field1065[var1 + 64] = var1 * 4 + 65280; + this.field1065[var1 + 64] = var1 * 262144 + 255; } for (var1 = 0; var1 < 64; ++var1) { - this.field1065[var1 + 128] = var1 * 262144 + 65535; + this.field1065[var1 + 128] = var1 * 1024 + 16711935; } for (var1 = 0; var1 < 64; ++var1) { this.field1065[var1 + 192] = 16777215; } - this.field1064 = new int[256]; - - for (var1 = 0; var1 < 64; ++var1) { - this.field1064[var1] = var1 * 4; - } - - for (var1 = 0; var1 < 64; ++var1) { - this.field1064[var1 + 64] = var1 * 262144 + 255; - } - - for (var1 = 0; var1 < 64; ++var1) { - this.field1064[var1 + 128] = var1 * 1024 + 16711935; - } - - for (var1 = 0; var1 < 64; ++var1) { - this.field1064[var1 + 192] = 16777215; - } - - this.field1074 = new int[256]; - this.field1055 = 0; + this.field1062 = new int[256]; + this.field1068 = 0; + this.field1067 = new int[32768]; + this.field1071 = new int[32768]; + this.method1885((IndexedSprite)null); + this.field1056 = new int[32768]; this.field1069 = new int[32768]; - this.field1070 = new int[32768]; - this.method1917((IndexedSprite)null); - this.field1057 = new int[32768]; - this.field1068 = new int[32768]; } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "41185107" + garbageValue = "2116735890" ) - void method1909() { - this.field1062 = null; + void method1878() { + this.field1063 = null; + this.field1061 = null; this.field1065 = null; - this.field1064 = null; - this.field1074 = null; + this.field1062 = null; + this.field1067 = null; + this.field1071 = null; + this.field1056 = null; this.field1069 = null; - this.field1070 = null; - this.field1057 = null; - this.field1068 = null; - this.field1055 = 0; - this.field1072 = 0; + this.field1068 = 0; + this.field1073 = 0; } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "10" + signature = "(III)V", + garbageValue = "-1329214185" ) @Export("draw") void draw(int var1, int var2) { - if (this.field1057 == null) { + if (this.field1056 == null) { this.initColors(); } - if (this.field1073 == 0) { - this.field1073 = var2; + if (this.field1074 == 0) { + this.field1074 = var2; } - int var3 = var2 - this.field1073; + int var3 = var2 - this.field1074; if (var3 >= 256) { var3 = 0; } - this.field1073 = var2; + this.field1074 = var2; if (var3 > 0) { - this.method1912(var3); + this.method1880(var3); } - this.method1919(var1); + this.method1882(var1); } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "2136809713" + garbageValue = "-305399146" ) - final void method1912(int var1) { - this.field1055 += 128 * var1; + final void method1880(int var1) { + this.field1068 += 128 * var1; int var2; - if (this.field1055 > this.field1069.length) { - this.field1055 -= this.field1069.length; + if (this.field1068 > this.field1067.length) { + this.field1068 -= this.field1067.length; var2 = (int)(Math.random() * 12.0D); - this.method1917(this.sprites[var2]); + this.method1885(this.sprites[var2]); } var2 = 0; @@ -217,12 +221,12 @@ public class LoginScreenAnimation { int var6; for (int var5 = 0; var5 < var4; ++var5) { - var6 = this.field1057[var2 + var3] - this.field1069[var2 + this.field1055 & this.field1069.length - 1] * var1 / 6; + var6 = this.field1056[var3 + var2] - this.field1067[var2 + this.field1068 & this.field1067.length - 1] * var1 / 6; if (var6 < 0) { var6 = 0; } - this.field1057[var2++] = var6; + this.field1056[var2++] = var6; } byte var15 = 10; @@ -236,42 +240,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.field1057[var8 + var9] = 255; + this.field1056[var8 + var9] = 255; } else { - this.field1057[var8 + var9] = 0; + this.field1056[var9 + var8] = 0; } } } - if (this.field1063 > 0) { - this.field1063 -= var1 * 4; - } - if (this.field1066 > 0) { this.field1066 -= var1 * 4; } - if (this.field1063 == 0 && this.field1066 == 0) { + if (this.field1064 > 0) { + this.field1064 -= var1 * 4; + } + + if (this.field1066 == 0 && this.field1064 == 0) { var7 = (int)(Math.random() * (double)(2000 / var1)); if (var7 == 0) { - this.field1063 = 1024; + this.field1066 = 1024; } if (var7 == 1) { - this.field1066 = 1024; + this.field1064 = 1024; } } for (var7 = 0; var7 < 256 - var1; ++var7) { - this.field1059[var7] = this.field1059[var7 + var1]; + this.field1075[var7] = this.field1075[var7 + var1]; } for (var7 = 256 - var1; var7 < 256; ++var7) { - this.field1059[var7] = (int)(Math.sin((double)this.field1060 / 14.0D) * 16.0D + Math.sin((double)this.field1060 / 15.0D) * 14.0D + Math.sin((double)this.field1060 / 16.0D) * 12.0D); - ++this.field1060; + this.field1075[var7] = (int)(Math.sin((double)this.field1070 / 14.0D) * 16.0D + Math.sin((double)this.field1070 / 15.0D) * 14.0D + Math.sin((double)this.field1070 / 16.0D) * 12.0D); + ++this.field1070; } - this.field1072 += var1; + this.field1073 += var1; var7 = ((Client.cycle & 1) + var1) / 2; if (var7 > 0) { short var16 = 128; @@ -281,13 +285,13 @@ public class LoginScreenAnimation { int var11; int var12; int var13; - for (var11 = 0; var11 < this.field1072 * 100; ++var11) { + for (var11 = 0; var11 < this.field1073 * 100; ++var11) { var12 = (int)(Math.random() * (double)var10) + var17; var13 = (int)(Math.random() * (double)var16) + var16; - this.field1057[var12 + (var13 << 7)] = 192; + this.field1056[var12 + (var13 << 7)] = 192; } - this.field1072 = 0; + this.field1073 = 0; int var14; for (var11 = 0; var11 < 256; ++var11) { @@ -296,15 +300,15 @@ public class LoginScreenAnimation { for (var14 = -var7; var14 < 128; ++var14) { if (var14 + var7 < 128) { - var12 += this.field1057[var7 + var13 + var14]; + var12 += this.field1056[var7 + var13 + var14]; } if (var14 - (var7 + 1) >= 0) { - var12 -= this.field1057[var13 + var14 - (var7 + 1)]; + var12 -= this.field1056[var13 + var14 - (var7 + 1)]; } if (var14 >= 0) { - this.field1068[var14 + var13] = var12 / (var7 * 2 + 1); + this.field1069[var13 + var14] = var12 / (var7 * 2 + 1); } } } @@ -315,15 +319,15 @@ public class LoginScreenAnimation { for (var13 = -var7; var13 < 256; ++var13) { var14 = var13 * 128; if (var13 + var7 < 256) { - var12 += this.field1068[var14 + var11 + var7 * 128]; + var12 += this.field1069[var7 * 128 + var14 + var11]; } if (var13 - (var7 + 1) >= 0) { - var12 -= this.field1068[var11 + var14 - (var7 + 1) * 128]; + var12 -= this.field1069[var11 + var14 - (var7 + 1) * 128]; } if (var13 >= 0) { - this.field1057[var14 + var11] = var12 / (var7 * 2 + 1); + this.field1056[var11 + var14] = var12 / (var7 * 2 + 1); } } } @@ -331,66 +335,66 @@ public class LoginScreenAnimation { } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(IIII)I", - garbageValue = "743870455" + garbageValue = "353428721" ) - final int method1940(int var1, int var2, int var3) { + final int method1891(int var1, int var2, int var3) { int var4 = 256 - var3; - return (var3 * (var2 & 65280) + var4 * (var1 & 65280) & 16711680) + (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) >> 8; + return (var3 * (var2 & 65280) + var4 * (var1 & 65280) & 16711680) + (var3 * (var2 & 16711935) + var4 * (var1 & 16711935) & -16711936) >> 8; } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-803188196" + garbageValue = "40685678" ) - final void method1919(int var1) { - int var2 = this.field1074.length; - if (this.field1063 > 0) { - this.method1915(this.field1063, this.field1065); - } else if (this.field1066 > 0) { - this.method1915(this.field1066, this.field1064); + final void method1882(int var1) { + int var2 = this.field1062.length; + if (this.field1066 > 0) { + this.method1886(this.field1066, this.field1061); + } else if (this.field1064 > 0) { + this.method1886(this.field1064, this.field1065); } else { for (int var3 = 0; var3 < var2; ++var3) { - this.field1074[var3] = this.field1062[var3]; + this.field1062[var3] = this.field1063[var3]; } } - this.method1916(var1); + this.method1884(var1); } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(I[II)V", - garbageValue = "1786403761" + signature = "(I[IB)V", + garbageValue = "41" ) - final void method1915(int var1, int[] var2) { - int var3 = this.field1074.length; + final void method1886(int var1, int[] var2) { + int var3 = this.field1062.length; for (int var4 = 0; var4 < var3; ++var4) { if (var1 > 768) { - this.field1074[var4] = this.method1940(this.field1062[var4], var2[var4], 1024 - var1); + this.field1062[var4] = this.method1891(this.field1063[var4], var2[var4], 1024 - var1); } else if (var1 > 256) { - this.field1074[var4] = var2[var4]; + this.field1062[var4] = var2[var4]; } else { - this.field1074[var4] = this.method1940(var2[var4], this.field1062[var4], 256 - var1); + this.field1062[var4] = this.method1891(var2[var4], this.field1063[var4], 256 - var1); } } } - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-1017589056" + garbageValue = "15252473" ) - final void method1916(int var1) { + final void method1884(int var1) { int var2 = 0; for (int var3 = 1; var3 < 255; ++var3) { - int var4 = (256 - var3) * this.field1059[var3] / 256; + int var4 = (256 - var3) * this.field1075[var3] / 256; int var5 = var4 + var1; int var6 = 0; int var7 = 128; @@ -399,22 +403,22 @@ public class LoginScreenAnimation { var5 = 0; } - if (var5 + 128 >= class206.rasterProvider.width) { - var7 = class206.rasterProvider.width - var5; + if (var5 + 128 >= ArchiveLoader.rasterProvider.width) { + var7 = ArchiveLoader.rasterProvider.width - var5; } - int var8 = var5 + (var3 + 8) * class206.rasterProvider.width; + int var8 = var5 + (var3 + 8) * ArchiveLoader.rasterProvider.width; var2 += var6; for (int var9 = var6; var9 < var7; ++var9) { - int var10 = this.field1057[var2++]; + int var10 = this.field1056[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.field1074[var10]; - int var14 = class206.rasterProvider.pixels[var8]; - class206.rasterProvider.pixels[var8++] = -16777216 | ((var10 & 16711935) * var12 + (var14 & 16711935) * var13 & -16711936) + (var13 * (var14 & 65280) + var12 * (var10 & 65280) & 16711680) >> 8; + var10 = this.field1062[var10]; + int var14 = ArchiveLoader.rasterProvider.pixels[var8]; + ArchiveLoader.rasterProvider.pixels[var8++] = -16777216 | (var13 * (var14 & 65280) + var12 * (var10 & 65280) & 16711680) + ((var14 & 16711935) * var13 + (var10 & 16711935) * var12 & -16711936) >> 8; } else { ++var8; } @@ -425,21 +429,21 @@ public class LoginScreenAnimation { } - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(Lle;I)V", - garbageValue = "-61779781" + signature = "(Llh;I)V", + garbageValue = "-760749522" ) - final void method1917(IndexedSprite var1) { + final void method1885(IndexedSprite var1) { int var2; - for (var2 = 0; var2 < this.field1069.length; ++var2) { - this.field1069[var2] = 0; + for (var2 = 0; var2 < this.field1067.length; ++var2) { + this.field1067[var2] = 0; } int var3; for (var2 = 0; var2 < 5000; ++var2) { var3 = (int)(Math.random() * 128.0D * 256.0D); - this.field1069[var3] = (int)(Math.random() * 256.0D); + this.field1067[var3] = (int)(Math.random() * 256.0D); } int var4; @@ -448,13 +452,13 @@ public class LoginScreenAnimation { for (var3 = 1; var3 < 255; ++var3) { for (var4 = 1; var4 < 127; ++var4) { var5 = var4 + (var3 << 7); - this.field1070[var5] = (this.field1069[var5 + 128] + this.field1069[var5 - 128] + this.field1069[var5 + 1] + this.field1069[var5 - 1]) / 4; + this.field1071[var5] = (this.field1067[var5 + 128] + this.field1067[var5 - 128] + this.field1067[var5 + 1] + this.field1067[var5 - 1]) / 4; } } - int[] var8 = this.field1069; - this.field1069 = this.field1070; - this.field1070 = var8; + int[] var8 = this.field1067; + this.field1067 = this.field1071; + this.field1071 = var8; } if (var1 != null) { @@ -466,7 +470,7 @@ public class LoginScreenAnimation { var5 = var4 + var1.xOffset + 16; int var6 = var3 + var1.yOffset + 16; int var7 = var5 + (var6 << 7); - this.field1069[var7] = 0; + this.field1067[var7] = 0; } } } @@ -474,68 +478,274 @@ public class LoginScreenAnimation { } - @ObfuscatedName("x") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "1" + signature = "([BIIIIIII[Lfz;I)V", + garbageValue = "66216788" ) - public static boolean method1939(int var0) { - return (var0 & 1) != 0; + static final void method1879(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, CollisionMap[] var8) { + int var10; + for (int var9 = 0; var9 < 8; ++var9) { + for (var10 = 0; var10 < 8; ++var10) { + if (var9 + var2 > 0 && var9 + var2 < 103 && var3 + var10 > 0 && var3 + var10 < 103) { + int[] var10000 = var8[var1].flags[var9 + var2]; + var10000[var10 + var3] &= -16777217; + } + } + } + + Buffer var21 = new Buffer(var0); + + for (var10 = 0; var10 < 4; ++var10) { + for (int var11 = 0; var11 < 64; ++var11) { + for (int var12 = 0; var12 < 64; ++var12) { + if (var10 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) { + int var15 = var2 + TilePaint.method3187(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; + } + + AbstractArchive.loadTerrain(var21, var1, var15, var17 + var3, 0, 0, var7); + } else { + AbstractArchive.loadTerrain(var21, 0, -1, -1, 0, 0, 0); + } + } + } + } + } - @ObfuscatedName("d") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "304486433" + signature = "(IB)V", + garbageValue = "-83" ) - @Export("loadInterface") - public static boolean loadInterface(int var0) { - if (Widget.Widget_loadedInterfaces[var0]) { - return true; - } else if (!Widget.Widget_archive.tryLoadGroup(var0)) { - return false; + static void method1908(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var1 != null) { + var1.remove(); + } + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "-49" + ) + static void method1906() { + Messages.Messages_channels.clear(); + Messages.Messages_hashTable.clear(); + Messages.Messages_queue.clear(); + Messages.Messages_count = 0; + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + signature = "(ILcs;ZI)I", + garbageValue = "-1332294124" + ) + static int method1883(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = WorldMapSection3.loadWorlds() ? 1 : 0; + return 1; } else { - int var1 = Widget.Widget_archive.getGroupFileCount(var0); - if (var1 == 0) { - Widget.Widget_loadedInterfaces[var0] = true; - return true; - } else { - if (Widget.Widget_interfaceComponents[var0] == null) { - Widget.Widget_interfaceComponents[var0] = new Widget[var1]; + World var3; + if (var0 == ScriptOpcodes.WORLDLIST_START) { + var3 = FontName.worldListStart(); + if (var3 != null) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.id; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.properties; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3.activity; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.location; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.population; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3.host; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; } - 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)); - } + return 1; + } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { + var3 = class3.getNextWorldListWorld(); + if (var3 != null) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.id; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.properties; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3.activity; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.location; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.population; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3.host; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else { + World var4; + int var5; + int var7; + if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { + var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + var4 = null; + + for (var5 = 0; var5 < World.World_count; ++var5) { + if (var7 == class13.World_worlds[var5].id) { + var4 = class13.World_worlds[var5]; + break; } } + + if (var4 != null) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var4.id; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var4.properties; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var4.activity; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var4.location; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var4.population; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var4.host; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { + UrlRequester.Interpreter_intStackSize -= 4; + var7 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + boolean var10 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1] == 1; + var5 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2]; + boolean var6 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 3] == 1; + WorldMapSection1.sortWorldList(var7, var10, var5, var6); + return 1; + } else if (var0 != ScriptOpcodes.GETWORLDINFO) { + if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { + Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + return 1; + } else { + int var8; + ParamDefinition var9; + if (var0 == ScriptOpcodes.NC_PARAM) { + UrlRequester.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + var9 = VarbitDefinition.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = StudioGame.getNpcDefinition(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = StudioGame.getNpcDefinition(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } else if (var0 == ScriptOpcodes.LC_PARAM) { + UrlRequester.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + var9 = VarbitDefinition.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = Canvas.getObjectDefinition(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Canvas.getObjectDefinition(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_PARAM) { + UrlRequester.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + var9 = VarbitDefinition.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = KitDefinition.ItemDefinition_get(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = KitDefinition.ItemDefinition_get(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { + UrlRequester.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + var9 = VarbitDefinition.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = class224.StructDefinition_getStructDefinition(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = class224.StructDefinition_getStructDefinition(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } else if (var0 == ScriptOpcodes.ON_MOBILE) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLIENTTYPE) { + Interpreter.Interpreter_intStack[++UrlRequester.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) { + --WorldMapEvent.Interpreter_stringStackSize; + --UrlRequester.Interpreter_intStackSize; + return 1; + } else if (var0 == 6523) { + --WorldMapEvent.Interpreter_stringStackSize; + --UrlRequester.Interpreter_intStackSize; + return 1; + } else if (var0 == ScriptOpcodes.BATTERYLEVEL) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; + return 1; + } else if (var0 == ScriptOpcodes.BATTERYCHARGING) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 1; + return 1; + } else if (var0 == ScriptOpcodes.WIFIAVAILABLE) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 1; + return 1; + } else { + return 2; + } + } + } else { + var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + if (var7 >= 0 && var7 < World.World_count) { + var4 = class13.World_worlds[var7]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var4.id; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var4.properties; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var4.activity; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var4.location; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var4.population; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var4.host; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; + } + + return 1; } - - Widget.Widget_loadedInterfaces[var0] = true; - return true; } } } - - @ObfuscatedName("ks") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-232699215" - ) - static void method1938(int var0) { - for (IntegerNode var1 = (IntegerNode)Client.widgetClickMasks.first(); var1 != null; var1 = (IntegerNode)Client.widgetClickMasks.next()) { - if ((var1.key >> 48 & 65535L) == (long)var0) { - var1.remove(); - } - } - - } } diff --git a/runescape-client/src/main/java/LoginType.java b/runescape-client/src/main/java/LoginType.java index ab0a7a5853..27247dcd18 100644 --- a/runescape-client/src/main/java/LoginType.java +++ b/runescape-client/src/main/java/LoginType.java @@ -4,89 +4,89 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mx") +@ObfuscatedName("mo") @Implements("LoginType") public class LoginType { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lmx;" + signature = "Lmo;" ) @Export("oldscape") public static final LoginType oldscape; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lmx;" - ) - static final LoginType field4049; - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Lmx;" - ) - static final LoginType field4051; - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "Lmx;" + signature = "Lmo;" ) static final LoginType field4052; - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lmx;" - ) - static final LoginType field4057; - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "Lmx;" - ) - static final LoginType field4059; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lmx;" - ) - static final LoginType field4055; - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "Lmx;" + signature = "Lmo;" ) static final LoginType field4056; - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lmx;" + signature = "Lmo;" ) - public static final LoginType field4054; - @ObfuscatedName("e") + static final LoginType field4054; + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "Lmo;" + ) + static final LoginType field4058; + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "Lmo;" + ) + static final LoginType field4055; + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "Lmo;" + ) + static final LoginType field4053; + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Lmo;" + ) + static final LoginType field4061; + @ObfuscatedName("a") + @ObfuscatedSignature( + signature = "Lmo;" + ) + public static final LoginType field4059; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 838731047 + intValue = -138904115 ) - final int field4058; - @ObfuscatedName("s") - final String field4053; + final int field4060; + @ObfuscatedName("w") + final String field4051; static { - oldscape = new LoginType(8, 0, "", ""); - field4049 = new LoginType(3, 1, "", ""); - field4051 = new LoginType(4, 2, "", ""); - field4052 = new LoginType(5, 3, "", ""); - field4057 = new LoginType(0, 4, "", ""); - field4059 = new LoginType(7, 5, "", ""); - field4055 = new LoginType(6, 6, "", ""); - field4056 = new LoginType(2, 7, "", ""); - field4054 = new LoginType(1, -1, "", "", true, new LoginType[]{oldscape, field4049, field4051, field4057, field4052}); + oldscape = new LoginType(7, 0, "", ""); + field4052 = new LoginType(2, 1, "", ""); + field4056 = new LoginType(6, 2, "", ""); + field4054 = new LoginType(8, 3, "", ""); + field4058 = new LoginType(1, 4, "", ""); + field4055 = new LoginType(4, 5, "", ""); + field4053 = new LoginType(0, 6, "", ""); + field4061 = new LoginType(3, 7, "", ""); + field4059 = new LoginType(5, -1, "", "", true, new LoginType[]{oldscape, field4052, field4056, field4058, field4054}); } LoginType(int var1, int var2, String var3, String var4) { - this.field4058 = var1; - this.field4053 = var4; + this.field4060 = var1; + this.field4051 = var4; } @ObfuscatedSignature( - signature = "(IILjava/lang/String;Ljava/lang/String;Z[Lmx;)V" + signature = "(IILjava/lang/String;Ljava/lang/String;Z[Lmo;)V" ) LoginType(int var1, int var2, String var3, String var4, boolean var5, LoginType[] var6) { - this.field4058 = var1; - this.field4053 = var4; + this.field4060 = var1; + this.field4051 = var4; } public String toString() { - return this.field4053; + return this.field4051; } } diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java index 27ea579be3..4a2fc8c2bd 100644 --- a/runescape-client/src/main/java/MenuAction.java +++ b/runescape-client/src/main/java/MenuAction.java @@ -4,43 +4,80 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ci") +@ObfuscatedName("cu") @Implements("MenuAction") public class MenuAction { - @ObfuscatedName("eh") - @ObfuscatedSignature( - signature = "Lih;" - ) - @Export("archive17") - static Archive archive17; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -1152596883 - ) - @Export("param1") - int param1; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 950122555 + intValue = 1178399769 ) @Export("param0") int param0; - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 935644857 + intValue = 1300782503 + ) + @Export("param1") + int param1; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 1809063501 ) @Export("opcode") int opcode; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -83774921 + intValue = -1681239955 ) @Export("identifier") int identifier; - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("action") String action; MenuAction() { } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "([BZI)Ljava/lang/Object;", + garbageValue = "1257898423" + ) + public static Object method2169(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; + } + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(Lic;Lic;I)V", + garbageValue = "1591696142" + ) + public static void method2171(AbstractArchive var0, AbstractArchive var1) { + SpotAnimationDefinition.SpotAnimationDefinition_archive = var0; + NPC.SpotAnimationDefinition_modelArchive = var1; + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "(ILic;IIIZI)V", + garbageValue = "896837453" + ) + @Export("playMusicTrack") + public static void playMusicTrack(int var0, AbstractArchive var1, int var2, int var3, int var4, boolean var5) { + class206.field2439 = 1; + Huffman.musicTrackArchive = var1; + class206.musicTrackGroupId = var2; + MilliClock.musicTrackFileId = var3; + class206.musicTrackVolume = var4; + class336.musicTrackBoolean = var5; + class206.field2442 = var0; + } } diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java index 8597d52f0e..0d463e16f0 100644 --- a/runescape-client/src/main/java/Message.java +++ b/runescape-client/src/main/java/Message.java @@ -3,56 +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("by") +@ObfuscatedName("br") @Implements("Message") public class Message extends DualNode { - @ObfuscatedName("at") - static String field633; - @ObfuscatedName("x") + @ObfuscatedName("dg") + @ObfuscatedSignature( + signature = "Lig;" + ) + @Export("archive1") + static Archive archive1; + @ObfuscatedName("dy") + @ObfuscatedSignature( + signature = "Lig;" + ) + @Export("archive12") + static Archive archive12; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 659624387 + intValue = 397960109 ) @Export("count") int count; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1682037485 + intValue = -2015162379 ) @Export("cycle") int cycle; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1650269491 + intValue = 195455957 ) @Export("type") int type; - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("sender") String sender; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lku;" + signature = "Lkq;" ) @Export("senderUsername") Username senderUsername; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lkv;" + signature = "Lkf;" ) @Export("isFromFriend0") TriBool isFromFriend0; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lkv;" + signature = "Lkf;" ) @Export("isFromIgnored0") TriBool isFromIgnored0; - @ObfuscatedName("z") + @ObfuscatedName("u") @Export("prefix") String prefix; - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("text") String text; @@ -62,14 +71,15 @@ public class Message extends DualNode { this.set(var1, var2, var3, var4); } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "1398956437" + garbageValue = "-427651151" ) @Export("set") void set(int var1, String var2, String var3, String var4) { - this.count = Player.method1342(); + int var5 = ++Messages.Messages_count - 1; + this.count = var5; this.cycle = Client.cycle; this.type = var1; this.sender = var2; @@ -80,20 +90,20 @@ public class Message extends DualNode { this.clearIsFromIgnored(); } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1417196149" + garbageValue = "2093900647" ) @Export("clearIsFromFriend") void clearIsFromFriend() { this.isFromFriend0 = TriBool.TriBool_unknown; } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "1" + signature = "(I)Z", + garbageValue = "1408976904" ) @Export("isFromFriend") final boolean isFromFriend() { @@ -104,30 +114,30 @@ public class Message extends DualNode { return this.isFromFriend0 == TriBool.TriBool_true; } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1598313930" + garbageValue = "511529108" ) @Export("fillIsFromFriend") void fillIsFromFriend() { - this.isFromFriend0 = Projectile.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isFromFriend0 = ModeWhere.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "14" + garbageValue = "108" ) @Export("clearIsFromIgnored") void clearIsFromIgnored() { this.isFromIgnored0 = TriBool.TriBool_unknown; } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(B)Z", - garbageValue = "-9" + garbageValue = "-124" ) @Export("isFromIgnored") final boolean isFromIgnored() { @@ -138,152 +148,218 @@ public class Message extends DualNode { return this.isFromIgnored0 == TriBool.TriBool_true; } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-929873231" + garbageValue = "-558597226" ) @Export("fillIsFromIgnored") void fillIsFromIgnored() { - this.isFromIgnored0 = Projectile.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isFromIgnored0 = ModeWhere.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-2096124823" + garbageValue = "-1793288574" ) @Export("fillSenderUsername") final void fillSenderUsername() { if (this.sender != null) { - this.senderUsername = new Username(Occluder.method3400(this.sender), WorldMapIcon_0.loginType); + this.senderUsername = new Username(BuddyRankComparator.method3556(this.sender), class195.loginType); } else { this.senderUsername = null; } } - @ObfuscatedName("x") + @ObfuscatedName("ik") @ObfuscatedSignature( - signature = "(Liy;Liy;I)V", - garbageValue = "1388306890" + signature = "(Lhd;III)V", + garbageValue = "-1019531565" ) - public static void method1319(AbstractArchive var0, AbstractArchive var1) { - KitDefinition.KitDefinition_archive = var0; - KitDefinition.KitDefinition_modelsArchive = var1; - KitDefinition.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); - } + static final void method1283(Widget var0, int var1, int var2) { + if (var0.buttonType == 1) { + ScriptEvent.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); + } - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "2024763142" - ) - static void method1300(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.field1110) { - var5 += var1 - var4.field1110; - } else if (var1 < var4.x) { - var5 += var4.x - var1; - } + String var3; + if (var0.buttonType == 2 && !Client.isSpellSelected) { + var3 = WorldMapAreaData.method762(var0); + if (var3 != null) { + ScriptEvent.insertMenuItemNoShift(var3, ItemContainer.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); + } + } - if (var2 > var4.field1100) { - var5 += var2 - var4.field1100; - } else if (var2 < var4.y) { - var5 += var4.y - var2; - } + if (var0.buttonType == 3) { + ScriptEvent.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); + } - if (var5 - 64 <= var4.field1106 && Client.areaSoundEffectVolume != 0 && var0 == var4.plane) { - var5 -= 64; - if (var5 < 0) { - var5 = 0; + if (var0.buttonType == 4) { + ScriptEvent.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); + } + + if (var0.buttonType == 5) { + ScriptEvent.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); + } + + if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { + ScriptEvent.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); + } + + int var4; + int var6; + int var7; + int var13; + if (var0.type == 2) { + var13 = 0; + + for (var4 = 0; var4 < var0.height; ++var4) { + for (int var5 = 0; var5 < var0.width; ++var5) { + var6 = (var0.paddingX + 32) * var5; + var7 = (var0.paddingY + 32) * var4; + if (var13 < 20) { + var6 += var0.inventoryXOffsets[var13]; + var7 += var0.inventoryYOffsets[var13]; } - int var6 = (var4.field1106 - var5) * Client.areaSoundEffectVolume / var4.field1106; - if (var4.stream1 == null) { - if (var4.soundEffectId >= 0) { - SoundEffect var7 = SoundEffect.readSoundEffect(FontName.archive4, var4.soundEffectId, 0); - if (var7 != null) { - RawSound var8 = var7.toRawSound().resample(class25.decimator); - RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6); - var9.setNumLoops(-1); - Tiles.pcmStreamMixer.addSubStream(var9); - var4.stream1 = var9; + if (var1 >= var6 && var2 >= var7 && var1 < var6 + 32 && var2 < var7 + 32) { + Client.dragItemSlotDestination = var13; + TaskHandler.field2066 = var0; + if (var0.itemIds[var13] > 0) { + ItemDefinition var8 = KitDefinition.ItemDefinition_get(var0.itemIds[var13] - 1); + if (Client.isItemSelected == 1 && FloorUnderlayDefinition.method4615(KeyHandler.getWidgetClickMask(var0))) { + if (var0.id != AbstractUserComparator.selectedItemWidget || var13 != LoginScreenAnimation.selectedItemSlot) { + ScriptEvent.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ItemContainer.colorStartTag(16748608) + var8.name, 31, var8.id, var13, var0.id); + } + } else if (Client.isSpellSelected && FloorUnderlayDefinition.method4615(KeyHandler.getWidgetClickMask(var0))) { + if ((WorldMapSprite.selectedSpellFlags & 16) == 16) { + ScriptEvent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ItemContainer.colorStartTag(16748608) + var8.name, 32, var8.id, var13, var0.id); + } + } else { + String[] var9 = var8.inventoryActions; + int var10 = -1; + if (Client.shiftClickDrop && ModelData0.method3375()) { + var10 = var8.getShiftClickIndex(); + } + + int var11; + if (FloorUnderlayDefinition.method4615(KeyHandler.getWidgetClickMask(var0))) { + for (var11 = 4; var11 >= 3; --var11) { + if (var11 != var10) { + WallDecoration.addWidgetItemMenuItem(var0, var8, var13, var11, false); + } + } + } + + if (class198.method3774(KeyHandler.getWidgetClickMask(var0))) { + ScriptEvent.insertMenuItemNoShift("Use", ItemContainer.colorStartTag(16748608) + var8.name, 38, var8.id, var13, var0.id); + } + + if (FloorUnderlayDefinition.method4615(KeyHandler.getWidgetClickMask(var0))) { + for (var11 = 2; var11 >= 0; --var11) { + if (var11 != var10) { + WallDecoration.addWidgetItemMenuItem(var0, var8, var13, var11, false); + } + } + + if (var10 >= 0) { + WallDecoration.addWidgetItemMenuItem(var0, var8, var13, var10, true); + } + } + + var9 = var0.itemActions; + if (var9 != null) { + for (var11 = 4; var11 >= 0; --var11) { + if (var9[var11] != null) { + byte var12 = 0; + if (var11 == 0) { + var12 = 39; + } + + if (var11 == 1) { + var12 = 40; + } + + if (var11 == 2) { + var12 = 41; + } + + if (var11 == 3) { + var12 = 42; + } + + if (var11 == 4) { + var12 = 43; + } + + ScriptEvent.insertMenuItemNoShift(var9[var11], ItemContainer.colorStartTag(16748608) + var8.name, var12, var8.id, var13, var0.id); + } + } + } + + ScriptEvent.insertMenuItemNoShift("Examine", ItemContainer.colorStartTag(16748608) + var8.name, 1005, var8.id, var13, var0.id); } } - } else { - var4.stream1.method2659(var6); } - if (var4.stream2 == null) { - if (var4.soundEffectIds != null && (var4.field1107 -= var3) <= 0) { - int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length); - SoundEffect var12 = SoundEffect.readSoundEffect(FontName.archive4, var4.soundEffectIds[var11], 0); - if (var12 != null) { - RawSound var13 = var12.toRawSound().resample(class25.decimator); - RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6); - var10.setNumLoops(0); - Tiles.pcmStreamMixer.addSubStream(var10); - var4.stream2 = var10; - var4.field1107 = var4.field1104 + (int)(Math.random() * (double)(var4.field1105 - var4.field1104)); - } - } - } else { - var4.stream2.method2659(var6); - if (!var4.stream2.hasNext()) { - var4.stream2 = null; - } - } - } else { - if (var4.stream1 != null) { - Tiles.pcmStreamMixer.removeSubStream(var4.stream1); - var4.stream1 = null; - } - - if (var4.stream2 != null) { - Tiles.pcmStreamMixer.removeSubStream(var4.stream2); - var4.stream2 = null; - } + ++var13; } } } - } + if (var0.isIf3) { + if (Client.isSpellSelected) { + var4 = KeyHandler.getWidgetClickMask(var0); + boolean var19 = (var4 >> 21 & 1) != 0; + if (var19 && (WorldMapSprite.selectedSpellFlags & 32) == 32) { + ScriptEvent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); + } + } else { + for (var13 = 9; var13 >= 5; --var13) { + var6 = KeyHandler.getWidgetClickMask(var0); + boolean var17 = (var6 >> var13 + 1 & 1) != 0; + String var14; + if (!var17 && var0.onOp == null) { + var14 = null; + } else if (var0.actions != null && var0.actions.length > var13 && var0.actions[var13] != null && var0.actions[var13].trim().length() != 0) { + var14 = var0.actions[var13]; + } else { + var14 = null; + } - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "1301536744" - ) - static int method1318(int var0, Script var1, boolean var2) { - Widget var3 = MusicPatchNode.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapRectangle.method388(ScriptEvent.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; + if (var14 != null) { + ScriptEvent.insertMenuItemNoShift(var14, var0.dataText, 1007, var13 + 1, var0.childIndex, var0.id); + } } - 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] = ""; - } + var3 = WorldMapAreaData.method762(var0); + if (var3 != null) { + ScriptEvent.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); + } - return 1; + for (var4 = 4; var4 >= 0; --var4) { + var7 = KeyHandler.getWidgetClickMask(var0); + boolean var18 = (var7 >> var4 + 1 & 1) != 0; + String var15; + if (!var18 && var0.onOp == null) { + var15 = null; + } else if (var0.actions != null && var0.actions.length > var4 && var0.actions[var4] != null && var0.actions[var4].trim().length() != 0) { + var15 = var0.actions[var4]; + } else { + var15 = null; + } + + if (var15 != null) { + ApproximateRouteStrategy.insertMenuItem(var15, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.field2744); + } + } + + if (WorldMapLabel.method487(KeyHandler.getWidgetClickMask(var0))) { + ScriptEvent.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); + } + } } + } } diff --git a/runescape-client/src/main/java/Messages.java b/runescape-client/src/main/java/Messages.java index 002ae18f75..17702e6329 100644 --- a/runescape-client/src/main/java/Messages.java +++ b/runescape-client/src/main/java/Messages.java @@ -6,30 +6,35 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ck") +@ObfuscatedName("cx") @Implements("Messages") public class Messages { - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("Messages_channels") static final Map Messages_channels; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lln;" + signature = "Llf;" ) @Export("Messages_hashTable") static final IterableNodeHashTable Messages_hashTable; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Ljz;" + signature = "Ljq;" ) @Export("Messages_queue") static final IterableDualNodeQueue Messages_queue; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 211996087 + intValue = 205405157 ) @Export("Messages_count") static int Messages_count; + @ObfuscatedName("g") + @Export("PcmPlayer_stereo") + protected static boolean PcmPlayer_stereo; + @ObfuscatedName("z") + public static short[][] field1308; static { Messages_channels = new HashMap(); @@ -38,84 +43,15 @@ public class Messages { Messages_count = 0; } - @ObfuscatedName("d") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "479861963" + signature = "(III)I", + garbageValue = "-1486803630" ) - @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; - } - - @ObfuscatedName("gq") - @ObfuscatedSignature( - signature = "(ZB)V", - garbageValue = "32" - ) - @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.field976 == 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 = IsaacCipher.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); - var2.playerCycle = Client.cycle; - GrandExchangeOfferWorldComparator.scene.drawEntity(ScriptEvent.Client_plane, var2.x, var2.y, class277.getTileHeight(var2.field976 * 64 - 64 + var2.x, var2.field976 * 64 - 64 + var2.y, ScriptEvent.Client_plane), var2.field976 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); - } - } - } - - } - - @ObfuscatedName("jh") - @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "803924766" - ) - static boolean method2322(int var0) { - for (int var1 = 0; var1 < Client.field901; ++var1) { - if (Client.field872[var1] == var0) { - return true; - } - } - - return false; + static final int method2350(int var0, int var1) { + int var2 = ClientPreferences.method1914(var0 - 1, var1 - 1) + ClientPreferences.method1914(1 + var0, var1 - 1) + ClientPreferences.method1914(var0 - 1, 1 + var1) + ClientPreferences.method1914(var0 + 1, 1 + var1); + int var3 = ClientPreferences.method1914(var0 - 1, var1) + ClientPreferences.method1914(1 + var0, var1) + ClientPreferences.method1914(var0, var1 - 1) + ClientPreferences.method1914(var0, var1 + 1); + int var4 = ClientPreferences.method1914(var0, var1); + return var2 / 16 + var3 / 8 + var4 / 4; } } diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java index cd43500d1b..36fa9296cd 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("hc") +@ObfuscatedName("hl") @Implements("MidiFileReader") public class MidiFileReader { - @ObfuscatedName("e") - static final byte[] field2478; - @ObfuscatedName("x") + @ObfuscatedName("z") + static final byte[] field2509; + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lkb;" + signature = "Lkn;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("division") int division; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("trackStarts") int[] trackStarts; - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("trackPositions") int[] trackPositions; - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("trackLengths") int[] trackLengths; - @ObfuscatedName("v") - int[] field2474; - @ObfuscatedName("q") - int field2471; - @ObfuscatedName("t") - long field2477; + @ObfuscatedName("g") + int[] field2505; + @ObfuscatedName("n") + int field2506; + @ObfuscatedName("a") + long field2508; static { - field2478 = 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}; + field2509 = 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("x") + @ObfuscatedName("m") @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.field2471 = 500000; + this.field2506 = 500000; this.trackStarts = new int[var2]; Buffer var10000; @@ -70,7 +70,7 @@ public class MidiFileReader { var10000 = this.buffer; } - this.field2477 = 0L; + this.field2508 = 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.field2474 = new int[var2]; + this.field2505 = new int[var2]; } - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("clear") void clear() { this.buffer.array = null; this.trackStarts = null; this.trackPositions = null; this.trackLengths = null; - this.field2474 = null; + this.field2505 = null; } - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("isReady") boolean isReady() { return this.buffer.array != null; } - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("trackCount") int trackCount() { return this.trackPositions.length; } - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("gotoTrack") void gotoTrack(int var1) { this.buffer.offset = this.trackPositions[var1]; } - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("markTrackPosition") void markTrackPosition(int var1) { this.trackPositions[var1] = this.buffer.offset; } - @ObfuscatedName("q") + @ObfuscatedName("n") @Export("setTrackDone") void setTrackDone() { this.buffer.offset = -1; } - @ObfuscatedName("z") + @ObfuscatedName("u") @Export("readTrackLength") void readTrackLength(int var1) { int var2 = this.buffer.readVarInt(); @@ -129,36 +129,36 @@ public class MidiFileReader { var10000[var1] += var2; } - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("readMessage") int readMessage(int var1) { int var2 = this.readMessage0(var1); return var2; } - @ObfuscatedName("e") + @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.field2474[var1] = var5; + this.field2505[var1] = var5; ++this.buffer.offset; } else { - var5 = this.field2474[var1]; + var5 = this.field2505[var1]; } if (var5 != 240 && var5 != 247) { - return this.method3934(var1, var5); + return this.method3982(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.field2474[var1] = var4; - return this.method3934(var1, var4); + this.field2505[var1] = var4; + return this.method3982(var1, var4); } } @@ -168,8 +168,8 @@ public class MidiFileReader { } } - @ObfuscatedName("s") - int method3934(int var1, int var2) { + @ObfuscatedName("w") + int method3982(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.field2477 += (long)var6 * (long)(this.field2471 - var5); - this.field2471 = var5; + this.field2508 += (long)var6 * (long)(this.field2506 - var5); + this.field2506 = var5; var10000 = this.buffer; var10000.offset += var4; return 2; @@ -194,7 +194,7 @@ public class MidiFileReader { return 3; } } else { - byte var3 = field2478[var2 - 128]; + byte var3 = field2509[var2 - 128]; var4 = var2; if (var3 >= 1) { var4 = var2 | this.buffer.readUnsignedByte() << 8; @@ -208,12 +208,12 @@ public class MidiFileReader { } } - @ObfuscatedName("p") - long method3935(int var1) { - return this.field2477 + (long)var1 * (long)this.field2471; + @ObfuscatedName("y") + long method3985(int var1) { + return this.field2508 + (long)var1 * (long)this.field2506; } - @ObfuscatedName("n") + @ObfuscatedName("c") @Export("getPrioritizedTrack") int getPrioritizedTrack() { int var1 = this.trackPositions.length; @@ -230,7 +230,7 @@ public class MidiFileReader { return var2; } - @ObfuscatedName("u") + @ObfuscatedName("h") @Export("isDone") boolean isDone() { int var1 = this.trackPositions.length; @@ -244,15 +244,15 @@ public class MidiFileReader { return true; } - @ObfuscatedName("h") + @ObfuscatedName("k") @Export("reset") void reset(long var1) { - this.field2477 = var1; + this.field2508 = var1; int var3 = this.trackPositions.length; for (int var4 = 0; var4 < var3; ++var4) { this.trackLengths[var4] = 0; - this.field2474[var4] = 0; + this.field2505[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 a8e76f08ff..b431408449 100644 --- a/runescape-client/src/main/java/MidiPcmStream.java +++ b/runescape-client/src/main/java/MidiPcmStream.java @@ -4,161 +4,155 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gi") +@ObfuscatedName("gw") @Implements("MidiPcmStream") public class MidiPcmStream extends PcmStream { - @ObfuscatedName("cn") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lbn;" - ) - @Export("mouseRecorder") - static MouseRecorder mouseRecorder; - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Llv;" + signature = "Lle;" ) @Export("musicPatches") NodeHashTable musicPatches; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 1512673055 - ) - int field2415; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 871751543 - ) - int field2419; - @ObfuscatedName("d") - int[] field2443; - @ObfuscatedName("v") - int[] field2416; - @ObfuscatedName("q") - int[] field2417; - @ObfuscatedName("z") - int[] field2420; - @ObfuscatedName("t") - int[] field2421; - @ObfuscatedName("e") - int[] field2422; - @ObfuscatedName("s") - int[] field2423; - @ObfuscatedName("p") - int[] field2424; - @ObfuscatedName("n") - int[] field2437; - @ObfuscatedName("l") - int[] field2428; - @ObfuscatedName("r") - int[] field2429; @ObfuscatedName("o") - int[] field2430; - @ObfuscatedName("c") - int[] field2431; + @ObfuscatedGetter( + intValue = 1861349381 + ) + int field2472; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -11314911 + ) + int field2462; @ObfuscatedName("j") - int[] field2432; + int[] field2450; + @ObfuscatedName("p") + int[] field2458; + @ObfuscatedName("g") + int[] field2452; + @ObfuscatedName("n") + int[] field2453; + @ObfuscatedName("u") + int[] field2456; + @ObfuscatedName("a") + int[] field2455; + @ObfuscatedName("z") + int[] field2448; @ObfuscatedName("y") - int[] field2433; + int[] field2457; + @ObfuscatedName("c") + int[] field2459; + @ObfuscatedName("e") + int[] field2460; + @ObfuscatedName("l") + int[] field2461; + @ObfuscatedName("t") + int[] field2447; + @ObfuscatedName("x") + int[] field2463; + @ObfuscatedName("b") + int[] field2464; + @ObfuscatedName("i") + int[] field2454; @ObfuscatedName("f") @ObfuscatedSignature( - signature = "[[Lhz;" + signature = "[[Lhm;" ) - MusicPatchNode[][] field2441; - @ObfuscatedName("ae") + MusicPatchNode[][] field2466; + @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "[[Lhz;" + signature = "[[Lhm;" ) - MusicPatchNode[][] field2435; - @ObfuscatedName("an") + MusicPatchNode[][] field2467; + @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "Lhc;" + signature = "Lhl;" ) @Export("midiFile") MidiFileReader midiFile; - @ObfuscatedName("ai") - boolean field2418; - @ObfuscatedName("ap") + @ObfuscatedName("ao") + boolean field2469; + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 1099692055 + intValue = -408664983 ) @Export("track") int track; - @ObfuscatedName("ab") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 1127320341 + intValue = -1241874657 ) @Export("trackLength") int trackLength; - @ObfuscatedName("ar") + @ObfuscatedName("ag") @ObfuscatedGetter( - longValue = -9197860659257492463L + longValue = 5529909508015764317L ) - long field2440; - @ObfuscatedName("af") + long field2465; + @ObfuscatedName("ab") @ObfuscatedGetter( - longValue = 573675785122514817L + longValue = 2344404175579983131L ) - long field2425; - @ObfuscatedName("at") + long field2473; + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "Lhs;" + signature = "Lhj;" ) @Export("patchStream") MusicPatchPcmStream patchStream; public MidiPcmStream() { - this.field2415 = 256; - this.field2419 = 1000000; - this.field2443 = new int[16]; - this.field2416 = new int[16]; - this.field2417 = new int[16]; - this.field2420 = new int[16]; - this.field2421 = new int[16]; - this.field2422 = new int[16]; - this.field2423 = new int[16]; - this.field2424 = new int[16]; - this.field2437 = new int[16]; - this.field2428 = new int[16]; - this.field2429 = new int[16]; - this.field2430 = new int[16]; - this.field2431 = new int[16]; - this.field2432 = new int[16]; - this.field2433 = new int[16]; - this.field2441 = new MusicPatchNode[16][128]; - this.field2435 = new MusicPatchNode[16][128]; + this.field2472 = 256; + this.field2462 = 1000000; + this.field2450 = new int[16]; + this.field2458 = new int[16]; + this.field2452 = new int[16]; + this.field2453 = new int[16]; + this.field2456 = new int[16]; + this.field2455 = new int[16]; + this.field2448 = new int[16]; + this.field2457 = new int[16]; + this.field2459 = new int[16]; + this.field2460 = new int[16]; + this.field2461 = new int[16]; + this.field2447 = new int[16]; + this.field2463 = new int[16]; + this.field2464 = new int[16]; + this.field2454 = new int[16]; + this.field2466 = new MusicPatchNode[16][128]; + this.field2467 = new MusicPatchNode[16][128]; this.midiFile = new MidiFileReader(); this.patchStream = new MusicPatchPcmStream(this); this.musicPatches = new NodeHashTable(128); - this.method3812(); - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1144046220" - ) - @Export("setPcmStreamVolume") - public synchronized void setPcmStreamVolume(int var1) { - this.field2415 = var1; + this.method3856(); } @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "688694968" + signature = "(II)V", + garbageValue = "-1244273754" ) - public int method3793() { - return this.field2415; + @Export("setPcmStreamVolume") + public synchronized void setPcmStreamVolume(int var1) { + this.field2472 = var1; } - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lhh;Liy;Ldk;II)Z", - garbageValue = "33477442" + signature = "(I)I", + garbageValue = "-988270526" + ) + public int method3837() { + return this.field2472; + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(Lhz;Lic;Ldo;II)Z", + garbageValue = "-700249158" ) @Export("loadMusicTrack") public synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) { - var1.method4007(); + var1.method4057(); boolean var5 = true; int[] var6 = null; if (var4 > 0) { @@ -169,7 +163,7 @@ public class MidiPcmStream extends PcmStream { int var8 = (int)var7.key; MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)var8); if (var9 == null) { - var9 = class298.method5343(var2, var8); + var9 = TileItem.method2255(var2, var8); if (var9 == null) { var5 = false; continue; @@ -178,7 +172,7 @@ public class MidiPcmStream extends PcmStream { this.musicPatches.put(var9, (long)var8); } - if (!var9.method3970(var3, var7.byteArray, var6)) { + if (!var9.method4027(var3, var7.byteArray, var6)) { var5 = false; } } @@ -190,10 +184,10 @@ public class MidiPcmStream extends PcmStream { return var5; } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "564851445" + signature = "(B)V", + garbageValue = "1" ) @Export("clearAll") public synchronized void clearAll() { @@ -203,10 +197,10 @@ public class MidiPcmStream extends PcmStream { } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1029490375" + garbageValue = "-100699849" ) @Export("removeAll") public synchronized void removeAll() { @@ -216,65 +210,65 @@ public class MidiPcmStream extends PcmStream { } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "()Lds;" + signature = "()Ldf;" ) @Export("firstSubStream") protected synchronized PcmStream firstSubStream() { return this.patchStream; } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "()Lds;" + signature = "()Ldf;" ) @Export("nextSubStream") protected synchronized PcmStream nextSubStream() { return null; } - @ObfuscatedName("z") - protected synchronized int vmethod3984() { + @ObfuscatedName("u") + protected synchronized int vmethod4037() { return 0; } - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("fill") protected synchronized void fill(int[] var1, int var2, int var3) { if (this.midiFile.isReady()) { - int var4 = this.midiFile.division * this.field2419 / PcmPlayer.field1421; + int var4 = this.midiFile.division * this.field2462 / class237.field3113; do { - long var5 = (long)var4 * (long)var3 + this.field2440; - if (this.field2425 - var5 >= 0L) { - this.field2440 = var5; + long var5 = (long)var3 * (long)var4 + this.field2465; + if (this.field2473 - var5 >= 0L) { + this.field2465 = var5; break; } - int var7 = (int)(((long)var4 + (this.field2425 - this.field2440) - 1L) / (long)var4); - this.field2440 += (long)var7 * (long)var4; + int var7 = (int)(((long)var4 + (this.field2473 - this.field2465) - 1L) / (long)var4); + this.field2465 += (long)var4 * (long)var7; this.patchStream.fill(var1, var2, var7); var2 += var7; var3 -= var7; - this.method3825(); + this.method3872(); } while(this.midiFile.isReady()); } this.patchStream.fill(var1, var2, var3); } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(Lhh;ZI)V", - garbageValue = "1158871386" + signature = "(Lhz;ZI)V", + garbageValue = "746467478" ) @Export("setMusicTrack") public synchronized void setMusicTrack(MusicTrack var1, boolean var2) { this.clear(); this.midiFile.parse(var1.midi); - this.field2418 = var2; - this.field2440 = 0L; + this.field2469 = var2; + this.field2465 = 0L; int var3 = this.midiFile.trackCount(); for (int var4 = 0; var4 < var3; ++var4) { @@ -285,248 +279,248 @@ public class MidiPcmStream extends PcmStream { this.track = this.midiFile.getPrioritizedTrack(); this.trackLength = this.midiFile.trackLengths[this.track]; - this.field2425 = this.midiFile.method3935(this.trackLength); + this.field2473 = this.midiFile.method3985(this.trackLength); } - @ObfuscatedName("s") + @ObfuscatedName("w") @Export("skip") protected synchronized void skip(int var1) { if (this.midiFile.isReady()) { - int var2 = this.midiFile.division * this.field2419 / PcmPlayer.field1421; + int var2 = this.midiFile.division * this.field2462 / class237.field3113; do { - long var3 = this.field2440 + (long)var1 * (long)var2; - if (this.field2425 - var3 >= 0L) { - this.field2440 = var3; + long var3 = (long)var2 * (long)var1 + this.field2465; + if (this.field2473 - var3 >= 0L) { + this.field2465 = var3; break; } - int var5 = (int)((this.field2425 - this.field2440 + (long)var2 - 1L) / (long)var2); - this.field2440 += (long)var5 * (long)var2; + int var5 = (int)(((long)var2 + (this.field2473 - this.field2465) - 1L) / (long)var2); + this.field2465 += (long)var5 * (long)var2; this.patchStream.skip(var5); var1 -= var5; - this.method3825(); + this.method3872(); } while(this.midiFile.isReady()); } this.patchStream.skip(var1); } - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1819276165" + signature = "(B)V", + garbageValue = "106" ) @Export("clear") public synchronized void clear() { this.midiFile.clear(); - this.method3812(); + this.method3856(); } - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-799045616" + garbageValue = "1676507703" ) @Export("isReady") public synchronized boolean isReady() { return this.midiFile.isReady(); } - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "82" - ) - public synchronized void method3800(int var1, int var2) { - this.method3801(var1, var2); - } - @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "1696015287" + signature = "(IIB)V", + garbageValue = "0" ) - void method3801(int var1, int var2) { - this.field2420[var1] = var2; - this.field2422[var1] = var2 & -128; - this.method3802(var1, var2); + public synchronized void method3935(int var1, int var2) { + this.method3916(var1, var2); } - @ObfuscatedName("g") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "1712067556" + garbageValue = "-1377126651" ) - void method3802(int var1, int var2) { - if (var2 != this.field2421[var1]) { - this.field2421[var1] = var2; + void method3916(int var1, int var2) { + this.field2453[var1] = var2; + this.field2455[var1] = var2 & -128; + this.method3846(var1, var2); + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + signature = "(IIB)V", + garbageValue = "4" + ) + void method3846(int var1, int var2) { + if (var2 != this.field2456[var1]) { + this.field2456[var1] = var2; for (int var3 = 0; var3 < 128; ++var3) { - this.field2435[var1][var3] = null; + this.field2467[var1][var3] = null; } } } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(IIII)V", - garbageValue = "-91684183" + signature = "(IIIS)V", + garbageValue = "23534" ) - void method3808(int var1, int var2, int var3) { - this.method3805(var1, var2, 64); - if ((this.field2428[var1] & 2) != 0) { + void method3847(int var1, int var2, int var3) { + this.method3849(var1, var2, 64); + if ((this.field2460[var1] & 2) != 0) { for (MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) { - if (var4.field2452 == var1 && var4.field2459 < 0) { - this.field2441[var1][var4.field2464] = null; - this.field2441[var1][var2] = var4; - int var5 = (var4.field2455 * var4.field2454 >> 12) + var4.field2445; - var4.field2445 += var2 - var4.field2464 << 8; - var4.field2454 = var5 - var4.field2445; - var4.field2455 = 4096; - var4.field2464 = var2; + if (var4.field2479 == var1 && var4.field2490 < 0) { + this.field2466[var1][var4.field2481] = null; + this.field2466[var1][var2] = var4; + int var5 = (var4.field2491 * var4.field2485 >> 12) + var4.field2484; + var4.field2484 += var2 - var4.field2481 << 8; + var4.field2485 = var5 - var4.field2484; + var4.field2491 = 4096; + var4.field2481 = var2; return; } } } - MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2421[var1]); + MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2456[var1]); if (var9 != null) { RawSound var8 = var9.rawSounds[var2]; if (var8 != null) { MusicPatchNode var6 = new MusicPatchNode(); - var6.field2452 = var1; + var6.field2479 = var1; var6.patch = var9; var6.rawSound = var8; - var6.field2460 = var9.field2488[var2]; - var6.field2467 = var9.field2489[var2]; - var6.field2464 = var2; - var6.field2451 = var3 * var3 * var9.field2487[var2] * var9.field2484 + 1024 >> 11; - var6.field2465 = var9.field2490[var2] & 255; - var6.field2445 = (var2 << 8) - (var9.field2485[var2] & 32767); - var6.field2456 = 0; - var6.field2457 = 0; - var6.field2458 = 0; - var6.field2459 = -1; - var6.field2448 = 0; - if (this.field2431[var1] == 0) { - var6.stream = RawPcmStream.method2685(var8, this.method3864(var6), this.method3818(var6), this.method3819(var6)); + var6.field2477 = var9.field2519[var2]; + var6.field2480 = var9.field2522[var2]; + var6.field2481 = var2; + var6.field2499 = var3 * var3 * var9.field2517[var2] * var9.field2520 + 1024 >> 11; + var6.field2483 = var9.field2518[var2] & 255; + var6.field2484 = (var2 << 8) - (var9.field2521[var2] & 32767); + var6.field2496 = 0; + var6.field2488 = 0; + var6.field2489 = 0; + var6.field2490 = -1; + var6.field2493 = 0; + if (this.field2463[var1] == 0) { + var6.stream = RawPcmStream.method2674(var8, this.method3861(var6), this.method3958(var6), this.method3912(var6)); } else { - var6.stream = RawPcmStream.method2685(var8, this.method3864(var6), 0, this.method3819(var6)); - this.method3852(var6, var9.field2485[var2] < 0); + var6.stream = RawPcmStream.method2674(var8, this.method3861(var6), 0, this.method3912(var6)); + this.method3852(var6, var9.field2521[var2] < 0); } - if (var9.field2485[var2] < 0) { + if (var9.field2521[var2] < 0) { var6.stream.setNumLoops(-1); } - if (var6.field2467 >= 0) { - MusicPatchNode var7 = this.field2435[var1][var6.field2467]; - if (var7 != null && var7.field2459 < 0) { - this.field2441[var1][var7.field2464] = null; - var7.field2459 = 0; + if (var6.field2480 >= 0) { + MusicPatchNode var7 = this.field2467[var1][var6.field2480]; + if (var7 != null && var7.field2490 < 0) { + this.field2466[var1][var7.field2481] = null; + var7.field2490 = 0; } - this.field2435[var1][var6.field2467] = var6; + this.field2467[var1][var6.field2480] = var6; } this.patchStream.queue.addFirst(var6); - this.field2441[var1][var2] = var6; + this.field2466[var1][var2] = var6; } } } - @ObfuscatedName("a") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Lhz;ZI)V", - garbageValue = "-1752723924" + signature = "(Lhm;ZI)V", + garbageValue = "2083616471" ) void method3852(MusicPatchNode var1, boolean var2) { int var3 = var1.rawSound.samples.length; int var4; - if (var2 && var1.rawSound.field1407) { + if (var2 && var1.rawSound.field1423) { int var5 = var3 + var3 - var1.rawSound.start; - var4 = (int)((long)this.field2431[var1.field2452] * (long)var5 >> 6); + var4 = (int)((long)var5 * (long)this.field2463[var1.field2479] >> 6); var3 <<= 8; if (var4 >= var3) { var4 = var3 + var3 - 1 - var4; - var1.stream.method2655(); + var1.stream.method2683(); } } else { - var4 = (int)((long)var3 * (long)this.field2431[var1.field2452] >> 6); + var4 = (int)((long)var3 * (long)this.field2463[var1.field2479] >> 6); } - var1.stream.method2664(var4); + var1.stream.method2682(var4); } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(IIII)V", - garbageValue = "686121236" + signature = "(IIIB)V", + garbageValue = "96" ) - void method3805(int var1, int var2, int var3) { - MusicPatchNode var4 = this.field2441[var1][var2]; + void method3849(int var1, int var2, int var3) { + MusicPatchNode var4 = this.field2466[var1][var2]; if (var4 != null) { - this.field2441[var1][var2] = null; - if ((this.field2428[var1] & 2) != 0) { + this.field2466[var1][var2] = null; + if ((this.field2460[var1] & 2) != 0) { for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var5.field2452 == var4.field2452 && var5.field2459 < 0 && var4 != var5) { - var4.field2459 = 0; + if (var4.field2479 == var5.field2479 && var5.field2490 < 0 && var4 != var5) { + var4.field2490 = 0; break; } } } else { - var4.field2459 = 0; + var4.field2490 = 0; } } } - @ObfuscatedName("c") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IIII)V", - garbageValue = "-97201691" + signature = "(IIIB)V", + garbageValue = "1" ) - void method3900(int var1, int var2, int var3) { + void method3850(int var1, int var2, int var3) { } - @ObfuscatedName("f") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "-1237765381" + signature = "(IIB)V", + garbageValue = "-70" ) - void method3817(int var1, int var2) { + void method3851(int var1, int var2) { } - @ObfuscatedName("ae") + @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "288952234" + signature = "(IIB)V", + garbageValue = "40" ) - void method3799(int var1, int var2) { - this.field2423[var1] = var2; + void method3961(int var1, int var2) { + this.field2448[var1] = var2; } - @ObfuscatedName("an") + @ObfuscatedName("ai") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "866447032" + garbageValue = "-1783640245" ) - void method3809(int var1) { + void method3858(int var1) { for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var1 < 0 || var2.field2452 == var1) { + if (var1 < 0 || var2.field2479 == var1) { if (var2.stream != null) { - var2.stream.method2706(PcmPlayer.field1421 / 100); - if (var2.stream.method2672()) { + var2.stream.method2732(class237.field3113 / 100); + if (var2.stream.method2691()) { this.patchStream.mixer.addSubStream(var2.stream); } - var2.method3917(); + var2.method3963(); } - if (var2.field2459 < 0) { - this.field2441[var2.field2452][var2.field2464] = null; + if (var2.field2490 < 0) { + this.field2466[var2.field2479][var2.field2481] = null; } var2.remove(); @@ -535,96 +529,44 @@ public class MidiPcmStream extends PcmStream { } - @ObfuscatedName("ai") + @ObfuscatedName("ao") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-1172399116" + garbageValue = "183029579" ) - void method3810(int var1) { + void method3952(int var1) { if (var1 >= 0) { - this.field2443[var1] = 12800; - this.field2416[var1] = 8192; - this.field2417[var1] = 16383; - this.field2423[var1] = 8192; - this.field2424[var1] = 0; - this.field2437[var1] = 8192; - this.method3813(var1); - this.method3916(var1); - this.field2428[var1] = 0; - this.field2429[var1] = 32767; - this.field2430[var1] = 256; - this.field2431[var1] = 0; - this.method3899(var1, 8192); + this.field2450[var1] = 12800; + this.field2458[var1] = 8192; + this.field2452[var1] = 16383; + this.field2448[var1] = 8192; + this.field2457[var1] = 0; + this.field2459[var1] = 8192; + this.method3857(var1); + this.method3929(var1); + this.field2460[var1] = 0; + this.field2461[var1] = 32767; + this.field2447[var1] = 256; + this.field2463[var1] = 0; + this.method3860(var1, 8192); } else { for (var1 = 0; var1 < 16; ++var1) { - this.method3810(var1); + this.method3952(var1); } } } - @ObfuscatedName("ap") - @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "-67" - ) - void method3840(int var1) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if ((var1 < 0 || var2.field2452 == var1) && var2.field2459 < 0) { - this.field2441[var2.field2452][var2.field2464] = null; - var2.field2459 = 0; - } - } - - } - - @ObfuscatedName("av") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "86" - ) - void method3812() { - this.method3809(-1); - this.method3810(-1); - - int var1; - for (var1 = 0; var1 < 16; ++var1) { - this.field2421[var1] = this.field2420[var1]; - } - - for (var1 = 0; var1 < 16; ++var1) { - this.field2422[var1] = this.field2420[var1] & -128; - } - - } - - @ObfuscatedName("ak") + @ObfuscatedName("ae") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-529276423" + garbageValue = "911673263" ) - void method3813(int var1) { - if ((this.field2428[var1] & 2) != 0) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var2.field2452 == var1 && this.field2441[var1][var2.field2464] == null && var2.field2459 < 0) { - var2.field2459 = 0; - } - } - } - - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "32" - ) - void method3916(int var1) { - if ((this.field2428[var1] & 4) != 0) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var2.field2452 == var1) { - var2.field2462 = 0; - } + void method3855(int var1) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { + if ((var1 < 0 || var2.field2479 == var1) && var2.field2490 < 0) { + this.field2466[var2.field2479][var2.field2481] = null; + var2.field2490 = 0; } } @@ -632,10 +574,62 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1370441478" + signature = "(B)V", + garbageValue = "-57" ) - void method3815(int var1) { + void method3856() { + this.method3858(-1); + this.method3952(-1); + + int var1; + for (var1 = 0; var1 < 16; ++var1) { + this.field2456[var1] = this.field2453[var1]; + } + + for (var1 = 0; var1 < 16; ++var1) { + this.field2455[var1] = this.field2453[var1] & -128; + } + + } + + @ObfuscatedName("an") + @ObfuscatedSignature( + signature = "(IB)V", + garbageValue = "8" + ) + void method3857(int var1) { + if ((this.field2460[var1] & 2) != 0) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { + if (var2.field2479 == var1 && this.field2466[var1][var2.field2481] == null && var2.field2490 < 0) { + var2.field2490 = 0; + } + } + } + + } + + @ObfuscatedName("av") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "-1839659310" + ) + void method3929(int var1) { + if ((this.field2460[var1] & 4) != 0) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { + if (var2.field2479 == var1) { + var2.field2478 = 0; + } + } + } + + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "-1915531597" + ) + void method3845(int var1) { int var2 = var1 & 240; int var3; int var4; @@ -644,289 +638,289 @@ public class MidiPcmStream extends PcmStream { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; - this.method3805(var3, var4, var5); + this.method3849(var3, var4, var5); } else if (var2 == 144) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; if (var5 > 0) { - this.method3808(var3, var4, var5); + this.method3847(var3, var4, var5); } else { - this.method3805(var3, var4, 64); + this.method3849(var3, var4, 64); } } else if (var2 == 160) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; - this.method3900(var3, var4, var5); + this.method3850(var3, var4, var5); } else if (var2 == 176) { var3 = var1 & 15; var4 = var1 >> 8 & 127; var5 = var1 >> 16 & 127; if (var4 == 0) { - this.field2422[var3] = (var5 << 14) + (this.field2422[var3] & -2080769); + this.field2455[var3] = (var5 << 14) + (this.field2455[var3] & -2080769); } if (var4 == 32) { - this.field2422[var3] = (var5 << 7) + (this.field2422[var3] & -16257); + this.field2455[var3] = (var5 << 7) + (this.field2455[var3] & -16257); } if (var4 == 1) { - this.field2424[var3] = (var5 << 7) + (this.field2424[var3] & -16257); + this.field2457[var3] = (var5 << 7) + (this.field2457[var3] & -16257); } if (var4 == 33) { - this.field2424[var3] = var5 + (this.field2424[var3] & -128); + this.field2457[var3] = var5 + (this.field2457[var3] & -128); } if (var4 == 5) { - this.field2437[var3] = (var5 << 7) + (this.field2437[var3] & -16257); + this.field2459[var3] = (var5 << 7) + (this.field2459[var3] & -16257); } if (var4 == 37) { - this.field2437[var3] = var5 + (this.field2437[var3] & -128); + this.field2459[var3] = var5 + (this.field2459[var3] & -128); } if (var4 == 7) { - this.field2443[var3] = (var5 << 7) + (this.field2443[var3] & -16257); + this.field2450[var3] = (var5 << 7) + (this.field2450[var3] & -16257); } if (var4 == 39) { - this.field2443[var3] = var5 + (this.field2443[var3] & -128); + this.field2450[var3] = var5 + (this.field2450[var3] & -128); } if (var4 == 10) { - this.field2416[var3] = (var5 << 7) + (this.field2416[var3] & -16257); + this.field2458[var3] = (var5 << 7) + (this.field2458[var3] & -16257); } if (var4 == 42) { - this.field2416[var3] = var5 + (this.field2416[var3] & -128); + this.field2458[var3] = var5 + (this.field2458[var3] & -128); } if (var4 == 11) { - this.field2417[var3] = (var5 << 7) + (this.field2417[var3] & -16257); + this.field2452[var3] = (var5 << 7) + (this.field2452[var3] & -16257); } if (var4 == 43) { - this.field2417[var3] = var5 + (this.field2417[var3] & -128); + this.field2452[var3] = var5 + (this.field2452[var3] & -128); } int[] var10000; if (var4 == 64) { if (var5 >= 64) { - var10000 = this.field2428; + var10000 = this.field2460; var10000[var3] |= 1; } else { - var10000 = this.field2428; + var10000 = this.field2460; var10000[var3] &= -2; } } if (var4 == 65) { if (var5 >= 64) { - var10000 = this.field2428; + var10000 = this.field2460; var10000[var3] |= 2; } else { - this.method3813(var3); - var10000 = this.field2428; + this.method3857(var3); + var10000 = this.field2460; var10000[var3] &= -3; } } if (var4 == 99) { - this.field2429[var3] = (var5 << 7) + (this.field2429[var3] & 127); + this.field2461[var3] = (var5 << 7) + (this.field2461[var3] & 127); } if (var4 == 98) { - this.field2429[var3] = (this.field2429[var3] & 16256) + var5; + this.field2461[var3] = (this.field2461[var3] & 16256) + var5; } if (var4 == 101) { - this.field2429[var3] = (var5 << 7) + (this.field2429[var3] & 127) + 16384; + this.field2461[var3] = (var5 << 7) + (this.field2461[var3] & 127) + 16384; } if (var4 == 100) { - this.field2429[var3] = (this.field2429[var3] & 16256) + var5 + 16384; + this.field2461[var3] = (this.field2461[var3] & 16256) + var5 + 16384; } if (var4 == 120) { - this.method3809(var3); + this.method3858(var3); } if (var4 == 121) { - this.method3810(var3); + this.method3952(var3); } if (var4 == 123) { - this.method3840(var3); + this.method3855(var3); } int var6; if (var4 == 6) { - var6 = this.field2429[var3]; + var6 = this.field2461[var3]; if (var6 == 16384) { - this.field2430[var3] = (var5 << 7) + (this.field2430[var3] & -16257); + this.field2447[var3] = (var5 << 7) + (this.field2447[var3] & -16257); } } if (var4 == 38) { - var6 = this.field2429[var3]; + var6 = this.field2461[var3]; if (var6 == 16384) { - this.field2430[var3] = var5 + (this.field2430[var3] & -128); + this.field2447[var3] = var5 + (this.field2447[var3] & -128); } } if (var4 == 16) { - this.field2431[var3] = (var5 << 7) + (this.field2431[var3] & -16257); + this.field2463[var3] = (var5 << 7) + (this.field2463[var3] & -16257); } if (var4 == 48) { - this.field2431[var3] = var5 + (this.field2431[var3] & -128); + this.field2463[var3] = var5 + (this.field2463[var3] & -128); } if (var4 == 81) { if (var5 >= 64) { - var10000 = this.field2428; + var10000 = this.field2460; var10000[var3] |= 4; } else { - this.method3916(var3); - var10000 = this.field2428; + this.method3929(var3); + var10000 = this.field2460; var10000[var3] &= -5; } } if (var4 == 17) { - this.method3899(var3, (var5 << 7) + (this.field2432[var3] & -16257)); + this.method3860(var3, (var5 << 7) + (this.field2464[var3] & -16257)); } if (var4 == 49) { - this.method3899(var3, var5 + (this.field2432[var3] & -128)); + this.method3860(var3, var5 + (this.field2464[var3] & -128)); } } else if (var2 == 192) { var3 = var1 & 15; var4 = var1 >> 8 & 127; - this.method3802(var3, var4 + this.field2422[var3]); + this.method3846(var3, var4 + this.field2455[var3]); } else if (var2 == 208) { var3 = var1 & 15; var4 = var1 >> 8 & 127; - this.method3817(var3, var4); + this.method3851(var3, var4); } else if (var2 == 224) { var3 = var1 & 15; var4 = (var1 >> 8 & 127) + (var1 >> 9 & 16256); - this.method3799(var3, var4); + this.method3961(var3, var4); } else { var2 = var1 & 255; if (var2 == 255) { - this.method3812(); + this.method3856(); } } } + @ObfuscatedName("aa") + @ObfuscatedSignature( + signature = "(III)V", + garbageValue = "-1375281235" + ) + void method3860(int var1, int var2) { + this.field2464[var1] = var2; + this.field2454[var1] = (int)(2097152.0D * Math.pow(2.0D, 5.4931640625E-4D * (double)var2) + 0.5D); + } + + @ObfuscatedName("aw") + @ObfuscatedSignature( + signature = "(Lhm;I)I", + garbageValue = "2062902962" + ) + int method3861(MusicPatchNode var1) { + int var2 = (var1.field2491 * var1.field2485 >> 12) + var1.field2484; + var2 += (this.field2448[var1.field2479] - 8192) * this.field2447[var1.field2479] >> 12; + MusicPatchNode2 var3 = var1.field2477; + int var4; + if (var3.field2431 > 0 && (var3.field2430 > 0 || this.field2457[var1.field2479] > 0)) { + var4 = var3.field2430 << 2; + int var5 = var3.field2425 << 1; + if (var1.field2492 < var5) { + var4 = var4 * var1.field2492 / var5; + } + + var4 += this.field2457[var1.field2479] >> 7; + double var6 = Math.sin(0.01227184630308513D * (double)(var1.field2476 & 511)); + var2 += (int)((double)var4 * var6); + } + + var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, 3.255208333333333E-4D * (double)var2) / (double)class237.field3113 + 0.5D); + return var4 < 1 ? 1 : var4; + } + @ObfuscatedName("az") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "97" + signature = "(Lhm;I)I", + garbageValue = "-352128958" ) - void method3899(int var1, int var2) { - this.field2432[var1] = var2; - this.field2433[var1] = (int)(2097152.0D * Math.pow(2.0D, (double)var2 * 5.4931640625E-4D) + 0.5D); - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - signature = "(Lhz;I)I", - garbageValue = "-1438720370" - ) - int method3864(MusicPatchNode var1) { - int var2 = (var1.field2454 * var1.field2455 >> 12) + var1.field2445; - var2 += (this.field2423[var1.field2452] - 8192) * this.field2430[var1.field2452] >> 12; - MusicPatchNode2 var3 = var1.field2460; - int var4; - if (var3.field2401 > 0 && (var3.field2395 > 0 || this.field2424[var1.field2452] > 0)) { - var4 = var3.field2395 << 2; - int var5 = var3.field2394 << 1; - if (var1.field2461 < var5) { - var4 = var4 * var1.field2461 / var5; - } - - var4 += this.field2424[var1.field2452] >> 7; - double var6 = Math.sin(0.01227184630308513D * (double)(var1.field2449 & 511)); - var2 += (int)((double)var4 * var6); - } - - var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, (double)var2 * 3.255208333333333E-4D) / (double)PcmPlayer.field1421 + 0.5D); - return var4 < 1 ? 1 : var4; - } - - @ObfuscatedName("ad") - @ObfuscatedSignature( - signature = "(Lhz;I)I", - garbageValue = "-2023927212" - ) - int method3818(MusicPatchNode var1) { - MusicPatchNode2 var2 = var1.field2460; - int var3 = this.field2443[var1.field2452] * this.field2417[var1.field2452] + 4096 >> 13; + int method3958(MusicPatchNode var1) { + MusicPatchNode2 var2 = var1.field2477; + int var3 = this.field2450[var1.field2479] * this.field2452[var1.field2479] + 4096 >> 13; var3 = var3 * var3 + 16384 >> 15; - var3 = var3 * var1.field2451 + 16384 >> 15; - var3 = var3 * this.field2415 + 128 >> 8; - if (var2.field2396 > 0) { - var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field2396 * (double)var1.field2456 * 1.953125E-5D) + 0.5D); + var3 = var3 * var1.field2499 + 16384 >> 15; + var3 = var3 * this.field2472 + 128 >> 8; + if (var2.field2426 > 0) { + var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field2426 * 1.953125E-5D * (double)var1.field2496) + 0.5D); } int var4; int var5; int var6; int var7; - if (var2.field2402 != null) { - var4 = var1.field2457; - var5 = var2.field2402[var1.field2458 + 1]; - if (var1.field2458 < var2.field2402.length - 2) { - var6 = (var2.field2402[var1.field2458] & 255) << 8; - var7 = (var2.field2402[var1.field2458 + 2] & 255) << 8; - var5 += (var4 - var6) * (var2.field2402[var1.field2458 + 3] - var5) / (var7 - var6); - } - - var3 = var3 * var5 + 32 >> 6; - } - - if (var1.field2459 > 0 && var2.field2398 != null) { - var4 = var1.field2459; - var5 = var2.field2398[var1.field2448 + 1]; - if (var1.field2448 < var2.field2398.length - 2) { - var6 = (var2.field2398[var1.field2448] & 255) << 8; - var7 = (var2.field2398[var1.field2448 + 2] & 255) << 8; - var5 += (var4 - var6) * (var2.field2398[var1.field2448 + 3] - var5) / (var7 - var6); + if (var2.field2424 != null) { + var4 = var1.field2488; + var5 = var2.field2424[var1.field2489 + 1]; + if (var1.field2489 < var2.field2424.length - 2) { + var6 = (var2.field2424[var1.field2489] & 255) << 8; + var7 = (var2.field2424[var1.field2489 + 2] & 255) << 8; + var5 += (var2.field2424[var1.field2489 + 3] - var5) * (var4 - var6) / (var7 - var6); } var3 = var5 * var3 + 32 >> 6; } + if (var1.field2490 > 0 && var2.field2429 != null) { + var4 = var1.field2490; + var5 = var2.field2429[var1.field2493 + 1]; + if (var1.field2493 < var2.field2429.length - 2) { + var6 = (var2.field2429[var1.field2493] & 255) << 8; + var7 = (var2.field2429[var1.field2493 + 2] & 255) << 8; + var5 += (var2.field2429[var1.field2493 + 3] - var5) * (var4 - var6) / (var7 - var6); + } + + var3 = var3 * var5 + 32 >> 6; + } + return var3; } - @ObfuscatedName("ah") + @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "(Lhz;I)I", - garbageValue = "1444946212" + signature = "(Lhm;B)I", + garbageValue = "0" ) - int method3819(MusicPatchNode var1) { - int var2 = this.field2416[var1.field2452]; - return var2 < 8192 ? var2 * var1.field2465 + 32 >> 6 : 16384 - ((128 - var1.field2465) * (16384 - var2) + 32 >> 6); + int method3912(MusicPatchNode var1) { + int var2 = this.field2458[var1.field2479]; + return var2 < 8192 ? var2 * var1.field2483 + 32 >> 6 : 16384 - ((128 - var1.field2483) * (16384 - var2) + 32 >> 6); } - @ObfuscatedName("ag") + @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-22" + signature = "(I)V", + garbageValue = "-668815738" ) - void method3825() { + void method3872() { int var1 = this.track; int var2 = this.trackLength; long var3; - for (var3 = this.field2425; var2 == this.trackLength; var3 = this.midiFile.method3935(var2)) { + for (var3 = this.field2473; var2 == this.trackLength; var3 = this.midiFile.method3985(var2)) { while (var2 == this.midiFile.trackLengths[var1]) { this.midiFile.gotoTrack(var1); int var5 = this.midiFile.readMessage(var1); @@ -934,8 +928,8 @@ public class MidiPcmStream extends PcmStream { this.midiFile.setTrackDone(); this.midiFile.markTrackPosition(var1); if (this.midiFile.isDone()) { - if (!this.field2418 || var2 == 0) { - this.method3812(); + if (!this.field2469 || var2 == 0) { + this.method3856(); this.midiFile.clear(); return; } @@ -946,7 +940,7 @@ public class MidiPcmStream extends PcmStream { } if ((var5 & 128) != 0) { - this.method3815(var5); + this.method3845(var5); } this.midiFile.readTrackLength(var1); @@ -959,20 +953,20 @@ public class MidiPcmStream extends PcmStream { this.track = var1; this.trackLength = var2; - this.field2425 = var3; + this.field2473 = var3; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - signature = "(Lhz;I)Z", - garbageValue = "-130954859" + signature = "(Lhm;I)Z", + garbageValue = "-1517604835" ) - boolean method3826(MusicPatchNode var1) { + boolean method3870(MusicPatchNode var1) { if (var1.stream == null) { - if (var1.field2459 >= 0) { + if (var1.field2490 >= 0) { var1.remove(); - if (var1.field2467 > 0 && var1 == this.field2435[var1.field2452][var1.field2467]) { - this.field2435[var1.field2452][var1.field2467] = null; + if (var1.field2480 > 0 && var1 == this.field2467[var1.field2479][var1.field2480]) { + this.field2467[var1.field2479][var1.field2480] = null; } } @@ -982,103 +976,183 @@ public class MidiPcmStream extends PcmStream { } } - @ObfuscatedName("bf") + @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "(Lhz;[IIIB)Z", - garbageValue = "0" + signature = "(Lhm;[IIII)Z", + garbageValue = "2001156959" ) - boolean method3884(MusicPatchNode var1, int[] var2, int var3, int var4) { - var1.field2453 = PcmPlayer.field1421 / 100; - if (var1.field2459 < 0 || var1.stream != null && !var1.stream.method2671()) { - int var5 = var1.field2455; + boolean method3897(MusicPatchNode var1, int[] var2, int var3, int var4) { + var1.field2495 = class237.field3113 / 100; + if (var1.field2490 < 0 || var1.stream != null && !var1.stream.method2690()) { + int var5 = var1.field2491; if (var5 > 0) { - var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.field2437[var1.field2452] * 4.921259842519685E-4D) + 0.5D); + var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.field2459[var1.field2479] * 4.921259842519685E-4D) + 0.5D); if (var5 < 0) { var5 = 0; } - var1.field2455 = var5; + var1.field2491 = var5; } - var1.stream.method2669(this.method3864(var1)); - MusicPatchNode2 var6 = var1.field2460; + var1.stream.method2688(this.method3861(var1)); + MusicPatchNode2 var6 = var1.field2477; boolean var7 = false; - ++var1.field2461; - var1.field2449 += var6.field2401; - double var8 = (double)((var1.field2464 - 60 << 8) + (var1.field2455 * var1.field2454 >> 12)) * 5.086263020833333E-6D; - if (var6.field2396 > 0) { - if (var6.field2399 > 0) { - var1.field2456 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2399 * var8) + 0.5D); + ++var1.field2492; + var1.field2476 += var6.field2431; + double var8 = 5.086263020833333E-6D * (double)((var1.field2481 - 60 << 8) + (var1.field2485 * var1.field2491 >> 12)); + if (var6.field2426 > 0) { + if (var6.field2435 > 0) { + var1.field2496 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2435) + 0.5D); } else { - var1.field2456 += 128; + var1.field2496 += 128; } } - if (var6.field2402 != null) { - if (var6.field2397 > 0) { - var1.field2457 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2397 * var8) + 0.5D); + if (var6.field2424 != null) { + if (var6.field2427 > 0) { + var1.field2488 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2427 * var8) + 0.5D); } else { - var1.field2457 += 128; + var1.field2488 += 128; } - while (var1.field2458 < var6.field2402.length - 2 && var1.field2457 > (var6.field2402[var1.field2458 + 2] & 255) << 8) { - var1.field2458 += 2; + while (var1.field2489 < var6.field2424.length - 2 && var1.field2488 > (var6.field2424[var1.field2489 + 2] & 255) << 8) { + var1.field2489 += 2; } - if (var6.field2402.length - 2 == var1.field2458 && var6.field2402[var1.field2458 + 1] == 0) { + if (var6.field2424.length - 2 == var1.field2489 && var6.field2424[var1.field2489 + 1] == 0) { var7 = true; } } - if (var1.field2459 >= 0 && var6.field2398 != null && (this.field2428[var1.field2452] & 1) == 0 && (var1.field2467 < 0 || var1 != this.field2435[var1.field2452][var1.field2467])) { - if (var6.field2400 > 0) { - var1.field2459 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2400 * var8) + 0.5D); + if (var1.field2490 >= 0 && var6.field2429 != null && (this.field2460[var1.field2479] & 1) == 0 && (var1.field2480 < 0 || var1 != this.field2467[var1.field2479][var1.field2480])) { + if (var6.field2428 > 0) { + var1.field2490 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2428 * var8) + 0.5D); } else { - var1.field2459 += 128; + var1.field2490 += 128; } - while (var1.field2448 < var6.field2398.length - 2 && var1.field2459 > (var6.field2398[var1.field2448 + 2] & 255) << 8) { - var1.field2448 += 2; + while (var1.field2493 < var6.field2429.length - 2 && var1.field2490 > (var6.field2429[var1.field2493 + 2] & 255) << 8) { + var1.field2493 += 2; } - if (var6.field2398.length - 2 == var1.field2448) { + if (var6.field2429.length - 2 == var1.field2493) { var7 = true; } } if (var7) { - var1.stream.method2706(var1.field2453); + var1.stream.method2732(var1.field2495); if (var2 != null) { var1.stream.fill(var2, var3, var4); } else { var1.stream.skip(var4); } - if (var1.stream.method2672()) { + if (var1.stream.method2691()) { this.patchStream.mixer.addSubStream(var1.stream); } - var1.method3917(); - if (var1.field2459 >= 0) { + var1.method3963(); + if (var1.field2490 >= 0) { var1.remove(); - if (var1.field2467 > 0 && var1 == this.field2435[var1.field2452][var1.field2467]) { - this.field2435[var1.field2452][var1.field2467] = null; + if (var1.field2480 > 0 && var1 == this.field2467[var1.field2479][var1.field2480]) { + this.field2467[var1.field2479][var1.field2480] = null; } } return true; } else { - var1.stream.method2704(var1.field2453, this.method3818(var1), this.method3819(var1)); + var1.stream.method2775(var1.field2495, this.method3958(var1), this.method3912(var1)); return false; } } else { - var1.method3917(); + var1.method3963(); var1.remove(); - if (var1.field2467 > 0 && var1 == this.field2435[var1.field2452][var1.field2467]) { - this.field2435[var1.field2452][var1.field2467] = null; + if (var1.field2480 > 0 && var1 == this.field2467[var1.field2479][var1.field2480]) { + this.field2467[var1.field2479][var1.field2480] = null; } return true; } } + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "2049415960" + ) + public static void method3918() { + synchronized(KeyHandler.KeyHandler_instance) { + ++KeyHandler.KeyHandler_idleCycles; + KeyHandler.field416 = KeyHandler.field421; + KeyHandler.field425 = 0; + int var1; + if (KeyHandler.field411 < 0) { + for (var1 = 0; var1 < 112; ++var1) { + KeyHandler.KeyHandler_pressedKeys[var1] = false; + } + + KeyHandler.field411 = KeyHandler.field414; + } else { + while (KeyHandler.field414 != KeyHandler.field411) { + var1 = KeyHandler.field409[KeyHandler.field414]; + KeyHandler.field414 = KeyHandler.field414 + 1 & 127; + if (var1 < 0) { + KeyHandler.KeyHandler_pressedKeys[~var1] = false; + } else { + if (!KeyHandler.KeyHandler_pressedKeys[var1] && KeyHandler.field425 < KeyHandler.field429.length - 1) { + KeyHandler.field429[++KeyHandler.field425 - 1] = var1; + } + + KeyHandler.KeyHandler_pressedKeys[var1] = true; + } + } + } + + if (KeyHandler.field425 > 0) { + KeyHandler.KeyHandler_idleCycles = 0; + } + + KeyHandler.field421 = KeyHandler.field417; + } + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1122474734" + ) + protected static final void method3905() { + FriendLoginUpdate.clock.mark(); + + int var0; + for (var0 = 0; var0 < 32; ++var0) { + GameShell.graphicsTickTimes[var0] = 0L; + } + + for (var0 = 0; var0 < 32; ++var0) { + GameShell.clientTickTimes[var0] = 0L; + } + + GameShell.gameCyclesToDo = 0; + } + + @ObfuscatedName("fr") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "1626393180" + ) + @Export("forceDisconnect") + static final void forceDisconnect(int var0) { + MouseRecorder.logOut(); + switch(var0) { + case 1: + Login.loginIndex = 24; + MusicPatchPcmStream.setLoginResponseString("", "You were disconnected from the server.", ""); + break; + case 2: + GrandExchangeOfferNameComparator.method213(); + } + + } } diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java index dc42814687..6ac14025f1 100644 --- a/runescape-client/src/main/java/MilliClock.java +++ b/runescape-client/src/main/java/MilliClock.java @@ -4,216 +4,202 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fz") +@ObfuscatedName("fw") @Implements("MilliClock") public class MilliClock extends Clock { - @ObfuscatedName("nw") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1060623823 + intValue = -41163463 ) - @Export("widgetDragDuration") - static int widgetDragDuration; - @ObfuscatedName("h") + @Export("musicTrackFileId") + public static int musicTrackFileId; + @ObfuscatedName("ds") @ObfuscatedSignature( - signature = "Lcr;" + signature = "Lig;" ) - @Export("loginScreenRunesAnimation") - static LoginScreenAnimation loginScreenRunesAnimation; - @ObfuscatedName("bf") - @Export("otp") - static String otp; - @ObfuscatedName("em") + @Export("archive0") + static Archive archive0; + @ObfuscatedName("fx") @ObfuscatedGetter( - intValue = 119222289 + longValue = -6195405350753601003L ) - static int field2026; - @ObfuscatedName("x") - long[] field2028; + static long field2046; @ObfuscatedName("m") + long[] field2041; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 370183015 + intValue = -1698832719 ) - int field2020; - @ObfuscatedName("k") + int field2044; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -542018665 + intValue = 402474679 ) - int field2021; - @ObfuscatedName("d") + int field2040; + @ObfuscatedName("j") @ObfuscatedGetter( - longValue = 8140433523785303581L + longValue = -6603351747931687267L ) - long field2019; - @ObfuscatedName("w") + long field2042; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1658910693 + intValue = 830495451 ) - int field2023; - @ObfuscatedName("v") + int field2038; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -371780323 + intValue = -819539781 ) - int field2024; + int field2043; - MilliClock() { - this.field2028 = new long[10]; - this.field2020 = 256; - this.field2021 = 1; - this.field2023 = 0; - this.field2019 = class217.currentTimeMillis(); + public MilliClock() { + this.field2041 = new long[10]; + this.field2044 = 256; + this.field2040 = 1; + this.field2038 = 0; + this.field2042 = currentTimeMillis(); for (int var1 = 0; var1 < 10; ++var1) { - this.field2028[var1] = this.field2019; + this.field2041[var1] = this.field2042; } } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1351231250" + garbageValue = "-1017447827" ) @Export("mark") public void mark() { for (int var1 = 0; var1 < 10; ++var1) { - this.field2028[var1] = 0L; + this.field2041[var1] = 0L; } } + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(III)I", + garbageValue = "-1786752641" + ) + @Export("wait") + public int wait(int var1, int var2) { + int var3 = this.field2044; + int var4 = this.field2040; + this.field2044 = 300; + this.field2040 = 1; + this.field2042 = currentTimeMillis(); + if (this.field2041[this.field2043] == 0L) { + this.field2044 = var3; + this.field2040 = var4; + } else if (this.field2042 > this.field2041[this.field2043]) { + this.field2044 = (int)((long)(var1 * 2560) / (this.field2042 - this.field2041[this.field2043])); + } + + if (this.field2044 < 25) { + this.field2044 = 25; + } + + if (this.field2044 > 256) { + this.field2044 = 256; + this.field2040 = (int)((long)var1 - (this.field2042 - this.field2041[this.field2043]) / 10L); + } + + if (this.field2040 > var1) { + this.field2040 = var1; + } + + this.field2041[this.field2043] = this.field2042; + this.field2043 = (this.field2043 + 1) % 10; + if (this.field2040 > 1) { + for (int var5 = 0; var5 < 10; ++var5) { + if (0L != this.field2041[var5]) { + this.field2041[var5] += (long)this.field2040; + } + } + } + + if (this.field2040 < var2) { + this.field2040 = var2; + } + + long var8 = (long)this.field2040; + if (var8 > 0L) { + if (var8 % 10L == 0L) { + SpriteMask.sleepExact(var8 - 1L); + SpriteMask.sleepExact(1L); + } else { + SpriteMask.sleepExact(var8); + } + } + + int var7; + for (var7 = 0; this.field2038 < 256; this.field2038 += this.field2044) { + ++var7; + } + + this.field2038 &= 255; + return var7; + } + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "-1723558008" + signature = "(I)J", + garbageValue = "301883572" ) - @Export("wait") - public int wait(int var1, int var2) { - int var3 = this.field2020; - int var4 = this.field2021; - this.field2020 = 300; - this.field2021 = 1; - this.field2019 = class217.currentTimeMillis(); - if (this.field2028[this.field2024] == 0L) { - this.field2020 = var3; - this.field2021 = var4; - } else if (this.field2019 > this.field2028[this.field2024]) { - this.field2020 = (int)((long)(var1 * 2560) / (this.field2019 - this.field2028[this.field2024])); + @Export("currentTimeMillis") + public static final synchronized long currentTimeMillis() { + long var0 = System.currentTimeMillis(); + if (var0 < class306.field3723) { + class306.field3726 += class306.field3723 - var0; } - if (this.field2020 < 25) { - this.field2020 = 25; - } - - if (this.field2020 > 256) { - this.field2020 = 256; - this.field2021 = (int)((long)var1 - (this.field2019 - this.field2028[this.field2024]) / 10L); - } - - if (this.field2021 > var1) { - this.field2021 = var1; - } - - this.field2028[this.field2024] = this.field2019; - this.field2024 = (this.field2024 + 1) % 10; - int var5; - if (this.field2021 > 1) { - for (var5 = 0; var5 < 10; ++var5) { - if (this.field2028[var5] != 0L) { - this.field2028[var5] += (long)this.field2021; - } - } - } - - if (this.field2021 < var2) { - this.field2021 = var2; - } - - class169.sleepExact((long)this.field2021); - - for (var5 = 0; this.field2023 < 256; this.field2023 += this.field2020) { - ++var5; - } - - this.field2023 &= 255; - return var5; + class306.field3723 = var0; + return var0 + class306.field3726; } - @ObfuscatedName("v") + @ObfuscatedName("jh") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "-985572869" + signature = "(Lhd;S)Z", + garbageValue = "442" ) - public static boolean method3560(int var0) { - return (var0 >> 29 & 1) != 0; - } + static final boolean method3586(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); + } - @ObfuscatedName("jf") - @ObfuscatedSignature( - signature = "([Lhe;II)V", - garbageValue = "1317800526" - ) - @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 || !AbstractWorldMapData.isComponentHidden(var3))) { - int var5; - if (var3.type == 0) { - if (!var3.isIf3 && AbstractWorldMapData.isComponentHidden(var3) && var3 != class9.mousedOverWidgetIf1) { - continue; - } + if (var1 >= 314 && var1 <= 323) { + var2 = (var1 - 314) / 2; + var3 = var1 & 1; + Client.playerAppearance.method4139(var2, var3 == 1); + } - drawModelComponents(var0, var3.id); - if (var3.children != null) { - drawModelComponents(var3.children, var3.id); - } + if (var1 == 324) { + Client.playerAppearance.changeSex(false); + } - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); - if (var4 != null) { - var5 = var4.group; - if (LoginScreenAnimation.loadInterface(var5)) { - drawModelComponents(Widget.Widget_interfaceComponents[var5], -1); - } - } - } + if (var1 == 325) { + Client.playerAppearance.changeSex(true); + } - if (var3.type == 6) { - if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { - boolean var7 = GrandExchangeOfferAgeComparator.runCs1(var3); - if (var7) { - var5 = var3.sequenceId2; - } else { - var5 = var3.sequenceId; - } - - if (var5 != -1) { - SequenceDefinition var6 = SpotAnimationDefinition.SequenceDefinition_get(var5); - - for (var3.modelFrameCycle += Client.field741; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; ItemContainer.invalidateWidget(var3)) { - var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; - ++var3.modelFrame; - if (var3.modelFrame >= var6.frameIds.length) { - var3.modelFrame -= var6.frameCount; - if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { - var3.modelFrame = 0; - } - } - } - } - } - - if (var3.field2623 != 0 && !var3.isIf3) { - int var8 = var3.field2623 >> 16; - var5 = var3.field2623 << 16 >> 16; - var8 *= Client.field741; - var5 *= Client.field741; - var3.modelAngleX = var8 + var3.modelAngleX & 2047; - var3.modelAngleY = var5 + var3.modelAngleY & 2047; - ItemContainer.invalidateWidget(var3); - } - } + if (var1 == 326) { + PacketBufferNode var4 = UserComparator4.getPacketBufferNode(ClientPacket.field2283, 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/ModeWhere.java b/runescape-client/src/main/java/ModeWhere.java index fff887e995..907c477a44 100644 --- a/runescape-client/src/main/java/ModeWhere.java +++ b/runescape-client/src/main/java/ModeWhere.java @@ -6,247 +6,137 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gd") +@ObfuscatedName("ge") @Implements("ModeWhere") public enum ModeWhere implements Enumerated { - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lgd;" - ) - field2375("", 0, new class200[]{class200.field2370}), @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lgd;" + signature = "Lge;" ) - field2382("", 1, new class200[]{class200.field2371, class200.field2370}), - @ObfuscatedName("k") + field2412("", 0, new class200[]{class200.field2399}), + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgd;" + signature = "Lge;" ) - field2374("", 2, new class200[]{class200.field2371, class200.field2369, class200.field2370}), - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "Lgd;" - ) - field2376("", 3, new class200[]{class200.field2371}), - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lgd;" - ) - field2378("", 4), - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "Lgd;" - ) - field2379("", 5, new class200[]{class200.field2371, class200.field2370}), + field2414("", 1, new class200[]{class200.field2398, class200.field2399}), @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lgd;" + signature = "Lge;" ) - field2380("", 6, new class200[]{class200.field2370}), - @ObfuscatedName("z") + field2404("", 2, new class200[]{class200.field2398, class200.field2400, class200.field2399}), + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lgd;" + signature = "Lge;" ) - field2381("", 8, new class200[]{class200.field2371, class200.field2370}), - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Lgd;" - ) - field2377("", 9, new class200[]{class200.field2371, class200.field2369}), - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lgd;" - ) - field2383("", 10, new class200[]{class200.field2371}), - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "Lgd;" - ) - field2384("", 11, new class200[]{class200.field2371}), + field2405("", 3, new class200[]{class200.field2398}), @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lgd;" + signature = "Lge;" ) - field2385("", 12, new class200[]{class200.field2371, class200.field2370}), + field2403("", 4), + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "Lge;" + ) + field2406("", 5, new class200[]{class200.field2398, class200.field2399}), @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lgd;" + signature = "Lge;" ) - field2386("", 13, new class200[]{class200.field2371}); - - @ObfuscatedName("bh") - @Export("worldListURL") - static String worldListURL; + field2408("", 6, new class200[]{class200.field2399}), @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Lge;" + ) + field2409("", 8, new class200[]{class200.field2398, class200.field2399}), + @ObfuscatedName("a") + @ObfuscatedSignature( + signature = "Lge;" + ) + field2402("", 9, new class200[]{class200.field2398, class200.field2400}), + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "Lge;" + ) + field2411("", 10, new class200[]{class200.field2398}), + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "Lge;" + ) + field2410("", 11, new class200[]{class200.field2398}), + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "Lge;" + ) + field2413("", 12, new class200[]{class200.field2398, class200.field2399}), + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "Lge;" + ) + field2418("", 13, new class200[]{class200.field2398}); + + @ObfuscatedName("sw") + @ObfuscatedSignature( + signature = "Lcg;" + ) + @Export("friendSystem") + public static FriendSystem friendSystem; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1460687895 + intValue = 1475259781 ) @Export("id") final int id; - @ObfuscatedName("h") - final Set field2388; - - static { - ModeWhere_rsValues(); - } + @ObfuscatedName("k") + final Set field2416; @ObfuscatedSignature( - signature = "(Ljava/lang/String;I[Lgy;)V" + signature = "(Ljava/lang/String;I[Lgi;)V" ) ModeWhere(String var3, int var4, class200[] var5) { - this.field2388 = new HashSet(); + this.field2416 = new HashSet(); this.id = var4; class200[] var6 = var5; for (int var7 = 0; var7 < var6.length; ++var7) { class200 var8 = var6[var7]; - this.field2388.add(var8); + this.field2416.add(var8); } } ModeWhere(String var3, int var4) { - this.field2388 = new HashSet(); + this.field2416 = new HashSet(); this.id = var4; } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "56" + signature = "(I)I", + garbageValue = "-995092303" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("x") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)[Lgd;", - garbageValue = "-2096888845" + signature = "(ZZI)I", + garbageValue = "57776207" ) - @Export("ModeWhere_rsValues") - static ModeWhere[] ModeWhere_rsValues() { - return new ModeWhere[]{field2379, field2385, field2386, field2376, field2384, field2380, field2381, field2377, field2378, field2374, field2375, field2382, field2383}; + public static int method3809(boolean var0, boolean var1) { + byte var2 = 0; + int var3 = var2 + NetCache.NetCache_pendingPriorityResponsesCount + NetCache.NetCache_pendingPriorityWritesCount; + return var3; } - @ObfuscatedName("x") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "1010005518" + signature = "(CB)Z", + garbageValue = "51" ) - static int method3761(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var2 == null) { - return -1; - } else { - return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; - } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "-122" - ) - public static int method3763(int var0, int var1) { - int var2; - if (var1 > var0) { - var2 = var0; - var0 = var1; - var1 = var2; - } - - while (var1 != 0) { - var2 = var0 % var1; - var0 = var1; - var1 = var2; - } - - return var0; - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "1096677335" - ) - static int method3760(int var0, Script var1, boolean var2) { - if (var0 < 1000) { - return WorldMapLabel.method517(var0, var1, var2); - } else if (var0 < 1100) { - return SecureRandomCallable.method1249(var0, var1, var2); - } else if (var0 < 1200) { - return UserList.method5225(var0, var1, var2); - } else if (var0 < 1300) { - return class2.method28(var0, var1, var2); - } else if (var0 < 1400) { - return Decimator.method2649(var0, var1, var2); - } else if (var0 < 1500) { - return WorldMapEvent.method866(var0, var1, var2); - } else if (var0 < 1600) { - return GrandExchangeOffer.method191(var0, var1, var2); - } else if (var0 < 1700) { - return GrandExchangeOfferWorldComparator.method137(var0, var1, var2); - } else if (var0 < 1800) { - return NPC.method2147(var0, var1, var2); - } else if (var0 < 1900) { - return WorldMapSection1.method683(var0, var1, var2); - } else if (var0 < 2000) { - return PlayerType.method4233(var0, var1, var2); - } else if (var0 < 2100) { - return SecureRandomCallable.method1249(var0, var1, var2); - } else if (var0 < 2200) { - return UserList.method5225(var0, var1, var2); - } else if (var0 < 2300) { - return class2.method28(var0, var1, var2); - } else if (var0 < 2400) { - return Decimator.method2649(var0, var1, var2); - } else if (var0 < 2500) { - return WorldMapEvent.method866(var0, var1, var2); - } else if (var0 < 2600) { - return WorldMapManager.method750(var0, var1, var2); - } else if (var0 < 2700) { - return class7.method101(var0, var1, var2); - } else if (var0 < 2800) { - return UrlRequest.method3423(var0, var1, var2); - } else if (var0 < 2900) { - return Message.method1318(var0, var1, var2); - } else if (var0 < 3000) { - return PlayerType.method4233(var0, var1, var2); - } else if (var0 < 3200) { - return Widget.method4183(var0, var1, var2); - } else if (var0 < 3300) { - return NPC.method2145(var0, var1, var2); - } else if (var0 < 3400) { - return AbstractUserComparator.method5119(var0, var1, var2); - } else if (var0 < 3500) { - return class52.method904(var0, var1, var2); - } else if (var0 < 3700) { - return class13.method132(var0, var1, var2); - } else if (var0 < 4000) { - return class224.method4124(var0, var1, var2); - } else if (var0 < 4100) { - return ObjectDefinition.method4710(var0, var1, var2); - } else if (var0 < 4200) { - return AbstractWorldMapData.method384(var0, var1, var2); - } else if (var0 < 4300) { - return class22.method258(var0, var1, var2); - } else if (var0 < 5100) { - return BoundaryObject.method3376(var0, var1, var2); - } else if (var0 < 5400) { - return WorldMapEvent.method865(var0, var1, var2); - } else if (var0 < 5600) { - return AbstractWorldMapData.method380(var0, var1, var2); - } else if (var0 < 5700) { - return WorldMapData_1.method814(var0, var1, var2); - } else if (var0 < 6300) { - return MouseRecorder.method1290(var0, var1, var2); - } else if (var0 < 6600) { - return GrandExchangeOfferNameComparator.method238(var0, var1, var2); - } else { - return var0 < 6700 ? IgnoreList.method5130(var0, var1, var2) : 2; - } + static boolean method3810(char var0) { + return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var0) != -1; } } diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java index bf12e8e72f..eb6d203951 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("el") +@ObfuscatedName("ef") @Implements("Model") public class Model extends Entity { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lef;" ) @Export("Model_sharedSequenceModel") static Model Model_sharedSequenceModel; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("Model_sharedSequenceModelFaceAlphas") static byte[] Model_sharedSequenceModelFaceAlphas; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lef;" ) @Export("Model_sharedSpotAnimationModel") static Model Model_sharedSpotAnimationModel; - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("Model_sharedSpotAnimationModelFaceAlphas") static byte[] Model_sharedSpotAnimationModelFaceAlphas; - @ObfuscatedName("aq") - static boolean[] field1721; - @ObfuscatedName("av") - static boolean[] field1722; - @ObfuscatedName("ak") + @ObfuscatedName("al") + static boolean[] field1735; + @ObfuscatedName("an") + static boolean[] field1752; + @ObfuscatedName("ac") @Export("modelViewportXs") static int[] modelViewportXs; - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("modelViewportYs") static int[] modelViewportYs; - @ObfuscatedName("ax") - static int[] field1703; - @ObfuscatedName("az") - static int[] field1726; - @ObfuscatedName("aj") - static int[] field1707; - @ObfuscatedName("ay") - static int[] field1728; - @ObfuscatedName("ac") - static int[] field1737; - @ObfuscatedName("ah") - static int[][] field1731; - @ObfuscatedName("ag") + @ObfuscatedName("af") + static int[] field1739; + @ObfuscatedName("at") + static int[] field1740; + @ObfuscatedName("aa") static int[] field1736; @ObfuscatedName("aw") - static int[][] field1727; - @ObfuscatedName("bf") - static int[] field1734; - @ObfuscatedName("bc") - static int[] field1735; - @ObfuscatedName("bo") - static int[] field1733; - @ObfuscatedName("bd") - static int[] field1696; + static int[] field1742; + @ObfuscatedName("aq") + static int[] field1744; + @ObfuscatedName("ay") + static int[][] field1745; + @ObfuscatedName("au") + static int[] field1699; + @ObfuscatedName("aj") + static int[][] field1747; @ObfuscatedName("bk") - static int[] field1692; - @ObfuscatedName("bu") - static int[] field1739; + static int[] field1698; + @ObfuscatedName("bh") + static int[] field1722; + @ObfuscatedName("bg") + static int[] field1750; @ObfuscatedName("be") + static int[] field1751; + @ObfuscatedName("bf") + static int[] field1716; + @ObfuscatedName("ba") + static int[] field1728; + @ObfuscatedName("bd") @Export("Model_transformTempX") static int Model_transformTempX; - @ObfuscatedName("bg") + @ObfuscatedName("bb") @Export("Model_transformTempY") static int Model_transformTempY; - @ObfuscatedName("bt") + @ObfuscatedName("bw") @Export("Model_transformTempZ") static int Model_transformTempZ; - @ObfuscatedName("bh") - static boolean field1743; - @ObfuscatedName("ba") + @ObfuscatedName("bq") + static boolean field1713; + @ObfuscatedName("bo") @Export("Model_sine") static int[] Model_sine; - @ObfuscatedName("bv") + @ObfuscatedName("bp") @Export("Model_cosine") static int[] Model_cosine; - @ObfuscatedName("bx") - static int[] field1748; - @ObfuscatedName("bz") - static int[] field1749; - @ObfuscatedName("w") + @ObfuscatedName("bm") + static int[] field1757; + @ObfuscatedName("bl") + static int[] field1763; + @ObfuscatedName("p") @Export("verticesCount") int verticesCount; - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("verticesX") int[] verticesX; - @ObfuscatedName("q") + @ObfuscatedName("n") @Export("verticesY") int[] verticesY; - @ObfuscatedName("z") + @ObfuscatedName("u") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("indicesCount") int indicesCount; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("indices1") int[] indices1; - @ObfuscatedName("s") + @ObfuscatedName("w") @Export("indices2") int[] indices2; - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("indices3") int[] indices3; - @ObfuscatedName("n") + @ObfuscatedName("c") @Export("faceColors1") int[] faceColors1; - @ObfuscatedName("u") + @ObfuscatedName("h") @Export("faceColors2") int[] faceColors2; - @ObfuscatedName("h") + @ObfuscatedName("k") @Export("faceColors3") int[] faceColors3; - @ObfuscatedName("g") + @ObfuscatedName("r") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("i") + @ObfuscatedName("s") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("a") - byte[] field1699; - @ObfuscatedName("b") + @ObfuscatedName("v") + byte[] field1731; + @ObfuscatedName("d") @Export("faceTextures") short[] faceTextures; + @ObfuscatedName("e") + byte field1715; @ObfuscatedName("l") - byte field1701; - @ObfuscatedName("r") - int field1698; - @ObfuscatedName("o") - int[] field1685; - @ObfuscatedName("c") - int[] field1704; - @ObfuscatedName("j") - int[] field1705; - @ObfuscatedName("y") + int field1730; + @ObfuscatedName("t") + int[] field1717; + @ObfuscatedName("x") + int[] field1718; + @ObfuscatedName("b") + int[] field1719; + @ObfuscatedName("i") @Export("vertexLabels") int[][] vertexLabels; @ObfuscatedName("f") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("ae") + @ObfuscatedName("ah") @Export("isSingleTile") public boolean isSingleTile; - @ObfuscatedName("an") + @ObfuscatedName("ai") @Export("boundsType") int boundsType; - @ObfuscatedName("ai") + @ObfuscatedName("ao") @Export("bottomY") int bottomY; - @ObfuscatedName("ap") + @ObfuscatedName("ae") @Export("xzRadius") int xzRadius; - @ObfuscatedName("ab") + @ObfuscatedName("ax") @Export("diameter") int diameter; - @ObfuscatedName("ar") + @ObfuscatedName("ag") @Export("radius") int radius; - @ObfuscatedName("af") + @ObfuscatedName("ab") @Export("xMid") int xMid; - @ObfuscatedName("at") + @ObfuscatedName("am") @Export("yMid") int yMid; - @ObfuscatedName("al") + @ObfuscatedName("ak") @Export("zMid") int zMid; - @ObfuscatedName("as") + @ObfuscatedName("ad") @Export("xMidOffset") int xMidOffset; - @ObfuscatedName("am") + @ObfuscatedName("as") @Export("yMidOffset") int yMidOffset; - @ObfuscatedName("au") + @ObfuscatedName("ar") @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]; - field1721 = new boolean[4700]; - field1722 = new boolean[4700]; + field1735 = new boolean[4700]; + field1752 = new boolean[4700]; modelViewportXs = new int[4700]; modelViewportYs = new int[4700]; - field1703 = new int[4700]; - field1726 = new int[4700]; - field1707 = new int[4700]; - field1728 = new int[4700]; - field1737 = new int[1600]; - field1731 = new int[1600][512]; - field1736 = new int[12]; - field1727 = new int[12][2000]; - field1734 = new int[2000]; - field1735 = new int[2000]; - field1733 = new int[12]; - field1696 = new int[10]; - field1692 = new int[10]; - field1739 = new int[10]; - field1743 = true; + field1739 = new int[4700]; + field1740 = new int[4700]; + field1736 = new int[4700]; + field1742 = new int[4700]; + field1744 = new int[1600]; + field1745 = new int[1600][512]; + field1699 = new int[12]; + field1747 = new int[12][2000]; + field1698 = new int[2000]; + field1722 = new int[2000]; + field1750 = new int[12]; + field1751 = new int[10]; + field1716 = new int[10]; + field1728 = new int[10]; + field1713 = true; Model_sine = Rasterizer3D.Rasterizer3D_sine; Model_cosine = Rasterizer3D.Rasterizer3D_cosine; - field1748 = Rasterizer3D.Rasterizer3D_colorPalette; - field1749 = Rasterizer3D.field1793; + field1757 = Rasterizer3D.Rasterizer3D_colorPalette; + field1763 = Rasterizer3D.field1791; } Model() { this.verticesCount = 0; this.indicesCount = 0; - this.field1701 = 0; - this.field1698 = 0; + this.field1715 = 0; + this.field1730 = 0; this.isSingleTile = false; this.xMidOffset = -1; this.yMidOffset = -1; @@ -222,13 +222,13 @@ public class Model extends Entity { } @ObfuscatedSignature( - signature = "([Lel;I)V" + signature = "([Lef;I)V" ) public Model(Model[] var1, int var2) { this.verticesCount = 0; this.indicesCount = 0; - this.field1701 = 0; - this.field1698 = 0; + this.field1715 = 0; + this.field1730 = 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.field1698 = 0; - this.field1701 = -1; + this.field1730 = 0; + this.field1715 = -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.field1698 += var8.field1698; + this.field1730 += var8.field1730; if (var8.faceRenderPriorities != null) { var3 = true; } else { - if (this.field1701 == -1) { - this.field1701 = var8.field1701; + if (this.field1715 == -1) { + this.field1715 = var8.field1715; } - if (this.field1701 != var8.field1701) { + if (this.field1715 != var8.field1715) { var3 = true; } } var4 |= var8.faceAlphas != null; var5 |= var8.faceTextures != null; - var6 |= var8.field1699 != null; + var6 |= var8.field1731 != null; } } @@ -290,18 +290,18 @@ public class Model extends Entity { } if (var6) { - this.field1699 = new byte[this.indicesCount]; + this.field1731 = new byte[this.indicesCount]; } - if (this.field1698 > 0) { - this.field1685 = new int[this.field1698]; - this.field1704 = new int[this.field1698]; - this.field1705 = new int[this.field1698]; + if (this.field1730 > 0) { + this.field1717 = new int[this.field1730]; + this.field1718 = new int[this.field1730]; + this.field1719 = new int[this.field1730]; } this.verticesCount = 0; this.indicesCount = 0; - this.field1698 = 0; + this.field1730 = 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.field1701; + this.faceRenderPriorities[this.indicesCount] = var8.field1715; } } @@ -335,21 +335,21 @@ public class Model extends Entity { } if (var6) { - if (var8.field1699 != null && var8.field1699[var9] != -1) { - this.field1699[this.indicesCount] = (byte)(this.field1698 + var8.field1699[var9]); + if (var8.field1731 != null && var8.field1731[var9] != -1) { + this.field1731[this.indicesCount] = (byte)(this.field1730 + var8.field1731[var9]); } else { - this.field1699[this.indicesCount] = -1; + this.field1731[this.indicesCount] = -1; } } ++this.indicesCount; } - for (var9 = 0; var9 < var8.field1698; ++var9) { - this.field1685[this.field1698] = this.verticesCount + var8.field1685[var9]; - this.field1704[this.field1698] = this.verticesCount + var8.field1704[var9]; - this.field1705[this.field1698] = this.verticesCount + var8.field1705[var9]; - ++this.field1698; + for (var9 = 0; var9 < var8.field1730; ++var9) { + this.field1717[this.field1730] = this.verticesCount + var8.field1717[var9]; + this.field1718[this.field1730] = this.verticesCount + var8.field1718[var9]; + this.field1719[this.field1730] = this.verticesCount + var8.field1719[var9]; + ++this.field1730; } for (var9 = 0; var9 < var8.verticesCount; ++var9) { @@ -363,9 +363,9 @@ public class Model extends Entity { } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "([[IIIIZI)Lel;" + signature = "([[IIIIZI)Lef;" ) @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.field1698 = this.field1698; + var11.field1730 = this.field1730; 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.field1699 = this.field1699; + var11.field1731 = this.field1731; var11.faceTextures = this.faceTextures; - var11.field1701 = this.field1701; - var11.field1685 = this.field1685; - var11.field1704 = this.field1704; - var11.field1705 = this.field1705; + var11.field1715 = this.field1715; + var11.field1717 = this.field1717; + var11.field1718 = this.field1718; + var11.field1719 = this.field1719; var11.vertexLabels = this.vertexLabels; var11.faceLabelsAlpha = this.faceLabelsAlpha; var11.isSingleTile = this.isSingleTile; @@ -461,9 +461,9 @@ public class Model extends Entity { } } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Z)Lel;" + signature = "(Z)Lef;" ) @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("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Z)Lel;" + signature = "(Z)Lef;" ) @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("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(ZLel;[B)Lel;" + signature = "(ZLef;[B)Lef;" ) @Export("buildSharedModel") Model buildSharedModel(boolean var1, Model var2, byte[] var3) { var2.verticesCount = this.verticesCount; var2.indicesCount = this.indicesCount; - var2.field1698 = this.field1698; + var2.field1730 = this.field1730; 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.field1699 = this.field1699; + var2.field1731 = this.field1731; var2.faceTextures = this.faceTextures; - var2.field1701 = this.field1701; - var2.field1685 = this.field1685; - var2.field1704 = this.field1704; - var2.field1705 = this.field1705; + var2.field1715 = this.field1715; + var2.field1717 = this.field1717; + var2.field1718 = this.field1718; + var2.field1719 = this.field1719; var2.vertexLabels = this.vertexLabels; var2.faceLabelsAlpha = this.faceLabelsAlpha; var2.isSingleTile = this.isSingleTile; @@ -544,7 +544,7 @@ public class Model extends Entity { return var2; } - @ObfuscatedName("w") + @ObfuscatedName("p") @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.method3113(this.verticesX[var10], this.verticesZ[var10], var8, var9); + int var11 = Rasterizer3D.method3131(this.verticesX[var10], this.verticesZ[var10], var8, var9); int var12 = this.verticesY[var10]; - int var13 = Rasterizer3D.method3150(this.verticesX[var10], this.verticesZ[var10], var8, var9); + int var13 = Rasterizer3D.method3118(this.verticesX[var10], this.verticesZ[var10], var8, var9); if (var11 < var2) { var2 = var11; } @@ -608,7 +608,7 @@ public class Model extends Entity { } } - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("calculateBoundsCylinder") public void calculateBoundsCylinder() { if (this.boundsType != 1) { @@ -641,7 +641,7 @@ public class Model extends Entity { } } - @ObfuscatedName("q") + @ObfuscatedName("n") void method2998() { if (this.boundsType != 2) { this.boundsType = 2; @@ -663,22 +663,22 @@ public class Model extends Entity { } } - @ObfuscatedName("z") - public int method2993() { + @ObfuscatedName("u") + public int method2999() { this.calculateBoundsCylinder(); return this.xzRadius; } - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("resetBounds") void resetBounds() { this.boundsType = 0; this.xMidOffset = -1; } - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lef;I)V" + signature = "(Leg;I)V" ) @Export("animate") public void animate(Frames var1, int var2) { @@ -700,9 +700,9 @@ public class Model extends Entity { } } - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Lef;ILef;I[I)V" + signature = "(Leg;ILeg;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("n") + @ObfuscatedName("c") @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("u") + @ObfuscatedName("h") @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("h") + @ObfuscatedName("k") @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("i") + @ObfuscatedName("d") @Export("rotateZ") public void rotateZ(int var1) { int var2 = Model_sine[var1]; @@ -970,7 +970,7 @@ public class Model extends Entity { this.resetBounds(); } - @ObfuscatedName("a") + @ObfuscatedName("e") @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("o") + @ObfuscatedName("l") @Export("scale") public void scale(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { @@ -997,9 +997,9 @@ public class Model extends Entity { this.resetBounds(); } - @ObfuscatedName("c") - public final void method2982(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - field1737[0] = -1; + @ObfuscatedName("t") + public final void method3010(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + field1744[0] = -1; if (this.boundsType != 2 && this.boundsType != 1) { this.method2998(); } @@ -1044,13 +1044,13 @@ public class Model extends Entity { var22 += var7; var23 = var21 * var17 - var22 * var16 >> 16; var22 = var21 * var16 + var22 * var17 >> 16; - field1703[var19] = var22 - var18; + field1739[var19] = var22 - var18; modelViewportXs[var19] = var20 * Rasterizer3D.Rasterizer3D_zoom / var22 + var8; modelViewportYs[var19] = var23 * Rasterizer3D.Rasterizer3D_zoom / var22 + var9; - if (this.field1698 > 0) { - field1726[var19] = var20; - field1707[var19] = var23; - field1728[var19] = var22; + if (this.field1730 > 0) { + field1740[var19] = var20; + field1736[var19] = var23; + field1742[var19] = var22; } } @@ -1061,9 +1061,9 @@ public class Model extends Entity { } - @ObfuscatedName("f") - public final void method3013(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - field1737[0] = -1; + @ObfuscatedName("x") + public final void method3011(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + field1744[0] = -1; if (this.boundsType != 2 && this.boundsType != 1) { this.method2998(); } @@ -1108,13 +1108,13 @@ public class Model extends Entity { var23 += var7; var24 = var22 * var18 - var23 * var17 >> 16; var23 = var22 * var17 + var23 * var18 >> 16; - field1703[var20] = var23 - var19; + field1739[var20] = var23 - var19; modelViewportXs[var20] = var9 + var21 * Rasterizer3D.Rasterizer3D_zoom / var8; modelViewportYs[var20] = var10 + var24 * Rasterizer3D.Rasterizer3D_zoom / var8; - if (this.field1698 > 0) { - field1726[var20] = var21; - field1707[var20] = var24; - field1728[var20] = var23; + if (this.field1730 > 0) { + field1740[var20] = var21; + field1736[var20] = var24; + field1742[var20] = var23; } } @@ -1125,20 +1125,19 @@ public class Model extends Entity { } - @ObfuscatedName("ae") + @ObfuscatedName("ah") @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) { - field1737[var6] = 0; + field1744[var6] = 0; } var6 = var3 ? 20 : 5; int var7; int var8; - int var9; int var10; int var11; int var12; @@ -1146,230 +1145,231 @@ public class Model extends Entity { int var15; int var16; int var18; + int var27; for (var7 = 0; var7 < this.indicesCount; ++var7) { if (this.faceColors3[var7] != -2) { var8 = this.indices1[var7]; - var9 = this.indices2[var7]; + var27 = this.indices2[var7]; var10 = this.indices3[var7]; var11 = modelViewportXs[var8]; - var12 = modelViewportXs[var9]; + var12 = modelViewportXs[var27]; var13 = modelViewportXs[var10]; + int var14; int var17; - int var34; - if (var1 && (var11 == -5000 || var12 == -5000 || var13 == -5000)) { - var34 = field1726[var8]; - var15 = field1726[var9]; - var16 = field1726[var10]; - var17 = field1707[var8]; - var18 = field1707[var9]; - int var19 = field1707[var10]; - int var20 = field1728[var8]; - int var21 = field1728[var9]; - int var22 = field1728[var10]; - var34 -= var15; + 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) { + ObjectSound.method2010(var4); + var2 = false; + } + } + + if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var27]) - (var13 - var12) * (modelViewportYs[var8] - modelViewportYs[var27]) > 0) { + field1752[var7] = false; + if (var11 >= 0 && var12 >= 0 && var13 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var13 <= Rasterizer3D.Rasterizer3D_clipWidth) { + field1735[var7] = false; + } else { + field1735[var7] = true; + } + + var14 = (field1739[var8] + field1739[var27] + field1739[var10]) / 3 + this.radius; + field1745[var14][field1744[var14]++] = var7; + } + } else { + var14 = field1740[var8]; + var15 = field1740[var27]; + var16 = field1740[var10]; + var17 = field1736[var8]; + var18 = field1736[var27]; + int var19 = field1736[var10]; + int var20 = field1742[var8]; + int var21 = field1742[var27]; + int var22 = field1742[var10]; + var14 -= var15; var16 -= var15; var17 -= var18; var19 -= var18; var20 -= var21; var22 -= var21; int var23 = var17 * var22 - var20 * var19; - int var24 = var20 * var16 - var34 * var22; - int var25 = var34 * var19 - var17 * var16; + int var24 = var20 * var16 - var14 * var22; + int var25 = var14 * var19 - var17 * var16; if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { - field1722[var7] = true; - int var26 = (field1703[var8] + field1703[var9] + field1703[var10]) / 3 + this.radius; - field1731[var26][field1737[var26]++] = var7; - } - } else { - if (var2) { - var15 = modelViewportYs[var8]; - var16 = modelViewportYs[var9]; - var17 = modelViewportYs[var10]; - var18 = var6 + ViewportMouse.ViewportMouse_y; - boolean var14; - if (var18 < var15 && var18 < var16 && var18 < var17) { - var14 = false; - } else { - var18 = ViewportMouse.ViewportMouse_y - var6; - if (var18 > var15 && var18 > var16 && var18 > var17) { - var14 = false; - } else { - var18 = var6 + ViewportMouse.ViewportMouse_x; - if (var18 < var11 && var18 < var12 && var18 < var13) { - var14 = false; - } else { - var18 = ViewportMouse.ViewportMouse_x - var6; - if (var18 > var11 && var18 > var12 && var18 > var13) { - var14 = false; - } else { - var14 = true; - } - } - } - } - - if (var14) { - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var4; - var2 = false; - } - } - - if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var13 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { - field1722[var7] = false; - if (var11 >= 0 && var12 >= 0 && var13 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var13 <= Rasterizer3D.Rasterizer3D_clipWidth) { - field1721[var7] = false; - } else { - field1721[var7] = true; - } - - var34 = (field1703[var8] + field1703[var9] + field1703[var10]) / 3 + this.radius; - field1731[var34][field1737[var34]++] = var7; + field1752[var7] = true; + int var26 = (field1739[var8] + field1739[var27] + field1739[var10]) / 3 + this.radius; + field1745[var26][field1744[var26]++] = var7; } } } } - int[] var27; + int[] var9; if (this.faceRenderPriorities == null) { for (var7 = this.diameter - 1; var7 >= 0; --var7) { - var8 = field1737[var7]; + var8 = field1744[var7]; if (var8 > 0) { - var27 = field1731[var7]; + var9 = field1745[var7]; for (var10 = 0; var10 < var8; ++var10) { - this.drawFace(var27[var10]); + this.drawFace(var9[var10]); } } } } else { for (var7 = 0; var7 < 12; ++var7) { - field1736[var7] = 0; - field1733[var7] = 0; + field1699[var7] = 0; + field1750[var7] = 0; } for (var7 = this.diameter - 1; var7 >= 0; --var7) { - var8 = field1737[var7]; + var8 = field1744[var7]; if (var8 > 0) { - var27 = field1731[var7]; + var9 = field1745[var7]; for (var10 = 0; var10 < var8; ++var10) { - var11 = var27[var10]; - byte var33 = this.faceRenderPriorities[var11]; - var13 = field1736[var33]++; - field1727[var33][var13] = var11; - if (var33 < 10) { - int[] var10000 = field1733; - var10000[var33] += var7; - } else if (var33 == 10) { - field1734[var13] = var7; + var11 = var9[var10]; + byte var31 = this.faceRenderPriorities[var11]; + var13 = field1699[var31]++; + field1747[var31][var13] = var11; + if (var31 < 10) { + int[] var10000 = field1750; + var10000[var31] += var7; + } else if (var31 == 10) { + field1698[var13] = var7; } else { - field1735[var13] = var7; + field1722[var13] = var7; } } } } var7 = 0; - if (field1736[1] > 0 || field1736[2] > 0) { - var7 = (field1733[1] + field1733[2]) / (field1736[1] + field1736[2]); + if (field1699[1] > 0 || field1699[2] > 0) { + var7 = (field1750[1] + field1750[2]) / (field1699[1] + field1699[2]); } var8 = 0; - if (field1736[3] > 0 || field1736[4] > 0) { - var8 = (field1733[3] + field1733[4]) / (field1736[3] + field1736[4]); + if (field1699[3] > 0 || field1699[4] > 0) { + var8 = (field1750[3] + field1750[4]) / (field1699[3] + field1699[4]); } - var9 = 0; - if (field1736[6] > 0 || field1736[8] > 0) { - var9 = (field1733[8] + field1733[6]) / (field1736[8] + field1736[6]); + var27 = 0; + if (field1699[6] > 0 || field1699[8] > 0) { + var27 = (field1750[8] + field1750[6]) / (field1699[8] + field1699[6]); } var11 = 0; - var12 = field1736[10]; - int[] var30 = field1727[10]; - int[] var31 = field1734; + var12 = field1699[10]; + int[] var28 = field1747[10]; + int[] var29 = field1698; if (var11 == var12) { var11 = 0; - var12 = field1736[11]; - var30 = field1727[11]; - var31 = field1735; + var12 = field1699[11]; + var28 = field1747[11]; + var29 = field1722; } if (var11 < var12) { - var10 = var31[var11]; + var10 = var29[var11]; } else { var10 = -1000; } for (var15 = 0; var15 < 10; ++var15) { while (var15 == 0 && var10 > var7) { - this.drawFace(var30[var11++]); - if (var11 == var12 && var30 != field1727[11]) { + this.drawFace(var28[var11++]); + if (var11 == var12 && var28 != field1747[11]) { var11 = 0; - var12 = field1736[11]; - var30 = field1727[11]; - var31 = field1735; + var12 = field1699[11]; + var28 = field1747[11]; + var29 = field1722; } if (var11 < var12) { - var10 = var31[var11]; + var10 = var29[var11]; } else { var10 = -1000; } } while (var15 == 3 && var10 > var8) { - this.drawFace(var30[var11++]); - if (var11 == var12 && var30 != field1727[11]) { + this.drawFace(var28[var11++]); + if (var11 == var12 && var28 != field1747[11]) { var11 = 0; - var12 = field1736[11]; - var30 = field1727[11]; - var31 = field1735; + var12 = field1699[11]; + var28 = field1747[11]; + var29 = field1722; } if (var11 < var12) { - var10 = var31[var11]; + var10 = var29[var11]; } else { var10 = -1000; } } - while (var15 == 5 && var10 > var9) { - this.drawFace(var30[var11++]); - if (var11 == var12 && var30 != field1727[11]) { + while (var15 == 5 && var10 > var27) { + this.drawFace(var28[var11++]); + if (var11 == var12 && var28 != field1747[11]) { var11 = 0; - var12 = field1736[11]; - var30 = field1727[11]; - var31 = field1735; + var12 = field1699[11]; + var28 = field1747[11]; + var29 = field1722; } if (var11 < var12) { - var10 = var31[var11]; + var10 = var29[var11]; } else { var10 = -1000; } } - var16 = field1736[var15]; - int[] var32 = field1727[var15]; + var16 = field1699[var15]; + int[] var30 = field1747[var15]; for (var18 = 0; var18 < var16; ++var18) { - this.drawFace(var32[var18]); + this.drawFace(var30[var18]); } } while (var10 != -1000) { - this.drawFace(var30[var11++]); - if (var11 == var12 && var30 != field1727[11]) { + this.drawFace(var28[var11++]); + if (var11 == var12 && var28 != field1747[11]) { var11 = 0; - var30 = field1727[11]; - var12 = field1736[11]; - var31 = field1735; + var28 = field1747[11]; + var12 = field1699[11]; + var29 = field1722; } if (var11 < var12) { - var10 = var31[var11]; + var10 = var29[var11]; } else { var10 = -1000; } @@ -1379,16 +1379,16 @@ public class Model extends Entity { } } - @ObfuscatedName("an") + @ObfuscatedName("ai") @Export("drawFace") final void drawFace(int var1) { - if (field1722[var1]) { - this.method3029(var1); + if (field1752[var1]) { + this.method3015(var1); } else { int var2 = this.indices1[var1]; int var3 = this.indices2[var1]; int var4 = this.indices3[var1]; - Rasterizer3D.field1778 = field1721[var1]; + Rasterizer3D.field1796 = field1735[var1]; if (this.faceAlphas == null) { Rasterizer3D.Rasterizer3D_alpha = 0; } else { @@ -1399,11 +1399,11 @@ public class Model extends Entity { int var5; int var6; int var7; - if (this.field1699 != null && this.field1699[var1] != -1) { - int var8 = this.field1699[var1] & 255; - var5 = this.field1685[var8]; - var6 = this.field1704[var8]; - var7 = this.field1705[var8]; + if (this.field1731 != null && this.field1731[var1] != -1) { + int var8 = this.field1731[var1] & 255; + var5 = this.field1717[var8]; + var6 = this.field1718[var8]; + var7 = this.field1719[var8]; } else { var5 = var2; var6 = var3; @@ -1411,30 +1411,30 @@ public class Model extends Entity { } if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3109(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1726[var5], field1726[var6], field1726[var7], field1707[var5], field1707[var6], field1707[var7], field1728[var5], field1728[var6], field1728[var7], this.faceTextures[var1]); + Rasterizer3D.method3126(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1740[var5], field1740[var6], field1740[var7], field1736[var5], field1736[var6], field1736[var7], field1742[var5], field1742[var6], field1742[var7], this.faceTextures[var1]); } else { - Rasterizer3D.method3109(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field1726[var5], field1726[var6], field1726[var7], field1707[var5], field1707[var6], field1707[var7], field1728[var5], field1728[var6], field1728[var7], this.faceTextures[var1]); + Rasterizer3D.method3126(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field1740[var5], field1740[var6], field1740[var7], field1736[var5], field1736[var6], field1736[var7], field1742[var5], field1742[var6], field1742[var7], this.faceTextures[var1]); } } else if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3107(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field1748[this.faceColors1[var1]]); + Rasterizer3D.method3124(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field1757[this.faceColors1[var1]]); } else { - Rasterizer3D.method3105(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); + Rasterizer3D.method3122(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); } } } - @ObfuscatedName("ai") - final void method3029(int var1) { + @ObfuscatedName("ao") + final void method3015(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 = field1728[var5]; - int var9 = field1728[var6]; - int var10 = field1728[var7]; + int var8 = field1742[var5]; + int var9 = field1742[var6]; + int var10 = field1742[var7]; if (this.faceAlphas == null) { Rasterizer3D.Rasterizer3D_alpha = 0; } else { @@ -1446,96 +1446,96 @@ public class Model extends Entity { int var13; int var14; if (var8 >= 50) { - field1696[var4] = modelViewportXs[var5]; - field1692[var4] = modelViewportYs[var5]; - field1739[var4++] = this.faceColors1[var1]; + field1751[var4] = modelViewportXs[var5]; + field1716[var4] = modelViewportYs[var5]; + field1728[var4++] = this.faceColors1[var1]; } else { - var11 = field1726[var5]; - var12 = field1707[var5]; + var11 = field1740[var5]; + var12 = field1736[var5]; var13 = this.faceColors1[var1]; if (var10 >= 50) { - var14 = field1749[var10 - var8] * (50 - var8); - field1696[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1726[var7] - var11) * var14 >> 16)) / 50; - field1692[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1707[var7] - var12) * var14 >> 16)) / 50; - field1739[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); + var14 = field1763[var10 - var8] * (50 - var8); + field1751[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1740[var7] - var11) * var14 >> 16)) / 50; + field1716[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1736[var7] - var12) * var14 >> 16)) / 50; + field1728[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); } if (var9 >= 50) { - var14 = field1749[var9 - var8] * (50 - var8); - field1696[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1726[var6] - var11) * var14 >> 16)) / 50; - field1692[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1707[var6] - var12) * var14 >> 16)) / 50; - field1739[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); + var14 = field1763[var9 - var8] * (50 - var8); + field1751[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1740[var6] - var11) * var14 >> 16)) / 50; + field1716[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1736[var6] - var12) * var14 >> 16)) / 50; + field1728[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); } } if (var9 >= 50) { - field1696[var4] = modelViewportXs[var6]; - field1692[var4] = modelViewportYs[var6]; - field1739[var4++] = this.faceColors2[var1]; + field1751[var4] = modelViewportXs[var6]; + field1716[var4] = modelViewportYs[var6]; + field1728[var4++] = this.faceColors2[var1]; } else { - var11 = field1726[var6]; - var12 = field1707[var6]; + var11 = field1740[var6]; + var12 = field1736[var6]; var13 = this.faceColors2[var1]; if (var8 >= 50) { - var14 = field1749[var8 - var9] * (50 - var9); - field1696[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1726[var5] - var11) * var14 >> 16)) / 50; - field1692[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1707[var5] - var12) * var14 >> 16)) / 50; - field1739[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); + var14 = field1763[var8 - var9] * (50 - var9); + field1751[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1740[var5] - var11) * var14 >> 16)) / 50; + field1716[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1736[var5] - var12) * var14 >> 16)) / 50; + field1728[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); } if (var10 >= 50) { - var14 = field1749[var10 - var9] * (50 - var9); - field1696[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1726[var7] - var11) * var14 >> 16)) / 50; - field1692[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1707[var7] - var12) * var14 >> 16)) / 50; - field1739[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); + var14 = field1763[var10 - var9] * (50 - var9); + field1751[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1740[var7] - var11) * var14 >> 16)) / 50; + field1716[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1736[var7] - var12) * var14 >> 16)) / 50; + field1728[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); } } if (var10 >= 50) { - field1696[var4] = modelViewportXs[var7]; - field1692[var4] = modelViewportYs[var7]; - field1739[var4++] = this.faceColors3[var1]; + field1751[var4] = modelViewportXs[var7]; + field1716[var4] = modelViewportYs[var7]; + field1728[var4++] = this.faceColors3[var1]; } else { - var11 = field1726[var7]; - var12 = field1707[var7]; + var11 = field1740[var7]; + var12 = field1736[var7]; var13 = this.faceColors3[var1]; if (var9 >= 50) { - var14 = field1749[var9 - var10] * (50 - var10); - field1696[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1726[var6] - var11) * var14 >> 16)) / 50; - field1692[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1707[var6] - var12) * var14 >> 16)) / 50; - field1739[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); + var14 = field1763[var9 - var10] * (50 - var10); + field1751[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1740[var6] - var11) * var14 >> 16)) / 50; + field1716[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1736[var6] - var12) * var14 >> 16)) / 50; + field1728[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); } if (var8 >= 50) { - var14 = field1749[var8 - var10] * (50 - var10); - field1696[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1726[var5] - var11) * var14 >> 16)) / 50; - field1692[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1707[var5] - var12) * var14 >> 16)) / 50; - field1739[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); + var14 = field1763[var8 - var10] * (50 - var10); + field1751[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1740[var5] - var11) * var14 >> 16)) / 50; + field1716[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1736[var5] - var12) * var14 >> 16)) / 50; + field1728[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); } } - var11 = field1696[0]; - var12 = field1696[1]; - var13 = field1696[2]; - var14 = field1692[0]; - int var15 = field1692[1]; - int var16 = field1692[2]; - Rasterizer3D.field1778 = false; + var11 = field1751[0]; + var12 = field1751[1]; + var13 = field1751[2]; + var14 = field1716[0]; + int var15 = field1716[1]; + int var16 = field1716[2]; + Rasterizer3D.field1796 = 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.field1778 = true; + Rasterizer3D.field1796 = true; } if (this.faceTextures != null && this.faceTextures[var1] != -1) { - if (this.field1699 != null && this.field1699[var1] != -1) { - var20 = this.field1699[var1] & 255; - var17 = this.field1685[var20]; - var18 = this.field1704[var20]; - var19 = this.field1705[var20]; + if (this.field1731 != null && this.field1731[var1] != -1) { + var20 = this.field1731[var1] & 255; + var17 = this.field1717[var20]; + var18 = this.field1718[var20]; + var19 = this.field1719[var20]; } else { var17 = var5; var18 = var6; @@ -1543,28 +1543,28 @@ public class Model extends Entity { } if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3109(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1726[var17], field1726[var18], field1726[var19], field1707[var17], field1707[var18], field1707[var19], field1728[var17], field1728[var18], field1728[var19], this.faceTextures[var1]); + Rasterizer3D.method3126(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1740[var17], field1740[var18], field1740[var19], field1736[var17], field1736[var18], field1736[var19], field1742[var17], field1742[var18], field1742[var19], this.faceTextures[var1]); } else { - Rasterizer3D.method3109(var14, var15, var16, var11, var12, var13, field1739[0], field1739[1], field1739[2], field1726[var17], field1726[var18], field1726[var19], field1707[var17], field1707[var18], field1707[var19], field1728[var17], field1728[var18], field1728[var19], this.faceTextures[var1]); + Rasterizer3D.method3126(var14, var15, var16, var11, var12, var13, field1728[0], field1728[1], field1728[2], field1740[var17], field1740[var18], field1740[var19], field1736[var17], field1736[var18], field1736[var19], field1742[var17], field1742[var18], field1742[var19], this.faceTextures[var1]); } } else if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3107(var14, var15, var16, var11, var12, var13, field1748[this.faceColors1[var1]]); + Rasterizer3D.method3124(var14, var15, var16, var11, var12, var13, field1757[this.faceColors1[var1]]); } else { - Rasterizer3D.method3105(var14, var15, var16, var11, var12, var13, field1739[0], field1739[1], field1739[2]); + Rasterizer3D.method3122(var14, var15, var16, var11, var12, var13, field1728[0], field1728[1], field1728[2]); } } if (var4 == 4) { - if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field1696[3] < 0 || field1696[3] > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field1778 = true; + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field1751[3] < 0 || field1751[3] > Rasterizer3D.Rasterizer3D_clipWidth) { + Rasterizer3D.field1796 = true; } if (this.faceTextures != null && this.faceTextures[var1] != -1) { - if (this.field1699 != null && this.field1699[var1] != -1) { - var20 = this.field1699[var1] & 255; - var17 = this.field1685[var20]; - var18 = this.field1704[var20]; - var19 = this.field1705[var20]; + if (this.field1731 != null && this.field1731[var1] != -1) { + var20 = this.field1731[var1] & 255; + var17 = this.field1717[var20]; + var18 = this.field1718[var20]; + var19 = this.field1719[var20]; } else { var17 = var5; var18 = var6; @@ -1573,28 +1573,28 @@ public class Model extends Entity { short var21 = this.faceTextures[var1]; if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3109(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1726[var17], field1726[var18], field1726[var19], field1707[var17], field1707[var18], field1707[var19], field1728[var17], field1728[var18], field1728[var19], var21); - Rasterizer3D.method3109(var14, var16, field1692[3], var11, var13, field1696[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1726[var17], field1726[var18], field1726[var19], field1707[var17], field1707[var18], field1707[var19], field1728[var17], field1728[var18], field1728[var19], var21); + Rasterizer3D.method3126(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1740[var17], field1740[var18], field1740[var19], field1736[var17], field1736[var18], field1736[var19], field1742[var17], field1742[var18], field1742[var19], var21); + Rasterizer3D.method3126(var14, var16, field1716[3], var11, var13, field1751[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1740[var17], field1740[var18], field1740[var19], field1736[var17], field1736[var18], field1736[var19], field1742[var17], field1742[var18], field1742[var19], var21); } else { - Rasterizer3D.method3109(var14, var15, var16, var11, var12, var13, field1739[0], field1739[1], field1739[2], field1726[var17], field1726[var18], field1726[var19], field1707[var17], field1707[var18], field1707[var19], field1728[var17], field1728[var18], field1728[var19], var21); - Rasterizer3D.method3109(var14, var16, field1692[3], var11, var13, field1696[3], field1739[0], field1739[2], field1739[3], field1726[var17], field1726[var18], field1726[var19], field1707[var17], field1707[var18], field1707[var19], field1728[var17], field1728[var18], field1728[var19], var21); + Rasterizer3D.method3126(var14, var15, var16, var11, var12, var13, field1728[0], field1728[1], field1728[2], field1740[var17], field1740[var18], field1740[var19], field1736[var17], field1736[var18], field1736[var19], field1742[var17], field1742[var18], field1742[var19], var21); + Rasterizer3D.method3126(var14, var16, field1716[3], var11, var13, field1751[3], field1728[0], field1728[2], field1728[3], field1740[var17], field1740[var18], field1740[var19], field1736[var17], field1736[var18], field1736[var19], field1742[var17], field1742[var18], field1742[var19], var21); } } else if (this.faceColors3[var1] == -1) { - var17 = field1748[this.faceColors1[var1]]; - Rasterizer3D.method3107(var14, var15, var16, var11, var12, var13, var17); - Rasterizer3D.method3107(var14, var16, field1692[3], var11, var13, field1696[3], var17); + var17 = field1757[this.faceColors1[var1]]; + Rasterizer3D.method3124(var14, var15, var16, var11, var12, var13, var17); + Rasterizer3D.method3124(var14, var16, field1716[3], var11, var13, field1751[3], var17); } else { - Rasterizer3D.method3105(var14, var15, var16, var11, var12, var13, field1739[0], field1739[1], field1739[2]); - Rasterizer3D.method3105(var14, var16, field1692[3], var11, var13, field1696[3], field1739[0], field1739[2], field1739[3]); + Rasterizer3D.method3122(var14, var15, var16, var11, var12, var13, field1728[0], field1728[1], field1728[2]); + Rasterizer3D.method3122(var14, var16, field1716[3], var11, var13, field1751[3], field1728[0], field1728[2], field1728[3]); } } } - @ObfuscatedName("cq") + @ObfuscatedName("cz") @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { - field1737[0] = -1; + field1744[0] = -1; if (this.boundsType != 1) { this.calculateBoundsCylinder(); } @@ -1624,19 +1624,25 @@ public class Model extends Entity { var25 = true; } - boolean var26 = var25 || this.field1698 > 0; - int var27 = class52.method905(); - int var28 = ViewportMouse.ViewportMouse_y; - boolean var30 = ViewportMouse.ViewportMouse_isInViewport; - boolean var32 = Decimator.method2635(var9); - boolean var33 = false; + boolean var26 = var25 || this.field1730 > 0; + int var27 = class1.method17(); + int var28 = Tiles.method1180(); + boolean var29 = ViewportMouse.ViewportMouse_isInViewport; + boolean var32 = var9 != 0L; + boolean var33; + if (var32) { + var33 = (int)(var9 >>> 16 & 1L) == 1; + var32 = !var33; + } + + var33 = false; int var35; int var36; int var37; - if (var32 && var30) { + if (var32 && var29) { boolean var34 = false; - if (field1743) { - var34 = SecureRandomCallable.method1252(this, var6, var7, var8); + if (field1713) { + var34 = class236.method4283(this, var6, var7, var8); } else { var35 = var12 - var13; if (var35 <= 50) { @@ -1668,14 +1674,14 @@ public class Model extends Entity { if (var34) { if (this.isSingleTile) { - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var9; + ObjectSound.method2010(var9); } else { var33 = true; } } } - int var47 = Rasterizer3D.Rasterizer3D_clipMidX; + int var45 = Rasterizer3D.Rasterizer3D_clipMidX; var35 = Rasterizer3D.Rasterizer3D_clipMidY; var36 = 0; var37 = 0; @@ -1703,9 +1709,9 @@ public class Model extends Entity { var39 = var42; var42 = var3 * var40 - var41 * var2 >> 16; var41 = var40 * var2 + var3 * var41 >> 16; - field1703[var38] = var41 - var12; + field1739[var38] = var41 - var12; if (var41 >= 50) { - modelViewportXs[var38] = var39 * Rasterizer3D.Rasterizer3D_zoom / var41 + var47; + modelViewportXs[var38] = var39 * Rasterizer3D.Rasterizer3D_zoom / var41 + var45; modelViewportYs[var38] = var42 * Rasterizer3D.Rasterizer3D_zoom / var41 + var35; } else { modelViewportXs[var38] = -5000; @@ -1713,15 +1719,15 @@ public class Model extends Entity { } if (var26) { - field1726[var38] = var39; - field1707[var38] = var42; - field1728[var38] = var41; + field1740[var38] = var39; + field1736[var38] = var42; + field1742[var38] = var41; } } try { this.draw0(var24, var33, this.isSingleTile, var9); - } catch (Exception var46) { + } catch (Exception var44) { } } diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java index 9fa8466bad..c5a206112f 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("ea") +@ObfuscatedName("ek") @Implements("ModelData") public class ModelData extends Entity { + @ObfuscatedName("ad") + static int[] field1610; @ObfuscatedName("as") - static int[] field1576; - @ObfuscatedName("am") - static int[] field1601; - @ObfuscatedName("au") - static int field1588; - @ObfuscatedName("ao") + static int[] field1597; + @ObfuscatedName("ar") + static int field1614; + @ObfuscatedName("ap") @Export("ModelData_sine") static int[] ModelData_sine; - @ObfuscatedName("aq") + @ObfuscatedName("al") @Export("ModelData_cosine") static int[] ModelData_cosine; - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("verticesCount") int verticesCount; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("verticesX") int[] verticesX; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("verticesY") int[] verticesY; - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("faceCount") int faceCount; - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("indices1") int[] indices1; - @ObfuscatedName("q") + @ObfuscatedName("n") @Export("indices2") int[] indices2; - @ObfuscatedName("z") + @ObfuscatedName("u") @Export("indices3") int[] indices3; - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("faceRenderTypes") byte[] faceRenderTypes; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("s") + @ObfuscatedName("w") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("textureCoords") byte[] textureCoords; - @ObfuscatedName("n") + @ObfuscatedName("c") @Export("faceColors") short[] faceColors; - @ObfuscatedName("u") + @ObfuscatedName("h") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("h") + @ObfuscatedName("k") @Export("priority") byte priority; - @ObfuscatedName("g") + @ObfuscatedName("r") @Export("textureTriangleCount") int textureTriangleCount; - @ObfuscatedName("i") + @ObfuscatedName("s") @Export("textureRenderTypes") byte[] textureRenderTypes; - @ObfuscatedName("a") + @ObfuscatedName("v") @Export("texTriangleX") short[] texTriangleX; - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("texTriangleY") short[] texTriangleY; - @ObfuscatedName("l") + @ObfuscatedName("e") @Export("texTriangleZ") short[] texTriangleZ; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("vertexSkins") int[] vertexSkins; - @ObfuscatedName("o") + @ObfuscatedName("t") @Export("faceSkins") int[] faceSkins; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("j") + @ObfuscatedName("b") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("y") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "[Ler;" + signature = "[Led;" ) @Export("faceNormals") FaceNormal[] faceNormals; @ObfuscatedName("f") @ObfuscatedSignature( - signature = "[Len;" + signature = "[Let;" ) @Export("vertexNormals") VertexNormal[] vertexNormals; - @ObfuscatedName("ae") + @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "[Len;" + signature = "[Let;" ) - VertexNormal[] field1591; - @ObfuscatedName("an") + VertexNormal[] field1603; + @ObfuscatedName("ai") @Export("ambient") public short ambient; - @ObfuscatedName("ai") + @ObfuscatedName("ao") @Export("contrast") public short contrast; - @ObfuscatedName("ap") + @ObfuscatedName("ae") @Export("isBoundsCalculated") boolean isBoundsCalculated; + @ObfuscatedName("ax") + int field1582; + @ObfuscatedName("ag") + int field1578; @ObfuscatedName("ab") - int field1567; - @ObfuscatedName("ar") - int field1595; - @ObfuscatedName("af") - int field1597; - @ObfuscatedName("at") - int field1594; - @ObfuscatedName("al") - int field1599; + int field1609; + @ObfuscatedName("am") + int field1601; + @ObfuscatedName("ak") + int field1613; static { - field1576 = new int[10000]; - field1601 = new int[10000]; - field1588 = 0; + field1610 = new int[10000]; + field1597 = new int[10000]; + field1614 = 0; ModelData_sine = Rasterizer3D.Rasterizer3D_sine; ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; } @@ -143,7 +143,7 @@ public class ModelData extends Entity { } @ObfuscatedSignature( - signature = "([Lea;I)V" + signature = "([Lek;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.method2884(var10, var10.indices1[var11]); - this.indices2[this.faceCount] = this.method2884(var10, var10.indices2[var11]); - this.indices3[this.faceCount] = this.method2884(var10, var10.indices3[var11]); + this.indices1[this.faceCount] = this.method2928(var10, var10.indices1[var11]); + this.indices2[this.faceCount] = this.method2928(var10, var10.indices2[var11]); + this.indices3[this.faceCount] = this.method2928(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.method2884(var10, var10.texTriangleX[var11]); - this.texTriangleY[this.textureTriangleCount] = (short)this.method2884(var10, var10.texTriangleY[var11]); - this.texTriangleZ[this.textureTriangleCount] = (short)this.method2884(var10, var10.texTriangleZ[var11]); + this.texTriangleX[this.textureTriangleCount] = (short)this.method2928(var10, var10.texTriangleX[var11]); + this.texTriangleY[this.textureTriangleCount] = (short)this.method2928(var10, var10.texTriangleY[var11]); + this.texTriangleZ[this.textureTriangleCount] = (short)this.method2928(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.method2894(var1); + this.method2908(var1); } else { - this.method2882(var1); + this.method2909(var1); } } @ObfuscatedSignature( - signature = "(Lea;ZZZZ)V", + signature = "(Lek;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.field1591 = var1.field1591; + this.field1603 = var1.field1603; this.ambient = var1.ambient; this.contrast = var1.contrast; } - @ObfuscatedName("m") - void method2894(byte[] var1) { + @ObfuscatedName("o") + void method2908(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("k") - void method2882(byte[] var1) { + @ObfuscatedName("q") + void method2909(byte[] var1) { boolean var2 = false; boolean var3 = false; Buffer var4 = new Buffer(var1); @@ -963,11 +963,11 @@ public class ModelData extends Entity { } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lea;I)I" + signature = "(Lek;I)I" ) - final int method2884(ModelData var1, int var2) { + final int method2928(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("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "()Lea;" + signature = "()Lek;" ) - public ModelData method2885() { + public ModelData method2938() { 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("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "([[IIIIZI)Lea;" + signature = "([[IIIIZI)Lek;" ) - public ModelData method2886(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { + public ModelData method2912(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { this.calculateBounds(); - int var7 = var2 + this.field1595; - int var8 = var2 + this.field1597; - int var9 = var4 + this.field1599; - int var10 = var4 + this.field1594; + int var7 = var2 + this.field1578; + int var8 = var2 + this.field1609; + int var9 = var4 + this.field1613; + int var10 = var4 + this.field1601; 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("q") - void method2901() { + @ObfuscatedName("n") + void method2940() { int[] var1; int var2; int var10002; @@ -1193,8 +1193,8 @@ public class ModelData extends Entity { } - @ObfuscatedName("z") - public void method2888() { + @ObfuscatedName("u") + public void method2914() { 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("e") - public void method2889() { + @ObfuscatedName("z") + public void method2944() { 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("s") - public void method2910() { + @ObfuscatedName("w") + public void method2915() { 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("p") - public void method2891(int var1) { + @ObfuscatedName("y") + public void method2968(int var1) { int var2 = ModelData_sine[var1]; int var3 = ModelData_cosine[var1]; @@ -1239,7 +1239,7 @@ public class ModelData extends Entity { this.invalidate(); } - @ObfuscatedName("n") + @ObfuscatedName("c") @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("u") + @ObfuscatedName("h") @Export("recolor") public void recolor(short var1, short var2) { for (int var3 = 0; var3 < this.faceCount; ++var3) { @@ -1265,7 +1265,7 @@ public class ModelData extends Entity { } - @ObfuscatedName("h") + @ObfuscatedName("k") @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 method2895() { + @ObfuscatedName("r") + public void method2919() { 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("i") + @ObfuscatedName("d") @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("a") + @ObfuscatedName("e") @Export("calculateVertexNormals") public void calculateVertexNormals() { if (this.vertexNormals == null) { @@ -1382,52 +1382,52 @@ public class ModelData extends Entity { } } - @ObfuscatedName("o") + @ObfuscatedName("l") @Export("invalidate") void invalidate() { this.vertexNormals = null; - this.field1591 = null; + this.field1603 = null; this.faceNormals = null; this.isBoundsCalculated = false; } - @ObfuscatedName("c") + @ObfuscatedName("t") @Export("calculateBounds") void calculateBounds() { if (!this.isBoundsCalculated) { super.height = 0; - this.field1567 = 0; - this.field1595 = 999999; - this.field1597 = -999999; - this.field1594 = -99999; - this.field1599 = 99999; + this.field1582 = 0; + this.field1578 = 999999; + this.field1609 = -999999; + this.field1601 = -99999; + this.field1613 = 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.field1595) { - this.field1595 = var2; + if (var2 < this.field1578) { + this.field1578 = var2; } - if (var2 > this.field1597) { - this.field1597 = var2; + if (var2 > this.field1609) { + this.field1609 = var2; } - if (var4 < this.field1599) { - this.field1599 = var4; + if (var4 < this.field1613) { + this.field1613 = var4; } - if (var4 > this.field1594) { - this.field1594 = var4; + if (var4 > this.field1601) { + this.field1601 = var4; } if (-var3 > super.height) { super.height = -var3; } - if (var3 > this.field1567) { - this.field1567 = var3; + if (var3 > this.field1582) { + this.field1582 = var3; } } @@ -1435,9 +1435,9 @@ public class ModelData extends Entity { } } - @ObfuscatedName("ae") + @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(IIIII)Lel;" + signature = "(IIIII)Lef;" ) @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.field1698 = 0; + var8.field1730 = 0; for (var10 = 0; var10 < this.textureTriangleCount; ++var10) { if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { - ++var8.field1698; + ++var8.field1730; } } - var8.field1685 = new int[var8.field1698]; - var8.field1704 = new int[var8.field1698]; - var8.field1705 = new int[var8.field1698]; + var8.field1717 = new int[var8.field1730]; + var8.field1718 = new int[var8.field1730]; + var8.field1719 = new int[var8.field1730]; var10 = 0; int var11; for (var11 = 0; var11 < this.textureTriangleCount; ++var11) { if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) { - var8.field1685[var10] = this.texTriangleX[var11] & '\uffff'; - var8.field1704[var10] = this.texTriangleY[var11] & '\uffff'; - var8.field1705[var10] = this.texTriangleZ[var11] & '\uffff'; + var8.field1717[var10] = this.texTriangleX[var11] & '\uffff'; + var8.field1718[var10] = this.texTriangleY[var11] & '\uffff'; + var8.field1719[var10] = this.texTriangleZ[var11] & '\uffff'; var9[var11] = var10++; } else { var9[var11] = -1; } } - var8.field1699 = new byte[this.faceCount]; + var8.field1731 = new byte[this.faceCount]; for (var11 = 0; var11 < this.faceCount; ++var11) { if (this.textureCoords[var11] != -1) { - var8.field1699[var11] = (byte)var9[this.textureCoords[var11] & 255]; + var8.field1731[var11] = (byte)var9[this.textureCoords[var11] & 255]; } else { - var8.field1699[var11] = -1; + var8.field1731[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] = method2902(this.faceColors[var16] & '\uffff', var14); + var8.faceColors1[var16] = method2911(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.field1591 != null && this.field1591[this.indices1[var16]] != null) { - var13 = this.field1591[this.indices1[var16]]; + if (this.field1603 != null && this.field1603[this.indices1[var16]] != null) { + var13 = this.field1603[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] = method2902(var15, var14); - if (this.field1591 != null && this.field1591[this.indices2[var16]] != null) { - var13 = this.field1591[this.indices2[var16]]; + var8.faceColors1[var16] = method2911(var15, var14); + if (this.field1603 != null && this.field1603[this.indices2[var16]] != null) { + var13 = this.field1603[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] = method2902(var15, var14); - if (this.field1591 != null && this.field1591[this.indices3[var16]] != null) { - var13 = this.field1591[this.indices3[var16]]; + var8.faceColors2[var16] = method2911(var15, var14); + if (this.field1603 != null && this.field1603[this.indices3[var16]] != null) { + var13 = this.field1603[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] = method2902(var15, var14); + var8.faceColors3[var16] = method2911(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] = method2938(var14); + var8.faceColors1[var16] = method2927(var14); var8.faceColors3[var16] = -1; } else { var8.faceColors3[var16] = -2; } } else { - if (this.field1591 != null && this.field1591[this.indices1[var16]] != null) { - var13 = this.field1591[this.indices1[var16]]; + if (this.field1603 != null && this.field1603[this.indices1[var16]] != null) { + var13 = this.field1603[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] = method2938(var14); - if (this.field1591 != null && this.field1591[this.indices2[var16]] != null) { - var13 = this.field1591[this.indices2[var16]]; + var8.faceColors1[var16] = method2927(var14); + if (this.field1603 != null && this.field1603[this.indices2[var16]] != null) { + var13 = this.field1603[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] = method2938(var14); - if (this.field1591 != null && this.field1591[this.indices3[var16]] != null) { - var13 = this.field1591[this.indices3[var16]]; + var8.faceColors2[var16] = method2927(var14); + if (this.field1603 != null && this.field1603[this.indices3[var16]] != null) { + var13 = this.field1603[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] = method2938(var14); + var8.faceColors3[var16] = method2927(var14); } } - this.method2901(); + this.method2940(); 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.field1701 = this.priority; + var8.field1715 = this.priority; var8.vertexLabels = this.vertexLabels; var8.faceLabelsAlpha = this.faceLabelsAlpha; var8.faceTextures = this.faceTextures; return var8; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Liy;II)Lea;" + signature = "(Lic;II)Lek;" ) @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("f") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lea;Lea;IIIZ)V" + signature = "(Lek;Lek;IIIZ)V" ) - static void method2890(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { + static void method2924(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { var0.calculateBounds(); var0.calculateVertexNormals(); var1.calculateBounds(); var1.calculateVertexNormals(); - ++field1588; + ++field1614; 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.field1567) { + if (var11 <= var1.field1582) { int var12 = var0.verticesX[var9] - var2; - if (var12 >= var1.field1595 && var12 <= var1.field1597) { + if (var12 >= var1.field1578 && var12 <= var1.field1609) { int var13 = var0.verticesZ[var9] - var4; - if (var13 >= var1.field1599 && var13 <= var1.field1594) { + if (var13 >= var1.field1613 && var13 <= var1.field1601) { 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.field1591 == null) { - var0.field1591 = new VertexNormal[var0.verticesCount]; + if (var0.field1603 == null) { + var0.field1603 = new VertexNormal[var0.verticesCount]; } - if (var1.field1591 == null) { - var1.field1591 = new VertexNormal[var8]; + if (var1.field1603 == null) { + var1.field1603 = new VertexNormal[var8]; } - VertexNormal var16 = var0.field1591[var9]; + VertexNormal var16 = var0.field1603[var9]; if (var16 == null) { - var16 = var0.field1591[var9] = new VertexNormal(var10); + var16 = var0.field1603[var9] = new VertexNormal(var10); } - VertexNormal var17 = var1.field1591[var14]; + VertexNormal var17 = var1.field1603[var14]; if (var17 == null) { - var17 = var1.field1591[var14] = new VertexNormal(var15); + var17 = var1.field1603[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; - field1576[var9] = field1588; - field1601[var14] = field1588; + field1610[var9] = field1614; + field1597[var14] = field1614; } } } @@ -1698,7 +1698,7 @@ public class ModelData extends Entity { if (var6 >= 3 && var5) { for (var9 = 0; var9 < var0.faceCount; ++var9) { - if (field1576[var0.indices1[var9]] == field1588 && field1576[var0.indices2[var9]] == field1588 && field1576[var0.indices3[var9]] == field1588) { + if (field1610[var0.indices1[var9]] == field1614 && field1610[var0.indices2[var9]] == field1614 && field1610[var0.indices3[var9]] == field1614) { 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 (field1588 == field1601[var1.indices1[var9]] && field1588 == field1601[var1.indices2[var9]] && field1588 == field1601[var1.indices3[var9]]) { + if (field1614 == field1597[var1.indices1[var9]] && field1614 == field1597[var1.indices2[var9]] && field1614 == field1597[var1.indices3[var9]]) { if (var1.faceRenderTypes == null) { var1.faceRenderTypes = new byte[var1.faceCount]; } @@ -1720,8 +1720,8 @@ public class ModelData extends Entity { } } - @ObfuscatedName("an") - static final int method2902(int var0, int var1) { + @ObfuscatedName("ai") + static final int method2911(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("ai") - static final int method2938(int var0) { + @ObfuscatedName("ao") + static final int method2927(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 e4e2a1ef53..4abbb5613b 100644 --- a/runescape-client/src/main/java/ModelData0.java +++ b/runescape-client/src/main/java/ModelData0.java @@ -1,103 +1,38 @@ -import 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("ed") +@ObfuscatedName("en") @Implements("ModelData0") public class ModelData0 { - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lle;" - ) - @Export("titleboxSprite") - static IndexedSprite titleboxSprite; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -2057553867 - ) - @Export("gameCyclesToDo") - protected static int gameCyclesToDo; - ModelData0() { } - @ObfuscatedName("w") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IIIZIZB)V", - garbageValue = "-80" + signature = "(CI)C", + garbageValue = "-706706502" ) - @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 = UserComparator2.World_worlds[var6]; - UserComparator2.World_worlds[var6] = UserComparator2.World_worlds[var1]; - UserComparator2.World_worlds[var1] = var8; - - for (int var9 = var0; var9 < var1; ++var9) { - World var11 = UserComparator2.World_worlds[var9]; - int var12 = DevicePcmPlayerProvider.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 = DevicePcmPlayerProvider.compareWorlds(var11, var8, var4, var5); - if (var5) { - var10 = -var13; - } else { - var10 = var13; - } - } - - if (var10 <= 0) { - World var14 = UserComparator2.World_worlds[var9]; - UserComparator2.World_worlds[var9] = UserComparator2.World_worlds[var7]; - UserComparator2.World_worlds[var7++] = var14; - } - } - - UserComparator2.World_worlds[var1] = UserComparator2.World_worlds[var7]; - UserComparator2.World_worlds[var7] = var8; - doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); - doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); + static char method3374(char var0) { + if (var0 == 198) { + return 'E'; + } else if (var0 == 230) { + return 'e'; + } else if (var0 == 223) { + return 's'; + } else if (var0 == 338) { + return 'E'; + } else { + return (char)(var0 == 339 ? 'e' : '\u0000'); } - } - @ObfuscatedName("fs") + @ObfuscatedName("ii") @ObfuscatedSignature( - signature = "(IIII)V", - garbageValue = "1566964636" + signature = "(I)Z", + garbageValue = "1532544056" ) - @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("kb") - @ObfuscatedSignature( - signature = "(Lkb;II)V", - garbageValue = "-1883187928" - ) - static void method3362(Buffer var0, int var1) { - Interpreter.method2113(var0.array, var1); - WorldMapSprite.method510(var0, var1); + static boolean method3375() { + return Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; } } diff --git a/runescape-client/src/main/java/MouseHandler.java b/runescape-client/src/main/java/MouseHandler.java index 886a5c9cbe..eb7d55be40 100644 --- a/runescape-client/src/main/java/MouseHandler.java +++ b/runescape-client/src/main/java/MouseHandler.java @@ -3,132 +3,129 @@ import java.awt.event.FocusListener; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; -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("bq") +@ObfuscatedName("bc") @Implements("MouseHandler") public class MouseHandler implements MouseListener, MouseMotionListener, FocusListener { - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -1802673633 - ) - @Export("MouseHandler_y") - public static int MouseHandler_y; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 9279483 - ) - @Export("MouseHandler_x") - public static int MouseHandler_x; - @ObfuscatedName("v") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lbq;" + signature = "Lbc;" ) @Export("MouseHandler_instance") - static MouseHandler MouseHandler_instance; - @ObfuscatedName("q") + public static MouseHandler MouseHandler_instance; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 481106497 + intValue = -344511405 ) @Export("MouseHandler_idleCycles") public static volatile int MouseHandler_idleCycles; - @ObfuscatedName("z") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -853983883 + intValue = 1045483843 ) @Export("MouseHandler_currentButtonVolatile") - static volatile int MouseHandler_currentButtonVolatile; - @ObfuscatedName("t") + public static volatile int MouseHandler_currentButtonVolatile; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -2069980405 + intValue = 238880943 ) @Export("MouseHandler_xVolatile") - static volatile int MouseHandler_xVolatile; - @ObfuscatedName("e") + public static volatile int MouseHandler_xVolatile; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1032976335 + intValue = -1843810125 ) @Export("MouseHandler_yVolatile") - static volatile int MouseHandler_yVolatile; - @ObfuscatedName("s") + public static volatile int MouseHandler_yVolatile; + @ObfuscatedName("a") @ObfuscatedGetter( - longValue = 8440490709549879739L + longValue = 6776371404405886705L ) @Export("MouseHandler_lastMovedVolatile") - static volatile long MouseHandler_lastMovedVolatile; - @ObfuscatedName("p") + public static volatile long MouseHandler_lastMovedVolatile; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 440702865 + intValue = 793567275 ) @Export("MouseHandler_currentButton") public static int MouseHandler_currentButton; - @ObfuscatedName("n") + @ObfuscatedName("w") @ObfuscatedGetter( - longValue = -7274898948584366517L + intValue = -493092611 + ) + @Export("MouseHandler_x") + public static int MouseHandler_x; + @ObfuscatedName("y") + @ObfuscatedGetter( + longValue = 8491441905862716493L ) @Export("MouseHandler_millis") public static long MouseHandler_millis; - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 329598021 + intValue = -1383373793 ) - @Export("MouseHandler_lastButtonVolatile") - static volatile int MouseHandler_lastButtonVolatile; + @Export("MouseHandler_y") + public static int MouseHandler_y; @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -2102823313 + intValue = 1244221461 + ) + @Export("MouseHandler_lastButtonVolatile") + public static volatile int MouseHandler_lastButtonVolatile; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -1667850499 ) @Export("MouseHandler_lastPressedXVolatile") - static volatile int MouseHandler_lastPressedXVolatile; - @ObfuscatedName("g") + public static volatile int MouseHandler_lastPressedXVolatile; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 44004483 + intValue = -356343703 ) @Export("MouseHandler_lastPressedYVolatile") - static volatile int MouseHandler_lastPressedYVolatile; - @ObfuscatedName("i") + public static volatile int MouseHandler_lastPressedYVolatile; + @ObfuscatedName("s") @ObfuscatedGetter( - longValue = -4336093553213135153L + longValue = 2783715713141770813L ) @Export("MouseHandler_lastPressedTimeMillisVolatile") - static volatile long MouseHandler_lastPressedTimeMillisVolatile; - @ObfuscatedName("a") + public static volatile long MouseHandler_lastPressedTimeMillisVolatile; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1894311513 + intValue = -1358279153 ) @Export("MouseHandler_lastButton") public static int MouseHandler_lastButton; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -894585521 + intValue = -1481741683 ) @Export("MouseHandler_lastPressedX") public static int MouseHandler_lastPressedX; - @ObfuscatedName("l") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -880195683 + intValue = -1779789351 ) @Export("MouseHandler_lastPressedY") public static int MouseHandler_lastPressedY; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - longValue = 5747430308835367139L + longValue = -1326951704781204379L ) @Export("MouseHandler_lastPressedTimeMillis") public static long MouseHandler_lastPressedTimeMillis; - @ObfuscatedName("ey") - @Export("secureRandom") - static SecureRandom secureRandom; - @ObfuscatedName("ge") + @ObfuscatedName("hg") @ObfuscatedGetter( - intValue = 1073160651 + intValue = 127786367 ) - static int field529; + @Export("cameraX") + static int cameraX; static { MouseHandler_instance = new MouseHandler(); @@ -154,10 +151,10 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi MouseHandler() { } - @ObfuscatedName("v") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(Ljava/awt/event/MouseEvent;I)I", - garbageValue = "-1992651704" + garbageValue = "-750750909" ) @Export("getButton") final int getButton(MouseEvent var1) { @@ -179,20 +176,19 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi } - public final synchronized void mousePressed(MouseEvent var1) { + public final synchronized void focusLost(FocusEvent var1) { if (MouseHandler_instance != null) { - MouseHandler_idleCycles = 0; - MouseHandler_lastPressedXVolatile = var1.getX(); - MouseHandler_lastPressedYVolatile = var1.getY(); - MouseHandler_lastPressedTimeMillisVolatile = class217.currentTimeMillis(); - MouseHandler_lastButtonVolatile = this.getButton(var1); - if (MouseHandler_lastButtonVolatile != 0) { - MouseHandler_currentButtonVolatile = MouseHandler_lastButtonVolatile; - } + MouseHandler_currentButtonVolatile = 0; } - 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(); } } @@ -216,16 +212,20 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi } - public final synchronized void mouseEntered(MouseEvent var1) { - this.mouseMoved(var1); - } - - public final synchronized void mouseExited(MouseEvent var1) { + public final synchronized void mousePressed(MouseEvent var1) { if (MouseHandler_instance != null) { MouseHandler_idleCycles = 0; - MouseHandler_xVolatile = -1; - MouseHandler_yVolatile = -1; - MouseHandler_lastMovedVolatile = var1.getWhen(); + MouseHandler_lastPressedXVolatile = var1.getX(); + MouseHandler_lastPressedYVolatile = var1.getY(); + MouseHandler_lastPressedTimeMillisVolatile = MilliClock.currentTimeMillis(); + MouseHandler_lastButtonVolatile = this.getButton(var1); + if (MouseHandler_lastButtonVolatile != 0) { + MouseHandler_currentButtonVolatile = MouseHandler_lastButtonVolatile; + } + } + + if (var1.isPopupTrigger()) { + var1.consume(); } } @@ -233,316 +233,39 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi public final void focusGained(FocusEvent var1) { } - public final synchronized void focusLost(FocusEvent var1) { - if (MouseHandler_instance != null) { - MouseHandler_currentButtonVolatile = 0; - } - - } - public final synchronized void mouseDragged(MouseEvent var1) { this.mouseMoved(var1); } - @ObfuscatedName("x") + public final synchronized void mouseEntered(MouseEvent var1) { + this.mouseMoved(var1); + } + + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II)Liw;", - garbageValue = "-222748117" + signature = "(I)V", + garbageValue = "-121589904" ) - @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)); + static void method1154() { + class247.field3220 = new int[2000]; + int var0 = 0; + int var1 = 240; + + int var3; + for (byte var2 = 12; var0 < 16; var1 -= var2) { + var3 = ScriptEvent.method1235((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)((float)var0 * 0.425F / 16.0F + 0.075F)); + class247.field3220[var0] = var3; + ++var0; + } + + var1 = 48; + + for (int var5 = var1 / 6; var0 < class247.field3220.length; var1 -= var5) { + var3 = var0 * 2; + + for (int var4 = ScriptEvent.method1235((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var3 && var0 < class247.field3220.length; ++var0) { + class247.field3220[var0] = var4; } - - SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(Liy;I)V", - garbageValue = "-50420172" - ) - public static void method1206(AbstractArchive var0) { - EnumDefinition.EnumDefinition_archive = var0; - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", - garbageValue = "2112458178" - ) - public static String method1187(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 = TaskHandler.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(); - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "(Lkj;I)I", - garbageValue = "537227900" - ) - static int method1200(PacketBuffer var0) { - int var1 = var0.readBits(2); - int var2; - if (var1 == 0) { - var2 = 0; - } else if (var1 == 1) { - var2 = var0.readBits(5); - } else if (var1 == 2) { - var2 = var0.readBits(8); - } else { - var2 = var0.readBits(11); - } - - return var2; - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "(I)Lch;", - garbageValue = "815744206" - ) - @Export("getNextWorldListWorld") - static World getNextWorldListWorld() { - return World.World_listCount < World.World_count ? UserComparator2.World_worlds[++World.World_listCount - 1] : null; - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(Lhe;IIII)V", - garbageValue = "-951911792" - ) - @Export("Widget_setKeyRate") - static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { - if (var0.field2644 == null) { - throw new RuntimeException(); - } else { - var0.field2644[var1] = var2; - var0.field2695[var1] = var3; - } - } - - @ObfuscatedName("go") - @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "-2142619406" - ) - static final void method1202(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 == ByteArrayPool.localPlayer) { - var6 = var9; - continue; - } - } else { - var10 = Client.npcs[Client.npcIndices[var9 - var7]]; - } - - WorldMapSection1.drawActor2d((Actor)var10, var9, var0, var1, var2, var3); - } - - if (Client.renderSelf && var6 != -1) { - WorldMapSection1.drawActor2d(ByteArrayPool.localPlayer, var6, var0, var1, var2, var3); - } - - if (var4) { - WorldMapSection1.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.overheadTextXOffsets[var15] + Client.overheadTextXs[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.field895[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) { - TaskHandler.fontBold12.drawCentered(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0); - } - - if (Client.overheadTextEffects[var9] == 1) { - TaskHandler.fontBold12.drawCenteredWave(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var9] == 2) { - TaskHandler.fontBold12.drawCenteredWave2(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var9] == 3) { - TaskHandler.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]) * (TaskHandler.fontBold12.stringWidth(var20) + 100) / 150; - Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); - TaskHandler.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 - TaskHandler.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); - TaskHandler.fontBold12.drawCentered(var20, var0 + Client.viewportTempX, var18 + Client.viewportTempY + var1, var16, 0); - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); - } - } else { - TaskHandler.fontBold12.drawCentered(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); - } - } - - } - - @ObfuscatedName("il") - @ObfuscatedSignature( - signature = "([Lhe;Lhe;ZI)V", - garbageValue = "584998144" - ) - @Export("revalidateWidgetScroll") - static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { - int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * 108625295 * -1973747345 : var1.width * -1065823023 * 2144076849; - int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * 1982360223 * -1503121057 : var1.height * 379197055 * -959731329; - InterfaceParent.resizeInterface(var0, var1.id, var3, var4, var2); - if (var1.children != null) { - InterfaceParent.resizeInterface(var1.children, var1.id, var3, var4, var2); - } - - InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); - if (var5 != null) { - int var6 = var5.group; - if (LoginScreenAnimation.loadInterface(var6)) { - InterfaceParent.resizeInterface(Widget.Widget_interfaceComponents[var6], -1, var3, var4, var2); - } - } - - if (var1.contentType == 1337) { } } diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java index f7ac2369df..473d5df235 100644 --- a/runescape-client/src/main/java/MouseRecorder.java +++ b/runescape-client/src/main/java/MouseRecorder.java @@ -3,30 +3,29 @@ 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("bn") +@ObfuscatedName("bx") @Implements("MouseRecorder") public class MouseRecorder implements Runnable { - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("isRunning") boolean isRunning; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("lock") Object lock; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1833503611 + intValue = -1800286553 ) @Export("index") int index; - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("xs") int[] xs; - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("ys") int[] ys; - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("millis") long[] millis; @@ -40,7 +39,7 @@ public class MouseRecorder implements Runnable { } public void run() { - for (; this.isRunning; class169.sleepExact(50L)) { + while (this.isRunning) { synchronized(this.lock) { if (this.index < 500) { this.xs[this.index] = MouseHandler.MouseHandler_x; @@ -49,800 +48,163 @@ public class MouseRecorder implements Runnable { ++this.index; } } + + SpriteMask.sleepExact(49L); + SpriteMask.sleepExact(1L); } } - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkx;Lkx;Lkx;I)V", - garbageValue = "684092055" + signature = "(DDII)[D", + garbageValue = "-2077426308" ) - @Export("drawTitle") - static void drawTitle(Font var0, Font var1, Font var2) { - Login.xPadding = (WorldMapLabel.canvasWidth - 765) / 2; - Login.loginBoxX = Login.xPadding + 202; - PacketWriter.loginBoxCenter = Login.loginBoxX + 180; - int var6; - int var8; - int var9; - int var11; - boolean var15; - int var17; - byte var23; - int var24; - int var47; - int var49; - if (Login.worldSelectOpen) { - if (class69.worldSelectBackSprites == null) { - class69.worldSelectBackSprites = FloorUnderlayDefinition.method4507(class228.archive8, "sl_back", ""); - } - - Archive var33; - int var36; - IndexedSprite[] var37; - if (GrandExchangeEvent.worldSelectFlagSprites == null) { - var33 = class228.archive8; - var36 = var33.getGroupId("sl_flags"); - var6 = var33.getFileId(var36, ""); - if (!UserComparator7.method3516(var33, var36, var6)) { - var37 = null; - } else { - var37 = Skills.method4214(); - } - - GrandExchangeEvent.worldSelectFlagSprites = var37; - } - - if (WorldMapDecoration.worldSelectArrows == null) { - var33 = class228.archive8; - var36 = var33.getGroupId("sl_arrows"); - var6 = var33.getFileId(var36, ""); - if (!UserComparator7.method3516(var33, var36, var6)) { - var37 = null; - } else { - var37 = Skills.method4214(); - } - - WorldMapDecoration.worldSelectArrows = var37; - } - - if (class348.worldSelectStars == null) { - var33 = class228.archive8; - var36 = var33.getGroupId("sl_stars"); - var6 = var33.getFileId(var36, ""); - if (!UserComparator7.method3516(var33, var36, var6)) { - var37 = null; - } else { - var37 = Skills.method4214(); - } - - class348.worldSelectStars = var37; - } - - if (class92.worldSelectLeftSprite == null) { - class92.worldSelectLeftSprite = class7.SpriteBuffer_getIndexedSpriteByName(class228.archive8, "leftarrow", ""); - } - - if (StructDefinition.worldSelectRightSprite == null) { - StructDefinition.worldSelectRightSprite = class7.SpriteBuffer_getIndexedSpriteByName(class228.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 (class348.worldSelectStars != null) { - class348.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); - var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); - class348.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); - var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); - } - - if (WorldMapDecoration.worldSelectArrows != null) { - var47 = Login.xPadding + 280; - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { - WorldMapDecoration.worldSelectArrows[2].drawAt(var47, 4); - } else { - WorldMapDecoration.worldSelectArrows[0].drawAt(var47, 4); - } - - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { - WorldMapDecoration.worldSelectArrows[3].drawAt(var47 + 15, 4); - } else { - WorldMapDecoration.worldSelectArrows[1].drawAt(var47 + 15, 4); - } - - var0.draw("World", var47 + 32, 17, 16777215, -1); - var24 = Login.xPadding + 390; - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { - WorldMapDecoration.worldSelectArrows[2].drawAt(var24, 4); - } else { - WorldMapDecoration.worldSelectArrows[0].drawAt(var24, 4); - } - - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { - WorldMapDecoration.worldSelectArrows[3].drawAt(var24 + 15, 4); - } else { - WorldMapDecoration.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) { - WorldMapDecoration.worldSelectArrows[2].drawAt(var36, 4); - } else { - WorldMapDecoration.worldSelectArrows[0].drawAt(var36, 4); - } - - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { - WorldMapDecoration.worldSelectArrows[3].drawAt(var36 + 15, 4); - } else { - WorldMapDecoration.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) { - WorldMapDecoration.worldSelectArrows[2].drawAt(var6, 4); - } else { - WorldMapDecoration.worldSelectArrows[0].drawAt(var6, 4); - } - - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { - WorldMapDecoration.worldSelectArrows[3].drawAt(var6 + 15, 4); - } else { - WorldMapDecoration.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 (class69.worldSelectBackSprites != null) { - var23 = 88; - byte var50 = 19; - var36 = 765 / (var23 + 1) - 1; - var6 = 480 / (var50 + 1); - - do { - var49 = var6; - var8 = 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(var6 != var49 || var36 != var8); - - var49 = (765 - var36 * var23) / (var36 + 1); - if (var49 > 5) { - var49 = 5; - } - - var8 = (480 - var50 * var6) / (var6 + 1); - if (var8 > 5) { - var8 = 5; - } - - var9 = (765 - var36 * var23 - var49 * (var36 - 1)) / 2; - int var29 = (480 - var6 * var50 - var8 * (var6 - 1)) / 2; - var11 = (var6 + World.World_count - 1) / var6; - Login.worldSelectPagesCount = var11 - var36; - if (class92.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { - class92.worldSelectLeftSprite.drawAt(8, Varps.canvasHeight / 2 - class92.worldSelectLeftSprite.subHeight / 2); - } - - if (StructDefinition.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { - StructDefinition.worldSelectRightSprite.drawAt(WorldMapLabel.canvasWidth - StructDefinition.worldSelectRightSprite.subWidth - 8, Varps.canvasHeight / 2 - StructDefinition.worldSelectRightSprite.subHeight / 2); - } - - int var42 = var29 + 23; - int var13 = var9 + Login.xPadding; - int var14 = 0; - var15 = false; - int var43 = Login.worldSelectPage; - - for (var17 = var43 * var6; var17 < World.World_count && var43 - Login.worldSelectPage < var36; ++var17) { - World var30 = UserComparator2.World_worlds[var17]; - boolean var19 = true; - String var20 = Integer.toString(var30.population); - if (var30.population == -1) { - var20 = "OFF"; - var19 = false; - } else if (var30.population > 1980) { - var20 = "FULL"; - var19 = false; - } - - int var22 = 0; - byte var21; - if (var30.isBeta()) { - if (var30.isMembersOnly()) { - var21 = 7; - } else { - var21 = 6; - } - } else if (var30.isDeadman()) { - var22 = 16711680; - if (var30.isMembersOnly()) { - var21 = 5; - } else { - var21 = 4; - } - } else if (var30.method1879()) { - if (var30.isMembersOnly()) { - var21 = 9; - } else { - var21 = 8; - } - } else if (var30.isPvp()) { - if (var30.isMembersOnly()) { - var21 = 3; - } else { - var21 = 2; - } - } else if (var30.isMembersOnly()) { - var21 = 1; - } else { - var21 = 0; - } - - if (MouseHandler.MouseHandler_x >= var13 && MouseHandler.MouseHandler_y >= var42 && MouseHandler.MouseHandler_x < var23 + var13 && MouseHandler.MouseHandler_y < var50 + var42 && var19) { - Login.hoveredWorldIndex = var17; - class69.worldSelectBackSprites[var21].drawTransOverlayAt(var13, var42, 128, 16777215); - var15 = true; - } else { - class69.worldSelectBackSprites[var21].drawAt(var13, var42); - } - - if (GrandExchangeEvent.worldSelectFlagSprites != null) { - GrandExchangeEvent.worldSelectFlagSprites[(var30.isMembersOnly() ? 8 : 0) + var30.location].drawAt(var13 + 29, var42); - } - - var0.drawCentered(Integer.toString(var30.id), var13 + 15, var50 / 2 + var42 + 5, var22, -1); - var1.drawCentered(var20, var13 + 60, var50 / 2 + var42 + 5, 268435455, -1); - var42 = var42 + var8 + var50; - ++var14; - if (var14 >= var6) { - var42 = var29 + 23; - var13 = var13 + var49 + var23; - var14 = 0; - ++var43; - } - } - - if (var15) { - var17 = var1.stringWidth(UserComparator2.World_worlds[Login.hoveredWorldIndex].activity) + 6; - int var44 = var1.ascent + 8; - int var45 = MouseHandler.MouseHandler_y + 25; - if (var45 + var44 > 480) { - var45 = MouseHandler.MouseHandler_y - 25 - var44; - } - - Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var17 / 2, var45, var17, var44, 16777120); - Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var17 / 2, var45, var17, var44, 0); - var1.drawCentered(UserComparator2.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var45 + var1.ascent + 4, 0, -1); - } - } - - class206.rasterProvider.drawFull(0, 0); - } else { - Login.leftTitleSprite.drawAt(Login.xPadding, 0); - DirectByteArrayCopier.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - class3.logoSprite.drawAt(Login.xPadding + 382 - class3.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 var7; - char[] var10; - String var25; - String var27; - short var46; - short var48; - if (Client.gameState == 20) { - ModelData0.titleboxSprite.drawAt(Login.loginBoxX + 180 - ModelData0.titleboxSprite.subWidth / 2, 271 - ModelData0.titleboxSprite.subHeight / 2); - var46 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var46, 16776960, 0); - var47 = var46 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var47, 16776960, 0); - var47 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var47, 16776960, 0); - var47 += 15; - var47 += 7; - if (Login.loginIndex != 4) { - var0.draw("Login: ", Login.loginBoxX + 180 - 110, var47, 16777215, 0); - var48 = 200; - - for (var25 = ClanChat.method5318(); var0.stringWidth(var25) > var48; var25 = var25.substring(0, var25.length() - 1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var25), Login.loginBoxX + 180 - 70, var47, 16777215, 0); - var47 += 15; - var7 = Login.Login_password; - var9 = var7.length(); - var10 = new char[var9]; - - for (var11 = 0; var11 < var9; ++var11) { - var10[var11] = '*'; - } - - var27 = new String(var10); - - for (var27 = var27; var0.stringWidth(var27) > var48; var27 = var27.substring(1)) { - } - - var0.draw("Password: " + var27, Login.loginBoxX + 180 - 108, var47, 16777215, 0); - var47 += 15; - } - } - - if (Client.gameState == 10 || Client.gameState == 11) { - ModelData0.titleboxSprite.drawAt(Login.loginBoxX, 171); - short var5; - if (Login.loginIndex == 0) { - var46 = 251; - var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var46, 16776960, 0); - var47 = var46 + 30; - var24 = Login.loginBoxX + 180 - 80; - var5 = 291; - GrandExchangeOfferOwnWorldComparator.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; - GrandExchangeOfferOwnWorldComparator.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); - var46 = 236; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var46, 16777215, 0); - var47 = var46 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var47, 16777215, 0); - var47 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var47, 16777215, 0); - var47 += 15; - var24 = Login.loginBoxX + 180 - 80; - var5 = 321; - GrandExchangeOfferOwnWorldComparator.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var0.drawCentered("Continue", var24, var5 + 5, 16777215, 0); - var24 = Login.loginBoxX + 180 + 80; - GrandExchangeOfferOwnWorldComparator.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var0.drawCentered("Cancel", var24, var5 + 5, 16777215, 0); - } else { - IndexedSprite var39; - if (Login.loginIndex == 2) { - var46 = 201; - var0.drawCentered(Login.Login_response1, PacketWriter.loginBoxCenter, var46, 16776960, 0); - var47 = var46 + 15; - var0.drawCentered(Login.Login_response2, PacketWriter.loginBoxCenter, var47, 16776960, 0); - var47 += 15; - var0.drawCentered(Login.Login_response3, PacketWriter.loginBoxCenter, var47, 16776960, 0); - var47 += 15; - var47 += 7; - var0.draw("Login: ", PacketWriter.loginBoxCenter - 110, var47, 16777215, 0); - var48 = 200; - - for (var25 = ClanChat.method5318(); var0.stringWidth(var25) > var48; var25 = var25.substring(1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var25) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? class297.colorStartTag(16776960) + "|" : ""), PacketWriter.loginBoxCenter - 70, var47, 16777215, 0); - var47 += 15; - var7 = Login.Login_password; - var9 = var7.length(); - var10 = new char[var9]; - - for (var11 = 0; var11 < var9; ++var11) { - var10[var11] = '*'; - } - - var27 = new String(var10); - - for (var27 = var27; var0.stringWidth(var27) > var48; var27 = var27.substring(1)) { - } - - var0.draw("Password: " + var27 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? class297.colorStartTag(16776960) + "|" : ""), PacketWriter.loginBoxCenter - 108, var47, 16777215, 0); - var47 += 15; - var46 = 277; - var9 = PacketWriter.loginBoxCenter + -117; - boolean var40 = Client.Login_isUsernameRemembered; - boolean var12 = Login.field1207; - var39 = var40 ? (var12 ? Login.field1195 : Login.options_buttons_2Sprite) : (var12 ? WorldMapLabelSize.field160 : class4.options_buttons_0Sprite); - var39.drawAt(var9, var46); - var9 = var9 + var39.subWidth + 5; - var1.draw("Remember username", var9, var46 + 13, 16776960, 0); - var9 = PacketWriter.loginBoxCenter + 24; - var15 = GrandExchangeOfferOwnWorldComparator.clientPreferences.hideUsername; - boolean var16 = Login.field1212; - IndexedSprite var32 = var15 ? (var16 ? Login.field1195 : Login.options_buttons_2Sprite) : (var16 ? WorldMapLabelSize.field160 : class4.options_buttons_0Sprite); - var32.drawAt(var9, var46); - var9 = var9 + var32.subWidth + 5; - var1.draw("Hide username", var9, var46 + 13, 16776960, 0); - var47 = var46 + 15; - var17 = PacketWriter.loginBoxCenter - 80; - short var18 = 321; - GrandExchangeOfferOwnWorldComparator.titlebuttonSprite.drawAt(var17 - 73, var18 - 20); - var0.drawCentered("Login", var17, var18 + 5, 16777215, 0); - var17 = PacketWriter.loginBoxCenter + 80; - GrandExchangeOfferOwnWorldComparator.titlebuttonSprite.drawAt(var17 - 73, var18 - 20); - var0.drawCentered("Cancel", var17, var18 + 5, 16777215, 0); - var46 = 357; - switch(Login.field1218) { - case 2: - Message.field633 = "Having trouble logging in?"; - break; - default: - Message.field633 = "Can't login? Click here."; - } - - class41.field315 = new Bounds(PacketWriter.loginBoxCenter, var46, var1.stringWidth(Message.field633), 11); - MusicPatchPcmStream.field2495 = new Bounds(PacketWriter.loginBoxCenter, var46, var1.stringWidth("Still having trouble logging in?"), 11); - var1.drawCentered(Message.field633, PacketWriter.loginBoxCenter, var46, 16777215, 0); - } else if (Login.loginIndex == 3) { - var46 = 201; - var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var46, 16776960, 0); - var47 = var46 + 20; - var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var47, 16776960, 0); - var47 += 15; - var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var47, 16776960, 0); - var47 += 15; - var24 = Login.loginBoxX + 180; - var5 = 276; - GrandExchangeOfferOwnWorldComparator.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var2.drawCentered("Try again", var24, var5 + 5, 16777215, 0); - var24 = Login.loginBoxX + 180; - var5 = 326; - GrandExchangeOfferOwnWorldComparator.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var2.drawCentered("Forgotten password?", var24, var5 + 5, 16777215, 0); - } else if (Login.loginIndex == 4) { - var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); - var46 = 236; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var46, 16777215, 0); - var47 = var46 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var47, 16777215, 0); - var47 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var47, 16777215, 0); - var47 += 15; - var25 = "PIN: "; - var7 = MilliClock.otp; - var9 = var7.length(); - var10 = new char[var9]; - - for (var11 = 0; var11 < var9; ++var11) { - var10[var11] = '*'; - } - - var27 = new String(var10); - var0.draw(var25 + var27 + (Client.cycle % 40 < 20 ? class297.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var47, 16777215, 0); - var47 -= 8; - var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var47, 16776960, 0); - var47 += 15; - var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var47, 16776960, 0); - var8 = 180 + Login.loginBoxX - 9 + var0.stringWidth("for 30 days: ") + 15; - var9 = var47 - var0.ascent; - if (Login.field1214) { - var39 = Login.options_buttons_2Sprite; - } else { - var39 = class4.options_buttons_0Sprite; - } - - var39.drawAt(var8, var9); - var47 += 15; - var11 = Login.loginBoxX + 180 - 80; - short var41 = 321; - GrandExchangeOfferOwnWorldComparator.titlebuttonSprite.drawAt(var11 - 73, var41 - 20); - var0.drawCentered("Continue", var11, var41 + 5, 16777215, 0); - var11 = Login.loginBoxX + 180 + 80; - GrandExchangeOfferOwnWorldComparator.titlebuttonSprite.drawAt(var11 - 73, var41 - 20); - var0.drawCentered("Cancel", var11, var41 + 5, 16777215, 0); - var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var41 + 36, 255, 0); - } else if (Login.loginIndex == 5) { - var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); - var46 = 221; - var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var46, 16776960, 0); - var47 = var46 + 15; - var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var47, 16776960, 0); - var47 += 15; - var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var47, 16776960, 0); - var47 += 15; - var47 += 14; - var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var47, 16777215, 0); - var48 = 174; - - for (var25 = ClanChat.method5318(); var0.stringWidth(var25) > var48; var25 = var25.substring(1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var25) + (Client.cycle % 40 < 20 ? class297.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var47, 16777215, 0); - var47 += 15; - var6 = Login.loginBoxX + 180 - 80; - short var26 = 321; - GrandExchangeOfferOwnWorldComparator.titlebuttonSprite.drawAt(var6 - 73, var26 - 20); - var0.drawCentered("Recover", var6, var26 + 5, 16777215, 0); - var6 = Login.loginBoxX + 180 + 80; - GrandExchangeOfferOwnWorldComparator.titlebuttonSprite.drawAt(var6 - 73, var26 - 20); - var0.drawCentered("Back", var6, var26 + 5, 16777215, 0); - var26 = 356; - var1.drawCentered("Still having trouble logging in?", PacketWriter.loginBoxCenter, var26, 268435455, 0); - } else if (Login.loginIndex == 6) { - var46 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var46, 16776960, 0); - var47 = var46 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var47, 16776960, 0); - var47 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var47, 16776960, 0); - var47 += 15; - var24 = Login.loginBoxX + 180; - var5 = 321; - GrandExchangeOfferOwnWorldComparator.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var0.drawCentered("Back", var24, var5 + 5, 16777215, 0); - } else if (Login.loginIndex == 7) { - var46 = 216; - var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var46, 16776960, 0); - var47 = var46 + 15; - var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var47, 16776960, 0); - var47 += 15; - var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var47, 16776960, 0); - var47 += 15; - var24 = Login.loginBoxX + 180 - 80; - var5 = 321; - GrandExchangeOfferOwnWorldComparator.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var0.drawCentered("Set Date of Birth", var24, var5 + 5, 16777215, 0); - var24 = Login.loginBoxX + 180 + 80; - GrandExchangeOfferOwnWorldComparator.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var0.drawCentered("Back", var24, var5 + 5, 16777215, 0); - } else if (Login.loginIndex == 8) { - var46 = 216; - var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var46, 16776960, 0); - var47 = var46 + 15; - var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var47, 16776960, 0); - var47 += 15; - var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var47, 16776960, 0); - var47 += 15; - var24 = Login.loginBoxX + 180 - 80; - var5 = 321; - GrandExchangeOfferOwnWorldComparator.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var0.drawCentered("Privacy Policy", var24, var5 + 5, 16777215, 0); - var24 = Login.loginBoxX + 180 + 80; - GrandExchangeOfferOwnWorldComparator.titlebuttonSprite.drawAt(var24 - 73, var5 - 20); - var0.drawCentered("Back", var24, var5 + 5, 16777215, 0); - } else if (Login.loginIndex == 12) { - var46 = 201; - String var4 = ""; - var25 = ""; - String var28 = ""; - switch(Login.field1201) { - case 0: - var4 = "Your account has been disabled."; - var25 = Strings.field2811; - var28 = ""; - break; - case 1: - var4 = "Account locked as we suspect it has been stolen."; - var25 = Strings.field2914; - var28 = ""; - break; - default: - ObjectDefinition.Login_promptCredentials(false); - } - - var0.drawCentered(var4, Login.loginBoxX + 180, var46, 16776960, 0); - var47 = var46 + 15; - var2.drawCentered(var25, Login.loginBoxX + 180, var47, 16776960, 0); - var47 += 15; - var2.drawCentered(var28, Login.loginBoxX + 180, var47, 16776960, 0); - var47 += 15; - var49 = Login.loginBoxX + 180; - short var38 = 276; - GrandExchangeOfferOwnWorldComparator.titlebuttonSprite.drawAt(var49 - 73, var38 - 20); - var0.drawCentered("Support Page", var49, var38 + 5, 16777215, 0); - var49 = Login.loginBoxX + 180; - var38 = 326; - GrandExchangeOfferOwnWorldComparator.titlebuttonSprite.drawAt(var49 - 73, var38 - 20); - var0.drawCentered("Back", var49, var38 + 5, 16777215, 0); - } else if (Login.loginIndex == 24) { - var46 = 221; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var46, 16777215, 0); - var47 = var46 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var47, 16777215, 0); - var47 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var47, 16777215, 0); - var47 += 15; - var24 = Login.loginBoxX + 180; - var5 = 301; - GrandExchangeOfferOwnWorldComparator.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, Varps.canvasHeight); - MilliClock.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); - MilliClock.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); - Rasterizer2D.Rasterizer2D_setClipArray(var3); - } - - ArchiveDisk.title_muteSprite[GrandExchangeOfferOwnWorldComparator.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); - if (Client.gameState > 5 && Language.Language_EN == IgnoreList.clientLanguage) { - if (ItemContainer.field572 != null) { - var47 = Login.xPadding + 5; - var48 = 463; - byte var35 = 100; - byte var34 = 35; - ItemContainer.field572.drawAt(var47, var48); - var0.drawCentered("World" + " " + Client.worldId, var35 / 2 + var47, var34 / 2 + var48 - 2, 16777215, 0); - if (LoginPacket.World_request != null) { - var1.drawCentered("Loading...", var35 / 2 + var47, var34 / 2 + var48 + 12, 16777215, 0); - } else { - var1.drawCentered("Click to switch", var35 / 2 + var47, var34 / 2 + var48 + 12, 16777215, 0); - } - } else { - ItemContainer.field572 = class7.SpriteBuffer_getIndexedSpriteByName(class228.archive8, "sl_button", ""); - } - } + public static double[] method1248(double var0, double var2, int var4) { + int var5 = var4 * 2 + 1; + double[] var6 = new double[var5]; + int var7 = -var4; + for (int var8 = 0; var7 <= var4; ++var8) { + double var15 = ((double)var7 - var0) / var2; + double var13 = Math.exp(-var15 * var15 / 2.0D) / Math.sqrt(6.283185307179586D); + double var11 = var13 / var2; + var6[var8] = var11; + ++var7; } + + return var6; } - @ObfuscatedName("aa") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "1787965087" + signature = "([BIII)Ljava/lang/String;", + garbageValue = "-2086998807" ) - static int method1290(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { - Interpreter.Interpreter_intStackSize -= 2; - Client.field931 = (short)class278.method5039(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]); - if (Client.field931 <= 0) { - Client.field931 = 256; - } + @Export("decodeStringCp1252") + public static String decodeStringCp1252(byte[] var0, int var1, int var2) { + char[] var3 = new char[var2]; + int var4 = 0; - Client.field932 = (short)class278.method5039(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - if (Client.field932 <= 0) { - Client.field932 = 256; - } + for (int var5 = 0; var5 < var2; ++var5) { + int var6 = var0[var5 + var1] & 255; + if (var6 != 0) { + if (var6 >= 128 && var6 < 160) { + char var7 = class297.cp1252AsciiExtension[var6 - 128]; + if (var7 == 0) { + var7 = '?'; + } - 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; - } + var6 = var7; + } - Client.zoomWidth = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - if (Client.zoomWidth <= 0) { - Client.zoomWidth = 320; + var3[var4++] = (char)var6; } - - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { - Interpreter.Interpreter_intStackSize -= 4; - Client.field935 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - if (Client.field935 <= 0) { - Client.field935 = 1; - } - - Client.field748 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - if (Client.field748 <= 0) { - Client.field748 = 32767; - } else if (Client.field748 < Client.field935) { - Client.field748 = Client.field935; - } - - Client.field937 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; - if (Client.field937 <= 0) { - Client.field937 = 1; - } - - Client.field938 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; - if (Client.field938 <= 0) { - Client.field938 = 32767; - } else if (Client.field938 < Client.field937) { - Client.field938 = Client.field937; - } - - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { - if (Client.viewportWidget != null) { - class204.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] = Actor.method1860(Client.field931); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Actor.method1860(Client.field932); - 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] = WorldMapLabel.canvasWidth; - return 1; - } else if (var0 == 6223) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Varps.canvasHeight; - return 1; - } else { - return 2; } + + return new String(var3, 0, var4); } - @ObfuscatedName("ew") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1951274332" + signature = "(I)V", + garbageValue = "-150787474" ) - @Export("updateGameState") - static void updateGameState(int var0) { - if (var0 != Client.gameState) { - if (Client.gameState == 0) { - WorldMapSection1.client.method1025(); - } + public static void method1251() { + ItemDefinition.ItemDefinition_cachedSprites.clear(); + } - if (var0 == 20 || var0 == 40 || var0 == 45) { - Client.loginState = 0; - Client.field712 = 0; - Client.field713 = 0; - Client.timer.method5044(var0); - if (var0 != 20) { - GraphicsObject.method2122(false); - } - } + @ObfuscatedName("fi") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1161280240" + ) + @Export("logOut") + static final void logOut() { + Client.packetWriter.close(); + FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); + Entity.method3387(); + 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(); + AttackOption.method2181(); + class60.method972(); + KitDefinition.method4624(); + HealthBar.method2133(); + HitSplatDefinition.HitSplatDefinition_cached.clear(); + HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); + HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); + AbstractWorldMapData.method343(); + StructDefinition.StructDefinition_cached.clear(); + ParamDefinition.ParamDefinition_cached.clear(); + WorldMapElement.WorldMapElement_cachedSprites.clear(); + ObjectSound.method2007(); + ObjectSound.method2008(); + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); + Script.Script_cached.clear(); + MilliClock.archive0.clearFiles(); + Message.archive1.clearFiles(); + class105.archive3.clearFiles(); + GrandExchangeOffer.archive4.clearFiles(); + WorldMapRectangle.archive5.clearFiles(); + UserComparator7.archive6.clearFiles(); + Projectile.archive7.clearFiles(); + GrandExchangeEvent.archive8.clearFiles(); + Tile.archive9.clearFiles(); + GraphicsObject.archive10.clearFiles(); + WorldMapData_0.archive11.clearFiles(); + Message.archive12.clearFiles(); + UserComparator3.scene.clear(); - if (var0 != 20 && var0 != 40 && UrlRequester.field1960 != null) { - UrlRequester.field1960.close(); - UrlRequester.field1960 = null; - } - - if (Client.gameState == 25) { - Client.field899 = 0; - Client.field818 = 0; - Client.field921 = 1; - Client.field734 = 0; - Client.field735 = 1; - } - - if (var0 != 5 && var0 != 10) { - if (var0 == 20) { - class299.method5349(PlayerAppearance.archive10, class228.archive8, true, Client.gameState == 11 ? 4 : 0); - } else if (var0 == 11) { - class299.method5349(PlayerAppearance.archive10, class228.archive8, false, 4); - } else { - Calendar.method4032(); - } - } else { - class299.method5349(PlayerAppearance.archive10, class228.archive8, true, 0); - } - - Client.gameState = var0; + for (int var0 = 0; var0 < 4; ++var0) { + Client.collisionMaps[var0].clear(); } + + System.gc(); + class206.field2439 = 1; + Huffman.musicTrackArchive = null; + class206.musicTrackGroupId = -1; + MilliClock.musicTrackFileId = -1; + class206.musicTrackVolume = 0; + class336.musicTrackBoolean = false; + class206.field2442 = 2; + Client.currentTrackGroupId = -1; + Client.field743 = false; + + for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var1.stream1 != null) { + class60.pcmStreamMixer.removeSubStream(var1.stream1); + var1.stream1 = null; + } + + if (var1.stream2 != null) { + class60.pcmStreamMixer.removeSubStream(var1.stream2); + var1.stream2 = null; + } + } + + ObjectSound.objectSounds.clear(); + ClientPreferences.updateGameState(10); + } + + @ObfuscatedName("fy") + @ObfuscatedSignature( + signature = "(IIB)V", + garbageValue = "-126" + ) + @Export("playSoundJingle") + static void playSoundJingle(int var0, int var1) { + if (Client.musicVolume != 0 && var0 != -1) { + UserComparator9.method3513(WorldMapData_0.archive11, var0, 0, Client.musicVolume, false); + Client.field743 = true; + } + } } diff --git a/runescape-client/src/main/java/MouseWheel.java b/runescape-client/src/main/java/MouseWheel.java index 7d0b3c2902..f413873c09 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("fq") +@ObfuscatedName("fv") @Implements("MouseWheel") public interface MouseWheel { - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "65280" + garbageValue = "1995693829" ) @Export("useRotation") int useRotation(); diff --git a/runescape-client/src/main/java/MouseWheelHandler.java b/runescape-client/src/main/java/MouseWheelHandler.java index 761436f2e2..330e6d23c5 100644 --- a/runescape-client/src/main/java/MouseWheelHandler.java +++ b/runescape-client/src/main/java/MouseWheelHandler.java @@ -7,12 +7,12 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bc") +@ObfuscatedName("bh") @Implements("MouseWheelHandler") public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1145232291 + intValue = -1874957647 ) @Export("rotation") int rotation; @@ -21,30 +21,30 @@ public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { this.rotation = 0; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(Ljava/awt/Component;I)V", - garbageValue = "637751715" + garbageValue = "-337398134" ) @Export("addTo") void addTo(Component var1) { var1.addMouseWheelListener(this); } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ljava/awt/Component;I)V", - garbageValue = "-1151636604" + signature = "(Ljava/awt/Component;B)V", + garbageValue = "21" ) @Export("removeFrom") void removeFrom(Component var1) { var1.removeMouseWheelListener(this); } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "65280" + garbageValue = "1995693829" ) @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 a61158ccd2..f94262d36b 100644 --- a/runescape-client/src/main/java/MusicPatch.java +++ b/runescape-client/src/main/java/MusicPatch.java @@ -1,47 +1,48 @@ +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("hy") +@ObfuscatedName("hi") @Implements("MusicPatch") public class MusicPatch extends Node { - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 1065297399 - ) - int field2484; @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -1762286349 + ) + int field2520; + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "[Ldm;" + signature = "[Ldp;" ) @Export("rawSounds") RawSound[] rawSounds; - @ObfuscatedName("k") - short[] field2485; - @ObfuscatedName("d") - byte[] field2487; - @ObfuscatedName("w") - byte[] field2490; - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "[Lgf;" - ) - MusicPatchNode2[] field2488; @ObfuscatedName("q") - byte[] field2489; - @ObfuscatedName("z") - int[] field2486; + short[] field2521; + @ObfuscatedName("j") + byte[] field2517; + @ObfuscatedName("p") + byte[] field2518; + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "[Lgp;" + ) + MusicPatchNode2[] field2519; + @ObfuscatedName("n") + byte[] field2522; + @ObfuscatedName("u") + int[] field2514; MusicPatch(byte[] var1) { this.rawSounds = new RawSound[128]; - this.field2485 = new short[128]; - this.field2487 = new byte[128]; - this.field2490 = new byte[128]; - this.field2488 = new MusicPatchNode2[128]; - this.field2489 = new byte[128]; - this.field2486 = new int[128]; + this.field2521 = new short[128]; + this.field2517 = new byte[128]; + this.field2518 = new byte[128]; + this.field2519 = new MusicPatchNode2[128]; + this.field2522 = new byte[128]; + this.field2514 = new int[128]; Buffer var2 = new Buffer(var1); int var3; @@ -88,11 +89,11 @@ public class MusicPatch extends Node { ++var2.offset; ++var9; - byte[] var38 = new byte[var9]; + byte[] var36 = new byte[var9]; int var12; int var14; if (var9 > 1) { - var38[1] = 1; + var36[1] = 1; int var13 = 1; var12 = 2; @@ -108,33 +109,33 @@ public class MusicPatch extends Node { var13 = var15; } - var38[var14] = (byte)var13; + var36[var14] = (byte)var13; } } else { var12 = var9; } - MusicPatchNode2[] var39 = new MusicPatchNode2[var12]; + MusicPatchNode2[] var37 = new MusicPatchNode2[var12]; - MusicPatchNode2 var40; - for (var14 = 0; var14 < var39.length; ++var14) { - var40 = var39[var14] = new MusicPatchNode2(); + MusicPatchNode2 var38; + for (var14 = 0; var14 < var37.length; ++var14) { + var38 = var37[var14] = new MusicPatchNode2(); int var16 = var2.readUnsignedByte(); if (var16 > 0) { - var40.field2402 = new byte[var16 * 2]; + var38.field2424 = new byte[var16 * 2]; } var16 = var2.readUnsignedByte(); if (var16 > 0) { - var40.field2398 = new byte[var16 * 2 + 2]; - var40.field2398[1] = 64; + var38.field2429 = new byte[var16 * 2 + 2]; + var38.field2429[1] = 64; } } var14 = var2.readUnsignedByte(); - byte[] var47 = var14 > 0 ? new byte[var14 * 2] : null; + byte[] var45 = var14 > 0 ? new byte[var14 * 2] : null; var14 = var2.readUnsignedByte(); - byte[] var41 = var14 > 0 ? new byte[var14 * 2] : null; + byte[] var39 = var14 > 0 ? new byte[var14 * 2] : null; int var17; for (var17 = 0; var2.array[var17 + var2.offset] != 0; ++var17) { @@ -154,16 +155,16 @@ public class MusicPatch extends Node { int var20; for (var20 = 0; var20 < 128; ++var20) { var19 += var2.readUnsignedByte(); - this.field2485[var20] = (short)var19; + this.field2521[var20] = (short)var19; } var19 = 0; - short[] var50; + short[] var48; for (var20 = 0; var20 < 128; ++var20) { var19 += var2.readUnsignedByte(); - var50 = this.field2485; - var50[var20] = (short)(var50[var20] + (var19 << 8)); + var48 = this.field2521; + var48[var20] = (short)(var48[var20] + (var19 << 8)); } var20 = 0; @@ -182,9 +183,9 @@ public class MusicPatch extends Node { var22 = var2.readVarInt(); } - var50 = this.field2485; - var50[var23] = (short)(var50[var23] + ((var22 - 1 & 2) << 14)); - this.field2486[var23] = var22; + var48 = this.field2521; + var48[var23] = (short)(var48[var23] + ((var22 - 1 & 2) << 14)); + this.field2514[var23] = var22; --var20; } @@ -194,7 +195,7 @@ public class MusicPatch extends Node { int var24; for (var24 = 0; var24 < 128; ++var24) { - if (this.field2486[var24] != 0) { + if (this.field2514[var24] != 0) { if (var20 == 0) { if (var21 < var4.length) { var20 = var4[var21++]; @@ -205,7 +206,7 @@ public class MusicPatch extends Node { var23 = var2.array[var5++] - 1; } - this.field2489[var24] = (byte)var23; + this.field2522[var24] = (byte)var23; --var20; } } @@ -215,7 +216,7 @@ public class MusicPatch extends Node { var24 = 0; for (int var25 = 0; var25 < 128; ++var25) { - if (this.field2486[var25] != 0) { + if (this.field2514[var25] != 0) { if (var20 == 0) { if (var21 < var7.length) { var20 = var7[var21++]; @@ -226,20 +227,20 @@ public class MusicPatch extends Node { var24 = var2.array[var8++] + 16 << 2; } - this.field2490[var25] = (byte)var24; + this.field2518[var25] = (byte)var24; --var20; } } var20 = 0; var21 = 0; - MusicPatchNode2 var42 = null; + MusicPatchNode2 var40 = null; int var26; for (var26 = 0; var26 < 128; ++var26) { - if (this.field2486[var26] != 0) { + if (this.field2514[var26] != 0) { if (var20 == 0) { - var42 = var39[var38[var21]]; + var40 = var37[var36[var21]]; if (var21 < var10.length) { var20 = var10[var21++]; } else { @@ -247,7 +248,7 @@ public class MusicPatch extends Node { } } - this.field2488[var26] = var42; + this.field2519[var26] = var40; --var20; } } @@ -265,66 +266,66 @@ public class MusicPatch extends Node { var20 = -1; } - if (this.field2486[var27] > 0) { + if (this.field2514[var27] > 0) { var26 = var2.readUnsignedByte() + 1; } } - this.field2487[var27] = (byte)var26; + this.field2517[var27] = (byte)var26; --var20; } - this.field2484 = var2.readUnsignedByte() + 1; + this.field2520 = var2.readUnsignedByte() + 1; MusicPatchNode2 var28; int var29; for (var27 = 0; var27 < var12; ++var27) { - var28 = var39[var27]; - if (var28.field2402 != null) { - for (var29 = 1; var29 < var28.field2402.length; var29 += 2) { - var28.field2402[var29] = var2.readByte(); + var28 = var37[var27]; + if (var28.field2424 != null) { + for (var29 = 1; var29 < var28.field2424.length; var29 += 2) { + var28.field2424[var29] = var2.readByte(); } } - if (var28.field2398 != null) { - for (var29 = 3; var29 < var28.field2398.length - 2; var29 += 2) { - var28.field2398[var29] = var2.readByte(); + if (var28.field2429 != null) { + for (var29 = 3; var29 < var28.field2429.length - 2; var29 += 2) { + var28.field2429[var29] = var2.readByte(); } } } - if (var47 != null) { - for (var27 = 1; var27 < var47.length; var27 += 2) { - var47[var27] = var2.readByte(); + if (var45 != null) { + for (var27 = 1; var27 < var45.length; var27 += 2) { + var45[var27] = var2.readByte(); } } - if (var41 != null) { - for (var27 = 1; var27 < var41.length; var27 += 2) { - var41[var27] = var2.readByte(); + if (var39 != null) { + for (var27 = 1; var27 < var39.length; var27 += 2) { + var39[var27] = var2.readByte(); } } for (var27 = 0; var27 < var12; ++var27) { - var28 = var39[var27]; - if (var28.field2398 != null) { + var28 = var37[var27]; + if (var28.field2429 != null) { var19 = 0; - for (var29 = 2; var29 < var28.field2398.length; var29 += 2) { - var19 = var19 + 1 + var2.readUnsignedByte(); - var28.field2398[var29] = (byte)var19; - } - } - } - - for (var27 = 0; var27 < var12; ++var27) { - var28 = var39[var27]; - if (var28.field2402 != null) { - var19 = 0; - - for (var29 = 2; var29 < var28.field2402.length; var29 += 2) { + for (var29 = 2; var29 < var28.field2429.length; var29 += 2) { var19 = 1 + var19 + var2.readUnsignedByte(); - var28.field2402[var29] = (byte)var19; + var28.field2429[var29] = (byte)var19; + } + } + } + + for (var27 = 0; var27 < var12; ++var27) { + var28 = var37[var27]; + if (var28.field2424 != null) { + var19 = 0; + + for (var29 = 2; var29 < var28.field2424.length; var29 += 2) { + var19 = var19 + 1 + var2.readUnsignedByte(); + var28.field2424[var29] = (byte)var19; } } } @@ -333,170 +334,164 @@ public class MusicPatch extends Node { int var32; int var33; int var34; - int var35; - int var36; - int var44; - byte var46; - if (var47 != null) { + int var42; + byte var44; + if (var45 != null) { var19 = var2.readUnsignedByte(); - var47[0] = (byte)var19; + var45[0] = (byte)var19; - for (var27 = 2; var27 < var47.length; var27 += 2) { + for (var27 = 2; var27 < var45.length; var27 += 2) { var19 = 1 + var19 + var2.readUnsignedByte(); - var47[var27] = (byte)var19; + var45[var27] = (byte)var19; } - var46 = var47[0]; - byte var43 = var47[1]; + var44 = var45[0]; + byte var41 = var45[1]; - for (var29 = 0; var29 < var46; ++var29) { - this.field2487[var29] = (byte)(var43 * this.field2487[var29] + 32 >> 6); + for (var29 = 0; var29 < var44; ++var29) { + this.field2517[var29] = (byte)(var41 * this.field2517[var29] + 32 >> 6); } - for (var29 = 2; var29 < var47.length; var29 += 2) { - var30 = var47[var29]; - byte var31 = var47[var29 + 1]; - var32 = var43 * (var30 - var46) + (var30 - var46) / 2; + for (var29 = 2; var29 < var45.length; var29 += 2) { + var30 = var45[var29]; + byte var31 = var45[var29 + 1]; + var32 = var41 * (var30 - var44) + (var30 - var44) / 2; - for (var33 = var46; var33 < var30; ++var33) { - var35 = var30 - var46; - var36 = var32 >>> 31; - var34 = (var36 + var32) / var35 - var36; - this.field2487[var33] = (byte)(var34 * this.field2487[var33] + 32 >> 6); - var32 += var31 - var43; + for (var33 = var44; var33 < var30; ++var33) { + var34 = WorldMapRectangle.method347(var32, var30 - var44); + this.field2517[var33] = (byte)(var34 * this.field2517[var33] + 32 >> 6); + var32 += var31 - var41; } - var46 = var30; - var43 = var31; + var44 = var30; + var41 = var31; } - for (var44 = var46; var44 < 128; ++var44) { - this.field2487[var44] = (byte)(var43 * this.field2487[var44] + 32 >> 6); + for (var42 = var44; var42 < 128; ++var42) { + this.field2517[var42] = (byte)(var41 * this.field2517[var42] + 32 >> 6); } - var40 = null; + var38 = null; } - if (var41 != null) { + if (var39 != null) { var19 = var2.readUnsignedByte(); - var41[0] = (byte)var19; + var39[0] = (byte)var19; - for (var27 = 2; var27 < var41.length; var27 += 2) { - var19 = 1 + var19 + var2.readUnsignedByte(); - var41[var27] = (byte)var19; + for (var27 = 2; var27 < var39.length; var27 += 2) { + var19 = var19 + 1 + var2.readUnsignedByte(); + var39[var27] = (byte)var19; } - var46 = var41[0]; - int var49 = var41[1] << 1; + var44 = var39[0]; + int var47 = var39[1] << 1; - for (var29 = 0; var29 < var46; ++var29) { - var44 = var49 + (this.field2490[var29] & 255); - if (var44 < 0) { - var44 = 0; + for (var29 = 0; var29 < var44; ++var29) { + var42 = var47 + (this.field2518[var29] & 255); + if (var42 < 0) { + var42 = 0; } - if (var44 > 128) { - var44 = 128; + if (var42 > 128) { + var42 = 128; } - this.field2490[var29] = (byte)var44; + this.field2518[var29] = (byte)var42; } - int var45; - for (var29 = 2; var29 < var41.length; var29 += 2) { - var30 = var41[var29]; - var45 = var41[var29 + 1] << 1; - var32 = var49 * (var30 - var46) + (var30 - var46) / 2; + int var43; + for (var29 = 2; var29 < var39.length; var29 += 2) { + var30 = var39[var29]; + var43 = var39[var29 + 1] << 1; + var32 = var47 * (var30 - var44) + (var30 - var44) / 2; - for (var33 = var46; var33 < var30; ++var33) { - var35 = var30 - var46; - var36 = var32 >>> 31; - var34 = (var36 + var32) / var35 - var36; - int var37 = var34 + (this.field2490[var33] & 255); - if (var37 < 0) { - var37 = 0; + for (var33 = var44; var33 < var30; ++var33) { + var34 = WorldMapRectangle.method347(var32, var30 - var44); + int var35 = var34 + (this.field2518[var33] & 255); + if (var35 < 0) { + var35 = 0; } - if (var37 > 128) { - var37 = 128; + if (var35 > 128) { + var35 = 128; } - this.field2490[var33] = (byte)var37; - var32 += var45 - var49; + this.field2518[var33] = (byte)var35; + var32 += var43 - var47; } - var46 = var30; - var49 = var45; + var44 = var30; + var47 = var43; } - for (var44 = var46; var44 < 128; ++var44) { - var45 = var49 + (this.field2490[var44] & 255); - if (var45 < 0) { - var45 = 0; + for (var42 = var44; var42 < 128; ++var42) { + var43 = var47 + (this.field2518[var42] & 255); + if (var43 < 0) { + var43 = 0; } - if (var45 > 128) { - var45 = 128; + if (var43 > 128) { + var43 = 128; } - this.field2490[var44] = (byte)var45; + this.field2518[var42] = (byte)var43; } - Object var48 = null; + Object var46 = null; } for (var27 = 0; var27 < var12; ++var27) { - var39[var27].field2396 = var2.readUnsignedByte(); + var37[var27].field2426 = var2.readUnsignedByte(); } for (var27 = 0; var27 < var12; ++var27) { - var28 = var39[var27]; - if (var28.field2402 != null) { - var28.field2397 = var2.readUnsignedByte(); + var28 = var37[var27]; + if (var28.field2424 != null) { + var28.field2427 = var2.readUnsignedByte(); } - if (var28.field2398 != null) { - var28.field2400 = var2.readUnsignedByte(); + if (var28.field2429 != null) { + var28.field2428 = var2.readUnsignedByte(); } - if (var28.field2396 > 0) { - var28.field2399 = var2.readUnsignedByte(); + if (var28.field2426 > 0) { + var28.field2435 = var2.readUnsignedByte(); } } for (var27 = 0; var27 < var12; ++var27) { - var39[var27].field2401 = var2.readUnsignedByte(); + var37[var27].field2431 = var2.readUnsignedByte(); } for (var27 = 0; var27 < var12; ++var27) { - var28 = var39[var27]; - if (var28.field2401 > 0) { - var28.field2395 = var2.readUnsignedByte(); + var28 = var37[var27]; + if (var28.field2431 > 0) { + var28.field2430 = var2.readUnsignedByte(); } } for (var27 = 0; var27 < var12; ++var27) { - var28 = var39[var27]; - if (var28.field2395 > 0) { - var28.field2394 = var2.readUnsignedByte(); + var28 = var37[var27]; + if (var28.field2430 > 0) { + var28.field2425 = var2.readUnsignedByte(); } } } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ldk;[B[IB)Z", - garbageValue = "50" + signature = "(Ldo;[B[II)Z", + garbageValue = "512208018" ) - boolean method3970(SoundCache var1, byte[] var2, int[] var3) { + boolean method4027(SoundCache var1, byte[] var2, int[] var3) { boolean var4 = true; int var5 = 0; RawSound var6 = null; for (int var7 = 0; var7 < 128; ++var7) { if (var2 == null || var2[var7] != 0) { - int var8 = this.field2486[var7]; + int var8 = this.field2514[var7]; if (var8 != 0) { if (var5 != var8) { var5 = var8--; @@ -513,7 +508,7 @@ public class MusicPatch extends Node { if (var6 != null) { this.rawSounds[var7] = var6; - this.field2486[var7] = 0; + this.field2514[var7] = 0; } } } @@ -522,193 +517,37 @@ public class MusicPatch extends Node { return var4; } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "106" + garbageValue = "58" ) @Export("clear") void clear() { - this.field2486 = null; + this.field2514 = null; } @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;B)Z", - garbageValue = "119" + signature = "(Ljava/io/File;I)V", + garbageValue = "-1151002932" ) - @Export("isNumber") - public static boolean isNumber(CharSequence var0) { - boolean var2 = false; - boolean var3 = false; - int var4 = 0; - int var5 = var0.length(); - int var6 = 0; - - boolean var1; - while (true) { - if (var6 >= var5) { - var1 = var3; - break; - } - - label85: { - char var7 = var0.charAt(var6); - if (var6 == 0) { - if (var7 == '-') { - var2 = true; - break label85; - } - - if (var7 == '+') { - break label85; - } - } - - 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 = var4 * 10 + var9; - if (var4 != var8 / 10) { - var1 = false; - break; - } - - var4 = var8; - var3 = true; - } - - ++var6; - } - - return var1; - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1693684309" - ) - public static void method3979() { - VarbitDefinition.VarbitDefinition_cached.clear(); - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "([BB)V", - garbageValue = "-75" - ) - @Export("SpriteBuffer_decode") - static void SpriteBuffer_decode(byte[] var0) { - Buffer var1 = new Buffer(var0); - var1.offset = var0.length - 2; - class335.SpriteBuffer_spriteCount = var1.readUnsignedShort(); - class335.SpriteBuffer_xOffsets = new int[class335.SpriteBuffer_spriteCount]; - StructDefinition.SpriteBuffer_yOffsets = new int[class335.SpriteBuffer_spriteCount]; - class335.SpriteBuffer_spriteWidths = new int[class335.SpriteBuffer_spriteCount]; - class335.SpriteBuffer_spriteHeights = new int[class335.SpriteBuffer_spriteCount]; - class4.SpriteBuffer_pixels = new byte[class335.SpriteBuffer_spriteCount][]; - var1.offset = var0.length - 7 - class335.SpriteBuffer_spriteCount * 8; - class335.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); - class335.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); - int var2 = (var1.readUnsignedByte() & 255) + 1; - - int var3; - for (var3 = 0; var3 < class335.SpriteBuffer_spriteCount; ++var3) { - class335.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class335.SpriteBuffer_spriteCount; ++var3) { - StructDefinition.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class335.SpriteBuffer_spriteCount; ++var3) { - class335.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class335.SpriteBuffer_spriteCount; ++var3) { - class335.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); - } - - var1.offset = var0.length - 7 - class335.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; - DefaultsGroup.SpriteBuffer_spritePalette = new int[var2]; - - for (var3 = 1; var3 < var2; ++var3) { - DefaultsGroup.SpriteBuffer_spritePalette[var3] = var1.readMedium(); - if (DefaultsGroup.SpriteBuffer_spritePalette[var3] == 0) { - DefaultsGroup.SpriteBuffer_spritePalette[var3] = 1; - } - } - - var1.offset = 0; - - for (var3 = 0; var3 < class335.SpriteBuffer_spriteCount; ++var3) { - int var4 = class335.SpriteBuffer_spriteWidths[var3]; - int var5 = class335.SpriteBuffer_spriteHeights[var3]; - int var6 = var4 * var5; - byte[] var7 = new byte[var6]; - class4.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(); - } - } - } - } - - } - - @ObfuscatedName("ik") - @ObfuscatedSignature( - signature = "(IIIIIIIII)V", - garbageValue = "2079542989" - ) - @Export("drawWidgets") - static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (LoginScreenAnimation.loadInterface(var0)) { - GrandExchangeEvents.field70 = null; - StudioGame.drawInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); - if (GrandExchangeEvents.field70 != null) { - StudioGame.drawInterface(GrandExchangeEvents.field70, -1412584499, var1, var2, var3, var4, WorldMapDecoration.field245, SequenceDefinition.field3526, var7); - GrandExchangeEvents.field70 = null; - } - + static void method4025(File var0) { + FileSystem.FileSystem_cacheDir = var0; + if (!FileSystem.FileSystem_cacheDir.exists()) { + throw new RuntimeException(""); } else { - if (var7 != -1) { - Client.field679[var7] = true; - } else { - for (int var8 = 0; var8 < 100; ++var8) { - Client.field679[var8] = true; - } - } - + FileSystem.FileSystem_hasPermissions = true; } } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(I)[Llw;", + garbageValue = "16711680" + ) + @Export("FillMode_values") + public static class332[] FillMode_values() { + return new class332[]{class332.field3881, class332.SOLID, class332.field3880}; + } } diff --git a/runescape-client/src/main/java/MusicPatchNode.java b/runescape-client/src/main/java/MusicPatchNode.java index 004acfbfde..7e48861279 100644 --- a/runescape-client/src/main/java/MusicPatchNode.java +++ b/runescape-client/src/main/java/MusicPatchNode.java @@ -1,259 +1,266 @@ +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("hz") +@ObfuscatedName("hm") @Implements("MusicPatchNode") public class MusicPatchNode extends Node { - @ObfuscatedName("dl") - @ObfuscatedSignature( - signature = "Llt;" - ) - @Export("js5Socket") - static AbstractSocket js5Socket; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -1338967265 - ) - int field2452; @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 53728519 + ) + int field2479; + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lhy;" + signature = "Lhi;" ) @Export("patch") MusicPatch patch; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Ldm;" + signature = "Ldp;" ) @Export("rawSound") RawSound rawSound; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lgf;" + signature = "Lgp;" ) - MusicPatchNode2 field2460; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -1651211223 - ) - int field2467; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -454114325 - ) - int field2464; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 1747303555 - ) - int field2451; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -289148489 - ) - int field2465; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 1697812591 - ) - int field2445; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = 1048994435 - ) - int field2454; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -599358683 - ) - int field2455; + MusicPatchNode2 field2477; @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1836492369 + intValue = -332172395 ) - int field2456; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 705413515 - ) - int field2457; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 1352510901 - ) - int field2458; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 2063074809 - ) - int field2459; + int field2480; @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1989506561 + intValue = 352043121 ) - int field2448; - @ObfuscatedName("i") + int field2481; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1064961041 + intValue = -1390443867 ) - int field2461; + int field2499; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 2081977777 + ) + int field2483; @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 32368267 + intValue = 824681331 ) - int field2449; - @ObfuscatedName("b") + int field2484; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 2037828979 + ) + int field2485; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -1496244827 + ) + int field2491; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = -182332207 + ) + int field2496; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -1654304629 + ) + int field2488; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -487308175 + ) + int field2489; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -213876459 + ) + int field2490; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 986422195 + ) + int field2493; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 1071893335 + ) + int field2492; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 1037928597 + ) + int field2476; + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Ldy;" + signature = "Ldk;" ) @Export("stream") RawPcmStream stream; - @ObfuscatedName("l") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -573766161 + intValue = -1898603709 ) - int field2453; - @ObfuscatedName("o") + int field2495; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1090387417 + intValue = 594099895 ) - int field2462; + int field2478; MusicPatchNode() { } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-392566943" + signature = "(B)V", + garbageValue = "1" ) - void method3917() { + void method3963() { this.patch = null; this.rawSound = null; - this.field2460 = null; + this.field2477 = null; this.stream = null; } - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "([Ljava/lang/CharSequence;IIS)Ljava/lang/String;", - garbageValue = "313" + signature = "(Lig;II)V", + garbageValue = "2117396915" ) - public static String method3921(CharSequence[] var0, int var1, int var2) { - if (var2 == 0) { - return ""; - } else if (var2 == 1) { - CharSequence var3 = var0[var1]; - return var3 == null ? "null" : var3.toString(); + static void method3968(Archive var0, int var1) { + if (UserComparator9.NetCache_reference != null) { + UserComparator9.NetCache_reference.offset = var1 * 8 + 5; + int var2 = UserComparator9.NetCache_reference.readInt(); + int var3 = UserComparator9.NetCache_reference.readInt(); + var0.loadIndex(var2, var3); } 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(); + WorldMapEvent.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); + NetCache.NetCache_archives[var1] = var0; } } - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)[Llu;", - garbageValue = "-133902824" + signature = "(I)Z", + garbageValue = "2076016155" ) - @Export("FillMode_values") - public static class332[] FillMode_values() { - return new class332[]{class332.SOLID, class332.field3875, class332.field3874}; + public static boolean method3966() { + ReflectionCheck var0 = (ReflectionCheck)class105.reflectionChecks.last(); + return var0 != null; } - @ObfuscatedName("m") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(IB)Lhe;", - garbageValue = "-47" + signature = "(B)V", + garbageValue = "-6" ) - @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 = LoginScreenAnimation.loadInterface(var1); - if (!var3) { - return null; - } - } - - return Widget.Widget_interfaceComponents[var1][var2]; - } - - @ObfuscatedName("hx") - @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "1143611655" - ) - static void method3922(int var0, int var1) { - int var2 = TaskHandler.fontBold12.stringWidth("Choose Option"); - - int var3; - for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { - Font var4 = TaskHandler.fontBold12; - String var5; - if (var3 < 0) { - var5 = ""; - } else if (Client.menuTargets[var3].length() > 0) { - var5 = Client.menuActions[var3] + " " + Client.menuTargets[var3]; + static void method3970() { + try { + File var0 = new File(ArchiveLoader.userHomeDirectory, "random.dat"); + int var2; + if (var0.exists()) { + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); } else { - var5 = Client.menuActions[var3]; + label36: + for (int var1 = 0; var1 < InterfaceParent.field590.length; ++var1) { + for (var2 = 0; var2 < class234.field3096.length; ++var2) { + File var3 = new File(class234.field3096[var2] + InterfaceParent.field590[var1] + File.separatorChar + "random.dat"); + if (var3.exists()) { + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0); + break label36; + } + } + } } - int var6 = var4.stringWidth(var5); - if (var6 > var2) { - var2 = var6; + 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) { } - var2 += 8; - var3 = Client.menuOptionsCount * 15 + 22; - int var7 = var0 - var2 / 2; - if (var2 + var7 > WorldMapLabel.canvasWidth) { - var7 = WorldMapLabel.canvasWidth - var2; - } + } - if (var7 < 0) { - var7 = 0; + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(ILcs;ZI)I", + garbageValue = "158312448" + ) + static int method3964(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? KeyHandler.field407 : SecureRandomCallable.field544; + if (var0 == ScriptOpcodes.CC_GETX) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.x; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETY) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.y; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.width; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.height; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETHIDE) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETLAYER) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.parentId; + return 1; + } else { + return 2; } + } - int var8 = var1; - if (var1 + var3 > Varps.canvasHeight) { - var8 = Varps.canvasHeight - var3; + @ObfuscatedName("ai") + @ObfuscatedSignature( + signature = "(ILcs;ZI)I", + garbageValue = "-1086642561" + ) + static int method3969(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.SOUND_SYNTH) { + UrlRequester.Interpreter_intStackSize -= 3; + AbstractWorldMapIcon.queueSoundEffect(Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize], Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2]); + return 1; + } else if (var0 == ScriptOpcodes.SOUND_SONG) { + UserComparator9.playSong(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); + return 1; + } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { + UrlRequester.Interpreter_intStackSize -= 2; + MouseRecorder.playSoundJingle(Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize], Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]); + return 1; + } else { + return 2; } + } - if (var8 < 0) { - var8 = 0; + @ObfuscatedName("je") + @ObfuscatedSignature( + signature = "(IIIIIIII)V", + garbageValue = "-1185349902" + ) + @Export("updateRootInterface") + static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (UserComparator4.loadInterface(var0)) { + class9.updateInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); } - - WorldMapDecoration.menuX = var7; - PacketBufferNode.menuY = var8; - WorldMapScaleHandler.menuWidth = var2; - WorldMapData_1.menuHeight = Client.menuOptionsCount * 15 + 22; } } diff --git a/runescape-client/src/main/java/MusicPatchNode2.java b/runescape-client/src/main/java/MusicPatchNode2.java index 8b8baf16f1..908b08139b 100644 --- a/runescape-client/src/main/java/MusicPatchNode2.java +++ b/runescape-client/src/main/java/MusicPatchNode2.java @@ -4,136 +4,112 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gf") +@ObfuscatedName("gp") @Implements("MusicPatchNode2") public class MusicPatchNode2 { - @ObfuscatedName("x") - byte[] field2402; + @ObfuscatedName("fj") + @ObfuscatedSignature( + signature = "Lko;" + ) + @Export("fontPlain12") + static Font fontPlain12; @ObfuscatedName("m") - byte[] field2398; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -224180223 - ) - int field2396; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 227896201 - ) - int field2397; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -615138819 - ) - int field2400; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 1353186567 - ) - int field2399; + byte[] field2424; + @ObfuscatedName("o") + byte[] field2429; @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 22420513 + intValue = 2005334705 ) - int field2395; - @ObfuscatedName("z") + int field2426; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 2050807293 + intValue = -1648638881 ) - int field2401; - @ObfuscatedName("t") + int field2427; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1299814217 + intValue = 905436641 ) - int field2394; + int field2428; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 759232079 + ) + int field2435; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -154479383 + ) + int field2430; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 566366641 + ) + int field2431; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 1910724783 + ) + int field2425; MusicPatchNode2() { } - @ObfuscatedName("m") + @ObfuscatedName("ev") @ObfuscatedSignature( - signature = "(Liy;III)Lla;", - garbageValue = "273345835" + signature = "(B)I", + garbageValue = "4" ) - @Export("SpriteBuffer_getSprite") - public static Sprite SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { - return !UserComparator7.method3516(var0, var1, var2) ? null : ArchiveDisk.method5932(); + static int method3820() { + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { + int var0 = 0; + + for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { + var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; + } + + return var0 * 10000 / Client.field945; + } else { + return 10000; + } } - @ObfuscatedName("w") + @ObfuscatedName("gs") @ObfuscatedSignature( - signature = "(Lkb;IIIIIIB)V", - garbageValue = "16" + signature = "(Lbt;I)V", + garbageValue = "486554393" ) - @Export("loadTerrain") - static final void loadTerrain(Buffer var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var7; - if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { - Tiles.Tiles_renderFlags[var1][var2][var3] = 0; - - while (true) { - var7 = var0.readUnsignedByte(); - if (var7 == 0) { - if (var1 == 0) { - int[] var8 = Tiles.Tiles_heights[0][var2]; - int var11 = var2 + var4 + 932731; - int var12 = var3 + var5 + 556238; - int var13 = Canvas.method957(var11 + 45365, 91923 + var12, 4) - 128 + (Canvas.method957(10294 + var11, 37821 + var12, 2) - 128 >> 1) + (Canvas.method957(var11, var12, 1) - 128 >> 2); - var13 = (int)(0.3D * (double)var13) + 35; - if (var13 < 10) { - var13 = 10; - } else if (var13 > 60) { - var13 = 60; - } - - var8[var3] = -var13 * 8; - } else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; - } - break; - } - - if (var7 == 1) { - int var14 = var0.readUnsignedByte(); - if (var14 == 1) { - var14 = 0; - } - - if (var1 == 0) { - Tiles.Tiles_heights[0][var2][var3] = -var14 * 8; - } else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var14 * 8; - } - break; - } - - if (var7 <= 49) { - class348.field4061[var1][var2][var3] = var0.readByte(); - Tiles.field539[var1][var2][var3] = (byte)((var7 - 2) / 4); - Tiles.field540[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); - } else if (var7 <= 81) { - Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); - } else { - Tiles.field538[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(); - } - } + static final void method3819(PendingSpawn var0) { + long var1 = 0L; + int var3 = -1; + int var4 = 0; + int var5 = 0; + if (var0.type == 0) { + var1 = UserComparator3.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); } + if (var0.type == 1) { + var1 = UserComparator3.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 2) { + var1 = UserComparator3.scene.getGameObjectTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 3) { + var1 = UserComparator3.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); + } + + if (var1 != 0L) { + int var6 = UserComparator3.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); + var3 = Language.Entity_unpackID(var1); + var4 = var6 & 31; + var5 = var6 >> 6 & 3; + } + + var0.objectId = var3; + var0.field957 = var4; + var0.field956 = var5; } } diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java index 1fab1948a3..3d745b0d5a 100644 --- a/runescape-client/src/main/java/MusicPatchPcmStream.java +++ b/runescape-client/src/main/java/MusicPatchPcmStream.java @@ -1,37 +1,36 @@ +import java.lang.management.GarbageCollectorMXBean; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hs") +@ObfuscatedName("hj") @Implements("MusicPatchPcmStream") public class MusicPatchPcmStream extends PcmStream { - @ObfuscatedName("as") + @ObfuscatedName("aw") + @Export("garbageCollector") + static GarbageCollectorMXBean garbageCollector; + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lld;" - ) - static Bounds field2495; - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lgi;" + signature = "Lgw;" ) @Export("superStream") MidiPcmStream superStream; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Ljh;" + signature = "Ljp;" ) @Export("queue") NodeDeque queue; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Ldz;" + signature = "Ldd;" ) @Export("mixer") PcmStreamMixer mixer; @ObfuscatedSignature( - signature = "(Lgi;)V" + signature = "(Lgw;)V" ) MusicPatchPcmStream(MidiPcmStream var1) { this.queue = new NodeDeque(); @@ -39,48 +38,48 @@ public class MusicPatchPcmStream extends PcmStream { this.superStream = var1; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lhz;[IIIIB)V", - garbageValue = "56" + signature = "(Lhm;[IIIIB)V", + garbageValue = "7" ) - void method3992(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { - if ((this.superStream.field2428[var1.field2452] & 4) != 0 && var1.field2459 < 0) { - int var6 = this.superStream.field2433[var1.field2452] / PcmPlayer.field1421; + void method4040(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { + if ((this.superStream.field2460[var1.field2479] & 4) != 0 && var1.field2490 < 0) { + int var6 = this.superStream.field2454[var1.field2479] / class237.field3113; while (true) { - int var7 = (var6 + 1048575 - var1.field2462) / var6; + int var7 = (var6 + 1048575 - var1.field2478) / var6; if (var7 > var4) { - var1.field2462 += var4 * var6; + var1.field2478 += var4 * var6; break; } var1.stream.fill(var2, var3, var7); var3 += var7; var4 -= var7; - var1.field2462 += var7 * var6 - 1048576; - int var8 = PcmPlayer.field1421 / 100; + var1.field2478 += var7 * var6 - 1048576; + int var8 = class237.field3113 / 100; int var9 = 262144 / var6; if (var9 < var8) { var8 = var9; } RawPcmStream var10 = var1.stream; - if (this.superStream.field2431[var1.field2452] == 0) { - var1.stream = RawPcmStream.method2685(var1.rawSound, var10.method2670(), var10.method2662(), var10.method2663()); + if (this.superStream.field2463[var1.field2479] == 0) { + var1.stream = RawPcmStream.method2674(var1.rawSound, var10.method2747(), var10.method2680(), var10.method2710()); } else { - var1.stream = RawPcmStream.method2685(var1.rawSound, var10.method2670(), 0, var10.method2663()); - this.superStream.method3852(var1, var1.patch.field2485[var1.field2464] < 0); - var1.stream.method2666(var8, var10.method2662()); + var1.stream = RawPcmStream.method2674(var1.rawSound, var10.method2747(), 0, var10.method2710()); + this.superStream.method3852(var1, var1.patch.field2521[var1.field2481] < 0); + var1.stream.method2685(var8, var10.method2680()); } - if (var1.patch.field2485[var1.field2464] < 0) { + if (var1.patch.field2521[var1.field2481] < 0) { var1.stream.setNumLoops(-1); } - var10.method2706(var8); + var10.method2732(var8); var10.fill(var2, var3, var5 - var3); - if (var10.method2672()) { + if (var10.method2691()) { this.mixer.addSubStream(var10); } } @@ -89,38 +88,38 @@ public class MusicPatchPcmStream extends PcmStream { var1.stream.fill(var2, var3, var4); } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lhz;II)V", - garbageValue = "2036025263" + signature = "(Lhm;II)V", + garbageValue = "948558076" ) - void method3989(MusicPatchNode var1, int var2) { - if ((this.superStream.field2428[var1.field2452] & 4) != 0 && var1.field2459 < 0) { - int var3 = this.superStream.field2433[var1.field2452] / PcmPlayer.field1421; - int var4 = (var3 + 1048575 - var1.field2462) / var3; - var1.field2462 = var3 * var2 + var1.field2462 & 1048575; + void method4041(MusicPatchNode var1, int var2) { + if ((this.superStream.field2460[var1.field2479] & 4) != 0 && var1.field2490 < 0) { + int var3 = this.superStream.field2454[var1.field2479] / class237.field3113; + int var4 = (var3 + 1048575 - var1.field2478) / var3; + var1.field2478 = var3 * var2 + var1.field2478 & 1048575; if (var4 <= var2) { - if (this.superStream.field2431[var1.field2452] == 0) { - var1.stream = RawPcmStream.method2685(var1.rawSound, var1.stream.method2670(), var1.stream.method2662(), var1.stream.method2663()); + if (this.superStream.field2463[var1.field2479] == 0) { + var1.stream = RawPcmStream.method2674(var1.rawSound, var1.stream.method2747(), var1.stream.method2680(), var1.stream.method2710()); } else { - var1.stream = RawPcmStream.method2685(var1.rawSound, var1.stream.method2670(), 0, var1.stream.method2663()); - this.superStream.method3852(var1, var1.patch.field2485[var1.field2464] < 0); + var1.stream = RawPcmStream.method2674(var1.rawSound, var1.stream.method2747(), 0, var1.stream.method2710()); + this.superStream.method3852(var1, var1.patch.field2521[var1.field2481] < 0); } - if (var1.patch.field2485[var1.field2464] < 0) { + if (var1.patch.field2521[var1.field2481] < 0) { var1.stream.setNumLoops(-1); } - var2 = var1.field2462 / var3; + var2 = var1.field2478 / var3; } } var1.stream.skip(var2); } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "()Lds;" + signature = "()Ldf;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { @@ -132,9 +131,9 @@ public class MusicPatchPcmStream extends PcmStream { } } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "()Lds;" + signature = "()Ldf;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { @@ -149,173 +148,70 @@ public class MusicPatchPcmStream extends PcmStream { return var1.stream; } - @ObfuscatedName("z") - protected int vmethod3984() { + @ObfuscatedName("u") + protected int vmethod4037() { return 0; } - @ObfuscatedName("t") + @ObfuscatedName("a") @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.method3826(var6)) { + if (!this.superStream.method3870(var6)) { int var4 = var2; int var5 = var3; do { - if (var5 <= var6.field2453) { - this.method3992(var6, var1, var4, var5, var4 + var5); - var6.field2453 -= var5; + if (var5 <= var6.field2495) { + this.method4040(var6, var1, var4, var5, var4 + var5); + var6.field2495 -= var5; break; } - this.method3992(var6, var1, var4, var6.field2453, var4 + var5); - var4 += var6.field2453; - var5 -= var6.field2453; - } while(!this.superStream.method3884(var6, var1, var4, var5)); + this.method4040(var6, var1, var4, var6.field2495, var5 + var4); + var4 += var6.field2495; + var5 -= var6.field2495; + } while(!this.superStream.method3897(var6, var1, var4, var5)); } } } - @ObfuscatedName("s") + @ObfuscatedName("w") @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.method3826(var3)) { + if (!this.superStream.method3870(var3)) { int var2 = var1; do { - if (var2 <= var3.field2453) { - this.method3989(var3, var2); - var3.field2453 -= var2; + if (var2 <= var3.field2495) { + this.method4041(var3, var2); + var3.field2495 -= var2; break; } - this.method3989(var3, var3.field2453); - var2 -= var3.field2453; - } while(!this.superStream.method3884(var3, (int[])null, 0, var2)); + this.method4041(var3, var3.field2495); + var2 -= var3.field2495; + } while(!this.superStream.method3897(var3, (int[])null, 0, var2)); } } } - @ObfuscatedName("fv") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1600061666" + signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-836395445" ) - static void method4004() { - Client.mouseLastLastPressedTimeMillis = -1L; - MidiPcmStream.mouseRecorder.index = 0; - GameShell.hasFocus = true; - Client.hadFocus = true; - Client.field904 = -1L; - class25.method277(); - Client.packetWriter.clearBuffer(); - Client.packetWriter.packetBuffer.offset = 0; - Client.packetWriter.serverPacket = null; - Client.packetWriter.field1334 = null; - Client.packetWriter.field1329 = null; - Client.packetWriter.field1339 = null; - Client.packetWriter.serverPacketLength = 0; - Client.packetWriter.field1338 = 0; - Client.rebootTimer = 0; - Client.logoutTimer = 0; - Client.hintArrowType = 0; - AbstractByteArrayCopier.method4023(); - ServerPacket.method3684(0); - Interpreter.method2112(); - Client.isItemSelected = 0; - Client.isSpellSelected = false; - Client.soundEffectCount = 0; - Client.camAngleY = 0; - Client.oculusOrbState = 0; - WorldMapRectangle.field222 = null; - Client.minimapState = 0; - Client.field695 = -1; - Client.destinationX = 0; - Client.destinationY = 0; - Client.playerAttackOption = AttackOption.AttackOption_hidden; - Client.npcAttackOption = AttackOption.AttackOption_hidden; - Client.npcCount = 0; - Player.method1383(); - - int var0; - for (var0 = 0; var0 < 2048; ++var0) { - Client.players[var0] = null; - } - - for (var0 = 0; var0 < 32768; ++var0) { - Client.npcs[var0] = null; - } - - Client.combatTargetPlayerIndex = -1; - Client.projectiles.clear(); - Client.graphicsObjects.clear(); - - for (var0 = 0; var0 < 4; ++var0) { - for (int var1 = 0; var1 < 104; ++var1) { - for (int var2 = 0; var2 < 104; ++var2) { - Client.groundItems[var0][var1][var2] = null; - } - } - } - - Client.pendingSpawns = new NodeDeque(); - Projectile.friendSystem.clear(); - - for (var0 = 0; var0 < VarpDefinition.VarpDefinition_fileCount; ++var0) { - VarpDefinition var3 = class228.VarpDefinition_get(var0); - if (var3 != null) { - Varps.Varps_temp[var0] = 0; - Varps.Varps_main[var0] = 0; - } - } - - UserComparator4.varcs.clearTransient(); - Client.followerIndex = -1; - if (Client.rootInterface != -1) { - EnumDefinition.method4614(Client.rootInterface); - } - - for (InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.first(); var4 != null; var4 = (InterfaceParent)Client.interfaceParents.next()) { - class41.closeInterface(var4, true); - } - - Client.rootInterface = -1; - Client.interfaceParents = new NodeHashTable(8); - Client.meslayerContinueWidget = null; - AbstractByteArrayCopier.method4023(); - Client.playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); - - for (var0 = 0; var0 < 8; ++var0) { - Client.playerMenuActions[var0] = null; - Client.playerOptionsPriorities[var0] = false; - } - - ItemContainer.itemContainers = new NodeHashTable(32); - Client.isLoading = true; - - for (var0 = 0; var0 < 100; ++var0) { - Client.field679[var0] = true; - } - - PacketBufferNode var5 = FaceNormal.getPacketBufferNode(ClientPacket.field2257, Client.packetWriter.isaacCipher); - var5.packetBuffer.writeByte(ApproximateRouteStrategy.getWindowedMode()); - var5.packetBuffer.writeShort(WorldMapLabel.canvasWidth); - var5.packetBuffer.writeShort(Varps.canvasHeight); - Client.packetWriter.addNode(var5); - InterfaceParent.clanChat = null; - - for (var0 = 0; var0 < 8; ++var0) { - Client.grandExchangeOffers[var0] = new GrandExchangeOffer(); - } - - GrandExchangeEvent.grandExchangeEvents = null; + @Export("setLoginResponseString") + static void setLoginResponseString(String var0, String var1, String var2) { + Login.Login_response1 = var0; + Login.Login_response2 = var1; + Login.Login_response3 = var2; } } diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java index a8c4fb2d91..ca76630f3c 100644 --- a/runescape-client/src/main/java/MusicTrack.java +++ b/runescape-client/src/main/java/MusicTrack.java @@ -3,21 +3,21 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hh") +@ObfuscatedName("hz") @Implements("MusicTrack") public class MusicTrack extends Node { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Llv;" + signature = "Lle;" ) @Export("table") NodeHashTable table; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("midi") byte[] midi; @ObfuscatedSignature( - signature = "(Lkb;)V" + signature = "(Lkn;)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; - label232: + label221: 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 label232; + continue label221; } if (var64 == 23) { @@ -335,8 +335,8 @@ public class MusicTrack extends Node { } - @ObfuscatedName("m") - void method4007() { + @ObfuscatedName("o") + void method4057() { if (this.table == null) { this.table = new NodeHashTable(16); int[] var1 = new int[16]; @@ -416,15 +416,15 @@ public class MusicTrack extends Node { } } - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("clear") void clear() { this.table = null; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Liy;II)Lhh;" + signature = "(Lic;II)Lhz;" ) @Export("readTrack") public static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) { diff --git a/runescape-client/src/main/java/NPC.java b/runescape-client/src/main/java/NPC.java index 5ad94968d8..dfbb8c8fe5 100644 --- a/runescape-client/src/main/java/NPC.java +++ b/runescape-client/src/main/java/NPC.java @@ -2,20 +2,22 @@ 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("cd") +@ObfuscatedName("cv") @Implements("NPC") public final class NPC extends Actor { - @ObfuscatedName("di") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lih;" + signature = "Lic;" ) - @Export("archive13") - static Archive archive13; - @ObfuscatedName("x") + @Export("SpotAnimationDefinition_modelArchive") + static AbstractArchive SpotAnimationDefinition_modelArchive; + @ObfuscatedName("p") + @Export("SpriteBuffer_yOffsets") + static int[] SpriteBuffer_yOffsets; + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Ljj;" + signature = "Ljz;" ) @Export("definition") NPCDefinition definition; @@ -23,12 +25,12 @@ public final class NPC extends Actor { NPC() { } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(IBI)V", - garbageValue = "1357831491" + garbageValue = "-676669615" ) - final void method2133(int var1, byte var2) { + final void method2150(int var1, byte var2) { int var3 = super.pathX[0]; int var4 = super.pathY[0]; if (var1 == 0) { @@ -67,7 +69,7 @@ public final class NPC extends Actor { --var4; } - if (super.sequence != -1 && SpotAnimationDefinition.SequenceDefinition_get(super.sequence).field3524 == 1) { + if (super.sequence != -1 && NetSocket.SequenceDefinition_get(super.sequence).field3560 == 1) { super.sequence = -1; } @@ -86,13 +88,13 @@ public final class NPC extends Actor { super.pathTraversed[0] = var2; } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIZB)V", - garbageValue = "88" + signature = "(IIZI)V", + garbageValue = "-1996954385" ) - final void method2136(int var1, int var2, boolean var3) { - if (super.sequence != -1 && SpotAnimationDefinition.SequenceDefinition_get(super.sequence).field3524 == 1) { + final void method2142(int var1, int var2, boolean var3) { + if (super.sequence != -1 && NetSocket.SequenceDefinition_get(super.sequence).field3560 == 1) { super.sequence = -1; } @@ -118,26 +120,26 @@ public final class NPC extends Actor { } super.pathLength = 0; - super.field1032 = 0; - super.field1031 = 0; + super.field1023 = 0; + super.field1022 = 0; super.pathX[0] = var1; super.pathY[0] = var2; - super.x = super.field976 * 64 + super.pathX[0] * 128; - super.y = super.field976 * 64 + super.pathY[0] * 128; + super.x = super.pathX[0] * 128 + super.field967 * 64; + super.y = super.field967 * 64 + super.pathY[0] * 128; } - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)Lel;", - garbageValue = "480835067" + signature = "(I)Lef;", + garbageValue = "1832696685" ) @Export("getModel") protected final Model getModel() { if (this.definition == null) { return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? SpotAnimationDefinition.SequenceDefinition_get(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence != -1 && (super.idleSequence != super.movementSequence || var1 == null) ? SpotAnimationDefinition.SequenceDefinition_get(super.movementSequence) : null; + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? NetSocket.SequenceDefinition_get(super.sequence) : null; + SequenceDefinition var2 = super.movementSequence != -1 && (super.idleSequence != super.movementSequence || var1 == null) ? NetSocket.SequenceDefinition_get(super.movementSequence) : null; Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); if (var3 == null) { return null; @@ -145,9 +147,9 @@ public final class NPC extends Actor { var3.calculateBoundsCylinder(); super.defaultHeight = var3.height; if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { - Model var4 = MouseHandler.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); + Model var4 = class4.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); if (var4 != null) { - var4.offsetBy(0, -super.field1033, 0); + var4.offsetBy(0, -super.field1005, 0); Model[] var5 = new Model[]{var3, var4}; var3 = new Model(var5, 2); } @@ -162,123 +164,46 @@ public final class NPC extends Actor { } } - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "116176402" + signature = "(B)Z", + garbageValue = "1" ) @Export("isVisible") final boolean isVisible() { return this.definition != null; } - @ObfuscatedName("x") - public static final int method2146(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 = (1.0D + var2) * var4; - } else { - var12 = var2 + var4 - var4 * var2; - } - - double var14 = var4 * 2.0D - var12; - double var16 = var0 + 0.3333333333333333D; - if (var16 > 1.0D) { - --var16; - } - - double var20 = var0 - 0.3333333333333333D; - if (var20 < 0.0D) { - ++var20; - } - - if (var16 * 6.0D < 1.0D) { - var6 = var14 + var16 * (var12 - var14) * 6.0D; - } else if (var16 * 2.0D < 1.0D) { - var6 = var12; - } else if (var16 * 3.0D < 2.0D) { - var6 = (var12 - var14) * (0.6666666666666666D - var16) * 6.0D + var14; - } else { - var6 = var14; - } - - if (var0 * 6.0D < 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 = var14 + (var12 - var14) * (0.6666666666666666D - var0) * 6.0D; - } else { - var8 = var14; - } - - if (var20 * 6.0D < 1.0D) { - var10 = var14 + 6.0D * (var12 - var14) * var20; - } else if (var20 * 2.0D < 1.0D) { - var10 = var12; - } else if (3.0D * var20 < 2.0D) { - var10 = (var12 - var14) * (0.6666666666666666D - var20) * 6.0D + var14; - } else { - var10 = var14; - } - } - - int var22 = (int)(var6 * 256.0D); - int var13 = (int)(var8 * 256.0D); - int var23 = (int)(var10 * 256.0D); - int var15 = var23 + (var13 << 8) + (var22 << 16); - return var15; + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(Lkn;I)Ljava/lang/String;", + garbageValue = "1758966720" + ) + public static String method2157(Buffer var0) { + return UserComparator5.method3534(var0, 32767); } - @ObfuscatedName("h") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "-1441905186" + signature = "(S)V", + garbageValue = "-25347" ) - static int method2147(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? GrandExchangeOfferNameComparator.field115 : Interpreter.field1130; - 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; - } + static void method2156() { + Players.Players_count = 0; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETID) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.childIndex; - return 1; - } else { - return 2; + for (int var0 = 0; var0 < 2048; ++var0) { + Players.field1279[var0] = null; + Players.field1278[var0] = 1; } + } - @ObfuscatedName("an") + @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(ILce;ZB)I", - garbageValue = "-41" + signature = "(Ldh;I)V", + garbageValue = "2097901447" ) - static int method2145(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.SOUND_SYNTH) { - Interpreter.Interpreter_intStackSize -= 3; - ModelData0.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) { - StudioGame.playSong(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - return 1; - } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { - Interpreter.Interpreter_intStackSize -= 2; - VerticalAlignment.playSoundJingle(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - return 1; - } else { - return 2; - } + public static final void method2144(PlayerProvider var0) { + HealthBarUpdate.pcmPlayerProvider = var0; } } diff --git a/runescape-client/src/main/java/NPCDefinition.java b/runescape-client/src/main/java/NPCDefinition.java index 288331c392..f9cfe9db5e 100644 --- a/runescape-client/src/main/java/NPCDefinition.java +++ b/runescape-client/src/main/java/NPCDefinition.java @@ -3,186 +3,187 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("jj") +@ObfuscatedName("jz") @Implements("NPCDefinition") public class NPCDefinition extends DualNode { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Liy;" + signature = "Lic;" ) @Export("NpcDefinition_archive") public static AbstractArchive NpcDefinition_archive; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Liy;" + signature = "Lic;" ) @Export("NpcDefinition_modelArchive") public static AbstractArchive NpcDefinition_modelArchive; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Leg;" + signature = "Lec;" ) @Export("NpcDefinition_cached") - static EvictingDualNodeHashTable NpcDefinition_cached; - @ObfuscatedName("d") + public static EvictingDualNodeHashTable NpcDefinition_cached; + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Leg;" + signature = "Lec;" ) @Export("NpcDefinition_cachedModels") - static EvictingDualNodeHashTable NpcDefinition_cachedModels; - @ObfuscatedName("w") + public static EvictingDualNodeHashTable NpcDefinition_cachedModels; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -389469873 + intValue = 1039013971 ) @Export("id") public int id; - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("name") public String name; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1343476403 + intValue = 784542157 ) @Export("size") public int size; - @ObfuscatedName("z") + @ObfuscatedName("u") @Export("models") int[] models; - @ObfuscatedName("t") - int[] field3483; - @ObfuscatedName("e") + @ObfuscatedName("a") + int[] field3497; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1727903795 + intValue = -1307303139 ) @Export("idleSequence") public int idleSequence; - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1188737805 + intValue = -677524767 ) @Export("turnLeftSequence") public int turnLeftSequence; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1064545751 + intValue = 1895421903 ) @Export("turnRightSequence") public int turnRightSequence; - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1167118343 + intValue = -1701932667 ) @Export("walkSequence") public int walkSequence; - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -899359333 + intValue = -456399597 ) @Export("walkBackSequence") public int walkBackSequence; - @ObfuscatedName("h") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1764143325 + intValue = -1996665451 ) @Export("walkLeftSequence") public int walkLeftSequence; - @ObfuscatedName("g") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 594616055 + intValue = 49834029 ) @Export("walkRightSequence") public int walkRightSequence; - @ObfuscatedName("i") + @ObfuscatedName("s") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("a") + @ObfuscatedName("v") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("l") + @ObfuscatedName("e") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("actions") public String[] actions; - @ObfuscatedName("o") + @ObfuscatedName("t") @Export("drawMapDot") public boolean drawMapDot; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1913171313 + intValue = 1641745369 ) @Export("combatLevel") public int combatLevel; - @ObfuscatedName("j") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -628781453 + intValue = 610196697 ) @Export("widthScale") int widthScale; - @ObfuscatedName("y") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 831579505 + intValue = -689457805 ) @Export("heightScale") int heightScale; @ObfuscatedName("f") @Export("isVisible") public boolean isVisible; - @ObfuscatedName("ae") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -2049591517 + intValue = -1624183581 ) @Export("ambient") int ambient; - @ObfuscatedName("an") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = 1268595579 + intValue = -2126781909 ) @Export("contrast") int contrast; - @ObfuscatedName("ai") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -1614239771 + intValue = 155267533 ) @Export("headIconPrayer") public int headIconPrayer; - @ObfuscatedName("ap") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 1421039835 + intValue = -125141041 ) @Export("rotation") public int rotation; - @ObfuscatedName("ab") + @ObfuscatedName("ax") @Export("transforms") public int[] transforms; - @ObfuscatedName("ar") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -1643554833 + intValue = 618925133 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("af") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 1966128939 + intValue = -1800109047 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("at") + @ObfuscatedName("am") @Export("isInteractable") public boolean isInteractable; - @ObfuscatedName("al") + @ObfuscatedName("ak") @Export("isClickable") public boolean isClickable; - @ObfuscatedName("as") + @ObfuscatedName("ad") @Export("isFollower") public boolean isFollower; - @ObfuscatedName("am") + @ObfuscatedName("as") @ObfuscatedSignature( - signature = "Lln;" + signature = "Llf;" ) @Export("params") IterableNodeHashTable params; @@ -219,19 +220,19 @@ public class NPCDefinition extends DualNode { this.isFollower = false; } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "33" + signature = "(I)V", + garbageValue = "-515379309" ) @Export("postDecode") void postDecode() { } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkb;B)V", - garbageValue = "-24" + signature = "(Lkn;I)V", + garbageValue = "-1111522508" ) @Export("decode") void decode(Buffer var1) { @@ -245,10 +246,10 @@ public class NPCDefinition extends DualNode { } } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkb;II)V", - garbageValue = "269088844" + signature = "(Lkn;II)V", + garbageValue = "-1876580246" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -303,10 +304,10 @@ public class NPCDefinition extends DualNode { } } else if (var2 == 60) { var3 = var1.readUnsignedByte(); - this.field3483 = new int[var3]; + this.field3497 = new int[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.field3483[var4] = var1.readUnsignedShort(); + this.field3497[var4] = var1.readUnsignedShort(); } } else if (var2 == 93) { this.drawMapDot = false; @@ -334,7 +335,7 @@ public class NPCDefinition extends DualNode { } else if (var2 == 111) { this.isFollower = true; } else if (var2 == 249) { - this.params = NetCache.readStringIntParameters(var1, this.params); + this.params = WorldMapElement.readStringIntParameters(var1, this.params); } } else { this.transformVarbit = var1.readUnsignedShort(); @@ -370,10 +371,10 @@ public class NPCDefinition extends DualNode { } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Ljc;ILjc;II)Lel;", - garbageValue = "-1957935091" + signature = "(Ljm;ILjm;II)Lef;", + garbageValue = "645123474" ) @Export("getModel") public final Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { @@ -444,23 +445,23 @@ public class NPCDefinition extends DualNode { } } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(B)Lea;", - garbageValue = "4" + signature = "(I)Lek;", + garbageValue = "1862538614" ) @Export("getModelData") public final ModelData getModelData() { if (this.transforms != null) { NPCDefinition var1 = this.transform(); return var1 == null ? null : var1.getModelData(); - } else if (this.field3483 == null) { + } else if (this.field3497 == null) { return null; } else { boolean var5 = false; - for (int var2 = 0; var2 < this.field3483.length; ++var2) { - if (!NpcDefinition_modelArchive.tryLoadFile(this.field3483[var2], 0)) { + for (int var2 = 0; var2 < this.field3497.length; ++var2) { + if (!NpcDefinition_modelArchive.tryLoadFile(this.field3497[var2], 0)) { var5 = true; } } @@ -468,10 +469,10 @@ public class NPCDefinition extends DualNode { if (var5) { return null; } else { - ModelData[] var6 = new ModelData[this.field3483.length]; + ModelData[] var6 = new ModelData[this.field3497.length]; - for (int var3 = 0; var3 < this.field3483.length; ++var3) { - var6[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field3483[var3], 0); + for (int var3 = 0; var3 < this.field3497.length; ++var3) { + var6[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field3497[var3], 0); } ModelData var7; @@ -499,16 +500,16 @@ public class NPCDefinition extends DualNode { } } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(I)Ljj;", - garbageValue = "-2051225078" + signature = "(I)Ljz;", + garbageValue = "478343419" ) @Export("transform") public final NPCDefinition transform() { int var1 = -1; if (this.transformVarbit != -1) { - var1 = Projectile.getVarbit(this.transformVarbit); + var1 = Widget.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -520,13 +521,13 @@ public class NPCDefinition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? class237.getNpcDefinition(var2) : null; + return var2 != -1 ? StudioGame.getNpcDefinition(var2) : null; } - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "1945900441" + signature = "(B)Z", + garbageValue = "1" ) @Export("transformIsVisible") public boolean transformIsVisible() { @@ -535,7 +536,7 @@ public class NPCDefinition extends DualNode { } else { int var1 = -1; if (this.transformVarbit != -1) { - var1 = Projectile.getVarbit(this.transformVarbit); + var1 = Widget.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -548,36 +549,169 @@ public class NPCDefinition extends DualNode { } } - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(IIS)I", - garbageValue = "-11262" + signature = "(IIB)I", + garbageValue = "-3" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - IterableNodeHashTable var4 = this.params; - int var3; - if (var4 == null) { - var3 = var2; - } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); - if (var5 == null) { - var3 = var2; - } else { - var3 = var5.integer; - } - } - - return var3; + return Language.method3801(this.params, var1, var2); } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(ILjava/lang/String;B)Ljava/lang/String;", - garbageValue = "-61" + signature = "(ILjava/lang/String;I)Ljava/lang/String;", + garbageValue = "-1927040360" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return class9.method122(this.params, var1, var2); + return FloorUnderlayDefinition.method4612(this.params, var1, var2); + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + signature = "(ILcs;ZI)I", + garbageValue = "1804514310" + ) + static int method4922(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; + return 1; + } else { + int var12; + if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var12 == 0 ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var12 == 2 ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var12 == 5 ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var12 == 1 ? 1 : 0; + return 1; + } else { + boolean var13; + if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { + var13 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + if (WorldMapIcon_0.grandExchangeEvents != null) { + WorldMapIcon_0.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var13); + } + + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { + var13 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + if (WorldMapIcon_0.grandExchangeEvents != null) { + WorldMapIcon_0.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var13); + } + + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { + UrlRequester.Interpreter_intStackSize -= 2; + var13 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize] == 1; + boolean var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1] == 1; + if (WorldMapIcon_0.grandExchangeEvents != null) { + Client.GrandExchangeEvents_worldComparator.filterWorlds = var4; + WorldMapIcon_0.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var13); + } + + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { + var13 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + if (WorldMapIcon_0.grandExchangeEvents != null) { + WorldMapIcon_0.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var13); + } + + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { + var13 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + if (WorldMapIcon_0.grandExchangeEvents != null) { + WorldMapIcon_0.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var13); + } + + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = WorldMapIcon_0.grandExchangeEvents == null ? 0 : WorldMapIcon_0.grandExchangeEvents.events.size(); + return 1; + } else { + GrandExchangeEvent var11; + if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)WorldMapIcon_0.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var11.world; + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)WorldMapIcon_0.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var11.getOfferName(); + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)WorldMapIcon_0.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var11.getPreviousOfferName(); + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)WorldMapIcon_0.grandExchangeEvents.events.get(var3); + long var5 = MilliClock.currentTimeMillis() - GraphicsObject.field1139 - 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[++WorldMapEvent.Interpreter_stringStackSize - 1] = var10; + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)WorldMapIcon_0.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity; + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)WorldMapIcon_0.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice; + return 1; + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)WorldMapIcon_0.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id; + return 1; + } else { + return 2; + } + } + } + } } } diff --git a/runescape-client/src/main/java/NanoClock.java b/runescape-client/src/main/java/NanoClock.java index b2ddbfb622..ff5da86994 100644 --- a/runescape-client/src/main/java/NanoClock.java +++ b/runescape-client/src/main/java/NanoClock.java @@ -4,55 +4,64 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fn") +@ObfuscatedName("fs") @Implements("NanoClock") public class NanoClock extends Clock { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedGetter( - longValue = 4971967116578097939L + longValue = -6841910125641657071L ) @Export("lastTimeNano") long lastTimeNano; - NanoClock() { + public NanoClock() { this.lastTimeNano = System.nanoTime(); } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1351231250" + garbageValue = "-1017447827" ) @Export("mark") public void mark() { this.lastTimeNano = System.nanoTime(); } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(III)I", - garbageValue = "-1723558008" + garbageValue = "-1786752641" ) @Export("wait") public int wait(int var1, int var2) { - long var3 = 1000000L * (long)var2; + long var3 = (long)var2 * 1000000L; long var5 = this.lastTimeNano - System.nanoTime(); if (var5 < var3) { var5 = var3; } - class169.sleepExact(var5 / 1000000L); - long var7 = System.nanoTime(); - - int var9; - for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += 1000000L * (long)var1) { - ++var9; + long var7 = var5 / 1000000L; + if (var7 > 0L) { + if (0L == var7 % 10L) { + SpriteMask.sleepExact(var7 - 1L); + SpriteMask.sleepExact(1L); + } else { + SpriteMask.sleepExact(var7); + } } - if (this.lastTimeNano < var7) { - this.lastTimeNano = var7; + long var9 = System.nanoTime(); + + int var11; + for (var11 = 0; var11 < 10 && (var11 < 1 || this.lastTimeNano < var9); this.lastTimeNano += (long)var1 * 1000000L) { + ++var11; } - return var9; + if (this.lastTimeNano < var9) { + this.lastTimeNano = var9; + } + + return var11; } } diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java index 3873a685a1..766ab8e363 100644 --- a/runescape-client/src/main/java/NetCache.java +++ b/runescape-client/src/main/java/NetCache.java @@ -1,8 +1,3 @@ -import java.io.BufferedReader; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringReader; -import java.io.StringWriter; import java.util.zip.CRC32; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; @@ -10,123 +5,108 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ia") +@ObfuscatedName("it") @Implements("NetCache") public class NetCache { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Llt;" + signature = "Llj;" ) @Export("NetCache_socket") public static AbstractSocket NetCache_socket; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1826620623 + intValue = -1369664309 ) @Export("NetCache_loadTime") public static int NetCache_loadTime; - @ObfuscatedName("k") - @ObfuscatedGetter( - longValue = 2064372708518790169L - ) - public static long field3165; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Llv;" + signature = "Lle;" ) @Export("NetCache_pendingPriorityWrites") public static NodeHashTable NetCache_pendingPriorityWrites; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1340946103 + intValue = -357267319 ) @Export("NetCache_pendingPriorityWritesCount") public static int NetCache_pendingPriorityWritesCount; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Llv;" + signature = "Lle;" ) @Export("NetCache_pendingPriorityResponses") public static NodeHashTable NetCache_pendingPriorityResponses; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1858030685 + intValue = 1385595783 ) @Export("NetCache_pendingPriorityResponsesCount") public static int NetCache_pendingPriorityResponsesCount; - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Ljl;" + signature = "Ljd;" ) @Export("NetCache_pendingWritesQueue") public static DualNodeDeque NetCache_pendingWritesQueue; - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Llv;" + signature = "Lle;" ) @Export("NetCache_pendingWrites") - static NodeHashTable NetCache_pendingWrites; - @ObfuscatedName("e") + public static NodeHashTable NetCache_pendingWrites; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -2108405401 + intValue = -2008436555 ) @Export("NetCache_pendingWritesCount") public static int NetCache_pendingWritesCount; - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Llv;" + signature = "Lle;" ) @Export("NetCache_pendingResponses") public static NodeHashTable NetCache_pendingResponses; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1540381013 + intValue = 764472147 ) @Export("NetCache_pendingResponsesCount") public static int NetCache_pendingResponsesCount; - @ObfuscatedName("u") + @ObfuscatedName("c") + public static boolean field3208; + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lix;" - ) - @Export("NetCache_currentResponse") - public static NetFileRequest NetCache_currentResponse; - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "Lkb;" + signature = "Lkn;" ) @Export("NetCache_responseHeaderBuffer") public static Buffer NetCache_responseHeaderBuffer; - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "Lkb;" - ) - @Export("NetCache_responseArchiveBuffer") - public static Buffer NetCache_responseArchiveBuffer; - @ObfuscatedName("i") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -488987433 + intValue = -534324197 ) - public static int field3178; - @ObfuscatedName("b") + public static int field3214; + @ObfuscatedName("d") @Export("NetCache_crc") public static CRC32 NetCache_crc; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "[Lih;" + signature = "[Lig;" ) @Export("NetCache_archives") public static Archive[] NetCache_archives; - @ObfuscatedName("o") - public static byte field3163; - @ObfuscatedName("c") + @ObfuscatedName("t") + public static byte field3213; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 2067454381 + intValue = -1163120283 ) @Export("NetCache_crcMismatches") public static int NetCache_crcMismatches; - @ObfuscatedName("j") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1675917745 + intValue = -1725551387 ) @Export("NetCache_ioExceptions") public static int NetCache_ioExceptions; @@ -143,126 +123,11 @@ public class NetCache { NetCache_pendingResponses = new NodeHashTable(4096); NetCache_pendingResponsesCount = 0; NetCache_responseHeaderBuffer = new Buffer(8); - field3178 = 0; + field3214 = 0; NetCache_crc = new CRC32(); NetCache_archives = new Archive[256]; - field3163 = 0; + field3213 = 0; NetCache_crcMismatches = 0; NetCache_ioExceptions = 0; } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;I)J", - garbageValue = "706335608" - ) - static long method4400(CharSequence var0) { - long var1 = 0L; - int var3 = var0.length(); - - for (int var4 = 0; var4 < var3; ++var4) { - var1 *= 37L; - char var5 = var0.charAt(var4); - if (var5 >= 'A' && var5 <= 'Z') { - var1 += (long)(var5 + 1 - 65); - } else if (var5 >= 'a' && var5 <= 'z') { - var1 += (long)(var5 + 1 - 97); - } else if (var5 >= '0' && var5 <= '9') { - var1 += (long)(var5 + 27 - 48); - } - - if (var1 >= 177917621779460413L) { - break; - } - } - - while (0L == var1 % 37L && var1 != 0L) { - var1 /= 37L; - } - - return var1; - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(Lkb;Lln;I)Lln;", - garbageValue = "-1200596784" - ) - @Export("readStringIntParameters") - static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { - int var2 = var0.readUnsignedByte(); - int var3; - if (var1 == null) { - var3 = Calendar.method4033(var2); - var1 = new IterableNodeHashTable(var3); - } - - for (var3 = 0; var3 < var2; ++var3) { - boolean var4 = var0.readUnsignedByte() == 1; - int var5 = var0.readMedium(); - Object var6; - if (var4) { - var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); - } else { - var6 = new IntegerNode(var0.readInt()); - } - - var1.put((Node)var6, (long)var5); - } - - return var1; - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "(Ljava/lang/Throwable;I)Ljava/lang/String;", - garbageValue = "-753208672" - ) - static String method4393(Throwable var0) throws IOException { - String var1; - if (var0 instanceof RunException) { - RunException var2 = (RunException)var0; - var1 = var2.message + " | "; - var0 = var2.throwable; - } else { - var1 = ""; - } - - StringWriter var12 = new StringWriter(); - PrintWriter var3 = new PrintWriter(var12); - var0.printStackTrace(var3); - var3.close(); - String var4 = var12.toString(); - BufferedReader var5 = new BufferedReader(new StringReader(var4)); - String var6 = var5.readLine(); - - while (true) { - while (true) { - String var7 = var5.readLine(); - if (var7 == null) { - var1 = var1 + "| " + var6; - return var1; - } - - int var8 = var7.indexOf(40); - int var9 = var7.indexOf(41, var8 + 1); - if (var8 >= 0 && var9 >= 0) { - String var10 = var7.substring(var8 + 1, var9); - int var11 = var10.indexOf(".java:"); - if (var11 >= 0) { - var10 = var10.substring(0, var11) + var10.substring(var11 + 5); - var1 = var1 + var10 + ' '; - continue; - } - - var7 = var7.substring(0, var8); - } - - var7 = var7.trim(); - var7 = var7.substring(var7.lastIndexOf(32) + 1); - var7 = var7.substring(var7.lastIndexOf(9) + 1); - var1 = var1 + var7 + ' '; - } - } - } } diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java index 607ebca026..35f76dfdb4 100644 --- a/runescape-client/src/main/java/NetFileRequest.java +++ b/runescape-client/src/main/java/NetFileRequest.java @@ -4,39 +4,67 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ix") +@ObfuscatedName("iq") @Implements("NetFileRequest") public class NetFileRequest extends DualNode { - @ObfuscatedName("re") - @ObfuscatedGetter( - intValue = 642121189 - ) - static int field3126; - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lih;" + signature = "Lig;" ) @Export("archive") public Archive archive; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -782171773 + intValue = 2064764775 ) @Export("crc") public int crc; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("padding") public byte padding; NetFileRequest() { } - @ObfuscatedName("x") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)[Lje;", - garbageValue = "534124687" + signature = "(CI)Z", + garbageValue = "-612356648" ) - static HorizontalAlignment[] method4244() { - return new HorizontalAlignment[]{HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field3453, HorizontalAlignment.field3458}; + static boolean method4304(char var0) { + for (int var1 = 0; var1 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var1) { + if (var0 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var1)) { + return true; + } + } + + return false; + } + + @ObfuscatedName("ij") + @ObfuscatedSignature( + signature = "(IIIIIIIII)V", + garbageValue = "-1145163576" + ) + @Export("drawWidgets") + static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + if (UserComparator4.loadInterface(var0)) { + class25.field124 = null; + Tiles.drawInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); + if (class25.field124 != null) { + Tiles.drawInterface(class25.field124, -1412584499, var1, var2, var3, var4, Clock.field2092, Client.field950, var7); + class25.field124 = null; + } + + } else { + if (var7 != -1) { + Client.field813[var7] = true; + } else { + for (int var8 = 0; var8 < 100; ++var8) { + Client.field813[var8] = true; + } + } + + } } } diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index aceaac94e3..99216c23af 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -9,66 +9,72 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fa") +@ObfuscatedName("fh") @Implements("NetSocket") public final class NetSocket extends AbstractSocket implements Runnable { - @ObfuscatedName("x") + @ObfuscatedName("st") + @ObfuscatedSignature( + signature = "Lcz;" + ) + @Export("clientPreferences") + static ClientPreferences clientPreferences; + @ObfuscatedName("m") @Export("inputStream") InputStream inputStream; - @ObfuscatedName("m") - @Export("outputStream") - OutputStream outputStream; - @ObfuscatedName("k") + @ObfuscatedName("o") @Export("socket") Socket socket; - @ObfuscatedName("d") + @ObfuscatedName("q") + @Export("outputStream") + OutputStream outputStream; + @ObfuscatedName("j") @Export("isClosed") boolean isClosed; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lfs;" + signature = "Lfm;" ) @Export("taskHandler") TaskHandler taskHandler; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lfr;" + signature = "Lfa;" ) @Export("task") Task task; - @ObfuscatedName("q") + @ObfuscatedName("n") @Export("outBuffer") byte[] outBuffer; - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -883377573 + intValue = -1562381729 ) @Export("outLength") int outLength; - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1663813013 + intValue = -171573129 ) @Export("outOffset") int outOffset; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("exceptionWriting") boolean exceptionWriting; - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -667900149 + intValue = -881465833 ) @Export("bufferLength") final int bufferLength; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1103298859 + intValue = -1622692111 ) @Export("maxPacketLength") final int maxPacketLength; @ObfuscatedSignature( - signature = "(Ljava/net/Socket;Lfs;I)V" + signature = "(Ljava/net/Socket;Lfm;I)V" ) public NetSocket(Socket var1, TaskHandler var2, int var3) throws IOException { this.isClosed = false; @@ -87,10 +93,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { this.outputStream = this.socket.getOutputStream(); } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "7" + signature = "(I)V", + garbageValue = "-768493590" ) @Export("close") public void close() { @@ -102,7 +108,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { if (this.task != null) { while (this.task.status == 0) { - class169.sleepExact(1L); + SpriteMask.sleepExact(1L); } if (this.task.status == 1) { @@ -117,30 +123,30 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1436175029" + signature = "(B)I", + garbageValue = "-8" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { return this.isClosed ? 0 : this.inputStream.read(); } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "195119972" + garbageValue = "-1942767880" ) @Export("available") public int available() throws IOException { return this.isClosed ? 0 : this.inputStream.available(); } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "0" + signature = "(II)Z", + garbageValue = "1355091335" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { @@ -151,10 +157,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "([BIIB)I", - garbageValue = "33" + garbageValue = "37" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { @@ -176,10 +182,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "([BIIB)V", - garbageValue = "-21" + signature = "([BIII)V", + garbageValue = "-950578253" ) @Export("write0") void write0(byte[] var1, int var2, int var3) throws IOException { @@ -196,7 +202,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 +217,10 @@ public final class NetSocket extends AbstractSocket implements Runnable { } } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "([BIII)V", - garbageValue = "-2040746201" + signature = "([BIIB)V", + garbageValue = "-105" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { @@ -232,7 +238,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { int var1; int var2; synchronized(this) { - if (this.outOffset == this.outLength) { + if (this.outLength == this.outOffset) { if (this.isClosed) { break label84; } @@ -264,7 +270,7 @@ public final class NetSocket extends AbstractSocket implements Runnable { this.outLength = (var1 + this.outLength) % this.bufferLength; try { - if (this.outOffset == this.outLength) { + if (this.outLength == this.outOffset) { this.outputStream.flush(); } } catch (IOException var8) { @@ -292,7 +298,118 @@ public final class NetSocket extends AbstractSocket implements Runnable { break; } } catch (Exception var12) { - WorldMapDecorationType.RunException_sendStackTrace((String)null, var12); + class197.RunException_sendStackTrace((String)null, var12); + } + + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(IB)Ljm;", + garbageValue = "67" + ) + @Export("SequenceDefinition_get") + public static SequenceDefinition SequenceDefinition_get(int var0) { + SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0); + var1 = new SequenceDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); + SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "(Lkn;J)V" + ) + static void method3677(Buffer var0, long var1) { + var1 /= 10L; + if (var1 < 0L) { + var1 = 0L; + } else if (var1 > 65535L) { + var1 = 65535L; + } + + var0.writeShort((int)var1); + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "(II)Leg;", + garbageValue = "-1650164099" + ) + @Export("getFrames") + static Frames getFrames(int var0) { + Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); + if (var1 != null) { + return var1; + } else { + AbstractArchive var3 = SequenceDefinition.SequenceDefinition_animationsArchive; + AbstractArchive var4 = SequenceDefinition.SequenceDefinition_skeletonsArchive; + boolean var5 = true; + int[] var6 = var3.getGroupFileIds(var0); + + 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; + } + } + } + + Frames var2; + if (!var5) { + var2 = null; + } else { + try { + var2 = new Frames(var3, var4, var0, false); + } catch (Exception var12) { + var2 = null; + } + } + + if (var2 != null) { + SequenceDefinition.SequenceDefinition_cachedFrames.put(var2, (long)var0); + } + + return var2; + } + } + + @ObfuscatedName("ko") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "2085444453" + ) + static void method3674() { + if (Client.field756 && class60.localPlayer != null) { + int var0 = class60.localPlayer.pathX[0]; + int var1 = class60.localPlayer.pathY[0]; + if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) { + return; + } + + class225.oculusOrbFocalPointX = class60.localPlayer.x; + int var2 = Language.getTileHeight(class60.localPlayer.x, class60.localPlayer.y, TileItemPile.Client_plane) - Client.camFollowHeight; + if (var2 < WorldMapDecoration.field234) { + WorldMapDecoration.field234 = var2; + } + + HealthBarDefinition.oculusOrbFocalPointY = class60.localPlayer.y; + Client.field756 = false; } } diff --git a/runescape-client/src/main/java/Node.java b/runescape-client/src/main/java/Node.java index a3f80786ab..8ff5403d97 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("ga") +@ObfuscatedName("gr") @Implements("Node") public class Node { - @ObfuscatedName("ct") + @ObfuscatedName("cm") @Export("key") public long key; @ObfuscatedName("cf") @ObfuscatedSignature( - signature = "Lga;" + signature = "Lgr;" ) @Export("previous") public Node previous; - @ObfuscatedName("ca") + @ObfuscatedName("ct") @ObfuscatedSignature( - signature = "Lga;" + signature = "Lgr;" ) @Export("next") public Node next; - @ObfuscatedName("fd") + @ObfuscatedName("fx") @Export("remove") public void remove() { if (this.next != null) { @@ -33,7 +33,7 @@ public class Node { } } - @ObfuscatedName("fo") + @ObfuscatedName("fy") @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 da06c33be7..f68f0df90d 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("jh") +@ObfuscatedName("jp") @Implements("NodeDeque") public class NodeDeque { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lga;" + signature = "Lgr;" ) @Export("sentinel") public Node sentinel; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lga;" + signature = "Lgr;" ) @Export("current") Node current; @@ -25,7 +25,7 @@ public class NodeDeque { this.sentinel.next = this.sentinel; } - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("clear") public void clear() { while (true) { @@ -39,9 +39,9 @@ public class NodeDeque { } } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lga;)V" + signature = "(Lgr;)V" ) @Export("addFirst") public void addFirst(Node var1) { @@ -55,9 +55,9 @@ public class NodeDeque { var1.previous.next = var1; } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lga;)V" + signature = "(Lgr;)V" ) @Export("addLast") public void addLast(Node var1) { @@ -71,9 +71,9 @@ public class NodeDeque { var1.previous.next = var1; } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "()Lga;" + signature = "()Lgr;" ) @Export("removeLast") public Node removeLast() { @@ -86,9 +86,9 @@ public class NodeDeque { } } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "()Lga;" + signature = "()Lgr;" ) @Export("removeFirst") public Node removeFirst() { @@ -101,9 +101,9 @@ public class NodeDeque { } } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "()Lga;" + signature = "()Lgr;" ) @Export("last") public Node last() { @@ -117,9 +117,9 @@ public class NodeDeque { } } - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "()Lga;" + signature = "()Lgr;" ) @Export("first") public Node first() { @@ -133,9 +133,9 @@ public class NodeDeque { } } - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "()Lga;" + signature = "()Lgr;" ) @Export("previous") public Node previous() { @@ -149,9 +149,9 @@ public class NodeDeque { } } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "()Lga;" + signature = "()Lgr;" ) @Export("next") public Node next() { @@ -165,9 +165,9 @@ public class NodeDeque { } } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lga;Lga;)V" + signature = "(Lgr;Lgr;)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 2a81c0a0e6..b030e84860 100644 --- a/runescape-client/src/main/java/NodeHashTable.java +++ b/runescape-client/src/main/java/NodeHashTable.java @@ -3,31 +3,31 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lv") +@ObfuscatedName("le") @Implements("NodeHashTable") public final class NodeHashTable { - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("size") int size; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "[Lga;" + signature = "[Lgr;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lga;" + signature = "Lgr;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lga;" + signature = "Lgr;" ) @Export("current") Node current; - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("index") int index; @@ -44,9 +44,9 @@ public final class NodeHashTable { } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(J)Lga;" + signature = "(J)Lgr;" ) @Export("get") public Node get(long var1) { @@ -64,9 +64,9 @@ public final class NodeHashTable { return null; } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lga;J)V" + signature = "(Lgr;J)V" ) @Export("put") public void put(Node var1, long var2) { @@ -82,9 +82,9 @@ public final class NodeHashTable { var1.key = var2; } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "()Lga;" + signature = "()Lgr;" ) @Export("first") public Node first() { @@ -92,9 +92,9 @@ public final class NodeHashTable { return this.next(); } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "()Lga;" + signature = "()Lgr;" ) @Export("next") public Node next() { diff --git a/runescape-client/src/main/java/ObjectDefinition.java b/runescape-client/src/main/java/ObjectDefinition.java index 0ebeb40f31..f57a7ba3c2 100644 --- a/runescape-client/src/main/java/ObjectDefinition.java +++ b/runescape-client/src/main/java/ObjectDefinition.java @@ -3,259 +3,258 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("jw") +@ObfuscatedName("jg") @Implements("ObjectDefinition") public class ObjectDefinition extends DualNode { - @ObfuscatedName("x") - @Export("ObjectDefinition_isLowDetail") - static boolean ObjectDefinition_isLowDetail; @ObfuscatedName("m") + @Export("ObjectDefinition_isLowDetail") + public static boolean ObjectDefinition_isLowDetail; + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Liy;" + signature = "Lic;" ) @Export("ObjectDefinition_archive") - static AbstractArchive ObjectDefinition_archive; - @ObfuscatedName("k") + public static AbstractArchive ObjectDefinition_archive; + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Liy;" + signature = "Lic;" ) @Export("ObjectDefinition_modelsArchive") - static AbstractArchive ObjectDefinition_modelsArchive; - @ObfuscatedName("d") + public static AbstractArchive ObjectDefinition_modelsArchive; + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Leg;" + signature = "Lec;" ) @Export("ObjectDefinition_cached") - static EvictingDualNodeHashTable ObjectDefinition_cached; - @ObfuscatedName("w") + public static EvictingDualNodeHashTable ObjectDefinition_cached; + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Leg;" + signature = "Lec;" ) @Export("ObjectDefinition_cachedModelData") public static EvictingDualNodeHashTable ObjectDefinition_cachedModelData; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Leg;" + signature = "Lec;" ) @Export("ObjectDefinition_cachedEntities") - static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; - @ObfuscatedName("q") + public static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Leg;" + signature = "Lec;" ) @Export("ObjectDefinition_cachedModels") - static EvictingDualNodeHashTable ObjectDefinition_cachedModels; - @ObfuscatedName("z") + public static EvictingDualNodeHashTable ObjectDefinition_cachedModels; + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "[Lea;" + signature = "[Lek;" ) - static ModelData[] field3376; - @ObfuscatedName("t") + static ModelData[] field3387; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1540034327 + intValue = -881332587 ) @Export("id") public int id; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("modelIds") int[] modelIds; - @ObfuscatedName("s") + @ObfuscatedName("w") @Export("models") int[] models; - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("name") public String name; - @ObfuscatedName("n") + @ObfuscatedName("c") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("u") + @ObfuscatedName("h") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("h") + @ObfuscatedName("k") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("g") + @ObfuscatedName("r") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("i") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 907984177 + intValue = 1877659379 ) @Export("sizeX") public int sizeX; - @ObfuscatedName("a") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 840243271 + intValue = 903583129 ) @Export("sizeY") public int sizeY; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 969965047 + intValue = 159236517 ) @Export("interactType") public int interactType; - @ObfuscatedName("l") + @ObfuscatedName("e") @Export("boolean1") public boolean boolean1; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1367724563 + intValue = 697092551 ) @Export("int1") public int int1; - @ObfuscatedName("o") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1336003431 + intValue = 536412795 ) @Export("clipType") int clipType; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("nonFlatShading") boolean nonFlatShading; - @ObfuscatedName("j") + @ObfuscatedName("b") @Export("modelClipped") public boolean modelClipped; - @ObfuscatedName("y") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -450300581 + intValue = 1667858493 ) @Export("animationId") public int animationId; @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -84642935 + intValue = 488202247 ) @Export("int2") public int int2; - @ObfuscatedName("ae") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -1160377515 + intValue = -2034457279 ) @Export("ambient") int ambient; - @ObfuscatedName("an") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = -1766971271 + intValue = 804091907 ) @Export("contrast") int contrast; - @ObfuscatedName("ai") + @ObfuscatedName("ao") @Export("actions") public String[] actions; - @ObfuscatedName("ap") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -481571835 + intValue = 797905341 ) @Export("mapIconId") public int mapIconId; - @ObfuscatedName("ab") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -337227603 + intValue = 154491837 ) @Export("mapSceneId") public int mapSceneId; - @ObfuscatedName("ar") + @ObfuscatedName("ag") @Export("isRotated") boolean isRotated; - @ObfuscatedName("af") + @ObfuscatedName("ab") @Export("clipped") public boolean clipped; - @ObfuscatedName("at") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -878255357 + intValue = -1244215605 ) @Export("modelSizeX") int modelSizeX; - @ObfuscatedName("al") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -344043167 + intValue = -1166856585 ) @Export("modelHeight") int modelHeight; - @ObfuscatedName("as") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 710022213 + intValue = -1237051145 ) @Export("modelSizeY") int modelSizeY; - @ObfuscatedName("am") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 720076445 + intValue = -443055951 ) @Export("offsetX") int offsetX; - @ObfuscatedName("au") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -278523345 + intValue = 1065825993 ) @Export("offsetHeight") int offsetHeight; - @ObfuscatedName("ao") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 1100577685 + intValue = 95865511 ) @Export("offsetY") int offsetY; - @ObfuscatedName("aq") + @ObfuscatedName("al") @Export("boolean2") public boolean boolean2; - @ObfuscatedName("av") + @ObfuscatedName("an") @Export("isSolid") boolean isSolid; - @ObfuscatedName("ak") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -1270005767 + intValue = -994480181 ) @Export("int3") public int int3; - @ObfuscatedName("aa") + @ObfuscatedName("av") @Export("transforms") public int[] transforms; - @ObfuscatedName("ax") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 1641253039 + intValue = 398971045 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("az") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -948693409 + intValue = 1441611153 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("aj") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = 1264376143 + intValue = 1854066097 ) @Export("ambientSoundId") public int ambientSoundId; - @ObfuscatedName("ay") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = -1413235621 + intValue = -1852678193 ) @Export("int4") public int int4; - @ObfuscatedName("ad") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 1914618679 + intValue = 26951059 ) @Export("int5") public int int5; - @ObfuscatedName("ac") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -279261471 + intValue = -623946511 ) @Export("int6") public int int6; - @ObfuscatedName("ah") + @ObfuscatedName("ay") @Export("soundEffectIds") public int[] soundEffectIds; - @ObfuscatedName("ag") + @ObfuscatedName("au") @ObfuscatedSignature( - signature = "Lln;" + signature = "Llf;" ) @Export("params") IterableNodeHashTable params; @@ -266,7 +265,7 @@ public class ObjectDefinition extends DualNode { ObjectDefinition_cachedModelData = new EvictingDualNodeHashTable(500); ObjectDefinition_cachedEntities = new EvictingDualNodeHashTable(30); ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30); - field3376 = new ModelData[4]; + field3387 = new ModelData[4]; } ObjectDefinition() { @@ -305,10 +304,10 @@ public class ObjectDefinition extends DualNode { this.int6 = 0; } - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-720129530" + garbageValue = "-2073183413" ) @Export("postDecode") void postDecode() { @@ -331,10 +330,10 @@ public class ObjectDefinition extends DualNode { } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkb;I)V", - garbageValue = "680070630" + signature = "(Lkn;I)V", + garbageValue = "-1769897725" ) @Export("decode") void decode(Buffer var1) { @@ -348,10 +347,10 @@ public class ObjectDefinition extends DualNode { } } - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkb;II)V", - garbageValue = "1616364474" + signature = "(Lkn;II)V", + garbageValue = "1890862568" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -486,7 +485,7 @@ public class ObjectDefinition extends DualNode { } else if (var2 == 82) { this.mapIconId = var1.readUnsignedShort(); } else if (var2 == 249) { - this.params = NetCache.readStringIntParameters(var1, this.params); + this.params = WorldMapElement.readStringIntParameters(var1, this.params); } } else { this.transformVarbit = var1.readUnsignedShort(); @@ -522,12 +521,12 @@ public class ObjectDefinition extends DualNode { } - @ObfuscatedName("v") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(II)Z", - garbageValue = "54022350" + garbageValue = "-582355792" ) - public final boolean method4661(int var1) { + public final boolean method4786(int var1) { if (this.models != null) { for (int var4 = 0; var4 < this.models.length; ++var4) { if (this.models[var4] == var1) { @@ -551,10 +550,10 @@ public class ObjectDefinition extends DualNode { } } - @ObfuscatedName("q") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "53" + signature = "(I)Z", + garbageValue = "285356335" ) @Export("needsModelFiles") public final boolean needsModelFiles() { @@ -571,10 +570,10 @@ public class ObjectDefinition extends DualNode { } } - @ObfuscatedName("z") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(II[[IIIII)Lee;", - garbageValue = "-557802915" + signature = "(II[[IIIIS)Lel;", + garbageValue = "20314" ) @Export("getEntity") public final Entity getEntity(int var1, int var2, int[][] var3, int var4, int var5, int var6) { @@ -605,24 +604,24 @@ public class ObjectDefinition extends DualNode { } if (this.nonFlatShading) { - var9 = ((ModelData)var9).method2885(); + var9 = ((ModelData)var9).method2938(); } if (this.clipType >= 0) { if (var9 instanceof Model) { var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType); } else if (var9 instanceof ModelData) { - var9 = ((ModelData)var9).method2886(var3, var4, var5, var6, true, this.clipType); + var9 = ((ModelData)var9).method2912(var3, var4, var5, var6, true, this.clipType); } } return (Entity)var9; } - @ObfuscatedName("t") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(II[[IIIII)Lel;", - garbageValue = "1873775908" + signature = "(II[[IIIII)Lef;", + garbageValue = "-1099346237" ) @Export("getModel") public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5, int var6) { @@ -651,10 +650,10 @@ public class ObjectDefinition extends DualNode { return var9; } - @ObfuscatedName("e") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(II[[IIIILjc;IS)Lel;", - garbageValue = "255" + signature = "(II[[IIIILjm;II)Lef;", + garbageValue = "132862520" ) @Export("getModelDynamic") public final Model getModelDynamic(int var1, int var2, int[][] var3, int var4, int var5, int var6, SequenceDefinition var7, int var8) { @@ -693,10 +692,10 @@ public class ObjectDefinition extends DualNode { } } - @ObfuscatedName("s") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(III)Lea;", - garbageValue = "179271223" + signature = "(IIB)Lek;", + garbageValue = "0" ) @Export("getModelData") final ModelData getModelData(int var1, int var2) { @@ -734,19 +733,19 @@ public class ObjectDefinition extends DualNode { } if (var4) { - var3.method2895(); + var3.method2919(); } ObjectDefinition_cachedModelData.put(var3, (long)var7); } if (var5 > 1) { - field3376[var6] = var3; + field3387[var6] = var3; } } if (var5 > 1) { - var3 = new ModelData(field3376, var5); + var3 = new ModelData(field3387, var5); } } else { int var9 = -1; @@ -776,7 +775,7 @@ public class ObjectDefinition extends DualNode { } if (var10) { - var3.method2895(); + var3.method2919(); } ObjectDefinition_cachedModelData.put(var3, (long)var5); @@ -796,19 +795,19 @@ public class ObjectDefinition extends DualNode { var11 = true; } - ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, this.recolorFrom == null, this.retextureFrom == null, true); + ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, null == this.recolorFrom, this.retextureFrom == null, true); if (var1 == 4 && var2 > 3) { - var8.method2891(256); + var8.method2968(256); var8.changeOffset(45, 0, -45); } var2 &= 3; if (var2 == 1) { - var8.method2888(); + var8.method2914(); } else if (var2 == 2) { - var8.method2889(); + var8.method2944(); } else if (var2 == 3) { - var8.method2910(); + var8.method2915(); } if (this.recolorFrom != null) { @@ -834,16 +833,16 @@ public class ObjectDefinition extends DualNode { return var8; } - @ObfuscatedName("p") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(S)Ljw;", - garbageValue = "128" + signature = "(I)Ljg;", + garbageValue = "-511896021" ) @Export("transform") public final ObjectDefinition transform() { int var1 = -1; if (this.transformVarbit != -1) { - var1 = Projectile.getVarbit(this.transformVarbit); + var1 = Widget.getVarbit(this.transformVarbit); } else if (this.transformVarp != -1) { var1 = Varps.Varps_main[this.transformVarp]; } @@ -855,46 +854,33 @@ public class ObjectDefinition extends DualNode { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? WorldMapSection2.getObjectDefinition(var2) : null; + return var2 != -1 ? Canvas.getObjectDefinition(var2) : null; } - @ObfuscatedName("n") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "-99" + signature = "(III)I", + garbageValue = "1846557749" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - IterableNodeHashTable var4 = this.params; - int var3; - if (var4 == null) { - var3 = var2; - } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); - if (var5 == null) { - var3 = var2; - } else { - var3 = var5.integer; - } - } - - return var3; + return Language.method3801(this.params, var1, var2); } - @ObfuscatedName("u") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1816202472" + garbageValue = "494622179" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return class9.method122(this.params, var1, var2); + return FloorUnderlayDefinition.method4612(this.params, var1, var2); } - @ObfuscatedName("g") + @ObfuscatedName("h") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "1998255719" + garbageValue = "389489469" ) @Export("hasSound") public boolean hasSound() { @@ -903,7 +889,7 @@ public class ObjectDefinition extends DualNode { } else { for (int var1 = 0; var1 < this.transforms.length; ++var1) { if (this.transforms[var1] != -1) { - ObjectDefinition var2 = WorldMapSection2.getObjectDefinition(this.transforms[var1]); + ObjectDefinition var2 = Canvas.getObjectDefinition(this.transforms[var1]); if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { return true; } @@ -913,175 +899,4 @@ public class ObjectDefinition extends DualNode { return false; } } - - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "649887816" - ) - @Export("Login_promptCredentials") - static void Login_promptCredentials(boolean var0) { - Login.Login_response1 = ""; - Login.Login_response2 = "Enter your username/email & password."; - Login.Login_response3 = ""; - Login.loginIndex = 2; - if (var0) { - Login.Login_password = ""; - } - - if (Login.Login_username == null || Login.Login_username.length() <= 0) { - if (GrandExchangeOfferOwnWorldComparator.clientPreferences.rememberedUsername != null) { - Login.Login_username = GrandExchangeOfferOwnWorldComparator.clientPreferences.rememberedUsername; - Client.Login_isUsernameRemembered = true; - } else { - Client.Login_isUsernameRemembered = false; - } - } - - FontName.method5388(); - } - - @ObfuscatedName("af") - @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "1104732115" - ) - static int method4710(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)(var13 * var9 / var11); - return 1; - } else { - return 2; - } - } } diff --git a/runescape-client/src/main/java/ObjectNode.java b/runescape-client/src/main/java/ObjectNode.java index b5b460e107..758e66756c 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("gw") +@ObfuscatedName("gq") @Implements("ObjectNode") public class ObjectNode extends Node { - @ObfuscatedName("x") + @ObfuscatedName("m") @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 d1ee85b313..bb0b3fb623 100644 --- a/runescape-client/src/main/java/ObjectSound.java +++ b/runescape-client/src/main/java/ObjectSound.java @@ -4,87 +4,93 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cm") +@ObfuscatedName("cn") @Implements("ObjectSound") public final class ObjectSound extends Node { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Ljh;" + signature = "Ljp;" ) @Export("objectSounds") static NodeDeque objectSounds; - @ObfuscatedName("x") + @ObfuscatedName("hx") @ObfuscatedGetter( - intValue = 1413400591 + intValue = -1274287771 ) - @Export("y") - int y; - @ObfuscatedName("k") + @Export("cameraZ") + static int cameraZ; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1795590701 + intValue = 979067629 ) @Export("plane") int plane; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -877292205 + intValue = -107293807 ) @Export("x") int x; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1466364365 + intValue = -1886851705 ) - int field1110; - @ObfuscatedName("v") + @Export("y") + int y; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -878503687 + intValue = -1922393949 ) - int field1100; - @ObfuscatedName("q") + int field1103; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 2082519321 + intValue = 371547415 ) - int field1106; - @ObfuscatedName("z") + int field1104; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1984124175 + intValue = 1292781509 + ) + int field1105; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -1063635793 ) @Export("soundEffectId") int soundEffectId; - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Ldy;" + signature = "Ldk;" ) @Export("stream1") RawPcmStream stream1; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -240636841 + intValue = -654816811 ) - int field1104; - @ObfuscatedName("s") + int field1108; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -901475347 + intValue = 648336705 ) - int field1105; - @ObfuscatedName("p") + int field1115; + @ObfuscatedName("y") @Export("soundEffectIds") int[] soundEffectIds; - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1043802301 + intValue = -1339220777 ) - int field1107; - @ObfuscatedName("u") + int field1111; + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Ldy;" + signature = "Ldk;" ) @Export("stream2") RawPcmStream stream2; - @ObfuscatedName("h") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Ljw;" + signature = "Ljg;" ) @Export("obj") ObjectDefinition obj; @@ -96,10 +102,10 @@ public final class ObjectSound extends Node { ObjectSound() { } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "29" + signature = "(I)V", + garbageValue = "2014471583" ) @Export("set") void set() { @@ -107,37 +113,67 @@ public final class ObjectSound extends Node { ObjectDefinition var2 = this.obj.transform(); if (var2 != null) { this.soundEffectId = var2.ambientSoundId; - this.field1106 = var2.int4 * 128; - this.field1104 = var2.int5; - this.field1105 = var2.int6; + this.field1105 = var2.int4 * 128; + this.field1108 = var2.int5; + this.field1115 = var2.int6; this.soundEffectIds = var2.soundEffectIds; } else { this.soundEffectId = -1; - this.field1106 = 0; - this.field1104 = 0; this.field1105 = 0; + this.field1108 = 0; + this.field1115 = 0; this.soundEffectIds = null; } if (var1 != this.soundEffectId && this.stream1 != null) { - Tiles.pcmStreamMixer.removeSubStream(this.stream1); + class60.pcmStreamMixer.removeSubStream(this.stream1); this.stream1 = null; } } - @ObfuscatedName("t") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-1791981608" + signature = "(ILjava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-997797111" ) - @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; - } + @Export("addGameMessage") + static void addGameMessage(int var0, String var1, String var2) { + WorldMapID.addChatMessage(var0, var1, var2, (String)null); + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(Lic;I)V", + garbageValue = "1163495687" + ) + public static void method1999(AbstractArchive var0) { + FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0; + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "(S)V", + garbageValue = "23035" + ) + public static void method2007() { + PlayerAppearance.PlayerAppearance_cachedModels.clear(); + } + + @ObfuscatedName("w") + static final void method2010(long var0) { + ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var0; + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1381107864" + ) + public static void method2008() { + Widget.Widget_cachedSprites.clear(); + Widget.Widget_cachedModels.clear(); + Widget.Widget_cachedFonts.clear(); + Widget.Widget_cachedSpriteMasks.clear(); } } diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java index d20a969d2b..283753adbf 100644 --- a/runescape-client/src/main/java/Occluder.java +++ b/runescape-client/src/main/java/Occluder.java @@ -1,182 +1,113 @@ -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("em") +@ObfuscatedName("ew") @Implements("Occluder") public final class Occluder { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1489465753 + intValue = -1770488455 ) @Export("minTileX") int minTileX; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -252661799 + intValue = -981753975 ) @Export("maxTileX") int maxTileX; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1056714957 + intValue = 1475510333 ) @Export("minTileY") int minTileY; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1875839743 + intValue = 1573452277 ) @Export("maxTileY") int maxTileY; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1984874267 + intValue = 775496851 ) @Export("type") int type; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1069465565 + intValue = 2113694595 ) @Export("minX") int minX; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1744424635 + intValue = 1622455341 ) @Export("maxX") int maxX; - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -104326363 + intValue = 1900446281 ) @Export("minZ") int minZ; - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -470429171 + intValue = 520274005 ) @Export("maxZ") int maxZ; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 2023575959 + intValue = -2040068515 ) @Export("minY") int minY; - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1540730751 + intValue = 1182984941 ) @Export("maxY") int maxY; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 223971517 + intValue = -773527471 ) - int field1916; - @ObfuscatedName("n") + int field1927; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1903761875 - ) - int field1917; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 2065104463 - ) - int field1914; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 213261407 + intValue = -386186759 ) int field1920; - @ObfuscatedName("g") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1460776299 + intValue = 1451159679 ) - int field1908; - @ObfuscatedName("i") + int field1929; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1267954519 + intValue = -2143405945 ) - int field1921; - @ObfuscatedName("a") + int field1926; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1266608785 + intValue = -1008084553 ) - int field1922; + int field1931; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -591721105 + ) + int field1932; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 1716029637 + ) + int field1928; Occluder() { } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - signature = "(Lfs;III)Ldw;", - garbageValue = "2138193849" - ) - public static final PcmPlayer method3401(TaskHandler var0, int var1, int var2) { - if (PcmPlayer.field1421 == 0) { - throw new IllegalStateException(); - } else if (var1 >= 0 && var1 < 2) { - if (var2 < 256) { - var2 = 256; - } - - try { - PcmPlayer var3 = PcmPlayer.pcmPlayerProvider.player(); - var3.samples = new int[(PcmPlayer.PcmPlayer_stereo ? 2 : 1) * 256]; - var3.field1431 = var2; - var3.init(); - var3.capacity = (var2 & -1024) + 1024; - if (var3.capacity > 16384) { - var3.capacity = 16384; - } - - var3.open(var3.capacity); - if (PcmPlayer.field1423 > 0 && class332.soundSystem == null) { - class332.soundSystem = new SoundSystem(); - PcmPlayer.soundSystemExecutor = Executors.newScheduledThreadPool(1); - PcmPlayer.soundSystemExecutor.scheduleAtFixedRate(class332.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); - } - - if (class332.soundSystem != null) { - if (class332.soundSystem.players[var1] != null) { - throw new IllegalArgumentException(); - } - - class332.soundSystem.players[var1] = var3; - } - - return var3; - } catch (Throwable var4) { - return new PcmPlayer(); - } - } else { - throw new IllegalArgumentException(); - } - } - - @ObfuscatedName("lc") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "880911904" - ) - static String method3400(String var0) { - PlayerType[] var1 = InterfaceParent.PlayerType_values(); - - for (int var2 = 0; var2 < var1.length; ++var2) { - PlayerType var3 = var1[var2]; - if (var3.modIcon != -1 && var0.startsWith(class1.method21(var3.modIcon))) { - var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); - break; - } - } - - return var0; - } } diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java index 9de3da0a44..0e9712aefe 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("kj") +@ObfuscatedName("kb") @Implements("PacketBuffer") public class PacketBuffer extends Buffer { + @ObfuscatedName("o") + static final int[] field3728; @ObfuscatedName("m") - static final int[] field3707; - @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Llp;" + signature = "Llb;" ) @Export("isaacCipher") IsaacCipher isaacCipher; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -2144680439 + intValue = 1364238519 ) @Export("bitIndex") int bitIndex; static { - field3707 = 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}; + field3728 = 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("x") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "([II)V", - garbageValue = "-1491722671" + garbageValue = "-1865727993" ) @Export("newIsaacCipher") public void newIsaacCipher(int[] var1) { this.isaacCipher = new IsaacCipher(var1); } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Llp;I)V", - garbageValue = "452312441" + signature = "(Llb;I)V", + garbageValue = "-472683600" ) @Export("setIsaacCipher") public void setIsaacCipher(IsaacCipher var1) { this.isaacCipher = var1; } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-407468573" + garbageValue = "-2126324259" ) @Export("writeByteIsaac") public void writeByteIsaac(int var1) { super.array[++super.offset - 1] = (byte)(var1 + this.isaacCipher.nextInt()); } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1676648466" + garbageValue = "-1443887320" ) @Export("readByteIsaac") public int readByteIsaac() { return super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "36" + signature = "(I)Z", + garbageValue = "-1957045910" ) - public boolean method5524() { - int var1 = super.array[super.offset] - this.isaacCipher.method6364() & 255; + public boolean method5657() { + int var1 = super.array[super.offset] - this.isaacCipher.method6467() & 255; return var1 >= 128; } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "787135806" + garbageValue = "691786573" ) @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("q") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "([BIII)V", - garbageValue = "330744535" + garbageValue = "1379772441" ) - public void method5516(byte[] var1, int var2, int var3) { + public void method5680(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("z") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-6" + signature = "(I)V", + garbageValue = "-1358588268" ) @Export("importIndex") public void importIndex() { this.bitIndex = super.offset * 8; } - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "-43" + signature = "(II)I", + garbageValue = "-1109143909" ) @Export("readBits") public int readBits(int var1) { @@ -125,425 +125,36 @@ public class PacketBuffer extends Buffer { int var4 = 0; for (this.bitIndex += var1; var1 > var3; var3 = 8) { - var4 += (super.array[var2++] & field3707[var3]) << var1 - var3; + var4 += (super.array[var2++] & field3728[var3]) << var1 - var3; var1 -= var3; } if (var3 == var1) { - var4 += super.array[var2] & field3707[var3]; + var4 += super.array[var2] & field3728[var3]; } else { - var4 += super.array[var2] >> var3 - var1 & field3707[var1]; + var4 += super.array[var2] >> var3 - var1 & field3728[var1]; } return var4; } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "931642026" + garbageValue = "-15519430" ) @Export("exportIndex") public void exportIndex() { super.offset = (this.bitIndex + 7) / 8; } - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "0" + signature = "(II)I", + garbageValue = "565890213" ) @Export("bitsRemaining") public int bitsRemaining(int var1) { return var1 * 8 - this.bitIndex; } - - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "(IIIIIILej;Lfm;S)V", - garbageValue = "7907" - ) - static final void method5554(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 = WorldMapSection2.getObjectDefinition(var3); - int var9; - int var10; - if (var4 != 1 && var4 != 3) { - var9 = var8.sizeX; - var10 = var8.sizeY; - } else { - var9 = var8.sizeY; - var10 = var8.sizeX; - } - - int var11; - int var12; - if (var9 + var1 <= 104) { - var11 = (var9 >> 1) + var1; - var12 = (var9 + 1 >> 1) + var1; - } else { - var11 = var1; - var12 = var1 + 1; - } - - int var13; - int var14; - if (var10 + var2 <= 104) { - var13 = (var10 >> 1) + var2; - var14 = var2 + (var10 + 1 >> 1); - } else { - var13 = var2; - var14 = var2 + 1; - } - - int[][] var15 = Tiles.Tiles_heights[var0]; - int var16 = var15[var12][var14] + var15[var11][var14] + var15[var12][var13] + var15[var11][var13] >> 2; - int var17 = (var1 << 7) + (var9 << 6); - int var18 = (var2 << 7) + (var10 << 6); - long var19 = IsaacCipher.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.field1110 = (var23 + var1) * 128; - var22.field1100 = (var24 + var2) * 128; - var22.soundEffectId = var8.ambientSoundId; - var22.field1106 = var8.int4 * 128; - var22.field1104 = var8.int5; - var22.field1105 = var8.int6; - var22.soundEffectIds = var8.soundEffectIds; - if (var8.transforms != null) { - var22.obj = var8; - var22.set(); - } - - ObjectSound.objectSounds.addFirst(var22); - if (var22.soundEffectIds != null) { - var22.field1107 = var22.field1104 + (int)(Math.random() * (double)(var22.field1105 - var22.field1104)); - } - } - - 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.method3187(var0, var1, var2, var16, 1, 1, (Entity)var34, 0, var19, var21); - if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { - var10000 = WorldMapSection3.field404[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.field544[var4], 0, var19, var21); - if (var4 == 0) { - if (var8.clipped) { - SoundCache.field1462[var0][var1][var2] = 50; - SoundCache.field1462[var0][var1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = WorldMapSection3.field404[var0][var1]; - var10000[var2] |= 585; - } - } else if (var4 == 1) { - if (var8.clipped) { - SoundCache.field1462[var0][var1][var2 + 1] = 50; - SoundCache.field1462[var0][var1 + 1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = WorldMapSection3.field404[var0][var1]; - var10000[var2 + 1] |= 1170; - } - } else if (var4 == 2) { - if (var8.clipped) { - SoundCache.field1462[var0][var1 + 1][var2] = 50; - SoundCache.field1462[var0][var1 + 1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = WorldMapSection3.field404[var0][var1 + 1]; - var10000[var2] |= 585; - } - } else if (var4 == 3) { - if (var8.clipped) { - SoundCache.field1462[var0][var1][var2] = 50; - SoundCache.field1462[var0][var1 + 1][var2] = 50; - } - - if (var8.modelClipped) { - var10000 = WorldMapSection3.field404[var0][var1]; - var10000[var2] |= 1170; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3630(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method3210(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.field542[var4], 0, var19, var21); - if (var8.clipped) { - if (var4 == 0) { - SoundCache.field1462[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { - SoundCache.field1462[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { - SoundCache.field1462[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { - SoundCache.field1462[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3630(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.field544[var4], Tiles.field544[var28], var19, var21); - if (var8.modelClipped) { - if (var4 == 0) { - var10000 = WorldMapSection3.field404[var0][var1]; - var10000[var2] |= 585; - var10000 = WorldMapSection3.field404[var0][var1]; - var10000[1 + var2] |= 1170; - } else if (var4 == 1) { - var10000 = WorldMapSection3.field404[var0][var1]; - var10000[var2 + 1] |= 1170; - var10000 = WorldMapSection3.field404[var0][var1 + 1]; - var10000[var2] |= 585; - } else if (var4 == 2) { - var10000 = WorldMapSection3.field404[var0][var1 + 1]; - var10000[var2] |= 585; - var10000 = WorldMapSection3.field404[var0][var1]; - var10000[var2] |= 1170; - } else if (var4 == 3) { - var10000 = WorldMapSection3.field404[var0][var1]; - var10000[var2] |= 1170; - var10000 = WorldMapSection3.field404[var0][var1]; - var10000[var2] |= 585; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3630(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method3210(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.field542[var4], 0, var19, var21); - if (var8.clipped) { - if (var4 == 0) { - SoundCache.field1462[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { - SoundCache.field1462[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { - SoundCache.field1462[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { - SoundCache.field1462[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3630(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.method3187(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.method3210(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.field544[var4], 0, 0, 0, var19, var21); - } else { - long var31; - Object var33; - if (var5 == 5) { - var28 = 16; - var31 = var6.getBoundaryObjectTag(var0, var1, var2); - if (var31 != 0L) { - var28 = WorldMapSection2.getObjectDefinition(WorldMapRectangle.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.field544[var4], 0, var28 * Tiles.field541[var4], var28 * Tiles.field547[var4], var19, var21); - } else if (var5 == 6) { - var28 = 8; - var31 = var6.getBoundaryObjectTag(var0, var1, var2); - if (0L != var31) { - var28 = WorldMapSection2.getObjectDefinition(WorldMapRectangle.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.field546[var4], var28 * Tiles.field552[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 = WorldMapSection2.getObjectDefinition(WorldMapRectangle.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.field546[var4], var28 * Tiles.field552[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.method3187(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).method2993() / 4; - if (var23 > 30) { - var23 = 30; - } - } - - for (var24 = 0; var24 <= var9; ++var24) { - for (int var25 = 0; var25 <= var10; ++var25) { - if (var23 > SoundCache.field1462[var0][var24 + var1][var25 + var2]) { - SoundCache.field1462[var0][var24 + var1][var25 + var2] = (byte)var23; - } - } - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - } - } - } } diff --git a/runescape-client/src/main/java/PacketBufferNode.java b/runescape-client/src/main/java/PacketBufferNode.java index a42dd91195..7613326daa 100644 --- a/runescape-client/src/main/java/PacketBufferNode.java +++ b/runescape-client/src/main/java/PacketBufferNode.java @@ -4,54 +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("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "[Lgq;" + signature = "[Lgj;" ) @Export("PacketBufferNode_packetBufferNodes") static PacketBufferNode[] PacketBufferNode_packetBufferNodes; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1377216057 + intValue = -477845615 ) @Export("PacketBufferNode_packetBufferNodeCount") static int PacketBufferNode_packetBufferNodeCount; - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "[Lms;" - ) - @Export("JagexCache_idxFiles") - public static BufferedFile[] JagexCache_idxFiles; - @ObfuscatedName("lc") - @ObfuscatedGetter( - intValue = 1185326295 - ) - @Export("menuY") - static int menuY; - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lgn;" ) @Export("clientPacket") - public ClientPacket clientPacket; - @ObfuscatedName("m") + ClientPacket clientPacket; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1271614463 + intValue = 1266543353 ) @Export("clientPacketLength") - public int clientPacketLength; - @ObfuscatedName("k") + int clientPacketLength; + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lkj;" + signature = "Lkb;" ) @Export("packetBuffer") public PacketBuffer packetBuffer; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1670678783 + intValue = -1411425987 ) @Export("index") public int index; @@ -64,10 +52,10 @@ public class PacketBufferNode extends Node { PacketBufferNode() { } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1494953808" + signature = "(B)V", + garbageValue = "-42" ) @Export("release") public void release() { @@ -76,54 +64,20 @@ public class PacketBufferNode extends Node { } } - @ObfuscatedName("m") + @ObfuscatedName("a") @ObfuscatedSignature( signature = "(III)I", - garbageValue = "1872697875" + garbageValue = "1965042826" ) - @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("w") - @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-1384794944" - ) - @Export("iLog") - public static int iLog(int var0) { - int var1 = 0; - if (var0 < 0 || var0 >= 65536) { - var0 >>>= 16; - var1 += 16; + static final int method3750(int var0, int var1) { + int var2 = VarbitDefinition.method4696(45365 + var0, var1 + 91923, 4) - 128 + (VarbitDefinition.method4696(var0 + 10294, 37821 + var1, 2) - 128 >> 1) + (VarbitDefinition.method4696(var0, var1, 1) - 128 >> 2); + var2 = (int)(0.3D * (double)var2) + 35; + if (var2 < 10) { + var2 = 10; + } else if (var2 > 60) { + var2 = 60; } - 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; + return var2; } } diff --git a/runescape-client/src/main/java/PacketWriter.java b/runescape-client/src/main/java/PacketWriter.java index 282bd4e623..316d68bd1c 100644 --- a/runescape-client/src/main/java/PacketWriter.java +++ b/runescape-client/src/main/java/PacketWriter.java @@ -5,91 +5,85 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dv") +@ObfuscatedName("dx") @Implements("PacketWriter") public class PacketWriter { - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = 2038642023 - ) - @Export("loginBoxCenter") - static int loginBoxCenter; - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Llt;" + signature = "Llj;" ) @Export("socket") AbstractSocket socket; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Ljm;" + signature = "Ljx;" ) @Export("packetBufferNodes") IterableNodeDeque packetBufferNodes; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1977656589 + intValue = -315328335 ) @Export("bufferSize") int bufferSize; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lkb;" + signature = "Lkn;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Llp;" + signature = "Llb;" ) @Export("isaacCipher") public IsaacCipher isaacCipher; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lkj;" + signature = "Lkb;" ) @Export("packetBuffer") PacketBuffer packetBuffer; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgu;" ) @Export("serverPacket") ServerPacket serverPacket; - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1499666993 + intValue = -1069759871 ) @Export("serverPacketLength") int serverPacketLength; - @ObfuscatedName("t") - boolean field1335; - @ObfuscatedName("e") + @ObfuscatedName("a") + boolean field1347; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1899399217 + intValue = 1004833869 ) - int field1338; - @ObfuscatedName("s") + int field1348; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1748299909 + intValue = -126397603 ) @Export("pendingWrites") int pendingWrites; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgu;" ) - ServerPacket field1334; - @ObfuscatedName("n") + ServerPacket field1350; + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgu;" ) - ServerPacket field1329; - @ObfuscatedName("u") + ServerPacket field1351; + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgu;" ) - ServerPacket field1339; + ServerPacket field1342; PacketWriter() { this.packetBufferNodes = new IterableNodeDeque(); @@ -98,15 +92,15 @@ public class PacketWriter { this.packetBuffer = new PacketBuffer(40000); this.serverPacket = null; this.serverPacketLength = 0; - this.field1335 = true; - this.field1338 = 0; + this.field1347 = true; + this.field1348 = 0; this.pendingWrites = 0; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1731012634" + signature = "(B)V", + garbageValue = "65" ) @Export("clearBuffer") final void clearBuffer() { @@ -114,10 +108,10 @@ public class PacketWriter { this.bufferSize = 0; } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-2069512411" + garbageValue = "1917984042" ) @Export("flush") final void flush() throws IOException { @@ -142,10 +136,10 @@ public class PacketWriter { } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lgq;I)V", - garbageValue = "348040455" + signature = "(Lgj;I)V", + garbageValue = "-251135286" ) @Export("addNode") public final void addNode(PacketBufferNode var1) { @@ -155,20 +149,20 @@ public class PacketWriter { this.bufferSize += var1.index; } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Llt;B)V", - garbageValue = "-28" + signature = "(Llj;I)V", + garbageValue = "-1410560856" ) @Export("setSocket") void setSocket(AbstractSocket var1) { this.socket = var1; } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "955020520" + garbageValue = "446694129" ) @Export("close") void close() { @@ -179,72 +173,23 @@ public class PacketWriter { } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-17" + signature = "(I)V", + garbageValue = "-2011501008" ) @Export("removeSocket") void removeSocket() { this.socket = null; } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(I)Llt;", - garbageValue = "1352632931" + signature = "(I)Llj;", + garbageValue = "2137567404" ) @Export("getSocket") AbstractSocket getSocket() { return this.socket; } - - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-816734320" - ) - public static int method2376(int var0) { - long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; - int var1 = (int)(var2 >>> 0 & 127L); - return var1; - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "1838015298" - ) - @Export("Messages_getHistorySize") - static int Messages_getHistorySize(int var0) { - ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); - return var1 == null ? 0 : var1.size(); - } - - @ObfuscatedName("fr") - @ObfuscatedSignature( - signature = "(Ljc;IIIB)V", - garbageValue = "29" - ) - @Export("addSequenceSoundEffect") - static void addSequenceSoundEffect(SequenceDefinition var0, int var1, int var2, int var3) { - if (Client.soundEffectCount < 50 && Client.areaSoundEffectVolume != 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/ParamDefinition.java b/runescape-client/src/main/java/ParamDefinition.java index a75d8bed27..e5714825de 100644 --- a/runescape-client/src/main/java/ParamDefinition.java +++ b/runescape-client/src/main/java/ParamDefinition.java @@ -4,34 +4,31 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("is") +@ObfuscatedName("ii") @Implements("ParamDefinition") public class ParamDefinition extends DualNode { - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Liy;" - ) - @Export("ParamDefinition_archive") - public static AbstractArchive ParamDefinition_archive; - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "Leg;" + signature = "Lec;" ) @Export("ParamDefinition_cached") public static EvictingDualNodeHashTable ParamDefinition_cached; - @ObfuscatedName("k") + @ObfuscatedName("n") + @Export("ByteArrayPool_alternativeSizes") + static int[] ByteArrayPool_alternativeSizes; + @ObfuscatedName("q") @Export("type") char type; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 493165411 + intValue = 153668641 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("autoDisable") boolean autoDisable; @@ -43,19 +40,19 @@ public class ParamDefinition extends DualNode { this.autoDisable = true; } - @ObfuscatedName("m") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "65" + signature = "(I)V", + garbageValue = "-1718151512" ) @Export("postDecode") void postDecode() { } - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkb;I)V", - garbageValue = "1593854390" + signature = "(Lkn;I)V", + garbageValue = "-115197089" ) @Export("decode") void decode(Buffer var1) { @@ -69,15 +66,31 @@ public class ParamDefinition extends DualNode { } } - @ObfuscatedName("d") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Lkb;II)V", - garbageValue = "-1589952103" + signature = "(Lkn;II)V", + garbageValue = "-1727060018" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { - this.type = class236.method4223(var1.readByte()); + byte var4 = var1.readByte(); + int var5 = var4 & 255; + if (var5 == 0) { + throw new IllegalArgumentException("" + Integer.toString(var5, 16)); + } + + if (var5 >= 128 && var5 < 160) { + char var6 = class297.cp1252AsciiExtension[var5 - 128]; + if (var6 == 0) { + var6 = '?'; + } + + var5 = var6; + } + + char var3 = (char)var5; + this.type = var3; } else if (var2 == 2) { this.defaultInt = var1.readInt(); } else if (var2 == 4) { @@ -88,10 +101,10 @@ public class ParamDefinition extends DualNode { } - @ObfuscatedName("w") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "861109850" + garbageValue = "624673738" ) @Export("isString") public boolean isString() { diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java index 30a2a22e95..1569ba424e 100644 --- a/runescape-client/src/main/java/PcmPlayer.java +++ b/runescape-client/src/main/java/PcmPlayer.java @@ -1,216 +1,199 @@ -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("dw") +@ObfuscatedName("dt") @Implements("PcmPlayer") public class PcmPlayer { - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 1186957939 - ) - public static int field1421; - @ObfuscatedName("v") - @Export("PcmPlayer_stereo") - protected static boolean PcmPlayer_stereo; @ObfuscatedName("z") - @Export("soundSystemExecutor") - static ScheduledExecutorService soundSystemExecutor; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 964748607 - ) - static int field1423; - @ObfuscatedName("n") @ObfuscatedSignature( signature = "Ldg;" ) - @Export("pcmPlayerProvider") - static PlayerProvider pcmPlayerProvider; - @ObfuscatedName("u") + @Export("soundSystem") + static SoundSystem soundSystem; + @ObfuscatedName("h") @Export("samples") protected int[] samples; - @ObfuscatedName("h") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lds;" + signature = "Ldf;" ) @Export("stream") PcmStream stream; - @ObfuscatedName("g") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1104250369 + intValue = -964785055 ) - int field1433; - @ObfuscatedName("i") + int field1440; + @ObfuscatedName("s") @ObfuscatedGetter( - longValue = -5529745032621792639L + longValue = -5225168782139234627L ) @Export("timeMs") long timeMs; - @ObfuscatedName("a") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1410666215 + intValue = 1568507089 ) @Export("capacity") int capacity; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1563986159 + intValue = 1378765481 ) - int field1431; + int field1443; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 338521005 + ) + int field1444; @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1383720405 + longValue = 6294144091277528537L ) - int field1432; - @ObfuscatedName("r") + long field1439; + @ObfuscatedName("t") @ObfuscatedGetter( - longValue = 8518304347901097889L + intValue = 83737029 ) - long field1441; - @ObfuscatedName("o") + int field1446; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -2057730941 + intValue = 1549144685 + ) + int field1447; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -34422633 ) int field1436; - @ObfuscatedName("c") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1413544229 + longValue = 710865060485688699L ) - int field1435; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 1350082309 - ) - int field1428; - @ObfuscatedName("y") - @ObfuscatedGetter( - longValue = -7306304429594816925L - ) - long field1424; + long field1452; @ObfuscatedName("f") - boolean field1438; - @ObfuscatedName("ar") + boolean field1450; + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -91931307 + intValue = 2018665007 ) - int field1439; - @ObfuscatedName("af") + int field1448; + @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "[Lds;" + signature = "[Ldf;" ) - PcmStream[] field1440; - @ObfuscatedName("at") + PcmStream[] field1449; + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "[Lds;" + signature = "[Ldf;" ) - PcmStream[] field1434; + PcmStream[] field1453; protected PcmPlayer() { - this.field1433 = 32; - this.timeMs = class217.currentTimeMillis(); - this.field1441 = 0L; + this.field1440 = 32; + this.timeMs = MilliClock.currentTimeMillis(); + this.field1439 = 0L; + this.field1446 = 0; + this.field1447 = 0; this.field1436 = 0; - this.field1435 = 0; - this.field1428 = 0; - this.field1424 = 0L; - this.field1438 = true; - this.field1439 = 0; - this.field1440 = new PcmStream[8]; - this.field1434 = new PcmStream[8]; + this.field1452 = 0L; + this.field1450 = true; + this.field1448 = 0; + this.field1449 = new PcmStream[8]; + this.field1453 = new PcmStream[8]; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-515177845" + garbageValue = "2128910021" ) @Export("init") protected void init() throws Exception { } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1831392073" + signature = "(IB)V", + garbageValue = "-14" ) @Export("open") protected void open(int var1) throws Exception { } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1722515255" + garbageValue = "1868944096" ) @Export("position") protected int position() throws Exception { return this.capacity; } - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("write") protected void write() throws Exception { } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-100" + signature = "(I)V", + garbageValue = "1900446281" ) @Export("close") protected void close() { } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-801705902" + garbageValue = "630637593" ) @Export("discard") protected void discard() throws Exception { } - @ObfuscatedName("ab") + @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "(Lds;I)V", - garbageValue = "1722615809" + signature = "(Ldf;I)V", + garbageValue = "204760061" ) @Export("setStream") public final synchronized void setStream(PcmStream var1) { this.stream = var1; } - @ObfuscatedName("ar") + @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "53" + signature = "(I)V", + garbageValue = "277207832" ) @Export("run") public final synchronized void run() { if (this.samples != null) { - long var1 = class217.currentTimeMillis(); + long var1 = MilliClock.currentTimeMillis(); try { - if (0L != this.field1441) { - if (var1 < this.field1441) { + if (0L != this.field1439) { + if (var1 < this.field1439) { return; } this.open(this.capacity); - this.field1441 = 0L; - this.field1438 = true; + this.field1439 = 0L; + this.field1450 = true; } int var3 = this.position(); - if (this.field1428 - var3 > this.field1436) { - this.field1436 = this.field1428 - var3; + if (this.field1436 - var3 > this.field1446) { + this.field1446 = this.field1436 - var3; } - int var4 = this.field1431 + this.field1432; + int var4 = this.field1443 + this.field1444; if (var4 + 256 > 16384) { var4 = 16128; } @@ -224,10 +207,10 @@ public class PcmPlayer { this.close(); this.open(this.capacity); var3 = 0; - this.field1438 = true; + this.field1450 = true; if (var4 + 256 > this.capacity) { var4 = this.capacity - 256; - this.field1432 = var4 - this.field1431; + this.field1444 = var4 - this.field1443; } } @@ -237,28 +220,28 @@ public class PcmPlayer { var3 += 256; } - if (var1 > this.field1424) { - if (!this.field1438) { - if (this.field1436 == 0 && this.field1435 == 0) { + if (var1 > this.field1452) { + if (!this.field1450) { + if (this.field1446 == 0 && this.field1447 == 0) { this.close(); - this.field1441 = var1 + 2000L; + this.field1439 = 2000L + var1; return; } - this.field1432 = Math.min(this.field1435, this.field1436); - this.field1435 = this.field1436; + this.field1444 = Math.min(this.field1447, this.field1446); + this.field1447 = this.field1446; } else { - this.field1438 = false; + this.field1450 = false; } - this.field1436 = 0; - this.field1424 = 2000L + var1; + this.field1446 = 0; + this.field1452 = var1 + 2000L; } - this.field1428 = var3; + this.field1436 = var3; } catch (Exception var7) { this.close(); - this.field1441 = 2000L + var1; + this.field1439 = var1 + 2000L; } try { @@ -266,9 +249,9 @@ public class PcmPlayer { var1 = this.timeMs; } - while (var1 > 5000L + this.timeMs) { + while (var1 > this.timeMs + 5000L) { this.skip(256); - this.timeMs += (long)(256000 / field1421); + this.timeMs += (long)(256000 / class237.field3113); } } catch (Exception var6) { this.timeMs = var1; @@ -277,57 +260,57 @@ public class PcmPlayer { } } - @ObfuscatedName("af") + @ObfuscatedName("ab") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1215131222" + garbageValue = "-537221049" ) - public final void method2537() { - this.field1438 = true; + public final void method2560() { + this.field1450 = true; } - @ObfuscatedName("at") + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "255" + signature = "(I)V", + garbageValue = "-209566182" ) @Export("tryDiscard") public final synchronized void tryDiscard() { - this.field1438 = true; + this.field1450 = true; try { this.discard(); } catch (Exception var2) { this.close(); - this.field1441 = class217.currentTimeMillis() + 2000L; + this.field1439 = MilliClock.currentTimeMillis() + 2000L; } } - @ObfuscatedName("as") + @ObfuscatedName("ak") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1390717833" + garbageValue = "733916097" ) @Export("shutdown") public final synchronized void shutdown() { - if (class332.soundSystem != null) { + if (soundSystem != null) { boolean var1 = true; for (int var2 = 0; var2 < 2; ++var2) { - if (this == class332.soundSystem.players[var2]) { - class332.soundSystem.players[var2] = null; + if (this == soundSystem.players[var2]) { + soundSystem.players[var2] = null; } - if (class332.soundSystem.players[var2] != null) { + if (soundSystem.players[var2] != null) { var1 = false; } } if (var1) { - soundSystemExecutor.shutdownNow(); - soundSystemExecutor = null; - class332.soundSystem = null; + class227.soundSystemExecutor.shutdownNow(); + class227.soundSystemExecutor = null; + soundSystem = null; } } @@ -335,16 +318,16 @@ public class PcmPlayer { this.samples = null; } - @ObfuscatedName("am") + @ObfuscatedName("ad") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-1537467116" + garbageValue = "-1841493566" ) @Export("skip") final void skip(int var1) { - this.field1439 -= var1; - if (this.field1439 < 0) { - this.field1439 = 0; + this.field1448 -= var1; + if (this.field1448 < 0) { + this.field1448 = 0; } if (this.stream != null) { @@ -353,20 +336,20 @@ public class PcmPlayer { } - @ObfuscatedName("au") + @ObfuscatedName("as") @Export("fill") final void fill(int[] var1, int var2) { int var3 = var2; - if (PcmPlayer_stereo) { + if (Messages.PcmPlayer_stereo) { var3 = var2 << 1; } class310.clearIntArray(var1, 0, var3); - this.field1439 -= var2; - if (this.stream != null && this.field1439 <= 0) { - this.field1439 += field1421 >> 4; - FileSystem.PcmStream_disable(this.stream); - this.method2571(this.stream, this.stream.vmethod2820()); + this.field1448 -= var2; + if (this.stream != null && this.field1448 <= 0) { + this.field1448 += class237.field3113 >> 4; + VarcInt.PcmStream_disable(this.stream); + this.method2565(this.stream, this.stream.vmethod2840()); int var4 = 0; int var5 = 255; @@ -388,7 +371,7 @@ public class PcmPlayer { if ((var9 & 1) != 0) { var5 &= ~(1 << var7); var10 = null; - PcmStream var11 = this.field1440[var7]; + PcmStream var11 = this.field1449[var7]; label98: while (true) { @@ -404,33 +387,33 @@ public class PcmPlayer { var11 = var11.after; } else { var11.active = true; - int var13 = var11.vmethod3984(); + int var13 = var11.vmethod4037(); var4 += var13; if (var12 != null) { var12.position += var13; } - if (var4 >= this.field1433) { + if (var4 >= this.field1440) { break label104; } PcmStream var14 = var11.firstSubStream(); if (var14 != null) { - for (int var15 = var11.field1507; var14 != null; var14 = var11.nextSubStream()) { - this.method2571(var14, var15 * var14.vmethod2820() >> 8); + for (int var15 = var11.field1520; var14 != null; var14 = var11.nextSubStream()) { + this.method2565(var14, var15 * var14.vmethod2840() >> 8); } } PcmStream var18 = var11.after; var11.after = null; if (var10 == null) { - this.field1440[var7] = var18; + this.field1449[var7] = var18; } else { var10.after = var18; } if (var18 == null) { - this.field1434[var7] = var10; + this.field1453[var7] = var10; } var11 = var18; @@ -445,9 +428,9 @@ public class PcmPlayer { } for (var6 = 0; var6 < 8; ++var6) { - PcmStream var16 = this.field1440[var6]; - PcmStream[] var17 = this.field1440; - this.field1434[var6] = null; + PcmStream var16 = this.field1449[var6]; + PcmStream[] var17 = this.field1449; + this.field1453[var6] = null; for (var17[var6] = null; var16 != null; var16 = var10) { var10 = var16.after; @@ -456,42 +439,32 @@ public class PcmPlayer { } } - if (this.field1439 < 0) { - this.field1439 = 0; + if (this.field1448 < 0) { + this.field1448 = 0; } if (this.stream != null) { this.stream.fill(var1, 0, var2); } - this.timeMs = class217.currentTimeMillis(); + this.timeMs = MilliClock.currentTimeMillis(); } - @ObfuscatedName("aq") + @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "(Lds;II)V", - garbageValue = "2093201048" + signature = "(Ldf;IB)V", + garbageValue = "45" ) - final void method2571(PcmStream var1, int var2) { + final void method2565(PcmStream var1, int var2) { int var3 = var2 >> 5; - PcmStream var4 = this.field1434[var3]; + PcmStream var4 = this.field1453[var3]; if (var4 == null) { - this.field1440[var3] = var1; + this.field1449[var3] = var1; } else { var4.after = var1; } - this.field1434[var3] = var1; - var1.field1507 = var2; - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "(CI)Z", - garbageValue = "210668082" - ) - @Export("isDigit") - public static boolean isDigit(char var0) { - return var0 >= '0' && var0 <= '9'; + this.field1453[var3] = var1; + var1.field1520 = var2; } } diff --git a/runescape-client/src/main/java/PcmStream.java b/runescape-client/src/main/java/PcmStream.java index f176333015..7bd006ac64 100644 --- a/runescape-client/src/main/java/PcmStream.java +++ b/runescape-client/src/main/java/PcmStream.java @@ -3,23 +3,23 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ds") +@ObfuscatedName("df") @Implements("PcmStream") public abstract class PcmStream extends Node { @ObfuscatedName("w") @Export("active") volatile boolean active; - @ObfuscatedName("i") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lds;" + signature = "Ldf;" ) @Export("after") PcmStream after; - @ObfuscatedName("a") - int field1507; - @ObfuscatedName("b") + @ObfuscatedName("v") + int field1520; + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Ldf;" + signature = "Ldy;" ) @Export("sound") AbstractSound sound; @@ -28,37 +28,37 @@ public abstract class PcmStream extends Node { this.active = true; } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "()Lds;" + signature = "()Ldf;" ) @Export("firstSubStream") protected abstract PcmStream firstSubStream(); - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "()Lds;" + signature = "()Ldf;" ) @Export("nextSubStream") protected abstract PcmStream nextSubStream(); - @ObfuscatedName("z") - protected abstract int vmethod3984(); + @ObfuscatedName("u") + protected abstract int vmethod4037(); - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("fill") protected abstract void fill(int[] var1, int var2, int var3); - @ObfuscatedName("s") + @ObfuscatedName("w") @Export("skip") protected abstract void skip(int var1); - @ObfuscatedName("ac") - int vmethod2820() { + @ObfuscatedName("af") + int vmethod2840() { return 255; } - @ObfuscatedName("fk") + @ObfuscatedName("ft") @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 241eea4de5..0fe68c1e1a 100644 --- a/runescape-client/src/main/java/PcmStreamMixer.java +++ b/runescape-client/src/main/java/PcmStreamMixer.java @@ -3,152 +3,152 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dz") +@ObfuscatedName("dd") @Implements("PcmStreamMixer") public class PcmStreamMixer extends PcmStream { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Ljh;" + signature = "Ljp;" ) @Export("subStreams") NodeDeque subStreams; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Ljh;" + signature = "Ljp;" ) - NodeDeque field1357; - @ObfuscatedName("k") - int field1358; - @ObfuscatedName("d") - int field1355; + NodeDeque field1373; + @ObfuscatedName("q") + int field1371; + @ObfuscatedName("j") + int field1374; public PcmStreamMixer() { this.subStreams = new NodeDeque(); - this.field1357 = new NodeDeque(); - this.field1358 = 0; - this.field1355 = -1; + this.field1373 = new NodeDeque(); + this.field1371 = 0; + this.field1374 = -1; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lds;)V" + signature = "(Ldf;)V" ) @Export("addSubStream") public final synchronized void addSubStream(PcmStream var1) { this.subStreams.addLast(var1); } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lds;)V" + signature = "(Ldf;)V" ) @Export("removeSubStream") public final synchronized void removeSubStream(PcmStream var1) { var1.remove(); } - @ObfuscatedName("k") - void method2401() { - if (this.field1358 > 0) { - for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field1357.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field1357.previous()) { - var1.field1466 -= this.field1358; + @ObfuscatedName("q") + void method2434() { + if (this.field1371 > 0) { + for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field1373.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field1373.previous()) { + var1.field1476 -= this.field1371; } - this.field1355 -= this.field1358; - this.field1358 = 0; + this.field1374 -= this.field1371; + this.field1371 = 0; } } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lga;Ldo;)V" + signature = "(Lgr;Ldb;)V" ) - void method2402(Node var1, PcmStreamMixerListener var2) { - while (this.field1357.sentinel != var1 && ((PcmStreamMixerListener)var1).field1466 <= var2.field1466) { + void method2423(Node var1, PcmStreamMixerListener var2) { + while (this.field1373.sentinel != var1 && ((PcmStreamMixerListener)var1).field1476 <= var2.field1476) { var1 = var1.previous; } NodeDeque.NodeDeque_addBefore(var2, var1); - this.field1355 = ((PcmStreamMixerListener)this.field1357.sentinel.previous).field1466; + this.field1374 = ((PcmStreamMixerListener)this.field1373.sentinel.previous).field1476; } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Ldo;)V" + signature = "(Ldb;)V" ) - void method2403(PcmStreamMixerListener var1) { + void method2424(PcmStreamMixerListener var1) { var1.remove(); var1.remove2(); - Node var2 = this.field1357.sentinel.previous; - if (var2 == this.field1357.sentinel) { - this.field1355 = -1; + Node var2 = this.field1373.sentinel.previous; + if (var2 == this.field1373.sentinel) { + this.field1374 = -1; } else { - this.field1355 = ((PcmStreamMixerListener)var2).field1466; + this.field1374 = ((PcmStreamMixerListener)var2).field1476; } } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "()Lds;" + signature = "()Ldf;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { return (PcmStream)this.subStreams.last(); } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "()Lds;" + signature = "()Ldf;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { return (PcmStream)this.subStreams.previous(); } - @ObfuscatedName("z") - protected int vmethod3984() { + @ObfuscatedName("u") + protected int vmethod4037() { return 0; } - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("fill") public final synchronized void fill(int[] var1, int var2, int var3) { do { - if (this.field1355 < 0) { + if (this.field1374 < 0) { this.updateSubStreams(var1, var2, var3); return; } - if (var3 + this.field1358 < this.field1355) { - this.field1358 += var3; + if (var3 + this.field1371 < this.field1374) { + this.field1371 += var3; this.updateSubStreams(var1, var2, var3); return; } - int var4 = this.field1355 - this.field1358; + int var4 = this.field1374 - this.field1371; this.updateSubStreams(var1, var2, var4); var2 += var4; var3 -= var4; - this.field1358 += var4; - this.method2401(); - PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field1357.last(); + this.field1371 += var4; + this.method2434(); + PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field1373.last(); synchronized(var5) { int var7 = var5.update(); if (var7 < 0) { - var5.field1466 = 0; - this.method2403(var5); + var5.field1476 = 0; + this.method2424(var5); } else { - var5.field1466 = var7; - this.method2402(var5.previous, var5); + var5.field1476 = var7; + this.method2423(var5.previous, var5); } } } while(var3 != 0); } - @ObfuscatedName("e") + @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("s") + @ObfuscatedName("w") @Export("skip") public final synchronized void skip(int var1) { do { - if (this.field1355 < 0) { + if (this.field1374 < 0) { this.skipSubStreams(var1); return; } - if (this.field1358 + var1 < this.field1355) { - this.field1358 += var1; + if (this.field1371 + var1 < this.field1374) { + this.field1371 += var1; this.skipSubStreams(var1); return; } - int var2 = this.field1355 - this.field1358; + int var2 = this.field1374 - this.field1371; this.skipSubStreams(var2); var1 -= var2; - this.field1358 += var2; - this.method2401(); - PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field1357.last(); + this.field1371 += var2; + this.method2434(); + PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field1373.last(); synchronized(var3) { int var5 = var3.update(); if (var5 < 0) { - var3.field1466 = 0; - this.method2403(var3); + var3.field1476 = 0; + this.method2424(var3); } else { - var3.field1466 = var5; - this.method2402(var3.previous, var3); + var3.field1476 = var5; + this.method2423(var3.previous, var3); } } } while(var1 != 0); } - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("skipSubStreams") void skipSubStreams(int var1) { for (PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) { diff --git a/runescape-client/src/main/java/PcmStreamMixerListener.java b/runescape-client/src/main/java/PcmStreamMixerListener.java index d7eb2333a7..4a40cfc1c7 100644 --- a/runescape-client/src/main/java/PcmStreamMixerListener.java +++ b/runescape-client/src/main/java/PcmStreamMixerListener.java @@ -3,19 +3,19 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("do") +@ObfuscatedName("db") @Implements("PcmStreamMixerListener") public abstract class PcmStreamMixerListener extends Node { - @ObfuscatedName("x") - int field1466; + @ObfuscatedName("m") + int field1476; - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("remove2") abstract void remove2(); - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ldz;)I" + signature = "(Ldd;)I" ) @Export("update") abstract int update(); diff --git a/runescape-client/src/main/java/PendingSpawn.java b/runescape-client/src/main/java/PendingSpawn.java index c90f74a2a8..038a116176 100644 --- a/runescape-client/src/main/java/PendingSpawn.java +++ b/runescape-client/src/main/java/PendingSpawn.java @@ -3,76 +3,77 @@ 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("bw") +@ObfuscatedName("bt") @Implements("PendingSpawn") public final class PendingSpawn extends Node { - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -1216764751 - ) - @Export("y") - int y; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1571459421 + intValue = 1985828823 ) @Export("plane") int plane; - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1864356937 + intValue = -1983032759 ) @Export("type") int type; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1344797441 + intValue = -1818060675 ) @Export("x") int x; - @ObfuscatedName("w") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1245486001 + intValue = 1999145911 + ) + @Export("y") + int y; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 386133029 ) @Export("objectId") int objectId; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -547933481 + intValue = 1588520035 ) - int field968; - @ObfuscatedName("q") + int field956; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1800022501 + intValue = 1476403807 ) - int field963; - @ObfuscatedName("z") + int field957; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1336190783 + intValue = -1658497211 ) @Export("id") int id; - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1244443099 + intValue = -1422873381 ) @Export("orientation") int orientation; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -668527737 + intValue = 1345962763 ) - int field967; - @ObfuscatedName("s") + int field962; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -297028933 + intValue = -577159519 ) @Export("delay") int delay; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 718779675 + intValue = 790870073 ) @Export("hitpoints") int hitpoints; @@ -82,34 +83,75 @@ public final class PendingSpawn extends Node { this.hitpoints = -1; } - @ObfuscatedName("m") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-42" + signature = "(Lic;Ljava/lang/String;Ljava/lang/String;I)[Llh;", + garbageValue = "574747014" ) - static void method1840() { - WorldMapRegion.WorldMapRegion_cachedSprites.clear(); + public static IndexedSprite[] method1806(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); + int var4 = var0.getFileId(var3, var2); + return HealthBar.method2125(var0, var3, var4); } - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(II)Lby;", - garbageValue = "755627010" + signature = "(Lhd;I[B[BI)V", + garbageValue = "-1571904788" ) - @Export("Messages_getMessage") - static Message Messages_getMessage(int var0) { - return (Message)Messages.Messages_hashTable.get((long)var0); + @Export("Widget_setKey") + static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { + if (var0.field2647 == null) { + if (var2 == null) { + return; + } + + var0.field2647 = new byte[11][]; + var0.field2678 = new byte[11][]; + var0.field2679 = new int[11]; + var0.field2680 = new int[11]; + } + + var0.field2647[var1] = var2; + if (var2 != null) { + var0.field2709 = true; + } else { + var0.field2709 = false; + + for (int var4 = 0; var4 < var0.field2647.length; ++var4) { + if (var0.field2647[var4] != null) { + var0.field2709 = true; + break; + } + } + } + + var0.field2678[var1] = var3; } - @ObfuscatedName("h") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "287596023" + signature = "(ILcs;ZI)I", + garbageValue = "556274205" ) - public static void method1838() { - ObjectDefinition.ObjectDefinition_cached.clear(); - ObjectDefinition.ObjectDefinition_cachedModelData.clear(); - ObjectDefinition.ObjectDefinition_cachedEntities.clear(); - ObjectDefinition.ObjectDefinition_cachedModels.clear(); + static int method1808(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? KeyHandler.field407 : SecureRandomCallable.field544; + if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.itemId; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { + if (var3.itemId != -1) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CC_GETID) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.childIndex; + return 1; + } else { + return 2; + } } } diff --git a/runescape-client/src/main/java/PlatformInfo.java b/runescape-client/src/main/java/PlatformInfo.java index ceea74c7c3..9f5d128eda 100644 --- a/runescape-client/src/main/java/PlatformInfo.java +++ b/runescape-client/src/main/java/PlatformInfo.java @@ -4,193 +4,188 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mq") +@ObfuscatedName("mc") @Implements("PlatformInfo") public class PlatformInfo extends Node { - @ObfuscatedName("gd") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -610946691 + intValue = 372314029 ) - static int field3959; - @ObfuscatedName("af") + int field3958; + @ObfuscatedName("am") + boolean field3932; + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 47209177 + intValue = 146044699 ) - int field3934; - @ObfuscatedName("at") - boolean field3947; - @ObfuscatedName("al") + int field3937; + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 1154854303 + intValue = 1561853885 ) int field3938; @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -1112820969 - ) - int field3937; - @ObfuscatedName("am") - @ObfuscatedGetter( - intValue = -655667677 - ) - int field3928; - @ObfuscatedName("au") - @ObfuscatedGetter( - intValue = 518978981 - ) - int field3942; - @ObfuscatedName("ao") - @ObfuscatedGetter( - intValue = 2071386103 - ) - int field3940; - @ObfuscatedName("aq") - boolean field3941; - @ObfuscatedName("av") - @ObfuscatedGetter( - intValue = -1697334687 - ) - int field3951; - @ObfuscatedName("ak") - @ObfuscatedGetter( - intValue = -1122579007 + intValue = 139773765 ) int field3939; - @ObfuscatedName("ax") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -807185627 + intValue = -2088982113 ) - int field3944; - @ObfuscatedName("az") + int field3940; + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -1858381727 + intValue = 174880953 + ) + int field3941; + @ObfuscatedName("al") + boolean field3942; + @ObfuscatedName("an") + @ObfuscatedGetter( + intValue = 48276617 + ) + int field3959; + @ObfuscatedName("ac") + @ObfuscatedGetter( + intValue = 1247220209 + ) + int field3949; + @ObfuscatedName("af") + @ObfuscatedGetter( + intValue = -609367375 ) int field3945; - @ObfuscatedName("aj") - String field3946; - @ObfuscatedName("ay") - String field3927; - @ObfuscatedName("ad") - String field3948; - @ObfuscatedName("ac") - String field3949; - @ObfuscatedName("ah") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -100344441 + intValue = 1576577653 ) - int field3950; - @ObfuscatedName("ag") - @ObfuscatedGetter( - intValue = -932660889 - ) - int field3957; + int field3946; + @ObfuscatedName("aa") + String field3947; @ObfuscatedName("aw") + String field3948; + @ObfuscatedName("az") + String field3953; + @ObfuscatedName("aq") + String field3950; + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 472073959 + intValue = -229581371 ) - int field3929; - @ObfuscatedName("bf") + int field3951; + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -1521683725 + intValue = 968666789 ) - int field3953; - @ObfuscatedName("bc") - String field3954; - @ObfuscatedName("bo") - String field3955; - @ObfuscatedName("bd") - int[] field3956; + int field3952; + @ObfuscatedName("aj") + @ObfuscatedGetter( + intValue = -1359786411 + ) + int field3955; @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = 912496001 + intValue = 401731303 ) - int field3943; - @ObfuscatedName("bu") - String field3952; + int field3954; + @ObfuscatedName("bh") + String field3943; + @ObfuscatedName("bg") + String field3936; + @ObfuscatedName("be") + int[] field3957; + @ObfuscatedName("bf") + @ObfuscatedGetter( + intValue = 1085036985 + ) + int field3944; + @ObfuscatedName("ba") + String field3934; PlatformInfo(int var1, boolean var2, int var3, int var4, int var5, int var6, int var7, boolean var8, int var9, int var10, int var11, int var12, String var13, String var14, String var15, String var16, int var17, int var18, int var19, int var20, String var21, String var22, int[] var23, int var24, String var25) { - this.field3956 = new int[3]; - this.field3934 = var1; - this.field3947 = var2; - this.field3938 = var3; - this.field3937 = var4; - this.field3928 = var5; - this.field3942 = var6; - this.field3940 = var7; - this.field3941 = var8; - this.field3951 = var9; - this.field3939 = var10; - this.field3944 = var11; - this.field3945 = var12; - this.field3946 = var13; - this.field3927 = var14; - this.field3948 = var15; - this.field3949 = var16; - this.field3950 = var17; - this.field3957 = var18; - this.field3929 = var19; - this.field3953 = var20; - this.field3954 = var21; - this.field3955 = var22; - this.field3956 = var23; - this.field3943 = var24; - this.field3952 = var25; - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(Lkb;I)V", - garbageValue = "1274635079" - ) - @Export("write") - public void write(Buffer var1) { - var1.writeByte(8); - var1.writeByte(this.field3934); - var1.writeByte(this.field3947 ? 1 : 0); - var1.writeShort(this.field3938); - var1.writeByte(this.field3937); - var1.writeByte(this.field3928); - var1.writeByte(this.field3942); - var1.writeByte(this.field3940); - var1.writeByte(this.field3941 ? 1 : 0); - var1.writeShort(this.field3951); - var1.writeByte(this.field3939); - var1.writeMedium(this.field3944); - var1.writeShort(this.field3945); - var1.writeStringCp1252NullCircumfixed(this.field3946); - var1.writeStringCp1252NullCircumfixed(this.field3927); - var1.writeStringCp1252NullCircumfixed(this.field3948); - var1.writeStringCp1252NullCircumfixed(this.field3949); - var1.writeByte(this.field3957); - var1.writeShort(this.field3950); - var1.writeStringCp1252NullCircumfixed(this.field3954); - var1.writeStringCp1252NullCircumfixed(this.field3955); - var1.writeByte(this.field3929); - var1.writeByte(this.field3953); - - for (int var2 = 0; var2 < this.field3956.length; ++var2) { - var1.writeInt(this.field3956[var2]); - } - - var1.writeInt(this.field3943); - var1.writeStringCp1252NullCircumfixed(this.field3952); + this.field3957 = new int[3]; + this.field3958 = var1; + this.field3932 = var2; + this.field3937 = var3; + this.field3938 = var4; + this.field3939 = var5; + this.field3940 = var6; + this.field3941 = var7; + this.field3942 = var8; + this.field3959 = var9; + this.field3949 = var10; + this.field3945 = var11; + this.field3946 = var12; + this.field3947 = var13; + this.field3948 = var14; + this.field3953 = var15; + this.field3950 = var16; + this.field3951 = var17; + this.field3952 = var18; + this.field3955 = var19; + this.field3954 = var20; + this.field3943 = var21; + this.field3936 = var22; + this.field3957 = var23; + this.field3944 = var24; + this.field3934 = var25; } @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-86" + signature = "(Lkn;I)V", + garbageValue = "972520847" + ) + @Export("write") + public void write(Buffer var1) { + var1.writeByte(8); + var1.writeByte(this.field3958); + var1.writeByte(this.field3932 ? 1 : 0); + var1.writeShort(this.field3937); + var1.writeByte(this.field3938); + var1.writeByte(this.field3939); + var1.writeByte(this.field3940); + var1.writeByte(this.field3941); + var1.writeByte(this.field3942 ? 1 : 0); + var1.writeShort(this.field3959); + var1.writeByte(this.field3949); + var1.writeMedium(this.field3945); + var1.writeShort(this.field3946); + var1.writeStringCp1252NullCircumfixed(this.field3947); + var1.writeStringCp1252NullCircumfixed(this.field3948); + var1.writeStringCp1252NullCircumfixed(this.field3953); + var1.writeStringCp1252NullCircumfixed(this.field3950); + var1.writeByte(this.field3952); + var1.writeShort(this.field3951); + var1.writeStringCp1252NullCircumfixed(this.field3943); + var1.writeStringCp1252NullCircumfixed(this.field3936); + var1.writeByte(this.field3955); + var1.writeByte(this.field3954); + + for (int var2 = 0; var2 < this.field3957.length; ++var2) { + var1.writeInt(this.field3957[var2]); + } + + var1.writeInt(this.field3944); + var1.writeStringCp1252NullCircumfixed(this.field3934); + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "-1553987970" ) @Export("size") public int size() { byte var1 = 39; - int var2 = var1 + ArchiveDiskActionHandler.method4340(this.field3946); - var2 += ArchiveDiskActionHandler.method4340(this.field3927); - var2 += ArchiveDiskActionHandler.method4340(this.field3948); - var2 += ArchiveDiskActionHandler.method4340(this.field3949); - var2 += ArchiveDiskActionHandler.method4340(this.field3954); - var2 += ArchiveDiskActionHandler.method4340(this.field3955); - var2 += ArchiveDiskActionHandler.method4340(this.field3952); + int var2 = var1 + TextureProvider.method2873(this.field3947); + var2 += TextureProvider.method2873(this.field3948); + var2 += TextureProvider.method2873(this.field3953); + var2 += TextureProvider.method2873(this.field3950); + var2 += TextureProvider.method2873(this.field3943); + var2 += TextureProvider.method2873(this.field3936); + var2 += TextureProvider.method2873(this.field3934); return var2; } } diff --git a/runescape-client/src/main/java/PlatformInfoProvider.java b/runescape-client/src/main/java/PlatformInfoProvider.java index d005203217..a35bd31ded 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("mm") +@ObfuscatedName("mk") @Implements("PlatformInfoProvider") public interface PlatformInfoProvider { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)Lmq;", - garbageValue = "1" + signature = "(I)Lmc;", + garbageValue = "-1826697521" ) @Export("get") PlatformInfo get(); diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index ada2961236..6cdb92a53a 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -4,155 +4,160 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bi") +@ObfuscatedName("by") @Implements("Player") public final class Player extends Actor { - @ObfuscatedName("x") + @ObfuscatedName("gi") + @ObfuscatedGetter( + intValue = 1432806709 + ) + static int field638; + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lku;" + signature = "Lkq;" ) @Export("username") Username username; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lhk;" + signature = "Lhv;" ) @Export("appearance") PlayerAppearance appearance; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -955452579 + intValue = 1861709523 ) @Export("headIconPk") int headIconPk; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1682761079 + intValue = 777321397 ) @Export("headIconPrayer") int headIconPrayer; - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("actions") String[] actions; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1517162387 + intValue = 2047058123 ) @Export("combatLevel") int combatLevel; - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 614146335 + intValue = -1460634789 ) @Export("skillLevel") int skillLevel; - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -550900363 + intValue = -287002613 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1364374011 + intValue = 1724096507 ) @Export("animationCycleStart") int animationCycleStart; - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1470813775 + intValue = -691368709 ) @Export("animationCycleEnd") int animationCycleEnd; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 168679087 + intValue = 366626367 ) - int field662; - @ObfuscatedName("n") + int field661; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 620810729 + intValue = 1150589939 ) @Export("tileHeight2") int tileHeight2; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -2027049547 - ) - int field657; @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -1432568009 + ) + int field653; + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lel;" + signature = "Lef;" ) @Export("model0") Model model0; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 1127396435 - ) - int field659; - @ObfuscatedName("i") - @ObfuscatedGetter( - intValue = 240208849 - ) - int field660; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = -2013432115 - ) - int field661; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -971151235 - ) - int field664; - @ObfuscatedName("l") - @Export("isUnanimated") - boolean isUnanimated; @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1431900799 + intValue = 1121860103 + ) + int field648; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -1904203447 + ) + int field649; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -1087815703 + ) + int field650; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = -910928239 + ) + int field651; + @ObfuscatedName("e") + @Export("isUnanimated") + boolean isUnanimated; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -136485713 ) @Export("team") int team; - @ObfuscatedName("o") + @ObfuscatedName("t") @Export("isHidden") boolean isHidden; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -777722891 + intValue = 679078717 ) @Export("plane") int plane; - @ObfuscatedName("j") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1532250791 + intValue = 445698711 ) @Export("index") int index; - @ObfuscatedName("y") + @ObfuscatedName("i") @ObfuscatedSignature( - signature = "Lkv;" + signature = "Lkf;" ) @Export("isFriendTriBool") TriBool isFriendTriBool; @ObfuscatedName("f") @ObfuscatedSignature( - signature = "Lkv;" + signature = "Lkf;" ) @Export("isInClanChat") TriBool isInClanChat; - @ObfuscatedName("ae") - boolean field670; + @ObfuscatedName("ah") + boolean field659; @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = 1349885547 + intValue = 1374290549 ) @Export("tileX") int tileX; - @ObfuscatedName("ap") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -1671422285 + intValue = 499025605 ) @Export("tileY") int tileY; @@ -175,13 +180,13 @@ public final class Player extends Actor { this.isHidden = false; this.isFriendTriBool = TriBool.TriBool_unknown; this.isInClanChat = TriBool.TriBool_unknown; - this.field670 = false; + this.field659 = false; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkb;I)V", - garbageValue = "-2042142749" + signature = "(Lkn;I)V", + garbageValue = "1937390555" ) @Export("read") final void read(Buffer var1) { @@ -208,7 +213,7 @@ public final class Player extends Actor { } if (var4[var5] >= 512) { - int var8 = AbstractWorldMapData.ItemDefinition_get(var4[var5] - 512).team; + int var8 = KitDefinition.ItemDefinition_get(var4[var5] - 512).team; if (var8 != 0) { this.team = var8; } @@ -220,7 +225,7 @@ public final class Player extends Actor { for (var6 = 0; var6 < 5; ++var6) { var7 = var1.readUnsignedByte(); - if (var7 < 0 || var7 >= VertexNormal.field1764[var6].length) { + if (var7 < 0 || var7 >= PlayerAppearance.field2575[var6].length) { var7 = 0; } @@ -263,10 +268,10 @@ public final class Player extends Actor { super.runSequence = -1; } - this.username = new Username(var1.readStringCp1252NullTerminated(), WorldMapIcon_0.loginType); + this.username = new Username(var1.readStringCp1252NullTerminated(), class195.loginType); this.clearIsFriend(); this.clearIsInClanChat(); - if (this == ByteArrayPool.localPlayer) { + if (this == class60.localPlayer) { RunException.localPlayerName = this.username.getName(); } @@ -284,10 +289,10 @@ public final class Player extends Actor { this.appearance.update(var4, var9, var2 == 1, var3); } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "990067508" + garbageValue = "-928055977" ) @Export("isFriend") boolean isFriend() { @@ -298,30 +303,30 @@ public final class Player extends Actor { return this.isFriendTriBool == TriBool.TriBool_true; } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "77261851" + garbageValue = "1165782088" ) @Export("clearIsFriend") void clearIsFriend() { this.isFriendTriBool = TriBool.TriBool_unknown; } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1863320246" + garbageValue = "-2131517341" ) @Export("checkIsFriend") void checkIsFriend() { - this.isFriendTriBool = Projectile.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isFriendTriBool = ModeWhere.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "1535464163" + garbageValue = "-1651593034" ) @Export("isClanMember") boolean isClanMember() { @@ -332,48 +337,48 @@ public final class Player extends Actor { return this.isInClanChat == TriBool.TriBool_true; } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "81" + signature = "(I)V", + garbageValue = "1245879584" ) @Export("clearIsInClanChat") void clearIsInClanChat() { this.isInClanChat = TriBool.TriBool_unknown; } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "101" + garbageValue = "0" ) @Export("updateIsInClanChat") void updateIsInClanChat() { - this.isInClanChat = InterfaceParent.clanChat != null && InterfaceParent.clanChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.isInClanChat = ClientPreferences.clanChat != null && ClientPreferences.clanChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; } - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "52" + signature = "(I)I", + garbageValue = "-6778929" ) @Export("transformedSize") int transformedSize() { - return this.appearance != null && this.appearance.npcTransformId != -1 ? class237.getNpcDefinition(this.appearance.npcTransformId).size : 1; + return this.appearance != null && this.appearance.npcTransformId != -1 ? StudioGame.getNpcDefinition(this.appearance.npcTransformId).size : 1; } - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)Lel;", - garbageValue = "480835067" + signature = "(I)Lef;", + garbageValue = "1832696685" ) @Export("getModel") protected final Model getModel() { if (this.appearance == null) { return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? SpotAnimationDefinition.SequenceDefinition_get(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.idleSequence == super.movementSequence && var1 != null ? null : SpotAnimationDefinition.SequenceDefinition_get(super.movementSequence); + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? NetSocket.SequenceDefinition_get(super.sequence) : null; + SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.movementSequence == super.idleSequence && var1 != null ? null : NetSocket.SequenceDefinition_get(super.movementSequence); Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); if (var3 == null) { return null; @@ -383,9 +388,9 @@ public final class Player extends Actor { Model var4; Model[] var5; if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { - var4 = MouseHandler.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); + var4 = class4.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); if (var4 != null) { - var4.offsetBy(0, -super.field1033, 0); + var4.offsetBy(0, -super.field1005, 0); var5 = new Model[]{var3, var4}; var3 = new Model(var5, 2); } @@ -398,7 +403,7 @@ public final class Player extends Actor { if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { var4 = this.model0; - var4.offsetBy(this.field662 - super.x, this.tileHeight2 - this.tileHeight, this.field657 - super.y); + var4.offsetBy(this.field661 - super.x, this.tileHeight2 - this.tileHeight, this.field653 - super.y); if (super.orientation == 512) { var4.rotateY90Ccw(); var4.rotateY90Ccw(); @@ -423,7 +428,7 @@ public final class Player extends Actor { var4.rotateY90Ccw(); } - var4.offsetBy(super.x - this.field662, this.tileHeight - this.tileHeight2, super.y - this.field657); + var4.offsetBy(super.x - this.field661, this.tileHeight - this.tileHeight2, super.y - this.field653); } } @@ -433,24 +438,24 @@ public final class Player extends Actor { } } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(IIBI)V", - garbageValue = "-618087503" + garbageValue = "-1126022474" ) - final void method1339(int var1, int var2, byte var3) { - if (super.sequence != -1 && SpotAnimationDefinition.SequenceDefinition_get(super.sequence).field3524 == 1) { + final void method1300(int var1, int var2, byte var3) { + if (super.sequence != -1 && NetSocket.SequenceDefinition_get(super.sequence).field3560 == 1) { super.sequence = -1; } - super.field1015 = -1; + super.field992 = -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) { - SoundCache.method2609(this, var1, var2, (byte)2); + ApproximateRouteStrategy.method1284(this, var1, var2, (byte)2); } - this.method1341(var1, var2, var3); + this.method1302(var1, var2, var3); } else { this.resetPath(var1, var2); } @@ -460,29 +465,29 @@ public final class Player extends Actor { } - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "-2118599552" + garbageValue = "2675490" ) @Export("resetPath") void resetPath(int var1, int var2) { super.pathLength = 0; - super.field1032 = 0; - super.field1031 = 0; + super.field1023 = 0; + super.field1022 = 0; super.pathX[0] = var1; super.pathY[0] = var2; int var3 = this.transformedSize(); - super.x = super.pathX[0] * 128 + var3 * 64; - super.y = super.pathY[0] * 128 + var3 * 64; + super.x = var3 * 64 + super.pathX[0] * 128; + super.y = var3 * 64 + super.pathY[0] * 128; } - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(IIBI)V", - garbageValue = "1447911882" + garbageValue = "-1628655645" ) - final void method1341(int var1, int var2, byte var3) { + final void method1302(int var1, int var2, byte var3) { if (super.pathLength < 9) { ++super.pathLength; } @@ -498,98 +503,114 @@ public final class Player extends Actor { super.pathTraversed[0] = var3; } - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "116176402" + signature = "(B)Z", + garbageValue = "1" ) @Export("isVisible") final boolean isVisible() { return this.appearance != null; } - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "556074954" + signature = "(III)V", + garbageValue = "-2139314606" ) - static int method1342() { - return ++Messages.Messages_count - 1; - } + @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; - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "(IZIZI)V", - garbageValue = "1788243043" - ) - @Export("sortWorldList") - static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { - if (UserComparator2.World_worlds != null) { - ModelData0.doWorldSorting(0, UserComparator2.World_worlds.length - 1, var0, var1, var2, var3); + for (int var5 = 0; var5 < 4; ++var5) { + if (World.World_sortOption1[var5] != var0) { + var2[var4] = World.World_sortOption1[var5]; + var3[var4] = World.World_sortOption2[var5]; + ++var4; + } } + World.World_sortOption1 = var2; + World.World_sortOption2 = var3; + GrandExchangeOffer.sortWorlds(class13.World_worlds, 0, class13.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); } - @ObfuscatedName("z") + @ObfuscatedName("io") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-389992863" + signature = "(Lby;IIIS)V", + garbageValue = "160" ) - static void method1383() { - Players.Players_count = 0; + @Export("addPlayerToMenu") + static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { + if (class60.localPlayer != var0) { + if (Client.menuOptionsCount < 400) { + String var4; + if (var0.skillLevel == 0) { + var4 = var0.actions[0] + var0.username + var0.actions[1] + Canvas.method924(var0.combatLevel, class60.localPlayer.combatLevel) + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; + } else { + var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; + } - for (int var0 = 0; var0 < 2048; ++var0) { - Players.field1269[var0] = null; - Players.field1273[var0] = 1; - } + int var5; + if (Client.isItemSelected == 1) { + ScriptEvent.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ItemContainer.colorStartTag(16777215) + var4, 14, var1, var2, var3); + } else if (Client.isSpellSelected) { + if ((WorldMapSprite.selectedSpellFlags & 8) == 8) { + ScriptEvent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ItemContainer.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 (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class60.localPlayer.combatLevel) { + var6 = 2000; + } - @ObfuscatedName("fg") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-357843101" - ) - @Export("forceDisconnect") - static final void forceDisconnect(int var0) { - Huffman.logOut(); - switch(var0) { - case 1: - ReflectionCheck.method2396(); - break; - case 2: - Login.loginIndex = 24; - HealthBarUpdate.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); - } + if (class60.localPlayer.team != 0 && var0.team != 0) { + if (var0.team == class60.localPlayer.team) { + var6 = 2000; + } else { + var6 = 0; + } + } + } else if (Client.playerOptionsPriorities[var5]) { + var6 = 2000; + } - } + boolean var7 = false; + int var8 = Client.playerMenuOpcodes[var5] + var6; + ScriptEvent.insertMenuItemNoShift(Client.playerMenuActions[var5], ItemContainer.colorStartTag(16777215) + var4, var8, var1, var2, var3); + } + } + } - @ObfuscatedName("ju") - @ObfuscatedSignature( - signature = "(Lhe;IIB)V", - garbageValue = "2" - ) - @Export("clickWidget") - static final void clickWidget(Widget var0, int var1, int var2) { - if (Client.clickedWidget == null && !Client.isMenuOpen) { - if (var0 != null && KitDefinition.method4538(var0) != null) { - Client.clickedWidget = var0; - Client.clickedWidgetParent = KitDefinition.method4538(var0); - Client.widgetClickX = var1; - Client.widgetClickY = var2; - MilliClock.widgetDragDuration = 0; - Client.isDraggingWidget = false; - int var3 = AbstractWorldMapData.method381(); - if (var3 != -1) { - AbstractWorldMapIcon.tempMenuAction = new MenuAction(); - AbstractWorldMapIcon.tempMenuAction.param0 = Client.menuArguments1[var3]; - AbstractWorldMapIcon.tempMenuAction.param1 = Client.menuArguments2[var3]; - AbstractWorldMapIcon.tempMenuAction.opcode = Client.menuOpcodes[var3]; - AbstractWorldMapIcon.tempMenuAction.identifier = Client.menuIdentifiers[var3]; - AbstractWorldMapIcon.tempMenuAction.action = Client.menuActions[var3]; + for (var5 = 0; var5 < Client.menuOptionsCount; ++var5) { + if (Client.menuOpcodes[var5] == 23) { + Client.menuTargets[var5] = ItemContainer.colorStartTag(16777215) + var4; + break; + } } } } } + + @ObfuscatedName("iv") + @ObfuscatedSignature( + signature = "(I)Z", + garbageValue = "452106658" + ) + @Export("getTapToDrop") + static boolean getTapToDrop() { + return Client.tapToDrop; + } } diff --git a/runescape-client/src/main/java/PlayerAppearance.java b/runescape-client/src/main/java/PlayerAppearance.java index abfd16357d..5530948f0d 100644 --- a/runescape-client/src/main/java/PlayerAppearance.java +++ b/runescape-client/src/main/java/PlayerAppearance.java @@ -3,66 +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("hk") +@ObfuscatedName("hv") @Implements("PlayerAppearance") public class PlayerAppearance { - @ObfuscatedName("t") - public static short[] field2539; - @ObfuscatedName("e") - public static short[][] field2535; - @ObfuscatedName("s") + @ObfuscatedName("n") + public static short[] field2574; + @ObfuscatedName("u") + public static short[][] field2575; + @ObfuscatedName("a") + public static short[] field2569; + @ObfuscatedName("w") @Export("equipmentIndices") static final int[] equipmentIndices; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Leg;" + signature = "Lec;" ) @Export("PlayerAppearance_cachedModels") static EvictingDualNodeHashTable PlayerAppearance_cachedModels; - @ObfuscatedName("dt") - @ObfuscatedSignature( - signature = "Lih;" - ) - @Export("archive10") - static Archive archive10; - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("equipment") int[] equipment; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("bodyColors") int[] bodyColors; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("isFemale") public boolean isFemale; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1293293343 + intValue = 818312483 ) @Export("npcTransformId") public int npcTransformId; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedGetter( - longValue = 3080768602890783779L + longValue = -9062210638033069275L ) @Export("hash") long hash; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedGetter( - longValue = 1388997665214268647L + longValue = 254720679631445871L ) - long field2538; + long field2573; static { equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10}; PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260); } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "([I[IZII)V", - garbageValue = "522059742" + signature = "([I[IZIB)V", + garbageValue = "28" ) @Export("update") public void update(int[] var1, int[] var2, boolean var3, int var4) { @@ -71,8 +66,8 @@ public class PlayerAppearance { for (int var5 = 0; var5 < 7; ++var5) { for (int var6 = 0; var6 < KitDefinition.KitDefinition_fileCount; ++var6) { - KitDefinition var7 = WorldMapElement.KitDefinition_get(var6); - if (var7 != null && !var7.nonSelectable && var7.bodypartID == (var3 ? 7 : 0) + var5) { + KitDefinition var7 = WorldMapEvent.KitDefinition_get(var6); + if (var7 != null && !var7.nonSelectable && var7.bodypartID == var5 + (var3 ? 7 : 0)) { var1[equipmentIndices[var5]] = var6 + 256; break; } @@ -87,10 +82,10 @@ public class PlayerAppearance { this.setHash(); } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(IZI)V", - garbageValue = "1928193476" + garbageValue = "-311469480" ) @Export("changeAppearance") public void changeAppearance(int var1, boolean var2) { @@ -113,7 +108,7 @@ public class PlayerAppearance { } } - var4 = WorldMapElement.KitDefinition_get(var3); + var4 = WorldMapEvent.KitDefinition_get(var3); } while(var4 == null || var4.nonSelectable || var1 + (this.isFemale ? 7 : 0) != var4.bodypartID); this.equipment[equipmentIndices[var1]] = var3 + 256; @@ -122,50 +117,37 @@ public class PlayerAppearance { } } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(IZI)V", - garbageValue = "-1053799565" + garbageValue = "1803508005" ) - public void method4089(int var1, boolean var2) { + public void method4139(int var1, boolean var2) { int var3 = this.bodyColors[var1]; - boolean var4; if (!var2) { do { --var3; if (var3 < 0) { - var3 = VertexNormal.field1764[var1].length - 1; + var3 = field2575[var1].length - 1; } - - if (var1 == 4 && var3 >= 8) { - var4 = false; - } else { - var4 = true; - } - } while(!var4); + } while(!class39.method615(var1, var3)); } else { do { ++var3; - if (var3 >= VertexNormal.field1764[var1].length) { + if (var3 >= field2575[var1].length) { var3 = 0; } - - if (var1 == 4 && var3 >= 8) { - var4 = false; - } else { - var4 = true; - } - } while(!var4); + } while(!class39.method615(var1, var3)); } this.bodyColors[var1] = var3; this.setHash(); } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(ZI)V", - garbageValue = "-1082412676" + signature = "(ZB)V", + garbageValue = "80" ) @Export("changeSex") public void changeSex(boolean var1) { @@ -174,10 +156,10 @@ public class PlayerAppearance { } } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Lkb;I)V", - garbageValue = "-1419902667" + signature = "(Lkn;I)V", + garbageValue = "1039310392" ) @Export("write") public void write(Buffer var1) { @@ -199,10 +181,10 @@ public class PlayerAppearance { } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "110" + signature = "(I)V", + garbageValue = "1504678480" ) @Export("setHash") void setHash() { @@ -238,21 +220,21 @@ public class PlayerAppearance { this.hash += (long)(this.isFemale ? 1 : 0); this.equipment[5] = var3; this.equipment[9] = var4; - if (var1 != 0L && this.hash != var1) { + if (0L != var1 && this.hash != var1) { PlayerAppearance_cachedModels.remove(var1); } } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Ljc;ILjc;II)Lel;", - garbageValue = "-1571730911" + signature = "(Ljm;ILjm;IB)Lef;", + garbageValue = "-39" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { if (this.npcTransformId != -1) { - return class237.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); + return StudioGame.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); } else { long var5 = this.hash; int[] var7 = this.equipment; @@ -281,18 +263,18 @@ public class PlayerAppearance { int var11; for (int var10 = 0; var10 < 12; ++var10) { var11 = var7[var10]; - if (var11 >= 256 && var11 < 512 && !WorldMapElement.KitDefinition_get(var11 - 256).ready()) { + if (var11 >= 256 && var11 < 512 && !WorldMapEvent.KitDefinition_get(var11 - 256).ready()) { var9 = true; } - if (var11 >= 512 && !AbstractWorldMapData.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { + if (var11 >= 512 && !KitDefinition.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { var9 = true; } } if (var9) { - if (this.field2538 != -1L) { - var8 = (Model)PlayerAppearance_cachedModels.get(this.field2538); + if (-1L != this.field2573) { + var8 = (Model)PlayerAppearance_cachedModels.get(this.field2573); } if (var8 == null) { @@ -309,75 +291,75 @@ public class PlayerAppearance { var13 = var7[var12]; ModelData var14; if (var13 >= 256 && var13 < 512) { - var14 = WorldMapElement.KitDefinition_get(var13 - 256).getModelData(); + var14 = WorldMapEvent.KitDefinition_get(var13 - 256).getModelData(); if (var14 != null) { var16[var11++] = var14; } } if (var13 >= 512) { - var14 = AbstractWorldMapData.ItemDefinition_get(var13 - 512).method4722(this.isFemale); + var14 = KitDefinition.ItemDefinition_get(var13 - 512).method4839(this.isFemale); if (var14 != null) { var16[var11++] = var14; } } } - ModelData var17 = new ModelData(var16, var11); + ModelData var18 = new ModelData(var16, var11); for (var13 = 0; var13 < 5; ++var13) { - if (this.bodyColors[var13] < VertexNormal.field1764[var13].length) { - var17.recolor(WorldMapLabel.field278[var13], VertexNormal.field1764[var13][this.bodyColors[var13]]); + if (this.bodyColors[var13] < field2575[var13].length) { + var18.recolor(field2574[var13], field2575[var13][this.bodyColors[var13]]); } - if (this.bodyColors[var13] < field2535[var13].length) { - var17.recolor(field2539[var13], field2535[var13][this.bodyColors[var13]]); + if (this.bodyColors[var13] < Messages.field1308[var13].length) { + var18.recolor(field2569[var13], Messages.field1308[var13][this.bodyColors[var13]]); } } - var8 = var17.toModel(64, 850, -30, -50, -30); + var8 = var18.toModel(64, 850, -30, -50, -30); PlayerAppearance_cachedModels.put(var8, var5); - this.field2538 = var5; + this.field2573 = var5; } } if (var1 == null && var3 == null) { return var8; } else { - Model var18; + Model var17; if (var1 != null && var3 != null) { - var18 = var1.applyTransformations(var8, var2, var3, var4); + var17 = var1.applyTransformations(var8, var2, var3, var4); } else if (var1 != null) { - var18 = var1.transformActorModel(var8, var2); + var17 = var1.transformActorModel(var8, var2); } else { - var18 = var3.transformActorModel(var8, var4); + var17 = var3.transformActorModel(var8, var4); } - return var18; + return var17; } } } - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(S)Lea;", - garbageValue = "180" + signature = "(I)Lek;", + garbageValue = "1279431909" ) @Export("getModelData") ModelData getModelData() { if (this.npcTransformId != -1) { - return class237.getNpcDefinition(this.npcTransformId).getModelData(); + return StudioGame.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 && !WorldMapElement.KitDefinition_get(var3 - 256).method4523()) { + if (var3 >= 256 && var3 < 512 && !WorldMapEvent.KitDefinition_get(var3 - 256).method4636()) { var1 = true; } - if (var3 >= 512 && !AbstractWorldMapData.ItemDefinition_get(var3 - 512).method4772(this.isFemale)) { + if (var3 >= 512 && !KitDefinition.ItemDefinition_get(var3 - 512).method4840(this.isFemale)) { var1 = true; } } @@ -393,14 +375,14 @@ public class PlayerAppearance { var5 = this.equipment[var4]; ModelData var6; if (var5 >= 256 && var5 < 512) { - var6 = WorldMapElement.KitDefinition_get(var5 - 256).getKitDefinitionModels(); + var6 = WorldMapEvent.KitDefinition_get(var5 - 256).getKitDefinitionModels(); if (var6 != null) { var7[var3++] = var6; } } if (var5 >= 512) { - var6 = AbstractWorldMapData.ItemDefinition_get(var5 - 512).method4724(this.isFemale); + var6 = KitDefinition.ItemDefinition_get(var5 - 512).method4841(this.isFemale); if (var6 != null) { var7[var3++] = var6; } @@ -410,12 +392,12 @@ public class PlayerAppearance { ModelData var8 = new ModelData(var7, var3); for (var5 = 0; var5 < 5; ++var5) { - if (this.bodyColors[var5] < VertexNormal.field1764[var5].length) { - var8.recolor(WorldMapLabel.field278[var5], VertexNormal.field1764[var5][this.bodyColors[var5]]); + if (this.bodyColors[var5] < field2575[var5].length) { + var8.recolor(field2574[var5], field2575[var5][this.bodyColors[var5]]); } - if (this.bodyColors[var5] < field2535[var5].length) { - var8.recolor(field2539[var5], field2535[var5][this.bodyColors[var5]]); + if (this.bodyColors[var5] < Messages.field1308[var5].length) { + var8.recolor(field2569[var5], Messages.field1308[var5][this.bodyColors[var5]]); } } @@ -424,439 +406,27 @@ public class PlayerAppearance { } } - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1778112126" + signature = "(B)I", + garbageValue = "0" ) @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 + class237.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 + StudioGame.getNpcDefinition(this.npcTransformId).id; } - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "(Lbb;II)V", - garbageValue = "2013269807" - ) - @Export("runScript") - static void runScript(ScriptEvent var0, int var1) { - Object[] var2 = var0.args; - Script var3; - int var17; - if (class25.isWorldMapEvent(var0.type)) { - TileItem.worldMapEvent = (WorldMapEvent)var2[0]; - WorldMapElement var4 = class25.WorldMapElement_get(TileItem.worldMapEvent.mapElement); - var3 = BoundaryObject.getWorldMapScript(var0.type, var4.objectId, var4.category); - } else { - var17 = (Integer)var2[0]; - var3 = WorldMapSprite.getScript(var17); - } - - 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.field1125 = false; - - try { - int var10; - try { - AbstractUserComparator.Interpreter_intLocals = new int[var3.localIntCount]; - int var8 = 0; - Interpreter.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 * -1381479581 * -957641141 : -1; - } - - if (var11 == -2147483644) { - var11 = var0.opIndex; - } - - if (var11 == -2147483643) { - var11 = var0.widget != null ? var0.widget.childIndex * -611900971 * -547025027 : -1; - } - - if (var11 == -2147483642) { - var11 = var0.dragTarget != null ? var0.dragTarget.id * -1381479581 * -957641141 : -1; - } - - if (var11 == -2147483641) { - var11 = var0.dragTarget != null ? var0.dragTarget.childIndex * -611900971 * -547025027 : -1; - } - - if (var11 == -2147483640) { - var11 = var0.keyTyped; - } - - if (var11 == -2147483639) { - var11 = var0.keyPressed; - } - - AbstractUserComparator.Interpreter_intLocals[var8++] = var11; - } else if (var2[var10] instanceof String) { - var18 = (String)var2[var10]; - if (var18.equals("event_opbase")) { - var18 = var0.targetName; - } - - Interpreter.Interpreter_stringLocals[var9++] = var18; - } - } - - var10 = 0; - Interpreter.field1127 = var0.field604; - - 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 = ModeWhere.method3760(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[++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]; - class22.changeGameOptions(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; - AbstractUserComparator.Interpreter_intLocals = var34.intLocals; - Interpreter.Interpreter_stringLocals = var34.stringLocals; - } else if (var29 == ScriptOpcodes.GET_VARBIT) { - var11 = var6[var17]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Projectile.getVarbit(var11); - } else if (var29 == ScriptOpcodes.SET_VARBIT) { - var11 = var6[var17]; - FloorDecoration.method2952(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] = AbstractUserComparator.Interpreter_intLocals[var6[var17]]; - } else if (var29 == ScriptOpcodes.ISTORE) { - AbstractUserComparator.Interpreter_intLocals[var6[var17]] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - } else if (var29 == ScriptOpcodes.SLOAD) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Interpreter.Interpreter_stringLocals[var6[var17]]; - } else if (var29 == ScriptOpcodes.SSTORE) { - Interpreter.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 = MusicPatchNode.method3921(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] = UserComparator4.varcs.getInt(var6[var17]); - } else if (var29 == ScriptOpcodes.SET_VARC_INT) { - UserComparator4.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 = UserComparator4.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) { - UserComparator4.varcs.setStringOld(var6[var17], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]); - } else if (var29 == ScriptOpcodes.GET_VARC_STRING) { - var18 = UserComparator4.varcs.getString(var6[var17]); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var18; - } else if (var29 == ScriptOpcodes.SET_VARC_STRING) { - UserComparator4.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 = WorldMapSprite.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 = AbstractUserComparator.Interpreter_intLocals; - var19.stringLocals = Interpreter.Interpreter_stringLocals; - Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var19; - var3 = var12; - var5 = var12.opcodes; - var6 = var12.intOperands; - var17 = -1; - AbstractUserComparator.Interpreter_intLocals = var13; - Interpreter.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); - WorldMapDecorationType.RunException_sendStackTrace(var24.toString(), var27); - } - } finally { - if (Interpreter.field1125) { - Interpreter.field1126 = true; - class227.method4184(); - Interpreter.field1126 = false; - Interpreter.field1125 = false; - } - - } - } - } - - @ObfuscatedName("fc") + @ObfuscatedName("kf") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-167013262" + garbageValue = "1446127367" ) - @Export("getLoginError") - static void getLoginError(int var0) { - if (var0 == -3) { - HealthBarUpdate.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); - } else if (var0 == -2) { - HealthBarUpdate.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); - } else if (var0 == -1) { - HealthBarUpdate.setLoginResponseString("No response from server.", "Please try using a different world.", ""); - } else if (var0 == 3) { - Login.loginIndex = 3; - Login.field1218 = 1; - } else if (var0 == 4) { - class39.method645(0); - } else if (var0 == 5) { - Login.field1218 = 2; - HealthBarUpdate.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) { - HealthBarUpdate.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); - } else if (var0 == 7) { - HealthBarUpdate.setLoginResponseString("This world is full.", "Please use a different world.", ""); - } else if (var0 == 8) { - HealthBarUpdate.setLoginResponseString("Unable to connect.", "Login server offline.", ""); - } else if (var0 == 9) { - HealthBarUpdate.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); - } else if (var0 == 10) { - HealthBarUpdate.setLoginResponseString("Unable to connect.", "Bad session id.", ""); - } else if (var0 == 11) { - HealthBarUpdate.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); - } else if (var0 == 12) { - HealthBarUpdate.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); - } else if (var0 == 13) { - HealthBarUpdate.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); - } else if (var0 == 14) { - HealthBarUpdate.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 16) { - HealthBarUpdate.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); - } else if (var0 == 17) { - HealthBarUpdate.setLoginResponseString("You are standing in a members-only area.", "To play on this world move to a free area first", ""); - } else if (var0 == 18) { - class39.method645(1); - } else if (var0 == 19) { - HealthBarUpdate.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); - } else if (var0 == 20) { - HealthBarUpdate.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); - } else if (var0 == 22) { - HealthBarUpdate.setLoginResponseString("Malformed login packet.", "Please try again.", ""); - } else if (var0 == 23) { - HealthBarUpdate.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 24) { - HealthBarUpdate.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); - } else if (var0 == 25) { - HealthBarUpdate.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); - } else if (var0 == 26) { - HealthBarUpdate.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); - } else if (var0 == 27) { - HealthBarUpdate.setLoginResponseString("", "Service unavailable.", ""); - } else if (var0 == 31) { - HealthBarUpdate.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) { - HealthBarUpdate.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) { - HealthBarUpdate.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); - } else if (var0 == 38) { - HealthBarUpdate.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) { - HealthBarUpdate.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); - MouseRecorder.updateGameState(11); - return; - } - - if (var0 == 57) { - HealthBarUpdate.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); - MouseRecorder.updateGameState(11); - return; - } - - if (var0 == 61) { - Login.loginIndex = 7; - } else { - HealthBarUpdate.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); + static void method4177(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(); } } - MouseRecorder.updateGameState(10); - } - - @ObfuscatedName("kk") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "1233914639" - ) - @Export("clanKickUser") - static final void clanKickUser(String var0) { - if (InterfaceParent.clanChat != null) { - PacketBufferNode var1 = FaceNormal.getPacketBufferNode(ClientPacket.field2217, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(class234.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); - } } } diff --git a/runescape-client/src/main/java/PlayerProvider.java b/runescape-client/src/main/java/PlayerProvider.java index 605e8a56eb..226290676f 100644 --- a/runescape-client/src/main/java/PlayerProvider.java +++ b/runescape-client/src/main/java/PlayerProvider.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dg") +@ObfuscatedName("dh") @Implements("PlayerProvider") public interface PlayerProvider { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)Ldw;", - garbageValue = "65536" + signature = "(I)Ldt;", + garbageValue = "-1371983171" ) @Export("player") PcmPlayer player(); diff --git a/runescape-client/src/main/java/PlayerType.java b/runescape-client/src/main/java/PlayerType.java index 2e3e4e13b8..916dab660a 100644 --- a/runescape-client/src/main/java/PlayerType.java +++ b/runescape-client/src/main/java/PlayerType.java @@ -5,62 +5,73 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("iz") +@ObfuscatedName("is") @Implements("PlayerType") public enum PlayerType implements Enumerated { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Liz;" + signature = "Lis;" ) @Export("PlayerType_normal") PlayerType_normal(0, -1, true, false, true), - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Liz;" + signature = "Lis;" ) @Export("PlayerType_playerModerator") PlayerType_playerModerator(1, 0, true, true, true), - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Liz;" + signature = "Lis;" ) @Export("PlayerType_jagexModerator") PlayerType_jagexModerator(2, 1, true, true, false), - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Liz;" + signature = "Lis;" ) @Export("PlayerType_ironman") PlayerType_ironman(3, 2, false, false, true), - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Liz;" + signature = "Lis;" ) @Export("PlayerType_ultimateIronman") PlayerType_ultimateIronman(4, 3, false, false, true), - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Liz;" + signature = "Lis;" ) @Export("PlayerType_hardcoreIronman") PlayerType_hardcoreIronman(5, 10, false, false, true); - @ObfuscatedName("q") + @ObfuscatedName("h") + @ObfuscatedSignature( + signature = "Liq;" + ) + @Export("NetCache_currentResponse") + public static NetFileRequest NetCache_currentResponse; + @ObfuscatedName("bg") + @ObfuscatedSignature( + signature = "Lij;" + ) + static GameBuild field3130; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 188785687 + intValue = 45468503 ) @Export("id") final int id; - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -25874505 + intValue = 87505705 ) @Export("modIcon") public final int modIcon; - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("isPrivileged") public final boolean isPrivileged; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("isUser") public final boolean isUser; @@ -71,45 +82,71 @@ public enum PlayerType implements Enumerated { this.isUser = var7; } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "56" + signature = "(I)I", + garbageValue = "-995092303" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("i") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "-512423566" + signature = "(ILcs;ZI)I", + garbageValue = "1286217427" ) - static int method4233(int var0, Script var1, boolean var2) { + static int method4289(int var0, Script var1, boolean var2) { Widget var3; if (var0 >= 2000) { var0 -= 1000; - var3 = MusicPatchNode.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); + var3 = WorldMapSprite.getWidget(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); } else { - var3 = var2 ? GrandExchangeOfferNameComparator.field115 : Interpreter.field1130; + var3 = var2 ? KeyHandler.field407 : SecureRandomCallable.field544; } - if (var0 == ScriptOpcodes.CC_CALLONRESIZE) { - if (Interpreter.field1127 >= 10) { - throw new RuntimeException(); - } else if (var3.onResize == null) { - return 0; - } else { - ScriptEvent var4 = new ScriptEvent(); - var4.widget = var3; - var4.args = var3.onResize; - var4.field604 = Interpreter.field1127 + 1; - Client.scriptEvents.addFirst(var4); + class234.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[--UrlRequester.Interpreter_intStackSize]; return 1; + } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { + var3.modelType = 3; + var3.modelId = class60.localPlayer.appearance.getChatHeadId(); + return 1; + } else { + return 2; } } else { - return 2; + UrlRequester.Interpreter_intStackSize -= 2; + int var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + int var5 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + var3.itemId = var4; + var3.itemQuantity = var5; + ItemDefinition var6 = KitDefinition.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 | var6.isStackable == 1) { + var3.itemQuantityMode = 1; + } else { + var3.itemQuantityMode = 2; + } + + if (var3.field2657 > 0) { + var3.modelZoom = var3.modelZoom * 32 / var3.field2657; + } else if (var3.rawWidth > 0) { + var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; + } + + return 1; } } } diff --git a/runescape-client/src/main/java/Players.java b/runescape-client/src/main/java/Players.java index 3685b15044..025c7f3310 100644 --- a/runescape-client/src/main/java/Players.java +++ b/runescape-client/src/main/java/Players.java @@ -4,69 +4,64 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cj") +@ObfuscatedName("cd") @Implements("Players") public class Players { - @ObfuscatedName("rh") - @ObfuscatedGetter( - intValue = 1328419047 - ) - static int field1280; - @ObfuscatedName("k") - static byte[] field1267; - @ObfuscatedName("d") - static byte[] field1273; - @ObfuscatedName("w") + @ObfuscatedName("q") + static byte[] field1282; + @ObfuscatedName("j") + static byte[] field1278; + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "[Lkb;" + signature = "[Lkn;" ) - static Buffer[] field1269; - @ObfuscatedName("v") + static Buffer[] field1279; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 2104068463 + intValue = -1356497417 ) @Export("Players_count") static int Players_count; - @ObfuscatedName("q") + @ObfuscatedName("n") @Export("Players_indices") static int[] Players_indices; - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1941416783 + intValue = -533970605 ) @Export("Players_emptyIdxCount") static int Players_emptyIdxCount; - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("Players_emptyIndices") static int[] Players_emptyIndices; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("Players_regions") static int[] Players_regions; - @ObfuscatedName("s") + @ObfuscatedName("w") @Export("Players_orientations") static int[] Players_orientations; - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("Players_targetIndices") static int[] Players_targetIndices; - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1119363991 + intValue = -144867877 ) @Export("Players_pendingUpdateCount") static int Players_pendingUpdateCount; - @ObfuscatedName("u") + @ObfuscatedName("h") @Export("Players_pendingUpdateIndices") static int[] Players_pendingUpdateIndices; - @ObfuscatedName("h") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "Lkb;" + signature = "Lkn;" ) - static Buffer field1268; + static Buffer field1289; static { - field1267 = new byte[2048]; - field1273 = new byte[2048]; - field1269 = new Buffer[2048]; + field1282 = new byte[2048]; + field1278 = new byte[2048]; + field1279 = new Buffer[2048]; Players_count = 0; Players_indices = new int[2048]; Players_emptyIdxCount = 0; @@ -76,15 +71,41 @@ public class Players { Players_targetIndices = new int[2048]; Players_pendingUpdateCount = 0; Players_pendingUpdateIndices = new int[2048]; - field1268 = new Buffer(new byte[5000]); + field1289 = new Buffer(new byte[5000]); } - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Liy;I)V", - garbageValue = "731875079" + signature = "(IIII)I", + garbageValue = "-1312297159" ) - public static void method2251(AbstractArchive var0) { - VarcInt.VarcInt_archive = var0; + static int method2285(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("q") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "910052167" + ) + public static void method2274() { + WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); } } diff --git a/runescape-client/src/main/java/PrivateChatMode.java b/runescape-client/src/main/java/PrivateChatMode.java index f11d72bdca..5c84b97d60 100644 --- a/runescape-client/src/main/java/PrivateChatMode.java +++ b/runescape-client/src/main/java/PrivateChatMode.java @@ -1,59 +1,39 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lg") +@ObfuscatedName("ls") @Implements("PrivateChatMode") public class PrivateChatMode { - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Llg;" - ) - static final PrivateChatMode field3801; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Llg;" + signature = "Lls;" ) - public static final PrivateChatMode field3806; - @ObfuscatedName("k") + static final PrivateChatMode field3819; + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Llg;" + signature = "Lls;" ) - static final PrivateChatMode field3803; - @ObfuscatedName("v") + public static final PrivateChatMode field3818; + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Liy;" + signature = "Lls;" ) - @Export("ItemDefinition_archive") - public static AbstractArchive ItemDefinition_archive; - @ObfuscatedName("d") + static final PrivateChatMode field3820; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1679462339 + intValue = 530188217 ) - public final int field3804; + public final int field3817; static { - field3801 = new PrivateChatMode(0); - field3806 = new PrivateChatMode(1); - field3803 = new PrivateChatMode(2); + field3819 = new PrivateChatMode(0); + field3818 = new PrivateChatMode(1); + field3820 = new PrivateChatMode(2); } PrivateChatMode(int var1) { - this.field3804 = var1; - } - - @ObfuscatedName("kx") - @ObfuscatedSignature( - signature = "(Lhe;B)Ljava/lang/String;", - garbageValue = "70" - ) - static String method5965(Widget var0) { - if (WorldMapRectangle.method388(ScriptEvent.getWidgetClickMask(var0)) == 0) { - return null; - } else { - return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; - } + this.field3817 = var1; } } diff --git a/runescape-client/src/main/java/Projectile.java b/runescape-client/src/main/java/Projectile.java index 21d1d24ef0..5e2493ae5c 100644 --- a/runescape-client/src/main/java/Projectile.java +++ b/runescape-client/src/main/java/Projectile.java @@ -4,135 +4,135 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ct") +@ObfuscatedName("cm") @Implements("Projectile") public final class Projectile extends Entity { - @ObfuscatedName("sj") + @ObfuscatedName("dk") @ObfuscatedSignature( - signature = "Lco;" + signature = "Lig;" ) - @Export("friendSystem") - public static FriendSystem friendSystem; - @ObfuscatedName("x") + @Export("archive7") + static Archive archive7; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -101649187 + intValue = -1211843013 ) @Export("id") int id; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1827872967 + intValue = 584817429 ) @Export("plane") int plane; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1361221531 + intValue = -1041388181 ) @Export("sourceX") int sourceX; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1265488669 + intValue = 1446127367 ) @Export("sourceY") int sourceY; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1417484877 + intValue = 967638661 ) @Export("sourceZ") int sourceZ; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1177641065 + intValue = -2073235503 ) @Export("endHeight") int endHeight; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1536269421 + intValue = 1099398643 ) @Export("cycleStart") int cycleStart; - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1563239709 + intValue = -1884800007 ) @Export("cycleEnd") int cycleEnd; - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1004662519 + intValue = -305912625 ) @Export("slope") int slope; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 491202369 + intValue = -1437284949 ) @Export("startHeight") int startHeight; - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 219402729 + intValue = 1247378157 ) @Export("targetIndex") int targetIndex; - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("isMoving") boolean isMoving; - @ObfuscatedName("n") + @ObfuscatedName("c") @Export("x") double x; - @ObfuscatedName("u") + @ObfuscatedName("h") @Export("y") double y; - @ObfuscatedName("h") + @ObfuscatedName("k") @Export("z") double z; - @ObfuscatedName("g") + @ObfuscatedName("r") @Export("speedX") double speedX; - @ObfuscatedName("i") + @ObfuscatedName("s") @Export("speedY") double speedY; - @ObfuscatedName("a") + @ObfuscatedName("v") @Export("speed") double speed; - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("speedZ") double speedZ; - @ObfuscatedName("l") + @ObfuscatedName("e") @Export("accelerationZ") double accelerationZ; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -858077797 + intValue = 2056427921 ) @Export("yaw") int yaw; - @ObfuscatedName("o") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1652545155 + intValue = -414343735 ) @Export("pitch") int pitch; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Ljc;" + signature = "Ljm;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("j") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -299919777 + intValue = 106305103 ) @Export("frame") int frame; - @ObfuscatedName("y") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1622544383 + intValue = -1726511745 ) @Export("frameCycle") int frameCycle; @@ -153,19 +153,19 @@ public final class Projectile extends Entity { this.targetIndex = var10; this.endHeight = var11; this.isMoving = false; - int var12 = MouseHandler.SpotAnimationDefinition_get(this.id).sequence; + int var12 = class4.SpotAnimationDefinition_get(this.id).sequence; if (var12 != -1) { - this.sequenceDefinition = SpotAnimationDefinition.SequenceDefinition_get(var12); + this.sequenceDefinition = NetSocket.SequenceDefinition_get(var12); } else { this.sequenceDefinition = null; } } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(IIIII)V", - garbageValue = "-251648925" + garbageValue = "129892196" ) @Export("setDestination") final void setDestination(int var1, int var2, int var3, int var4) { @@ -174,33 +174,33 @@ public final class Projectile extends Entity { var5 = (double)(var1 - this.sourceX); double var7 = (double)(var2 - this.sourceY); double var9 = Math.sqrt(var5 * var5 + var7 * var7); - this.x = (double)this.sourceX + var5 * (double)this.startHeight / var9; - this.y = (double)this.startHeight * var7 / var9 + (double)this.sourceY; + this.x = (double)this.startHeight * var5 / var9 + (double)this.sourceX; + this.y = (double)this.sourceY + var7 * (double)this.startHeight / var9; 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.speedY * this.speedY + this.speedX * this.speedX); + this.speed = Math.sqrt(this.speedX * this.speedX + this.speedY * this.speedY); if (!this.isMoving) { - this.speedZ = -this.speed * Math.tan(0.02454369D * (double)this.slope); + this.speedZ = -this.speed * Math.tan((double)this.slope * 0.02454369D); } - this.accelerationZ = ((double)var3 - this.z - var5 * this.speedZ) * 2.0D / (var5 * var5); + this.accelerationZ = ((double)var3 - this.z - this.speedZ * var5) * 2.0D / (var5 * var5); } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1296799789" + signature = "(IB)V", + garbageValue = "-44" ) @Export("advance") final void advance(int var1) { this.isMoving = true; this.x += (double)var1 * this.speedX; this.y += (double)var1 * this.speedY; - this.z += (double)var1 * this.speedZ + 0.5D * this.accelerationZ * (double)var1 * (double)var1; + this.z += this.accelerationZ * 0.5D * (double)var1 * (double)var1 + (double)var1 * this.speedZ; 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; @@ -226,14 +226,14 @@ public final class Projectile extends Entity { } } - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)Lel;", - garbageValue = "480835067" + signature = "(I)Lef;", + garbageValue = "1832696685" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = MouseHandler.SpotAnimationDefinition_get(this.id); + SpotAnimationDefinition var1 = class4.SpotAnimationDefinition_get(this.id); Model var2 = var1.getModel(this.frame); if (var2 == null) { return null; @@ -243,32 +243,26 @@ public final class Projectile extends Entity { } } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "29577048" + signature = "(I)V", + garbageValue = "-40295508" ) - @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)); + static void method2247() { + for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var0.obj != null) { + var0.set(); } - - 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("p") + @ObfuscatedSignature( + signature = "(IB)Z", + garbageValue = "3" + ) + public static boolean method2249(int var0) { + return (var0 >> 29 & 1) != 0; } } diff --git a/runescape-client/src/main/java/RasterProvider.java b/runescape-client/src/main/java/RasterProvider.java index 6c044a70ec..1ad2129198 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("bh") +@ObfuscatedName("bq") @Implements("RasterProvider") public final class RasterProvider extends AbstractRasterProvider { - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("component") Component component; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("image") Image image; @@ -36,40 +36,40 @@ public final class RasterProvider extends AbstractRasterProvider { this.apply(); } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljava/awt/Component;I)V", - garbageValue = "894605018" + signature = "(Ljava/awt/Component;B)V", + garbageValue = "-55" ) @Export("setComponent") final void setComponent(Component var1) { this.component = var1; } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "1321130014" + signature = "(IIB)V", + garbageValue = "-5" ) @Export("drawFull") public final void drawFull(int var1, int var2) { this.drawFull0(this.component.getGraphics(), var1, var2); } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IIIIS)V", - garbageValue = "32475" + signature = "(IIIII)V", + garbageValue = "-1334771637" ) @Export("draw") public final void draw(int var1, int var2, int var3, int var4) { this.draw0(this.component.getGraphics(), var1, var2, var3, var4); } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(Ljava/awt/Graphics;III)V", - garbageValue = "-972433777" + garbageValue = "2097062254" ) @Export("drawFull0") final void drawFull0(Graphics var1, int var2, int var3) { @@ -81,10 +81,10 @@ public final class RasterProvider extends AbstractRasterProvider { } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(Ljava/awt/Graphics;IIIII)V", - garbageValue = "297654999" + garbageValue = "-199223642" ) @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 3cd3f06063..c13b02e5f5 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("li") +@ObfuscatedName("ld") @Implements("Rasterizer2D") public class Rasterizer2D extends DualNode { - @ObfuscatedName("an") + @ObfuscatedName("ai") @Export("Rasterizer2D_pixels") public static int[] Rasterizer2D_pixels; - @ObfuscatedName("ai") + @ObfuscatedName("ao") @Export("Rasterizer2D_width") public static int Rasterizer2D_width; - @ObfuscatedName("ap") + @ObfuscatedName("ae") @Export("Rasterizer2D_height") public static int Rasterizer2D_height; - @ObfuscatedName("ab") + @ObfuscatedName("ax") @Export("Rasterizer2D_yClipStart") public static int Rasterizer2D_yClipStart; - @ObfuscatedName("ar") + @ObfuscatedName("ag") @Export("Rasterizer2D_yClipEnd") public static int Rasterizer2D_yClipEnd; - @ObfuscatedName("af") + @ObfuscatedName("ab") @Export("Rasterizer2D_xClipStart") public static int Rasterizer2D_xClipStart; - @ObfuscatedName("at") + @ObfuscatedName("am") @Export("Rasterizer2D_xClipEnd") public static int Rasterizer2D_xClipEnd; @@ -38,7 +38,7 @@ public class Rasterizer2D extends DualNode { protected Rasterizer2D() { } - @ObfuscatedName("db") + @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("dw") + @ObfuscatedName("dc") @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("de") + @ObfuscatedName("dt") @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("dh") + @ObfuscatedName("ds") @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("dk") + @ObfuscatedName("dg") @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("da") + @ObfuscatedName("do") @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("do") + @ObfuscatedName("dn") @Export("Rasterizer2D_clear") public static void Rasterizer2D_clear() { int var0 = 0; @@ -141,7 +141,7 @@ public class Rasterizer2D extends DualNode { } - @ObfuscatedName("dr") + @ObfuscatedName("db") @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("dx") + @ObfuscatedName("de") @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("dy") + @ObfuscatedName("dv") @Export("Rasterizer2D_fillRectangleAlpha") public static void Rasterizer2D_fillRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { if (var0 < Rasterizer2D_xClipStart) { @@ -387,7 +387,7 @@ public class Rasterizer2D extends DualNode { } - @ObfuscatedName("dc") + @ObfuscatedName("dk") @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("ds") + @ObfuscatedName("da") @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("dt") + @ObfuscatedName("df") @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("dp") + @ObfuscatedName("dz") @ObfuscatedSignature( signature = "(IIIIII[BIZ)V", garbageValue = "1" @@ -604,7 +604,7 @@ public class Rasterizer2D extends DualNode { } } - @ObfuscatedName("df") + @ObfuscatedName("dq") @Export("Rasterizer2D_drawRectangle") public static void Rasterizer2D_drawRectangle(int var0, int var1, int var2, int var3, int var4) { Rasterizer2D_drawHorizontalLine(var0, var1, var2, var4); @@ -613,7 +613,7 @@ public class Rasterizer2D extends DualNode { Rasterizer2D_drawVerticalLine(var0 + var2 - 1, var1, var3, var4); } - @ObfuscatedName("di") + @ObfuscatedName("dy") @Export("Rasterizer2D_drawRectangleAlpha") public static void Rasterizer2D_drawRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { Rasterizer2D_drawHorizontalLineAlpha(var0, var1, var2, var4, var5); @@ -625,7 +625,7 @@ public class Rasterizer2D extends DualNode { } - @ObfuscatedName("dn") + @ObfuscatedName("du") @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("ea") + @ObfuscatedName("dj") @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("ex") + @ObfuscatedName("ek") @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("eo") + @ObfuscatedName("ej") @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("et") + @ObfuscatedName("eu") @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("eh") + @ObfuscatedName("eo") @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("eq") + @ObfuscatedName("es") @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 c1ed656b6d..3a65fbdf91 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("ec") +@ObfuscatedName("eq") @Implements("Rasterizer3D") public class Rasterizer3D extends Rasterizer2D { - @ObfuscatedName("x") - static boolean field1778; @ObfuscatedName("m") - static boolean field1782; - @ObfuscatedName("k") + static boolean field1796; + @ObfuscatedName("o") + static boolean field1809; + @ObfuscatedName("q") @Export("Rasterizer3D_isLowDetailTexture") static boolean Rasterizer3D_isLowDetailTexture; - @ObfuscatedName("d") - public static boolean field1772; - @ObfuscatedName("w") + @ObfuscatedName("j") + public static boolean field1789; + @ObfuscatedName("p") @Export("Rasterizer3D_alpha") static int Rasterizer3D_alpha; - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("Rasterizer3D_zoom") public static int Rasterizer3D_zoom; - @ObfuscatedName("n") + @ObfuscatedName("c") @Export("Rasterizer3D_clipMidX") static int Rasterizer3D_clipMidX; - @ObfuscatedName("u") + @ObfuscatedName("h") @Export("Rasterizer3D_clipMidY") static int Rasterizer3D_clipMidY; - @ObfuscatedName("h") + @ObfuscatedName("k") @Export("Rasterizer3D_clipWidth") static int Rasterizer3D_clipWidth; - @ObfuscatedName("g") + @ObfuscatedName("r") @Export("Rasterizer3D_clipHeight") static int Rasterizer3D_clipHeight; - @ObfuscatedName("i") + @ObfuscatedName("s") @Export("Rasterizer3D_clipNegativeMidX") static int Rasterizer3D_clipNegativeMidX; - @ObfuscatedName("a") + @ObfuscatedName("v") @Export("Rasterizer3D_clipMidX2") static int Rasterizer3D_clipMidX2; - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("Rasterizer3D_clipNegativeMidY") static int Rasterizer3D_clipNegativeMidY; - @ObfuscatedName("l") + @ObfuscatedName("e") @Export("Rasterizer3D_clipMidY2") static int Rasterizer3D_clipMidY2; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("Rasterizer3D_rowOffsets") static int[] Rasterizer3D_rowOffsets; - @ObfuscatedName("o") + @ObfuscatedName("t") @Export("Rasterizer3D_colorPalette") public static int[] Rasterizer3D_colorPalette; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Leu;" + signature = "Ley;" ) @Export("Rasterizer3D_textureLoader") public static TextureLoader Rasterizer3D_textureLoader; - @ObfuscatedName("j") - static int[] field1792; - @ObfuscatedName("y") - static int[] field1793; + @ObfuscatedName("b") + static int[] field1786; + @ObfuscatedName("i") + static int[] field1791; @ObfuscatedName("f") @Export("Rasterizer3D_sine") public static int[] Rasterizer3D_sine; - @ObfuscatedName("ae") + @ObfuscatedName("ah") @Export("Rasterizer3D_cosine") public static int[] Rasterizer3D_cosine; static { - field1778 = false; - field1782 = false; + field1796 = false; + field1809 = false; Rasterizer3D_isLowDetailTexture = false; - field1772 = true; + field1789 = true; Rasterizer3D_alpha = 0; Rasterizer3D_zoom = 512; Rasterizer3D_rowOffsets = new int[1024]; Rasterizer3D_colorPalette = new int[65536]; - field1792 = new int[512]; - field1793 = new int[2048]; + field1786 = new int[512]; + field1791 = new int[2048]; Rasterizer3D_sine = new int[2048]; Rasterizer3D_cosine = new int[2048]; int var0; for (var0 = 1; var0 < 512; ++var0) { - field1792[var0] = 32768 / var0; + field1786[var0] = 32768 / var0; } for (var0 = 1; var0 < 2048; ++var0) { - field1793[var0] = 65536 / var0; + field1791[var0] = 65536 / var0; } for (var0 = 0; var0 < 2048; ++var0) { @@ -98,32 +98,42 @@ public class Rasterizer3D extends Rasterizer2D { } - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("Rasterizer3D_setClipFromRasterizer2D") public static final void Rasterizer3D_setClipFromRasterizer2D() { Rasterizer3D_setClip(Rasterizer2D.Rasterizer2D_xClipStart, Rasterizer2D.Rasterizer2D_yClipStart, Rasterizer2D.Rasterizer2D_xClipEnd, Rasterizer2D.Rasterizer2D_yClipEnd); } - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("Rasterizer3D_setClip") static final void Rasterizer3D_setClip(int var0, int var1, int var2, int var3) { Rasterizer3D_clipWidth = var2 - var0; Rasterizer3D_clipHeight = var3 - var1; Rasterizer3D_method3(); + int var4; + int var5; if (Rasterizer3D_rowOffsets.length < Rasterizer3D_clipHeight) { - Rasterizer3D_rowOffsets = new int[Calendar.method4033(Rasterizer3D_clipHeight)]; + var5 = Rasterizer3D_clipHeight; + --var5; + var5 |= var5 >>> 1; + var5 |= var5 >>> 2; + var5 |= var5 >>> 4; + var5 |= var5 >>> 8; + var5 |= var5 >>> 16; + var4 = var5 + 1; + Rasterizer3D_rowOffsets = new int[var4]; } - int var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; + var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; - for (int var5 = 0; var5 < Rasterizer3D_clipHeight; ++var5) { + for (var5 = 0; var5 < Rasterizer3D_clipHeight; ++var5) { Rasterizer3D_rowOffsets[var5] = var4; var4 += Rasterizer2D.Rasterizer2D_width; } } - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("Rasterizer3D_method3") public static final void Rasterizer3D_method3() { Rasterizer3D_clipMidX = Rasterizer3D_clipWidth / 2; @@ -134,8 +144,8 @@ public class Rasterizer3D extends Rasterizer2D { Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; } - @ObfuscatedName("d") - public static final void method3099(int var0, int var1) { + @ObfuscatedName("j") + public static final void method3147(int var0, int var1) { int var2 = Rasterizer3D_rowOffsets[0]; int var3 = var2 / Rasterizer2D.Rasterizer2D_width; int var4 = var2 - var3 * Rasterizer2D.Rasterizer2D_width; @@ -147,22 +157,22 @@ public class Rasterizer3D extends Rasterizer2D { Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Leu;)V" + signature = "(Ley;)V" ) @Export("Rasterizer3D_setTextureLoader") public static final void Rasterizer3D_setTextureLoader(TextureLoader var0) { Rasterizer3D_textureLoader = var0; } - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("Rasterizer3D_setBrightness") public static final void Rasterizer3D_setBrightness(double var0) { Rasterizer3D_buildPalette(var0, 0, 512); } - @ObfuscatedName("q") + @ObfuscatedName("n") @Export("Rasterizer3D_buildPalette") static final void Rasterizer3D_buildPalette(double var0, int var2, int var3) { int var4 = var2 * 128; @@ -241,7 +251,7 @@ public class Rasterizer3D extends Rasterizer2D { } - @ObfuscatedName("z") + @ObfuscatedName("u") @Export("Rasterizer3D_brighten") static int Rasterizer3D_brighten(int var0, double var1) { double var3 = (double)(var0 >> 16) / 256.0D; @@ -256,13 +266,13 @@ public class Rasterizer3D extends Rasterizer2D { return var11 + (var10 << 8) + (var9 << 16); } - @ObfuscatedName("t") - public static void method3110(int var0, int var1, int var2) { - field1778 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; + @ObfuscatedName("a") + public static void method3144(int var0, int var1, int var2) { + field1796 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; } - @ObfuscatedName("e") - static final void method3105(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + @ObfuscatedName("z") + static final void method3122(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; @@ -392,35 +402,7 @@ public class Rasterizer3D extends Rasterizer2D { var2 = 0; } - if (var0 != var2 && var17 < var16 || var0 == var2 && var15 > var16) { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); - var5 += var15; - var3 += var16; - var6 += var20; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var3 >> 14, var6, var19); - var4 += var17; - var3 += var16; - var6 += var20; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } else { + if ((var0 == var2 || var17 >= var16) && (var0 != var2 || var15 <= var16)) { var1 -= var2; var2 -= var0; var0 = Rasterizer3D_rowOffsets[var0]; @@ -448,6 +430,34 @@ public class Rasterizer3D extends Rasterizer2D { var6 += var20; var0 += Rasterizer2D.Rasterizer2D_width; } + } else { + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); + var5 += var15; + var3 += var16; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var3 >> 14, var6, var19); + var4 += var17; + var3 += var16; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; + } } } } @@ -767,10 +777,10 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("s") + @ObfuscatedName("w") @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 (field1778) { + if (field1796) { if (var5 > Rasterizer3D_clipWidth) { var5 = Rasterizer3D_clipWidth; } @@ -786,7 +796,7 @@ public class Rasterizer3D extends Rasterizer2D { int var8; int var9; int var10; - if (field1772) { + if (field1789) { var3 = var5 - var4 >> 2; var7 <<= 2; if (Rasterizer3D_alpha == 0) { @@ -870,8 +880,8 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("p") - public static final void method3107(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("y") + public static final void method3124(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); @@ -978,33 +988,7 @@ public class Rasterizer3D extends Rasterizer2D { var2 = 0; } - if ((var0 == var2 || var9 >= var7) && (var0 != var2 || var8 <= var7)) { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); - var5 += var8; - var3 += var7; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var4 >> 14); - var4 += var9; - var3 += var7; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } else { + if (var0 != var2 && var9 < var7 || var0 == var2 && var8 > var7) { var1 -= var2; var2 -= var0; var0 = Rasterizer3D_rowOffsets[var0]; @@ -1030,6 +1014,32 @@ public class Rasterizer3D extends Rasterizer2D { var3 += var7; var0 += Rasterizer2D.Rasterizer2D_width; } + } else { + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); + var5 += var8; + var3 += var7; + var0 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var4 >> 14); + var4 += var9; + var3 += var7; + var0 += Rasterizer2D.Rasterizer2D_width; + } } } } @@ -1326,10 +1336,10 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("n") + @ObfuscatedName("c") @Export("Rasterizer3D_horizAlpha") static final void Rasterizer3D_horizAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5) { - if (field1778) { + if (field1796) { if (var5 > Rasterizer3D_clipWidth) { var5 = Rasterizer3D_clipWidth; } @@ -1421,16 +1431,16 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("u") - static final void method3109(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("h") + static final void method3126(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); - method3105(var0, var1, var2, var3, var4, var5, method3112(var20, var6), method3112(var20, var7), method3112(var20, var8)); + method3122(var0, var1, var2, var3, var4, var5, method3145(var20, var6), method3145(var20, var7), method3145(var20, var8)); } else { Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); - field1782 = Rasterizer3D_textureLoader.vmethod3388(var18); + field1809 = Rasterizer3D_textureLoader.vmethod3404(var18); var20 = var4 - var3; int var21 = var1 - var0; int var22 = var5 - var3; @@ -1502,41 +1512,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_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var28; - var4 += var27; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - 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]; @@ -1570,6 +1546,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_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var4 += var27; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } } } else { var4 = var3 <<= 14; @@ -1691,41 +1701,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_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var26; - var5 += var28; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - 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]; @@ -1759,6 +1735,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_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var5 += var28; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } } } else { var5 = var4 <<= 14; @@ -2042,10 +2052,10 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("h") + @ObfuscatedName("k") @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 (field1778) { + if (field1796) { if (var6 > Rasterizer3D_clipWidth) { var6 = Rasterizer3D_clipWidth; } @@ -2109,7 +2119,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; var8 <<= 3; var15 = var7 >> 8; - if (field1782) { + if (field1809) { if (var17 > 0) { do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; @@ -2304,7 +2314,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; var8 <<= 3; var15 = var7 >> 8; - if (field1782) { + if (field1809) { if (var17 > 0) { do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; @@ -2463,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); - method3105(var0, var1, var2, var3, var4, var5, method3112(var20, var6), method3112(var20, var7), method3112(var20, var8)); + method3122(var0, var1, var2, var3, var4, var5, method3145(var20, var6), method3145(var20, var7), method3145(var20, var8)); } else { Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); - field1782 = Rasterizer3D_textureLoader.vmethod3388(var18); + field1809 = Rasterizer3D_textureLoader.vmethod3404(var18); var20 = var4 - var3; int var21 = var1 - var0; int var22 = var5 - var3; @@ -2545,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]; @@ -2613,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; @@ -2734,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]; @@ -2802,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; @@ -3085,10 +3095,10 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("i") + @ObfuscatedName("d") @Export("Rasterizer3D_textureAlpha") static final void Rasterizer3D_textureAlpha(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14) { - if (field1778) { + if (field1796) { if (var6 > Rasterizer3D_clipWidth) { var6 = Rasterizer3D_clipWidth; } @@ -3141,7 +3151,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; var8 <<= 3; var15 = var7 >> 8; - if (field1782) { + if (field1809) { if (var17 > 0) { do { var3 = var1[(var2 >>> 26) + (var2 & 4032)]; @@ -3284,7 +3294,7 @@ public class Rasterizer3D extends Rasterizer2D { var17 >>= 3; var8 <<= 3; var15 = var7 >> 8; - if (field1782) { + if (field1809) { if (var17 > 0) { do { var3 = var1[(var2 & 16256) + (var2 >>> 25)]; @@ -3401,8 +3411,8 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("a") - static final int method3112(int var0, int var1) { + @ObfuscatedName("e") + static final int method3145(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; if (var1 < 2) { var1 = 2; @@ -3413,33 +3423,33 @@ public class Rasterizer3D extends Rasterizer2D { return (var0 & 65408) + var1; } - @ObfuscatedName("o") - static final int method3113(int var0, int var1, int var2, int var3) { + @ObfuscatedName("l") + static final int method3131(int var0, int var1, int var2, int var3) { return var0 * var2 + var3 * var1 >> 16; } - @ObfuscatedName("c") - static final int method3150(int var0, int var1, int var2, int var3) { - return var2 * var1 - var3 * var0 >> 16; - } - - @ObfuscatedName("f") - static final int method3115(int var0, int var1, int var2, int var3) { - return var0 * var2 - var3 * var1 >> 16; - } - - @ObfuscatedName("ae") - static final int method3116(int var0, int var1, int var2, int var3) { - return var3 * var0 + var2 * var1 >> 16; - } - - @ObfuscatedName("an") - static final int method3151(int var0, int var1, int var2, int var3) { - return var0 * var2 + var3 * var1 >> 16; - } - - @ObfuscatedName("ai") + @ObfuscatedName("t") static final int method3118(int var0, int var1, int var2, int var3) { return var2 * var1 - var3 * var0 >> 16; } + + @ObfuscatedName("x") + static final int method3158(int var0, int var1, int var2, int var3) { + return var0 * var2 - var3 * var1 >> 16; + } + + @ObfuscatedName("ah") + static final int method3134(int var0, int var1, int var2, int var3) { + return var3 * var0 + var2 * var1 >> 16; + } + + @ObfuscatedName("ai") + static final int method3135(int var0, int var1, int var2, int var3) { + return var0 * var2 + var3 * var1 >> 16; + } + + @ObfuscatedName("ao") + static final int method3136(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 76d472776d..ae443c44c4 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("dy") +@ObfuscatedName("dk") @Implements("RawPcmStream") public class RawPcmStream extends PcmStream { - @ObfuscatedName("x") - int field1490; @ObfuscatedName("m") - int field1481; - @ObfuscatedName("k") - int field1482; - @ObfuscatedName("d") - int field1483; - @ObfuscatedName("v") - int field1484; + int field1492; + @ObfuscatedName("o") + int field1491; @ObfuscatedName("q") - int field1489; - @ObfuscatedName("z") - int field1486; - @ObfuscatedName("t") + int field1503; + @ObfuscatedName("j") + int field1493; + @ObfuscatedName("p") + int field1494; + @ObfuscatedName("g") + int field1495; + @ObfuscatedName("n") + int field1496; + @ObfuscatedName("u") @Export("numLoops") int numLoops; - @ObfuscatedName("e") + @ObfuscatedName("a") @Export("start") int start; - @ObfuscatedName("s") + @ObfuscatedName("z") @Export("end") int end; - @ObfuscatedName("p") - boolean field1493; - @ObfuscatedName("n") - int field1491; - @ObfuscatedName("u") - int field1485; + @ObfuscatedName("y") + boolean field1497; + @ObfuscatedName("c") + int field1501; @ObfuscatedName("h") - int field1492; - @ObfuscatedName("g") - int field1494; + int field1502; + @ObfuscatedName("k") + int field1490; + @ObfuscatedName("r") + int field1504; @ObfuscatedSignature( - signature = "(Ldm;III)V" + signature = "(Ldp;III)V" ) RawPcmStream(RawSound var1, int var2, int var3, int var4) { super.sound = var1; this.start = var1.start; this.end = var1.end; - this.field1493 = var1.field1407; - this.field1481 = var2; - this.field1482 = var3; - this.field1483 = var4; - this.field1490 = 0; - this.method2658(); + this.field1497 = var1.field1423; + this.field1491 = var2; + this.field1503 = var3; + this.field1493 = var4; + this.field1492 = 0; + this.method2675(); } @ObfuscatedSignature( - signature = "(Ldm;II)V" + signature = "(Ldp;II)V" ) RawPcmStream(RawSound var1, int var2, int var3) { super.sound = var1; this.start = var1.start; this.end = var1.end; - this.field1493 = var1.field1407; - this.field1481 = var2; - this.field1482 = var3; - this.field1483 = 8192; - this.field1490 = 0; - this.method2658(); + this.field1497 = var1.field1423; + this.field1491 = var2; + this.field1503 = var3; + this.field1493 = 8192; + this.field1492 = 0; + this.method2675(); } - @ObfuscatedName("w") - void method2658() { - this.field1484 = this.field1482; - this.field1489 = method2721(this.field1482, this.field1483); - this.field1486 = method2652(this.field1482, this.field1483); + @ObfuscatedName("p") + void method2675() { + this.field1494 = this.field1503; + this.field1495 = method2814(this.field1503, this.field1493); + this.field1496 = method2803(this.field1503, this.field1493); } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "()Lds;" + signature = "()Ldf;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { return null; } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "()Lds;" + signature = "()Ldf;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { return null; } - @ObfuscatedName("z") - protected int vmethod3984() { - return this.field1482 == 0 && this.field1491 == 0 ? 0 : 1; + @ObfuscatedName("u") + protected int vmethod4037() { + return this.field1503 == 0 && this.field1501 == 0 ? 0 : 1; } - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("fill") public synchronized void fill(int[] var1, int var2, int var3) { - if (this.field1482 == 0 && this.field1491 == 0) { + if (this.field1503 == 0 && this.field1501 == 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.field1490 < 0) { - if (this.field1481 <= 0) { - this.method2794(); + if (this.field1492 < 0) { + if (this.field1491 <= 0) { + this.method2684(); this.remove(); return; } - this.field1490 = 0; + this.field1492 = 0; } - if (this.field1490 >= var7) { - if (this.field1481 >= 0) { - this.method2794(); + if (this.field1492 >= var7) { + if (this.field1491 >= 0) { + this.method2684(); this.remove(); return; } - this.field1490 = var7 - 1; + this.field1492 = var7 - 1; } if (this.numLoops < 0) { - if (this.field1493) { - if (this.field1481 < 0) { - var9 = this.method2679(var1, var2, var5, var3, var4.samples[this.start]); - if (this.field1490 >= var5) { + if (this.field1497) { + if (this.field1491 < 0) { + var9 = this.method2698(var1, var2, var5, var3, var4.samples[this.start]); + if (this.field1492 >= var5) { return; } - this.field1490 = var5 + var5 - 1 - this.field1490; - this.field1481 = -this.field1481; + this.field1492 = var5 + var5 - 1 - this.field1492; + this.field1491 = -this.field1491; } while (true) { - var9 = this.method2678(var1, var9, var6, var3, var4.samples[this.end - 1]); - if (this.field1490 < var6) { + var9 = this.method2697(var1, var9, var6, var3, var4.samples[this.end - 1]); + if (this.field1492 < var6) { return; } - this.field1490 = var6 + var6 - 1 - this.field1490; - this.field1481 = -this.field1481; - var9 = this.method2679(var1, var9, var5, var3, var4.samples[this.start]); - if (this.field1490 >= var5) { + this.field1492 = var6 + var6 - 1 - this.field1492; + this.field1491 = -this.field1491; + var9 = this.method2698(var1, var9, var5, var3, var4.samples[this.start]); + if (this.field1492 >= var5) { return; } - this.field1490 = var5 + var5 - 1 - this.field1490; - this.field1481 = -this.field1481; + this.field1492 = var5 + var5 - 1 - this.field1492; + this.field1491 = -this.field1491; } - } else if (this.field1481 < 0) { + } else if (this.field1491 < 0) { while (true) { - var9 = this.method2679(var1, var9, var5, var3, var4.samples[this.end - 1]); - if (this.field1490 >= var5) { + var9 = this.method2698(var1, var9, var5, var3, var4.samples[this.end - 1]); + if (this.field1492 >= var5) { return; } - this.field1490 = var6 - 1 - (var6 - 1 - this.field1490) % var8; + this.field1492 = var6 - 1 - (var6 - 1 - this.field1492) % var8; } } else { while (true) { - var9 = this.method2678(var1, var9, var6, var3, var4.samples[this.start]); - if (this.field1490 < var6) { + var9 = this.method2697(var1, var9, var6, var3, var4.samples[this.start]); + if (this.field1492 < var6) { return; } - this.field1490 = var5 + (this.field1490 - var5) % var8; + this.field1492 = var5 + (this.field1492 - var5) % var8; } } } else { if (this.numLoops > 0) { - if (this.field1493) { - label139: { - if (this.field1481 < 0) { - var9 = this.method2679(var1, var2, var5, var3, var4.samples[this.start]); - if (this.field1490 >= var5) { + if (this.field1497) { + label132: { + if (this.field1491 < 0) { + var9 = this.method2698(var1, var2, var5, var3, var4.samples[this.start]); + if (this.field1492 >= var5) { return; } - this.field1490 = var5 + var5 - 1 - this.field1490; - this.field1481 = -this.field1481; + this.field1492 = var5 + var5 - 1 - this.field1492; + this.field1491 = -this.field1491; if (--this.numLoops == 0) { - break label139; + break label132; } } do { - var9 = this.method2678(var1, var9, var6, var3, var4.samples[this.end - 1]); - if (this.field1490 < var6) { + var9 = this.method2697(var1, var9, var6, var3, var4.samples[this.end - 1]); + if (this.field1492 < var6) { return; } - this.field1490 = var6 + var6 - 1 - this.field1490; - this.field1481 = -this.field1481; + this.field1492 = var6 + var6 - 1 - this.field1492; + this.field1491 = -this.field1491; if (--this.numLoops == 0) { break; } - var9 = this.method2679(var1, var9, var5, var3, var4.samples[this.start]); - if (this.field1490 >= var5) { + var9 = this.method2698(var1, var9, var5, var3, var4.samples[this.start]); + if (this.field1492 >= var5) { return; } - this.field1490 = var5 + var5 - 1 - this.field1490; - this.field1481 = -this.field1481; + this.field1492 = var5 + var5 - 1 - this.field1492; + this.field1491 = -this.field1491; } while(--this.numLoops != 0); } } else { int var10; - if (this.field1481 < 0) { + if (this.field1491 < 0) { while (true) { - var9 = this.method2679(var1, var9, var5, var3, var4.samples[this.end - 1]); - if (this.field1490 >= var5) { + var9 = this.method2698(var1, var9, var5, var3, var4.samples[this.end - 1]); + if (this.field1492 >= var5) { return; } - var10 = (var6 - 1 - this.field1490) / var8; + var10 = (var6 - 1 - this.field1492) / var8; if (var10 >= this.numLoops) { - this.field1490 += var8 * this.numLoops; + this.field1492 += var8 * this.numLoops; this.numLoops = 0; break; } - this.field1490 += var8 * var10; + this.field1492 += var8 * var10; this.numLoops -= var10; } } else { while (true) { - var9 = this.method2678(var1, var9, var6, var3, var4.samples[this.start]); - if (this.field1490 < var6) { + var9 = this.method2697(var1, var9, var6, var3, var4.samples[this.start]); + if (this.field1492 < var6) { return; } - var10 = (this.field1490 - var5) / var8; + var10 = (this.field1492 - var5) / var8; if (var10 >= this.numLoops) { - this.field1490 -= var8 * this.numLoops; + this.field1492 -= var8 * this.numLoops; this.numLoops = 0; break; } - this.field1490 -= var8 * var10; + this.field1492 -= var8 * var10; this.numLoops -= var10; } } } } - if (this.field1481 < 0) { - this.method2679(var1, var9, 0, var3, 0); - if (this.field1490 < 0) { - this.field1490 = -1; - this.method2794(); + if (this.field1491 < 0) { + this.method2698(var1, var9, 0, var3, 0); + if (this.field1492 < 0) { + this.field1492 = -1; + this.method2684(); this.remove(); } } else { - this.method2678(var1, var9, var7, var3, 0); - if (this.field1490 >= var7) { - this.field1490 = var7; - this.method2794(); + this.method2697(var1, var9, var7, var3, 0); + if (this.field1492 >= var7) { + this.field1492 = var7; + this.method2684(); this.remove(); } } @@ -282,33 +282,33 @@ public class RawPcmStream extends PcmStream { } } - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("setNumLoops") public synchronized void setNumLoops(int var1) { this.numLoops = var1; } - @ObfuscatedName("s") + @ObfuscatedName("w") @Export("skip") public synchronized void skip(int var1) { - if (this.field1491 > 0) { - if (var1 >= this.field1491) { - if (this.field1482 == Integer.MIN_VALUE) { - this.field1482 = 0; - this.field1486 = 0; - this.field1489 = 0; - this.field1484 = 0; + if (this.field1501 > 0) { + if (var1 >= this.field1501) { + if (this.field1503 == Integer.MIN_VALUE) { + this.field1503 = 0; + this.field1496 = 0; + this.field1495 = 0; + this.field1494 = 0; this.remove(); - var1 = this.field1491; + var1 = this.field1501; } - this.field1491 = 0; - this.method2658(); + this.field1501 = 0; + this.method2675(); } else { - this.field1484 += this.field1485 * var1; - this.field1489 += this.field1492 * var1; - this.field1486 += this.field1494 * var1; - this.field1491 -= var1; + this.field1494 += this.field1502 * var1; + this.field1495 += this.field1490 * var1; + this.field1496 += this.field1504 * var1; + this.field1501 -= var1; } } @@ -321,179 +321,179 @@ public class RawPcmStream extends PcmStream { this.numLoops = 0; } - if (this.field1490 < 0) { - if (this.field1481 <= 0) { - this.method2794(); + if (this.field1492 < 0) { + if (this.field1491 <= 0) { + this.method2684(); this.remove(); return; } - this.field1490 = 0; + this.field1492 = 0; } - if (this.field1490 >= var5) { - if (this.field1481 >= 0) { - this.method2794(); + if (this.field1492 >= var5) { + if (this.field1491 >= 0) { + this.method2684(); this.remove(); return; } - this.field1490 = var5 - 1; + this.field1492 = var5 - 1; } - this.field1490 += this.field1481 * var1; + this.field1492 += this.field1491 * var1; if (this.numLoops < 0) { - if (!this.field1493) { - if (this.field1481 < 0) { - if (this.field1490 >= var3) { + if (!this.field1497) { + if (this.field1491 < 0) { + if (this.field1492 >= var3) { return; } - this.field1490 = var4 - 1 - (var4 - 1 - this.field1490) % var6; + this.field1492 = var4 - 1 - (var4 - 1 - this.field1492) % var6; } else { - if (this.field1490 < var4) { + if (this.field1492 < var4) { return; } - this.field1490 = var3 + (this.field1490 - var3) % var6; + this.field1492 = var3 + (this.field1492 - var3) % var6; } } else { - if (this.field1481 < 0) { - if (this.field1490 >= var3) { + if (this.field1491 < 0) { + if (this.field1492 >= var3) { return; } - this.field1490 = var3 + var3 - 1 - this.field1490; - this.field1481 = -this.field1481; + this.field1492 = var3 + var3 - 1 - this.field1492; + this.field1491 = -this.field1491; } - while (this.field1490 >= var4) { - this.field1490 = var4 + var4 - 1 - this.field1490; - this.field1481 = -this.field1481; - if (this.field1490 >= var3) { + while (this.field1492 >= var4) { + this.field1492 = var4 + var4 - 1 - this.field1492; + this.field1491 = -this.field1491; + if (this.field1492 >= var3) { return; } - this.field1490 = var3 + var3 - 1 - this.field1490; - this.field1481 = -this.field1481; + this.field1492 = var3 + var3 - 1 - this.field1492; + this.field1491 = -this.field1491; } } } else { if (this.numLoops > 0) { - if (this.field1493) { - label123: { - if (this.field1481 < 0) { - if (this.field1490 >= var3) { + if (this.field1497) { + label124: { + if (this.field1491 < 0) { + if (this.field1492 >= var3) { return; } - this.field1490 = var3 + var3 - 1 - this.field1490; - this.field1481 = -this.field1481; + this.field1492 = var3 + var3 - 1 - this.field1492; + this.field1491 = -this.field1491; if (--this.numLoops == 0) { - break label123; + break label124; } } do { - if (this.field1490 < var4) { + if (this.field1492 < var4) { return; } - this.field1490 = var4 + var4 - 1 - this.field1490; - this.field1481 = -this.field1481; + this.field1492 = var4 + var4 - 1 - this.field1492; + this.field1491 = -this.field1491; if (--this.numLoops == 0) { break; } - if (this.field1490 >= var3) { + if (this.field1492 >= var3) { return; } - this.field1490 = var3 + var3 - 1 - this.field1490; - this.field1481 = -this.field1481; + this.field1492 = var3 + var3 - 1 - this.field1492; + this.field1491 = -this.field1491; } while(--this.numLoops != 0); } } else { int var7; - if (this.field1481 < 0) { - if (this.field1490 >= var3) { + if (this.field1491 < 0) { + if (this.field1492 >= var3) { return; } - var7 = (var4 - 1 - this.field1490) / var6; + var7 = (var4 - 1 - this.field1492) / var6; if (var7 < this.numLoops) { - this.field1490 += var6 * var7; + this.field1492 += var6 * var7; this.numLoops -= var7; return; } - this.field1490 += var6 * this.numLoops; + this.field1492 += var6 * this.numLoops; this.numLoops = 0; } else { - if (this.field1490 < var4) { + if (this.field1492 < var4) { return; } - var7 = (this.field1490 - var3) / var6; + var7 = (this.field1492 - var3) / var6; if (var7 < this.numLoops) { - this.field1490 -= var6 * var7; + this.field1492 -= var6 * var7; this.numLoops -= var7; return; } - this.field1490 -= var6 * this.numLoops; + this.field1492 -= var6 * this.numLoops; this.numLoops = 0; } } } - if (this.field1481 < 0) { - if (this.field1490 < 0) { - this.field1490 = -1; - this.method2794(); + if (this.field1491 < 0) { + if (this.field1492 < 0) { + this.field1492 = -1; + this.method2684(); this.remove(); } - } else if (this.field1490 >= var5) { - this.field1490 = var5; - this.method2794(); + } else if (this.field1492 >= var5) { + this.field1492 = var5; + this.method2684(); this.remove(); } } } - @ObfuscatedName("p") - public synchronized void method2659(int var1) { - this.method2661(var1 << 6, this.method2663()); + @ObfuscatedName("y") + public synchronized void method2677(int var1) { + this.method2679(var1 << 6, this.method2710()); } - @ObfuscatedName("n") - synchronized void method2682(int var1) { - this.method2661(var1, this.method2663()); - } - - @ObfuscatedName("u") - synchronized void method2661(int var1, int var2) { - this.field1482 = var1; - this.field1483 = var2; - this.field1491 = 0; - this.method2658(); + @ObfuscatedName("c") + synchronized void method2678(int var1) { + this.method2679(var1, this.method2710()); } @ObfuscatedName("h") - public synchronized int method2662() { - return this.field1482 == Integer.MIN_VALUE ? 0 : this.field1482; + synchronized void method2679(int var1, int var2) { + this.field1503 = var1; + this.field1493 = var2; + this.field1501 = 0; + this.method2675(); } - @ObfuscatedName("g") - public synchronized int method2663() { - return this.field1483 < 0 ? -1 : this.field1483; + @ObfuscatedName("k") + public synchronized int method2680() { + return this.field1503 == Integer.MIN_VALUE ? 0 : this.field1503; } - @ObfuscatedName("i") - public synchronized void method2664(int var1) { + @ObfuscatedName("r") + public synchronized int method2710() { + return this.field1493 < 0 ? -1 : this.field1493; + } + + @ObfuscatedName("d") + public synchronized void method2682(int var1) { int var2 = ((RawSound)super.sound).samples.length << 8; if (var1 < -1) { var1 = -1; @@ -503,326 +503,257 @@ public class RawPcmStream extends PcmStream { var1 = var2; } - this.field1490 = var1; + this.field1492 = var1; } - @ObfuscatedName("a") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(Z)V", garbageValue = "1" ) - public synchronized void method2655() { - this.field1481 = (this.field1481 ^ this.field1481 >> 31) + (this.field1481 >>> 31); - this.field1481 = -this.field1481; + public synchronized void method2683() { + this.field1491 = (this.field1491 ^ this.field1491 >> 31) + (this.field1491 >>> 31); + this.field1491 = -this.field1491; } - @ObfuscatedName("o") - void method2794() { - if (this.field1491 != 0) { - if (this.field1482 == Integer.MIN_VALUE) { - this.field1482 = 0; + @ObfuscatedName("l") + void method2684() { + if (this.field1501 != 0) { + if (this.field1503 == Integer.MIN_VALUE) { + this.field1503 = 0; } - this.field1491 = 0; - this.method2658(); + this.field1501 = 0; + this.method2675(); } } - @ObfuscatedName("c") - public synchronized void method2666(int var1, int var2) { - this.method2704(var1, var2, this.method2663()); + @ObfuscatedName("t") + public synchronized void method2685(int var1, int var2) { + this.method2775(var1, var2, this.method2710()); } - @ObfuscatedName("f") - public synchronized void method2704(int var1, int var2, int var3) { + @ObfuscatedName("x") + public synchronized void method2775(int var1, int var2, int var3) { if (var1 == 0) { - this.method2661(var2, var3); + this.method2679(var2, var3); } else { - int var4 = method2721(var2, var3); - int var5 = method2652(var2, var3); - if (var4 == this.field1489 && var5 == this.field1486) { - this.field1491 = 0; + int var4 = method2814(var2, var3); + int var5 = method2803(var2, var3); + if (var4 == this.field1495 && var5 == this.field1496) { + this.field1501 = 0; } else { - int var6 = var2 - this.field1484; - if (this.field1484 - var2 > var6) { - var6 = this.field1484 - var2; + int var6 = var2 - this.field1494; + if (this.field1494 - var2 > var6) { + var6 = this.field1494 - var2; } - if (var4 - this.field1489 > var6) { - var6 = var4 - this.field1489; + if (var4 - this.field1495 > var6) { + var6 = var4 - this.field1495; } - if (this.field1489 - var4 > var6) { - var6 = this.field1489 - var4; + if (this.field1495 - var4 > var6) { + var6 = this.field1495 - var4; } - if (var5 - this.field1486 > var6) { - var6 = var5 - this.field1486; + if (var5 - this.field1496 > var6) { + var6 = var5 - this.field1496; } - if (this.field1486 - var5 > var6) { - var6 = this.field1486 - var5; + if (this.field1496 - var5 > var6) { + var6 = this.field1496 - var5; } if (var1 > var6) { var1 = var6; } - this.field1491 = var1; - this.field1482 = var2; - this.field1483 = var3; - this.field1485 = (var2 - this.field1484) / var1; - this.field1492 = (var4 - this.field1489) / var1; - this.field1494 = (var5 - this.field1486) / var1; + this.field1501 = var1; + this.field1503 = var2; + this.field1493 = var3; + this.field1502 = (var2 - this.field1494) / var1; + this.field1490 = (var4 - this.field1495) / var1; + this.field1504 = (var5 - this.field1496) / var1; } } } - @ObfuscatedName("ae") - public synchronized void method2706(int var1) { + @ObfuscatedName("ah") + public synchronized void method2732(int var1) { if (var1 == 0) { - this.method2682(0); + this.method2678(0); this.remove(); - } else if (this.field1489 == 0 && this.field1486 == 0) { - this.field1491 = 0; - this.field1482 = 0; - this.field1484 = 0; + } else if (this.field1495 == 0 && this.field1496 == 0) { + this.field1501 = 0; + this.field1503 = 0; + this.field1494 = 0; this.remove(); } else { - int var2 = -this.field1484; - if (this.field1484 > var2) { - var2 = this.field1484; + int var2 = -this.field1494; + if (this.field1494 > var2) { + var2 = this.field1494; } - if (-this.field1489 > var2) { - var2 = -this.field1489; + if (-this.field1495 > var2) { + var2 = -this.field1495; } - if (this.field1489 > var2) { - var2 = this.field1489; + if (this.field1495 > var2) { + var2 = this.field1495; } - if (-this.field1486 > var2) { - var2 = -this.field1486; + if (-this.field1496 > var2) { + var2 = -this.field1496; } - if (this.field1486 > var2) { - var2 = this.field1486; + if (this.field1496 > var2) { + var2 = this.field1496; } if (var1 > var2) { var1 = var2; } - this.field1491 = var1; - this.field1482 = Integer.MIN_VALUE; - this.field1485 = -this.field1484 / var1; - this.field1492 = -this.field1489 / var1; - this.field1494 = -this.field1486 / var1; + this.field1501 = var1; + this.field1503 = Integer.MIN_VALUE; + this.field1502 = -this.field1494 / var1; + this.field1490 = -this.field1495 / var1; + this.field1504 = -this.field1496 / var1; } } - @ObfuscatedName("an") - public synchronized void method2669(int var1) { - if (this.field1481 < 0) { - this.field1481 = -var1; - } else { - this.field1481 = var1; - } - - } - @ObfuscatedName("ai") - public synchronized int method2670() { - return this.field1481 < 0 ? -this.field1481 : this.field1481; - } - - @ObfuscatedName("ap") - public boolean method2671() { - return this.field1490 < 0 || this.field1490 >= ((RawSound)super.sound).samples.length << 8; - } - - @ObfuscatedName("av") - public boolean method2672() { - return this.field1491 != 0; - } - - @ObfuscatedName("ak") - int method2678(int[] var1, int var2, int var3, int var4, int var5) { - while (true) { - if (this.field1491 > 0) { - int var6 = var2 + this.field1491; - if (var6 > var4) { - var6 = var4; - } - - this.field1491 += var2; - if (this.field1481 == 256 && (this.field1490 & 255) == 0) { - if (PcmPlayer.PcmPlayer_stereo) { - var2 = method2753(0, ((RawSound)super.sound).samples, var1, this.field1490, var2, this.field1489, this.field1486, this.field1492, this.field1494, 0, var6, var3, this); - } else { - var2 = method2710(((RawSound)super.sound).samples, var1, this.field1490, var2, this.field1484, this.field1485, 0, var6, var3, this); - } - } else if (PcmPlayer.PcmPlayer_stereo) { - var2 = method2694(0, 0, ((RawSound)super.sound).samples, var1, this.field1490, var2, this.field1489, this.field1486, this.field1492, this.field1494, 0, var6, var3, this, this.field1481, var5); - } else { - var2 = method2693(0, 0, ((RawSound)super.sound).samples, var1, this.field1490, var2, this.field1484, this.field1485, 0, var6, var3, this, this.field1481, var5); - } - - this.field1491 -= var2; - if (this.field1491 != 0) { - return var2; - } - - if (!this.method2786()) { - continue; - } - - return var4; - } - - if (this.field1481 == 256 && (this.field1490 & 255) == 0) { - if (PcmPlayer.PcmPlayer_stereo) { - return method2718(0, ((RawSound)super.sound).samples, var1, this.field1490, var2, this.field1489, this.field1486, 0, var4, var3, this); - } - - return method2690(((RawSound)super.sound).samples, var1, this.field1490, var2, this.field1484, 0, var4, var3, this); - } - - if (PcmPlayer.PcmPlayer_stereo) { - return method2686(0, 0, ((RawSound)super.sound).samples, var1, this.field1490, var2, this.field1489, this.field1486, 0, var4, var3, this, this.field1481, var5); - } - - return method2691(0, 0, ((RawSound)super.sound).samples, var1, this.field1490, var2, this.field1484, 0, var4, var3, this, this.field1481, var5); + public synchronized void method2688(int var1) { + if (this.field1491 < 0) { + this.field1491 = -var1; + } else { + this.field1491 = var1; } + } - @ObfuscatedName("aa") - int method2679(int[] var1, int var2, int var3, int var4, int var5) { - while (true) { - if (this.field1491 > 0) { - int var6 = var2 + this.field1491; - if (var6 > var4) { - var6 = var4; - } + @ObfuscatedName("ao") + public synchronized int method2747() { + return this.field1491 < 0 ? -this.field1491 : this.field1491; + } - this.field1491 += var2; - if (this.field1481 == -256 && (this.field1490 & 255) == 0) { - if (PcmPlayer.PcmPlayer_stereo) { - var2 = method2719(0, ((RawSound)super.sound).samples, var1, this.field1490, var2, this.field1489, this.field1486, this.field1492, this.field1494, 0, var6, var3, this); - } else { - var2 = method2683(((RawSound)super.sound).samples, var1, this.field1490, var2, this.field1484, this.field1485, 0, var6, var3, this); - } - } else if (PcmPlayer.PcmPlayer_stereo) { - var2 = method2781(0, 0, ((RawSound)super.sound).samples, var1, this.field1490, var2, this.field1489, this.field1486, this.field1492, this.field1494, 0, var6, var3, this, this.field1481, var5); - } else { - var2 = method2738(0, 0, ((RawSound)super.sound).samples, var1, this.field1490, var2, this.field1484, this.field1485, 0, var6, var3, this, this.field1481, var5); - } - - this.field1491 -= var2; - if (this.field1491 != 0) { - return var2; - } - - if (!this.method2786()) { - continue; - } - - return var4; - } - - if (this.field1481 == -256 && (this.field1490 & 255) == 0) { - if (PcmPlayer.PcmPlayer_stereo) { - return method2748(0, ((RawSound)super.sound).samples, var1, this.field1490, var2, this.field1489, this.field1486, 0, var4, var3, this); - } - - return method2681(((RawSound)super.sound).samples, var1, this.field1490, var2, this.field1484, 0, var4, var3, this); - } - - if (PcmPlayer.PcmPlayer_stereo) { - return method2688(0, 0, ((RawSound)super.sound).samples, var1, this.field1490, var2, this.field1489, this.field1486, 0, var4, var3, this, this.field1481, var5); - } - - return method2687(0, 0, ((RawSound)super.sound).samples, var1, this.field1490, var2, this.field1484, 0, var4, var3, this, this.field1481, var5); - } + @ObfuscatedName("ae") + public boolean method2690() { + return this.field1492 < 0 || this.field1492 >= ((RawSound)super.sound).samples.length << 8; } @ObfuscatedName("ax") - boolean method2786() { - int var1 = this.field1482; - int var2; - int var3; - if (var1 == Integer.MIN_VALUE) { - var3 = 0; - var2 = 0; - var1 = 0; - } else { - var2 = method2721(var1, this.field1483); - var3 = method2652(var1, this.field1483); - } + public boolean method2691() { + return this.field1501 != 0; + } - if (var1 == this.field1484 && var2 == this.field1489 && var3 == this.field1486) { - if (this.field1482 == Integer.MIN_VALUE) { - this.field1482 = 0; - this.field1486 = 0; - this.field1489 = 0; - this.field1484 = 0; - this.remove(); - return true; - } else { - this.method2658(); - return false; - } - } else { - if (this.field1484 < var1) { - this.field1485 = 1; - this.field1491 = var1 - this.field1484; - } else if (this.field1484 > var1) { - this.field1485 = -1; - this.field1491 = this.field1484 - var1; - } else { - this.field1485 = 0; + @ObfuscatedName("an") + int method2697(int[] var1, int var2, int var3, int var4, int var5) { + while (true) { + if (this.field1501 > 0) { + int var6 = var2 + this.field1501; + if (var6 > var4) { + var6 = var4; + } + + this.field1501 += var2; + if (this.field1491 == 256 && (this.field1492 & 255) == 0) { + if (Messages.PcmPlayer_stereo) { + var2 = method2781(0, ((RawSound)super.sound).samples, var1, this.field1492, var2, this.field1495, this.field1496, this.field1490, this.field1504, 0, var6, var3, this); + } else { + var2 = method2708(((RawSound)super.sound).samples, var1, this.field1492, var2, this.field1494, this.field1502, 0, var6, var3, this); + } + } else if (Messages.PcmPlayer_stereo) { + var2 = method2738(0, 0, ((RawSound)super.sound).samples, var1, this.field1492, var2, this.field1495, this.field1496, this.field1490, this.field1504, 0, var6, var3, this, this.field1491, var5); + } else { + var2 = method2712(0, 0, ((RawSound)super.sound).samples, var1, this.field1492, var2, this.field1494, this.field1502, 0, var6, var3, this, this.field1491, var5); + } + + this.field1501 -= var2; + if (this.field1501 != 0) { + return var2; + } + + if (!this.method2699()) { + continue; + } + + return var4; } - if (this.field1489 < var2) { - this.field1492 = 1; - if (this.field1491 == 0 || this.field1491 > var2 - this.field1489) { - this.field1491 = var2 - this.field1489; + if (this.field1491 == 256 && (this.field1492 & 255) == 0) { + if (Messages.PcmPlayer_stereo) { + return method2742(0, ((RawSound)super.sound).samples, var1, this.field1492, var2, this.field1495, this.field1496, 0, var4, var3, this); } - } else if (this.field1489 > var2) { - this.field1492 = -1; - if (this.field1491 == 0 || this.field1491 > this.field1489 - var2) { - this.field1491 = this.field1489 - var2; - } - } else { - this.field1492 = 0; + + return method2723(((RawSound)super.sound).samples, var1, this.field1492, var2, this.field1494, 0, var4, var3, this); } - if (this.field1486 < var3) { - this.field1494 = 1; - if (this.field1491 == 0 || this.field1491 > var3 - this.field1486) { - this.field1491 = var3 - this.field1486; - } - } else if (this.field1486 > var3) { - this.field1494 = -1; - if (this.field1491 == 0 || this.field1491 > this.field1486 - var3) { - this.field1491 = this.field1486 - var3; - } - } else { - this.field1494 = 0; + if (Messages.PcmPlayer_stereo) { + return method2705(0, 0, ((RawSound)super.sound).samples, var1, this.field1492, var2, this.field1495, this.field1496, 0, var4, var3, this, this.field1491, var5); } - return false; + return method2740(0, 0, ((RawSound)super.sound).samples, var1, this.field1492, var2, this.field1494, 0, var4, var3, this, this.field1491, var5); } } - @ObfuscatedName("ac") - int vmethod2820() { - int var1 = this.field1484 * 3 >> 6; + @ObfuscatedName("av") + int method2698(int[] var1, int var2, int var3, int var4, int var5) { + while (true) { + if (this.field1501 > 0) { + int var6 = var2 + this.field1501; + if (var6 > var4) { + var6 = var4; + } + + this.field1501 += var2; + if (this.field1491 == -256 && (this.field1492 & 255) == 0) { + if (Messages.PcmPlayer_stereo) { + var2 = method2711(0, ((RawSound)super.sound).samples, var1, this.field1492, var2, this.field1495, this.field1496, this.field1490, this.field1504, 0, var6, var3, this); + } else { + var2 = method2695(((RawSound)super.sound).samples, var1, this.field1492, var2, this.field1494, this.field1502, 0, var6, var3, this); + } + } else if (Messages.PcmPlayer_stereo) { + var2 = method2672(0, 0, ((RawSound)super.sound).samples, var1, this.field1492, var2, this.field1495, this.field1496, this.field1490, this.field1504, 0, var6, var3, this, this.field1491, var5); + } else { + var2 = method2767(0, 0, ((RawSound)super.sound).samples, var1, this.field1492, var2, this.field1494, this.field1502, 0, var6, var3, this, this.field1491, var5); + } + + this.field1501 -= var2; + if (this.field1501 != 0) { + return var2; + } + + if (!this.method2699()) { + continue; + } + + return var4; + } + + if (this.field1491 == -256 && (this.field1492 & 255) == 0) { + if (Messages.PcmPlayer_stereo) { + return method2783(0, ((RawSound)super.sound).samples, var1, this.field1492, var2, this.field1495, this.field1496, 0, var4, var3, this); + } + + return method2702(((RawSound)super.sound).samples, var1, this.field1492, var2, this.field1494, 0, var4, var3, this); + } + + if (Messages.PcmPlayer_stereo) { + return method2707(0, 0, ((RawSound)super.sound).samples, var1, this.field1492, var2, this.field1495, this.field1496, 0, var4, var3, this, this.field1491, var5); + } + + return method2706(0, 0, ((RawSound)super.sound).samples, var1, this.field1492, var2, this.field1494, 0, var4, var3, this, this.field1491, var5); + } + } + + @ObfuscatedName("af") + int vmethod2840() { + int var1 = this.field1494 * 3 >> 6; var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); if (this.numLoops == 0) { - var1 -= var1 * this.field1490 / (((RawSound)super.sound).samples.length << 8); + var1 -= var1 * this.field1492 / (((RawSound)super.sound).samples.length << 8); } else if (this.numLoops >= 0) { var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; } @@ -830,38 +761,107 @@ public class RawPcmStream extends PcmStream { return var1 > 255 ? 255 : var1; } - @ObfuscatedName("x") - static int method2721(int var0, int var1) { - return var1 < 0 ? var0 : (int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D); + @ObfuscatedName("at") + boolean method2699() { + int var1 = this.field1503; + int var2; + int var3; + if (var1 == Integer.MIN_VALUE) { + var3 = 0; + var2 = 0; + var1 = 0; + } else { + var2 = method2814(var1, this.field1493); + var3 = method2803(var1, this.field1493); + } + + if (var1 == this.field1494 && var2 == this.field1495 && var3 == this.field1496) { + if (this.field1503 == Integer.MIN_VALUE) { + this.field1503 = 0; + this.field1496 = 0; + this.field1495 = 0; + this.field1494 = 0; + this.remove(); + return true; + } else { + this.method2675(); + return false; + } + } else { + if (this.field1494 < var1) { + this.field1502 = 1; + this.field1501 = var1 - this.field1494; + } else if (this.field1494 > var1) { + this.field1502 = -1; + this.field1501 = this.field1494 - var1; + } else { + this.field1502 = 0; + } + + if (this.field1495 < var2) { + this.field1490 = 1; + if (this.field1501 == 0 || this.field1501 > var2 - this.field1495) { + this.field1501 = var2 - this.field1495; + } + } else if (this.field1495 > var2) { + this.field1490 = -1; + if (this.field1501 == 0 || this.field1501 > this.field1495 - var2) { + this.field1501 = this.field1495 - var2; + } + } else { + this.field1490 = 0; + } + + if (this.field1496 < var3) { + this.field1504 = 1; + if (this.field1501 == 0 || this.field1501 > var3 - this.field1496) { + this.field1501 = var3 - this.field1496; + } + } else if (this.field1496 > var3) { + this.field1504 = -1; + if (this.field1501 == 0 || this.field1501 > this.field1496 - var3) { + this.field1501 = this.field1496 - var3; + } + } else { + this.field1504 = 0; + } + + return false; + } } @ObfuscatedName("m") - static int method2652(int var0, int var1) { + static int method2814(int var0, int var1) { + return var1 < 0 ? var0 : (int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D); + } + + @ObfuscatedName("o") + static int method2803(int var0, int var1) { return var1 < 0 ? -var0 : (int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D); } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Ldm;II)Ldy;" + signature = "(Ldp;II)Ldk;" ) @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.field1421 * 100)), var2 << 6) : null; + return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(class237.field3113 * 100)), var2 << 6) : null; } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Ldm;III)Ldy;" + signature = "(Ldp;III)Ldk;" ) - public static RawPcmStream method2685(RawSound var0, int var1, int var2, int var3) { + public static RawPcmStream method2674(RawSound var0, int var1, int var2, int var3) { return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, var1, var2, var3) : null; } - @ObfuscatedName("az") + @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "([B[IIIIIIILdy;)I" + signature = "([B[IIIIIIILdk;)I" ) - static int method2690(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method2723(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { var2 >>= 8; var7 >>= 8; var4 <<= 2; @@ -884,15 +884,15 @@ public class RawPcmStream extends PcmStream { var10001 = var3++; } - var8.field1490 = var2 << 8; + var8.field1492 = var2 << 8; return var3; } - @ObfuscatedName("ay") + @ObfuscatedName("aw") @ObfuscatedSignature( - signature = "(I[B[IIIIIIIILdy;)I" + signature = "(I[B[IIIIIIIILdk;)I" ) - static int method2718(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + static int method2742(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; @@ -935,15 +935,15 @@ public class RawPcmStream extends PcmStream { var10001 = var4++; } - var10.field1490 = var3 << 8; + var10.field1492 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("ad") + @ObfuscatedName("az") @ObfuscatedSignature( - signature = "([B[IIIIIIILdy;)I" + signature = "([B[IIIIIIILdk;)I" ) - static int method2681(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + static int method2702(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { var2 >>= 8; var7 >>= 8; var4 <<= 2; @@ -966,15 +966,15 @@ public class RawPcmStream extends PcmStream { var10001 = var3++; } - var8.field1490 = var2 << 8; + var8.field1492 = var2 << 8; return var3; } - @ObfuscatedName("ah") + @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "(I[B[IIIIIIIILdy;)I" + signature = "(I[B[IIIIIIIILdk;)I" ) - static int method2748(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + static int method2783(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; @@ -1017,15 +1017,15 @@ public class RawPcmStream extends PcmStream { var10001 = var4++; } - var10.field1490 = var3 << 8; + var10.field1492 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("ag") + @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "(II[B[IIIIIIILdy;II)I" + signature = "(II[B[IIIIIIILdk;II)I" ) - static int method2691(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 method2740(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; } @@ -1050,15 +1050,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6; } - var10.field1490 = var4; + var10.field1492 = var4; return var5; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIILdy;II)I" + signature = "(II[B[IIIIIIIILdk;II)I" ) - static int method2686(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 method2705(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; } @@ -1092,15 +1092,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += var0 * var7 >> 6; } - var11.field1490 = var4; + var11.field1492 = var4; return var5 >> 1; } - @ObfuscatedName("bf") + @ObfuscatedName("aj") @ObfuscatedSignature( - signature = "(II[B[IIIIIIILdy;II)I" + signature = "(II[B[IIIIIIILdk;II)I" ) - static int method2687(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 method2706(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; } @@ -1125,15 +1125,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; } - var10.field1490 = var4; + var10.field1492 = var4; return var5; } - @ObfuscatedName("bc") + @ObfuscatedName("bk") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIILdy;II)I" + signature = "(II[B[IIIIIIIILdk;II)I" ) - static int method2688(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 method2707(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; } @@ -1165,15 +1165,15 @@ public class RawPcmStream extends PcmStream { var3[var10001] += var0 * var7 >> 6; } - var11.field1490 = var4; + var11.field1492 = var4; return var5 >> 1; } - @ObfuscatedName("bo") + @ObfuscatedName("bh") @ObfuscatedSignature( - signature = "([B[IIIIIIIILdy;)I" + signature = "([B[IIIIIIIILdk;)I" ) - static int method2710(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method2708(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; @@ -1182,8 +1182,8 @@ public class RawPcmStream extends PcmStream { var6 = var7; } - var9.field1489 += var9.field1492 * (var6 - var3); - var9.field1486 += var9.field1494 * (var6 - var3); + var9.field1495 += var9.field1490 * (var6 - var3); + var9.field1496 += var9.field1504 * (var6 - var3); int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { @@ -1205,16 +1205,16 @@ public class RawPcmStream extends PcmStream { var1[var10001] += var0[var2++] * var4; } - var9.field1484 = var4 >> 2; - var9.field1490 = var2 << 8; + var9.field1494 = var4 >> 2; + var9.field1492 = var2 << 8; return var3; } - @ObfuscatedName("bd") + @ObfuscatedName("bg") @ObfuscatedSignature( - signature = "(I[B[IIIIIIIIIILdy;)I" + signature = "(I[B[IIIIIIIIIILdk;)I" ) - static int method2753(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 method2781(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; @@ -1225,7 +1225,7 @@ public class RawPcmStream extends PcmStream { var9 = var10; } - var12.field1484 += var12.field1485 * (var9 - var4); + var12.field1494 += var12.field1502 * (var9 - var4); var4 <<= 1; var9 <<= 1; @@ -1270,17 +1270,17 @@ public class RawPcmStream extends PcmStream { var2[var10001] += var13 * var6; } - var12.field1489 = var5 >> 2; - var12.field1486 = var6 >> 2; - var12.field1490 = var3 << 8; + var12.field1495 = var5 >> 2; + var12.field1496 = var6 >> 2; + var12.field1492 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("bk") + @ObfuscatedName("be") @ObfuscatedSignature( - signature = "([B[IIIIIIIILdy;)I" + signature = "([B[IIIIIIIILdk;)I" ) - static int method2683(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + static int method2695(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; @@ -1289,8 +1289,8 @@ public class RawPcmStream extends PcmStream { var6 = var7; } - var9.field1489 += var9.field1492 * (var6 - var3); - var9.field1486 += var9.field1494 * (var6 - var3); + var9.field1495 += var9.field1490 * (var6 - var3); + var9.field1496 += var9.field1504 * (var6 - var3); int var10001; for (var6 -= 3; var3 < var6; var4 += var5) { @@ -1312,16 +1312,16 @@ public class RawPcmStream extends PcmStream { var1[var10001] += var0[var2--] * var4; } - var9.field1484 = var4 >> 2; - var9.field1490 = var2 << 8; + var9.field1494 = var4 >> 2; + var9.field1492 = var2 << 8; return var3; } - @ObfuscatedName("bu") + @ObfuscatedName("bf") @ObfuscatedSignature( - signature = "(I[B[IIIIIIIIIILdy;)I" + signature = "(I[B[IIIIIIIIIILdk;)I" ) - static int method2719(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 method2711(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; @@ -1332,7 +1332,7 @@ public class RawPcmStream extends PcmStream { var9 = var10; } - var12.field1484 += var12.field1485 * (var9 - var4); + var12.field1494 += var12.field1502 * (var9 - var4); var4 <<= 1; var9 <<= 1; @@ -1377,19 +1377,19 @@ public class RawPcmStream extends PcmStream { var2[var10001] += var13 * var6; } - var12.field1489 = var5 >> 2; - var12.field1486 = var6 >> 2; - var12.field1490 = var3 << 8; + var12.field1495 = var5 >> 2; + var12.field1496 = var6 >> 2; + var12.field1492 = var3 << 8; return var4 >> 1; } - @ObfuscatedName("be") + @ObfuscatedName("ba") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIILdy;II)I" + signature = "(II[B[IIIIIIIILdk;II)I" ) - static int method2693(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.field1489 -= var11.field1492 * var5; - var11.field1486 -= var11.field1494 * var5; + static int method2712(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.field1495 -= var11.field1490 * var5; + var11.field1496 -= var11.field1504 * var5; if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { var8 = var9; } @@ -1416,19 +1416,19 @@ public class RawPcmStream extends PcmStream { var6 += var7; } - var11.field1489 += var11.field1492 * var5; - var11.field1486 += var11.field1494 * var5; - var11.field1484 = var6; - var11.field1490 = var4; + var11.field1495 += var11.field1490 * var5; + var11.field1496 += var11.field1504 * var5; + var11.field1494 = var6; + var11.field1492 = var4; return var5; } - @ObfuscatedName("bg") + @ObfuscatedName("bd") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIIIILdy;II)I" + signature = "(II[B[IIIIIIIIIILdk;II)I" ) - static int method2694(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.field1484 -= var5 * var13.field1485; + static int method2738(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.field1494 -= var5 * var13.field1502; if (var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) { var10 = var11; } @@ -1467,20 +1467,20 @@ public class RawPcmStream extends PcmStream { } var5 >>= 1; - var13.field1484 += var13.field1485 * var5; - var13.field1489 = var6; - var13.field1486 = var7; - var13.field1490 = var4; + var13.field1494 += var13.field1502 * var5; + var13.field1495 = var6; + var13.field1496 = var7; + var13.field1492 = var4; return var5; } - @ObfuscatedName("bt") + @ObfuscatedName("bb") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIILdy;II)I" + signature = "(II[B[IIIIIIIILdk;II)I" ) - static int method2738(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.field1489 -= var11.field1492 * var5; - var11.field1486 -= var11.field1494 * var5; + static int method2767(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.field1495 -= var11.field1490 * var5; + var11.field1496 -= var11.field1504 * var5; if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { var8 = var9; } @@ -1507,19 +1507,19 @@ public class RawPcmStream extends PcmStream { var6 += var7; } - var11.field1489 += var11.field1492 * var5; - var11.field1486 += var11.field1494 * var5; - var11.field1484 = var6; - var11.field1490 = var4; + var11.field1495 += var11.field1490 * var5; + var11.field1496 += var11.field1504 * var5; + var11.field1494 = var6; + var11.field1492 = var4; return var5; } - @ObfuscatedName("bh") + @ObfuscatedName("bw") @ObfuscatedSignature( - signature = "(II[B[IIIIIIIIIILdy;II)I" + signature = "(II[B[IIIIIIIIIILdk;II)I" ) - static int method2781(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.field1484 -= var5 * var13.field1485; + static int method2672(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.field1494 -= var5 * var13.field1502; if (var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) { var10 = var11; } @@ -1556,10 +1556,10 @@ public class RawPcmStream extends PcmStream { } var5 >>= 1; - var13.field1484 += var13.field1485 * var5; - var13.field1489 = var6; - var13.field1486 = var7; - var13.field1490 = var4; + var13.field1494 += var13.field1502 * var5; + var13.field1495 = var6; + var13.field1496 = var7; + var13.field1492 = var4; return var5; } } diff --git a/runescape-client/src/main/java/RawSound.java b/runescape-client/src/main/java/RawSound.java index afa7e2576e..2323a986cd 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("dm") +@ObfuscatedName("dp") @Implements("RawSound") public class RawSound extends AbstractSound { - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("sampleRate") public int sampleRate; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("samples") public byte[] samples; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("start") public int start; - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("end") int end; - @ObfuscatedName("w") - public boolean field1407; + @ObfuscatedName("p") + public boolean field1423; 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.field1407 = var5; + this.field1423 = var5; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ldx;)Ldm;" + signature = "(Ldv;)Ldp;" ) @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 2fe0e1a4ff..4b0773eb62 100644 --- a/runescape-client/src/main/java/ReflectionCheck.java +++ b/runescape-client/src/main/java/ReflectionCheck.java @@ -5,66 +5,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("du") +@ObfuscatedName("dm") @Implements("ReflectionCheck") public class ReflectionCheck extends Node { - @ObfuscatedName("gi") - @ObfuscatedSignature( - signature = "[Lla;" - ) - @Export("headIconPrayerSprites") - static Sprite[] headIconPrayerSprites; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 1911756689 - ) - @Export("id") - int id; @ObfuscatedName("m") @Export("arguments") byte[][][] arguments; - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -28201163 + intValue = -1835332677 + ) + @Export("id") + int id; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -514712003 ) @Export("size") int size; - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("operations") int[] operations; - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("creationErrors") int[] creationErrors; - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("fields") Field[] fields; - @ObfuscatedName("q") + @ObfuscatedName("n") @Export("intReplaceValues") int[] intReplaceValues; - @ObfuscatedName("z") + @ObfuscatedName("u") @Export("methods") Method[] methods; ReflectionCheck() { } - @ObfuscatedName("g") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "100" + signature = "(ILcs;ZI)I", + garbageValue = "1841893741" ) - static void method2396() { - Login.loginIndex = 24; - HealthBarUpdate.setLoginResponseString("", "You were disconnected from the server.", ""); - } - - @ObfuscatedName("an") - @ObfuscatedSignature( - signature = "(Ldg;S)V", - garbageValue = "-25430" - ) - public static final void method2397(PlayerProvider var0) { - PcmPlayer.pcmPlayerProvider = var0; + static int method2418(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? KeyHandler.field407 : SecureRandomCallable.field544; + if (var0 == ScriptOpcodes.CC_GETSCROLLX) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.scrollX; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.scrollY; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETTEXT) { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3.text; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.scrollWidth; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.scrollHeight; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.modelZoom; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.modelAngleX; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.modelAngleZ; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.modelAngleY; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETTRANSTOP) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.transparencyTop; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETTRANSBOT) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.transparencyBot; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.color; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.color2; + return 1; + } else if (var0 == ScriptOpcodes.CC_GETFILLMODE) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); + return 1; + } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; + return 1; + } else { + return 2; + } } } diff --git a/runescape-client/src/main/java/RouteStrategy.java b/runescape-client/src/main/java/RouteStrategy.java index f5aedf1c92..4e09e2246d 100644 --- a/runescape-client/src/main/java/RouteStrategy.java +++ b/runescape-client/src/main/java/RouteStrategy.java @@ -1,41 +1,39 @@ -import java.lang.management.GarbageCollectorMXBean; -import java.lang.management.ManagementFactory; -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gx") +@ObfuscatedName("ga") @Implements("RouteStrategy") public abstract class RouteStrategy { - @ObfuscatedName("jz") - @ObfuscatedSignature( - signature = "Lhe;" - ) - static Widget field2106; - @ObfuscatedName("x") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 326663409 + intValue = 193339833 + ) + @Export("cacheGamebuild") + static int cacheGamebuild; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -508607035 ) @Export("approxDestinationX") public int approxDestinationX; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1533837037 + intValue = 1154057799 ) @Export("approxDestinationY") public int approxDestinationY; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 50701303 + intValue = -1924382877 ) @Export("approxDestinationSizeX") public int approxDestinationSizeX; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 695146693 + intValue = 399050389 ) @Export("approxDestinationSizeY") public int approxDestinationSizeY; @@ -43,53 +41,11 @@ public abstract class RouteStrategy { protected RouteStrategy() { } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IIILfm;B)Z", - garbageValue = "-112" + signature = "(IIILfz;I)Z", + garbageValue = "-1966963917" ) @Export("hasArrived") - public abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4); - - @ObfuscatedName("ay") - @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "42" - ) - @Export("getGcDuration") - protected static int getGcDuration() { - int var0 = 0; - if (GameShell.garbageCollector == null || !GameShell.garbageCollector.isValid()) { - try { - Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); - - while (var1.hasNext()) { - GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); - if (var2.isValid()) { - GameShell.garbageCollector = var2; - GameShell.garbageCollectorLastCheckTimeMs = -1L; - GameShell.garbageCollectorLastCollectionTime = -1L; - } - } - } catch (Throwable var11) { - } - } - - if (GameShell.garbageCollector != null) { - long var9 = class217.currentTimeMillis(); - long var3 = GameShell.garbageCollector.getCollectionTime(); - if (-1L != GameShell.garbageCollectorLastCollectionTime) { - long var5 = var3 - GameShell.garbageCollectorLastCollectionTime; - long var7 = var9 - GameShell.garbageCollectorLastCheckTimeMs; - if (var7 != 0L) { - var0 = (int)(100L * var5 / var7); - } - } - - GameShell.garbageCollectorLastCollectionTime = var3; - GameShell.garbageCollectorLastCheckTimeMs = var9; - } - - return var0; - } + protected abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4); } diff --git a/runescape-client/src/main/java/RunException.java b/runescape-client/src/main/java/RunException.java index d0dda3b0cf..dbacc962c8 100644 --- a/runescape-client/src/main/java/RunException.java +++ b/runescape-client/src/main/java/RunException.java @@ -4,34 +4,31 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("mf") +@ObfuscatedName("mr") @Implements("RunException") public class RunException extends RuntimeException { - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("RunException_applet") public static Applet RunException_applet; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("localPlayerName") public static String localPlayerName; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 858852849 + intValue = 2064059247 ) @Export("RunException_revision") public static int RunException_revision; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -834136847 + intValue = 810638289 ) @Export("clientType") public static int clientType; - @ObfuscatedName("q") - @Export("ByteArrayPool_alternativeSizes") - public static int[] ByteArrayPool_alternativeSizes; - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("message") String message; - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("throwable") Throwable throwable; diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java index 0973e1472a..6f8a71f2b4 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("ej") +@ObfuscatedName("em") @Implements("Scene") public class Scene { - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("Scene_isLowDetail") public static boolean Scene_isLowDetail; - @ObfuscatedName("h") + @ObfuscatedName("k") @Export("tileUpdateCount") static int tileUpdateCount; - @ObfuscatedName("g") + @ObfuscatedName("r") @Export("Scene_plane") static int Scene_plane; - @ObfuscatedName("i") + @ObfuscatedName("s") @Export("Scene_drawnCount") static int Scene_drawnCount; - @ObfuscatedName("a") + @ObfuscatedName("v") @Export("Scene_cameraXTileMin") static int Scene_cameraXTileMin; - @ObfuscatedName("b") + @ObfuscatedName("d") @Export("Scene_cameraXTileMax") static int Scene_cameraXTileMax; - @ObfuscatedName("l") + @ObfuscatedName("e") @Export("Scene_cameraYTileMin") static int Scene_cameraYTileMin; - @ObfuscatedName("r") + @ObfuscatedName("l") @Export("Scene_cameraYTileMax") static int Scene_cameraYTileMax; - @ObfuscatedName("o") + @ObfuscatedName("t") @Export("Scene_cameraXTile") static int Scene_cameraXTile; - @ObfuscatedName("c") + @ObfuscatedName("x") @Export("Scene_cameraYTile") static int Scene_cameraYTile; - @ObfuscatedName("j") + @ObfuscatedName("b") @Export("Scene_cameraX") static int Scene_cameraX; - @ObfuscatedName("y") + @ObfuscatedName("i") @Export("Scene_cameraY") static int Scene_cameraY; @ObfuscatedName("f") @Export("Scene_cameraZ") static int Scene_cameraZ; - @ObfuscatedName("ae") + @ObfuscatedName("ah") @Export("Scene_cameraPitchSine") static int Scene_cameraPitchSine; - @ObfuscatedName("an") + @ObfuscatedName("ai") @Export("Scene_cameraPitchCosine") static int Scene_cameraPitchCosine; - @ObfuscatedName("ai") + @ObfuscatedName("ao") @Export("Scene_cameraYawSine") static int Scene_cameraYawSine; - @ObfuscatedName("ap") + @ObfuscatedName("ae") @Export("Scene_cameraYawCosine") static int Scene_cameraYawCosine; - @ObfuscatedName("ab") + @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "[Lek;" + signature = "[Lev;" ) @Export("gameObjects") static GameObject[] gameObjects; - @ObfuscatedName("ar") + @ObfuscatedName("ag") @Export("checkClick") static boolean checkClick; - @ObfuscatedName("af") + @ObfuscatedName("ab") @Export("Scene_selectedPlane") static int Scene_selectedPlane; - @ObfuscatedName("at") + @ObfuscatedName("am") @Export("Scene_selectedScreenX") static int Scene_selectedScreenX; - @ObfuscatedName("al") + @ObfuscatedName("ak") @Export("Scene_selectedScreenY") static int Scene_selectedScreenY; - @ObfuscatedName("as") + @ObfuscatedName("ad") @Export("Scene_selectedX") public static int Scene_selectedX; - @ObfuscatedName("am") + @ObfuscatedName("as") @Export("Scene_selectedY") public static int Scene_selectedY; - @ObfuscatedName("au") + @ObfuscatedName("ar") @Export("viewportWalking") static boolean viewportWalking; - @ObfuscatedName("av") + @ObfuscatedName("an") @Export("Scene_planesCount") static int Scene_planesCount; - @ObfuscatedName("ak") + @ObfuscatedName("ac") @Export("Scene_planeOccluderCounts") static int[] Scene_planeOccluderCounts; - @ObfuscatedName("aa") + @ObfuscatedName("av") @ObfuscatedSignature( - signature = "[[Lem;" + signature = "[[Lew;" ) @Export("Scene_planeOccluders") static Occluder[][] Scene_planeOccluders; - @ObfuscatedName("ax") + @ObfuscatedName("af") @Export("Scene_currentOccludersCount") static int Scene_currentOccludersCount; - @ObfuscatedName("az") + @ObfuscatedName("at") @ObfuscatedSignature( - signature = "[Lem;" + signature = "[Lew;" ) @Export("Scene_currentOccluders") static Occluder[] Scene_currentOccluders; - @ObfuscatedName("aj") + @ObfuscatedName("aa") @ObfuscatedSignature( - signature = "Ljh;" + signature = "Ljp;" ) @Export("Scene_tilesDeque") static NodeDeque Scene_tilesDeque; - @ObfuscatedName("ay") - static final int[] field1856; - @ObfuscatedName("ad") - static final int[] field1870; - @ObfuscatedName("ac") - static final int[] field1858; - @ObfuscatedName("ah") - static final int[] field1820; - @ObfuscatedName("ag") - static final int[] field1842; @ObfuscatedName("aw") - static final int[] field1861; - @ObfuscatedName("bf") - static final int[] field1814; - @ObfuscatedName("bg") + static final int[] field1874; + @ObfuscatedName("az") + static final int[] field1875; + @ObfuscatedName("aq") + static final int[] field1876; + @ObfuscatedName("ay") + static final int[] field1862; + @ObfuscatedName("au") + static final int[] field1834; + @ObfuscatedName("aj") + static final int[] field1829; + @ObfuscatedName("bk") + static final int[] field1880; + @ObfuscatedName("bb") @Export("visibilityMap") static boolean[][][][] visibilityMap; - @ObfuscatedName("bt") + @ObfuscatedName("bw") @Export("visibleTiles") static boolean[][] visibleTiles; - @ObfuscatedName("bh") + @ObfuscatedName("bq") @Export("Scene_viewportXCenter") static int Scene_viewportXCenter; - @ObfuscatedName("br") + @ObfuscatedName("bn") @Export("Scene_viewportYCenter") static int Scene_viewportYCenter; - @ObfuscatedName("bq") + @ObfuscatedName("bc") @Export("Scene_viewportXMin") static int Scene_viewportXMin; - @ObfuscatedName("ba") + @ObfuscatedName("bo") @Export("Scene_viewportYMin") static int Scene_viewportYMin; - @ObfuscatedName("bv") + @ObfuscatedName("bp") @Export("Scene_viewportXMax") static int Scene_viewportXMax; - @ObfuscatedName("bx") + @ObfuscatedName("bm") @Export("Scene_viewportYMax") static int Scene_viewportYMax; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("planes") int planes; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("xSize") int xSize; - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("ySize") int ySize; - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("tileHeights") int[][][] tileHeights; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "[[[Leq;" + signature = "[[[Lea;" ) @Export("tiles") Tile[][][] tiles; - @ObfuscatedName("q") + @ObfuscatedName("n") @Export("minPlane") int minPlane; - @ObfuscatedName("z") + @ObfuscatedName("u") @Export("tempGameObjectsCount") int tempGameObjectsCount; - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "[Lek;" + signature = "[Lev;" ) @Export("tempGameObjects") GameObject[] tempGameObjects; - @ObfuscatedName("e") - int[][][] field1819; - @ObfuscatedName("bu") + @ObfuscatedName("z") + int[][][] field1839; + @ObfuscatedName("ba") @Export("tileShape2D") int[][] tileShape2D; - @ObfuscatedName("be") + @ObfuscatedName("bd") @Export("tileRotation2D") int[][] tileRotation2D; @@ -206,13 +206,13 @@ public class Scene { Scene_currentOccludersCount = 0; Scene_currentOccluders = new Occluder[500]; Scene_tilesDeque = new NodeDeque(); - field1856 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; - field1870 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; - field1858 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; - field1820 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; - field1842 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; - field1861 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; - field1814 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; + field1874 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; + field1875 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; + field1876 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; + field1862 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; + field1834 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; + field1829 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; + field1880 = 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.field1819 = new int[var1][var2 + 1][var3 + 1]; + this.field1839 = new int[var1][var2 + 1][var3 + 1]; this.tileHeights = var4; this.clear(); } - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("clear") public void clear() { int var1; @@ -264,7 +264,7 @@ public class Scene { } - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("init") public void init(int var1) { this.minPlane = var1; @@ -279,7 +279,7 @@ public class Scene { } - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("setLinkBelow") public void setLinkBelow(int var1, int var2) { Tile var3 = this.tiles[0][var1][var2]; @@ -291,10 +291,7 @@ public class Scene { for (int var6 = 0; var6 < var5.gameObjectsCount; ++var6) { GameObject var7 = var5.gameObjects[var6]; - long var9 = var7.tag; - int var11 = (int)(var9 >>> 14 & 3L); - boolean var8 = var11 == 2; - if (var8 && var7.startX == var1 && var2 == var7.startY) { + if (FloorDecoration.method2977(var7.tag) && var7.startX == var1 && var2 == var7.startY) { --var7.plane; } } @@ -309,7 +306,7 @@ public class Scene { this.tiles[3][var1][var2] = null; } - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("setTileMinPlane") public void setTileMinPlane(int var1, int var2, int var3, int var4) { Tile var5 = this.tiles[var1][var2][var3]; @@ -318,7 +315,7 @@ public class Scene { } } - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("addTile") public void addTile(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20) { TilePaint var21; @@ -356,9 +353,9 @@ public class Scene { } } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(IIIILee;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) { @@ -378,9 +375,9 @@ public class Scene { } } - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(IIIILee;JLee;Lee;)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) { @@ -414,9 +411,9 @@ public class Scene { this.tiles[var1][var2][var3].tileItemPile = var10; } - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(IIIILee;Lee;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) { @@ -442,9 +439,9 @@ public class Scene { } } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(IIIILee;Lee;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) { @@ -472,11 +469,11 @@ public class Scene { } } - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(IIIIIILee;IJI)Z" + signature = "(IIIIIILel;IJI)Z" ) - public boolean method3187(int var1, int var2, int var3, int var4, int var5, int var6, Entity var7, int var8, long var9, int var11) { + public boolean method3356(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 { @@ -486,9 +483,9 @@ public class Scene { } } - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(IIIIILee;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) { @@ -525,18 +522,18 @@ public class Scene { } } - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IIIIILee;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("u") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(IIIIIIIILee;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) { @@ -547,8 +544,8 @@ public class Scene { return false; } - Tile var17 = this.tiles[var1][var15][var16]; - if (var17 != null && var17.gameObjectsCount >= 5) { + Tile var23 = this.tiles[var1][var15][var16]; + if (var23 != null && var23.gameObjectsCount >= 5) { return false; } } @@ -569,7 +566,7 @@ public class Scene { var21.endY = var3 + var5 - 1; for (var16 = var2; var16 < var2 + var4; ++var16) { - for (int var22 = var3; var22 < var3 + var5; ++var22) { + for (int var17 = var3; var17 < var3 + var5; ++var17) { int var18 = 0; if (var16 > var2) { ++var18; @@ -579,25 +576,25 @@ public class Scene { var18 += 4; } - if (var22 > var3) { + if (var17 > var3) { var18 += 8; } - if (var22 < var3 + var5 - 1) { + if (var17 < var3 + var5 - 1) { var18 += 2; } for (int var19 = var1; var19 >= 0; --var19) { - if (this.tiles[var19][var16][var22] == null) { - this.tiles[var19][var16][var22] = new Tile(var19, var16, var22); + if (this.tiles[var19][var16][var17] == null) { + this.tiles[var19][var16][var17] = new Tile(var19, var16, var17); } } - Tile var23 = this.tiles[var1][var16][var22]; - var23.gameObjects[var23.gameObjectsCount] = var21; - var23.gameObjectEdgeMasks[var23.gameObjectsCount] = var18; - var23.gameObjectsEdgeMask |= var18; - ++var23.gameObjectsCount; + Tile var22 = this.tiles[var1][var16][var17]; + var22.gameObjects[var22.gameObjectsCount] = var21; + var22.gameObjectEdgeMasks[var22.gameObjectsCount] = var18; + var22.gameObjectsEdgeMask |= var18; + ++var22.gameObjectsCount; } } @@ -608,7 +605,7 @@ public class Scene { return true; } - @ObfuscatedName("h") + @ObfuscatedName("k") @Export("clearTempGameObjects") public void clearTempGameObjects() { for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { @@ -620,9 +617,9 @@ public class Scene { this.tempGameObjectsCount = 0; } - @ObfuscatedName("g") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(Lek;)V" + signature = "(Lev;)V" ) @Export("removeGameObject") void removeGameObject(GameObject var1) { @@ -656,8 +653,8 @@ public class Scene { } - @ObfuscatedName("i") - public void method3210(int var1, int var2, int var3, int var4) { + @ObfuscatedName("d") + public void method3208(int var1, int var2, int var3, int var4) { Tile var5 = this.tiles[var1][var2][var3]; if (var5 != null) { WallDecoration var6 = var5.wallDecoration; @@ -668,7 +665,7 @@ public class Scene { } } - @ObfuscatedName("a") + @ObfuscatedName("e") @Export("removeBoundaryObject") public void removeBoundaryObject(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -677,7 +674,7 @@ public class Scene { } } - @ObfuscatedName("o") + @ObfuscatedName("l") @Export("removeWallDecoration") public void removeWallDecoration(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -686,17 +683,14 @@ public class Scene { } } - @ObfuscatedName("c") + @ObfuscatedName("t") @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]; - long var8 = var6.tag; - int var10 = (int)(var8 >>> 14 & 3L); - boolean var7 = var10 == 2; - if (var7 && var2 == var6.startX && var3 == var6.startY) { + if (FloorDecoration.method2977(var6.tag) && var2 == var6.startX && var3 == var6.startY) { this.removeGameObject(var6); return; } @@ -705,7 +699,7 @@ public class Scene { } } - @ObfuscatedName("f") + @ObfuscatedName("x") @Export("removeFloorDecoration") public void removeFloorDecoration(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -714,7 +708,7 @@ public class Scene { } } - @ObfuscatedName("ae") + @ObfuscatedName("ah") @Export("removeGroundItemPile") public void removeGroundItemPile(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -723,39 +717,36 @@ public class Scene { } } - @ObfuscatedName("an") - @ObfuscatedSignature( - signature = "(III)Lep;" - ) - public BoundaryObject method3199(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; - return var4 == null ? null : var4.boundaryObject; - } - @ObfuscatedName("ai") @ObfuscatedSignature( signature = "(III)Lez;" ) - public WallDecoration method3252(int var1, int var2, int var3) { + public BoundaryObject method3213(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; + return var4 == null ? null : var4.boundaryObject; + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + signature = "(III)Lep;" + ) + public WallDecoration method3214(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; return var4 == null ? null : var4.wallDecoration; } - @ObfuscatedName("ap") + @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "(III)Lek;" + signature = "(III)Lev;" ) - public GameObject method3201(int var1, int var2, int var3) { + public GameObject method3215(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]; - long var8 = var6.tag; - int var10 = (int)(var8 >>> 14 & 3L); - boolean var7 = var10 == 2; - if (var7 && var2 == var6.startX && var3 == var6.startY) { + if (FloorDecoration.method2977(var6.tag) && var2 == var6.startX && var3 == var6.startY) { return var6; } } @@ -764,9 +755,9 @@ public class Scene { } } - @ObfuscatedName("ab") + @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "(III)Leo;" + signature = "(III)Leu;" ) @Export("getFloorDecoration") public FloorDecoration getFloorDecoration(int var1, int var2, int var3) { @@ -774,21 +765,21 @@ public class Scene { return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; } - @ObfuscatedName("ar") + @ObfuscatedName("ag") @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("ab") @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("at") + @ObfuscatedName("am") @Export("getGameObjectTag") public long getGameObjectTag(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; @@ -798,8 +789,7 @@ public class Scene { for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { GameObject var6 = var4.gameObjects[var5]; long var8 = var6.tag; - int var10 = (int)(var8 >>> 14 & 3L); - boolean var7 = var10 == 2; + boolean var7 = class171.method3571(var8) == 2; if (var7 && var2 == var6.startX && var3 == var6.startY) { return var6.tag; } @@ -809,14 +799,14 @@ public class Scene { } } - @ObfuscatedName("as") + @ObfuscatedName("ak") @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("am") + @ObfuscatedName("ad") @Export("getObjectFlags") public int getObjectFlags(int var1, int var2, int var3, long var4) { Tile var6 = this.tiles[var1][var2][var3]; @@ -839,8 +829,8 @@ public class Scene { } } - @ObfuscatedName("au") - public void method3262(int var1, int var2, int var3) { + @ObfuscatedName("as") + public void method3222(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) { @@ -850,11 +840,11 @@ public class Scene { ModelData var10; if (var8 != null && var8.entity1 instanceof ModelData) { ModelData var9 = (ModelData)var8.entity1; - this.method3209(var9, var4, var5, var6, 1, 1); + this.method3224(var9, var4, var5, var6, 1, 1); if (var8.entity2 instanceof ModelData) { var10 = (ModelData)var8.entity2; - this.method3209(var10, var4, var5, var6, 1, 1); - ModelData.method2890(var9, var10, 0, 0, 0, false); + this.method3224(var10, var4, var5, var6, 1, 1); + ModelData.method2924(var9, var10, 0, 0, 0, false); var8.entity2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); } @@ -865,7 +855,7 @@ public class Scene { GameObject var14 = var7.gameObjects[var12]; if (var14 != null && var14.entity instanceof ModelData) { ModelData var11 = (ModelData)var14.entity; - this.method3209(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); + this.method3224(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); } } @@ -873,7 +863,7 @@ public class Scene { FloorDecoration var13 = var7.floorDecoration; if (var13 != null && var13.entity instanceof ModelData) { var10 = (ModelData)var13.entity; - this.method3308(var10, var4, var5, var6); + this.method3283(var10, var4, var5, var6); var13.entity = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); } } @@ -883,18 +873,18 @@ public class Scene { } - @ObfuscatedName("ao") + @ObfuscatedName("ar") @ObfuscatedSignature( - signature = "(Lea;III)V" + signature = "(Lek;III)V" ) - void method3308(ModelData var1, int var2, int var3, int var4) { + void method3283(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.method2890(var1, var6, 128, 0, 0, true); + ModelData.method2924(var1, var6, 128, 0, 0, true); } } @@ -902,7 +892,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.method2890(var1, var6, 0, 0, 128, true); + ModelData.method2924(var1, var6, 0, 0, 128, true); } } @@ -910,7 +900,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.method2890(var1, var6, 128, 0, 128, true); + ModelData.method2924(var1, var6, 128, 0, 128, true); } } @@ -918,17 +908,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.method2890(var1, var6, 128, 0, -128, true); + ModelData.method2924(var1, var6, 128, 0, -128, true); } } } - @ObfuscatedName("aq") + @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "(Lea;IIIII)V" + signature = "(Lek;IIIII)V" ) - void method3209(ModelData var1, int var2, int var3, int var4, int var5, int var6) { + void method3224(ModelData var1, int var2, int var3, int var4, int var5, int var6) { boolean var7 = true; int var8 = var3; int var9 = var3 + var5; @@ -949,12 +939,12 @@ public class Scene { ModelData var18; if (var17.entity1 instanceof ModelData) { var18 = (ModelData)var17.entity1; - ModelData.method2890(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); + ModelData.method2924(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.method2890(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); + ModelData.method2924(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); } } @@ -964,7 +954,7 @@ public class Scene { ModelData var20 = (ModelData)var19.entity; int var21 = var19.endX - var19.startX + 1; int var22 = var19.endY - var19.startY + 1; - ModelData.method2890(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); + ModelData.method2924(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); } } } @@ -980,7 +970,7 @@ public class Scene { } - @ObfuscatedName("av") + @ObfuscatedName("al") @Export("drawTileMinimap") public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, int var6) { Tile var7 = this.tiles[var4][var5][var6]; @@ -1045,10 +1035,10 @@ public class Scene { } } - @ObfuscatedName("ax") + @ObfuscatedName("av") @Export("menuOpen") public void menuOpen(int var1, int var2, int var3, boolean var4) { - if (!method3215() || var4) { + if (!method3230() || var4) { checkClick = true; viewportWalking = var4; Scene_selectedPlane = var1; @@ -1059,13 +1049,13 @@ public class Scene { } } - @ObfuscatedName("az") + @ObfuscatedName("af") @Export("setViewportWalking") public void setViewportWalking() { viewportWalking = true; } - @ObfuscatedName("ad") + @ObfuscatedName("aw") @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { if (var1 < 0) { @@ -1132,7 +1122,11 @@ public class Scene { for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { Tile var11 = var8[var9][var10]; if (var11 != null) { - if (var11.minPlane <= var6 && (visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] || this.tileHeights[var7][var9][var10] - var2 >= 2000)) { + if (var11.minPlane > var6 || !visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] && this.tileHeights[var7][var9][var10] - var2 < 2000) { + var11.drawPrimary = false; + var11.drawSecondary = false; + var11.drawGameObjectEdges = 0; + } else { var11.drawPrimary = true; var11.drawSecondary = true; if (var11.gameObjectsCount > 0) { @@ -1142,10 +1136,6 @@ public class Scene { } ++tileUpdateCount; - } else { - var11.drawPrimary = false; - var11.drawSecondary = false; - var11.drawGameObjectEdges = 0; } } } @@ -1262,9 +1252,9 @@ public class Scene { checkClick = false; } - @ObfuscatedName("ac") + @ObfuscatedName("az") @ObfuscatedSignature( - signature = "(Leq;Z)V" + signature = "(Lea;Z)V" ) @Export("drawTile") void drawTile(Tile var1, boolean var2) { @@ -1358,10 +1348,10 @@ public class Scene { if (var3.linkedBelowTile != null) { var9 = var3.linkedBelowTile; if (var9.paint != null) { - if (!this.method3177(0, var4, var5)) { + if (!this.method3196(0, var4, var5)) { this.drawTileUnderlay(var9.paint, 0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - } else if (var9.model != null && !this.method3177(0, var4, var5)) { + } else if (var9.model != null && !this.method3196(0, var4, var5)) { this.drawTileOverlay(var9.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } @@ -1380,13 +1370,13 @@ public class Scene { var20 = false; if (var3.paint != null) { - if (!this.method3177(var7, var4, var5)) { + if (!this.method3196(var7, var4, var5)) { var20 = true; if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { this.drawTileUnderlay(var3.paint, var7, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } } - } else if (var3.model != null && !this.method3177(var7, var4, var5)) { + } else if (var3.model != null && !this.method3196(var7, var4, var5)) { var20 = true; this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } @@ -1408,43 +1398,43 @@ public class Scene { var21 += 6; } - var11 = field1856[var21]; - var3.field1680 = field1858[var21]; + var11 = field1874[var21]; + var3.field1692 = field1876[var21]; } if (var31 != null) { - if ((var31.orientationA & field1870[var21]) != 0) { + if ((var31.orientationA & field1875[var21]) != 0) { if (var31.orientationA == 16) { var3.drawGameObjectEdges = 3; - var3.field1678 = field1820[var21]; - var3.field1679 = 3 - var3.field1678; + var3.field1690 = field1862[var21]; + var3.field1691 = 3 - var3.field1690; } else if (var31.orientationA == 32) { var3.drawGameObjectEdges = 6; - var3.field1678 = field1842[var21]; - var3.field1679 = 6 - var3.field1678; + var3.field1690 = field1834[var21]; + var3.field1691 = 6 - var3.field1690; } else if (var31.orientationA == 64) { var3.drawGameObjectEdges = 12; - var3.field1678 = field1861[var21]; - var3.field1679 = 12 - var3.field1678; + var3.field1690 = field1829[var21]; + var3.field1691 = 12 - var3.field1690; } else { var3.drawGameObjectEdges = 9; - var3.field1678 = field1814[var21]; - var3.field1679 = 9 - var3.field1678; + var3.field1690 = field1880[var21]; + var3.field1691 = 9 - var3.field1690; } } else { var3.drawGameObjectEdges = 0; } - if ((var31.orientationA & var11) != 0 && !this.method3303(var7, var4, var5, var31.orientationA)) { + if ((var31.orientationA & var11) != 0 && !this.method3240(var7, var4, var5, var31.orientationA)) { var31.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); } - if ((var31.orientationB & var11) != 0 && !this.method3303(var7, var4, var5, var31.orientationB)) { + if ((var31.orientationB & var11) != 0 && !this.method3240(var7, var4, var5, var31.orientationB)) { var31.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); } } - if (var13 != null && !this.method3226(var7, var4, var5, var13.entity1.height)) { + if (var13 != null && !this.method3241(var7, var4, var5, var13.entity1.height)) { if ((var13.orientation & var11) != 0) { var13.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.x - Scene_cameraX + var13.xOffset, var13.tileHeight - Scene_cameraY, var13.y - Scene_cameraZ + var13.yOffset, var13.tag); } else if (var13.orientation == 256) { @@ -1532,7 +1522,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.field1678) { + if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field1690) { var20 = false; break; } @@ -1540,7 +1530,7 @@ public class Scene { if (var20) { var10 = var3.boundaryObject; - if (!this.method3303(var7, var4, var5, var10.orientationA)) { + if (!this.method3240(var7, var4, var5, var10.orientationA)) { var10.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag); } @@ -1587,7 +1577,7 @@ public class Scene { var16 += 2; } - if ((var16 & var36.drawGameObjectEdges) == var3.field1679) { + if ((var16 & var36.drawGameObjectEdges) == var3.field1691) { var3.drawGameObjects = true; continue label563; } @@ -1605,9 +1595,9 @@ public class Scene { var15 = Scene_cameraYTile - var12.startY; var16 = var12.endY - Scene_cameraYTile; if (var16 > var15) { - var12.field1950 = var24 + var16; + var12.field1959 = var24 + var16; } else { - var12.field1950 = var24 + var15; + var12.field1959 = var24 + var15; } } } @@ -1619,10 +1609,10 @@ public class Scene { for (var24 = 0; var24 < var21; ++var24) { GameObject var35 = gameObjects[var24]; if (var35.lastDrawn != Scene_drawnCount) { - if (var35.field1950 > var11) { - var11 = var35.field1950; + if (var35.field1959 > var11) { + var11 = var35.field1959; var25 = var24; - } else if (var11 == var35.field1950) { + } else if (var11 == var35.field1959) { var15 = var35.centerX - Scene_cameraX; var16 = var35.centerY - Scene_cameraZ; var17 = gameObjects[var25].centerX - Scene_cameraX; @@ -1640,7 +1630,7 @@ public class Scene { GameObject var33 = gameObjects[var25]; var33.lastDrawn = Scene_drawnCount; - if (!this.method3227(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.entity.height)) { + if (!this.method3367(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); } @@ -1712,10 +1702,10 @@ public class Scene { } } - if (var3.field1680 != 0) { + if (var3.field1692 != 0) { WallDecoration var29 = var3.wallDecoration; - if (var29 != null && !this.method3226(var7, var4, var5, var29.entity1.height)) { - if ((var29.orientation & var3.field1680) != 0) { + if (var29 != null && !this.method3241(var7, var4, var5, var29.entity1.height)) { + if ((var29.orientation & var3.field1692) != 0) { var29.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.tileHeight - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag); } else if (var29.orientation == 256) { var11 = var29.x - Scene_cameraX; @@ -1744,11 +1734,11 @@ public class Scene { BoundaryObject var27 = var3.boundaryObject; if (var27 != null) { - if ((var27.orientationB & var3.field1680) != 0 && !this.method3303(var7, var4, var5, var27.orientationB)) { + if ((var27.orientationB & var3.field1692) != 0 && !this.method3240(var7, var4, var5, var27.orientationB)) { var27.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag); } - if ((var27.orientationA & var3.field1680) != 0 && !this.method3303(var7, var4, var5, var27.orientationA)) { + if ((var27.orientationA & var3.field1692) != 0 && !this.method3240(var7, var4, var5, var27.orientationA)) { var27.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag); } } @@ -1792,9 +1782,9 @@ public class Scene { } } - @ObfuscatedName("ah") + @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "(Lev;IIIIIII)V" + signature = "(Lex;IIIIIII)V" ) @Export("drawTileUnderlay") void drawTileUnderlay(TilePaint var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { @@ -1848,9 +1838,9 @@ public class Scene { Rasterizer3D.Rasterizer3D_alpha = 0; int var30; if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { - Rasterizer3D.field1778 = false; + Rasterizer3D.field1796 = false; if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field1778 = true; + Rasterizer3D.field1796 = true; } if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { @@ -1860,7 +1850,7 @@ public class Scene { if (var1.texture == -1) { if (var1.neColor != 12345678) { - Rasterizer3D.method3105(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); + Rasterizer3D.method3122(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); } } else if (!Scene_isLowDetail) { if (var1.isFlat) { @@ -1870,14 +1860,14 @@ public class Scene { } } else { var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); - Rasterizer3D.method3105(var27, var29, var25, var26, var28, var24, method3221(var30, var1.neColor), method3221(var30, var1.nwColor), method3221(var30, var1.seColor)); + Rasterizer3D.method3122(var27, var29, var25, var26, var28, var24, method3236(var30, var1.neColor), method3236(var30, var1.nwColor), method3236(var30, var1.seColor)); } } if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { - Rasterizer3D.field1778 = false; + Rasterizer3D.field1796 = false; if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field1778 = true; + Rasterizer3D.field1796 = true; } if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { @@ -1887,13 +1877,13 @@ public class Scene { if (var1.texture == -1) { if (var1.swColor != 12345678) { - Rasterizer3D.method3105(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor); + Rasterizer3D.method3122(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.method3105(var23, var25, var29, var22, var24, var28, method3221(var30, var1.swColor), method3221(var30, var1.seColor), method3221(var30, var1.nwColor)); + Rasterizer3D.method3122(var23, var25, var29, var22, var24, var28, method3236(var30, var1.swColor), method3236(var30, var1.seColor), method3236(var30, var1.nwColor)); } } @@ -1903,9 +1893,9 @@ public class Scene { } } - @ObfuscatedName("ag") + @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "(Lex;IIIIII)V" + signature = "(Lej;IIIIII)V" ) @Export("drawTileOverlay") void drawTileOverlay(TileModel var1, int var2, int var3, int var4, int var5, int var6, int var7) { @@ -1930,13 +1920,13 @@ public class Scene { } if (var1.triangleTextureId != null) { - TileModel.field1613[var9] = var10; - TileModel.field1623[var9] = var13; - TileModel.field1620[var9] = var12; + TileModel.field1634[var9] = var10; + TileModel.field1635[var9] = var13; + TileModel.field1636[var9] = var12; } - TileModel.field1615[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; - TileModel.field1605[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; + TileModel.field1632[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; + TileModel.field1625[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; } Rasterizer3D.Rasterizer3D_alpha = 0; @@ -1946,16 +1936,16 @@ public class Scene { var10 = var1.faceX[var9]; var11 = var1.faceY[var9]; var12 = var1.faceZ[var9]; - var13 = TileModel.field1615[var10]; - int var14 = TileModel.field1615[var11]; - int var15 = TileModel.field1615[var12]; - int var16 = TileModel.field1605[var10]; - int var17 = TileModel.field1605[var11]; - int var18 = TileModel.field1605[var12]; + var13 = TileModel.field1632[var10]; + int var14 = TileModel.field1632[var11]; + int var15 = TileModel.field1632[var12]; + int var16 = TileModel.field1625[var10]; + int var17 = TileModel.field1625[var11]; + int var18 = TileModel.field1625[var12]; if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { - Rasterizer3D.field1778 = false; + Rasterizer3D.field1796 = false; if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field1778 = true; + Rasterizer3D.field1796 = true; } if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { @@ -1966,23 +1956,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.field1613[0], TileModel.field1613[1], TileModel.field1613[3], TileModel.field1623[0], TileModel.field1623[1], TileModel.field1623[3], TileModel.field1620[0], TileModel.field1620[1], TileModel.field1620[3], var1.triangleTextureId[var9]); + Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1634[0], TileModel.field1634[1], TileModel.field1634[3], TileModel.field1635[0], TileModel.field1635[1], TileModel.field1635[3], TileModel.field1636[0], TileModel.field1636[1], TileModel.field1636[3], var1.triangleTextureId[var9]); } else { - Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1613[var10], TileModel.field1613[var11], TileModel.field1613[var12], TileModel.field1623[var10], TileModel.field1623[var11], TileModel.field1623[var12], TileModel.field1620[var10], TileModel.field1620[var11], TileModel.field1620[var12], var1.triangleTextureId[var9]); + Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1634[var10], TileModel.field1634[var11], TileModel.field1634[var12], TileModel.field1635[var10], TileModel.field1635[var11], TileModel.field1635[var12], TileModel.field1636[var10], TileModel.field1636[var11], TileModel.field1636[var12], var1.triangleTextureId[var9]); } } else { int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); - Rasterizer3D.method3105(var16, var17, var18, var13, var14, var15, method3221(var19, var1.triangleColorA[var9]), method3221(var19, var1.triangleColorB[var9]), method3221(var19, var1.triangleColorC[var9])); + Rasterizer3D.method3122(var16, var17, var18, var13, var14, var15, method3236(var19, var1.triangleColorA[var9]), method3236(var19, var1.triangleColorB[var9]), method3236(var19, var1.triangleColorC[var9])); } } else if (var1.triangleColorA[var9] != 12345678) { - Rasterizer3D.method3105(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); + Rasterizer3D.method3122(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); } } } } - @ObfuscatedName("bc") + @ObfuscatedName("bk") @Export("occlude") void occlude() { int var1 = Scene_planeOccluderCounts[Scene_plane]; @@ -2021,20 +2011,20 @@ public class Scene { if (var13) { var9 = Scene_cameraX - var4.minX; if (var9 > 32) { - var4.field1916 = 1; + var4.field1927 = 1; } else { if (var9 >= -32) { continue; } - var4.field1916 = 2; + var4.field1927 = 2; var9 = -var9; } - var4.field1920 = (var4.minZ - Scene_cameraZ << 8) / var9; - var4.field1908 = (var4.maxZ - Scene_cameraZ << 8) / var9; - var4.field1921 = (var4.minY - Scene_cameraY << 8) / var9; - var4.field1922 = (var4.maxY - Scene_cameraY << 8) / var9; + var4.field1926 = (var4.minZ - Scene_cameraZ << 8) / var9; + var4.field1931 = (var4.maxZ - Scene_cameraZ << 8) / var9; + var4.field1932 = (var4.minY - Scene_cameraY << 8) / var9; + var4.field1928 = (var4.maxY - Scene_cameraY << 8) / var9; Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } @@ -2063,20 +2053,20 @@ public class Scene { if (var13) { var9 = Scene_cameraZ - var4.minZ; if (var9 > 32) { - var4.field1916 = 3; + var4.field1927 = 3; } else { if (var9 >= -32) { continue; } - var4.field1916 = 4; + var4.field1927 = 4; var9 = -var9; } - var4.field1917 = (var4.minX - Scene_cameraX << 8) / var9; - var4.field1914 = (var4.maxX - Scene_cameraX << 8) / var9; - var4.field1921 = (var4.minY - Scene_cameraY << 8) / var9; - var4.field1922 = (var4.maxY - Scene_cameraY << 8) / var9; + var4.field1920 = (var4.minX - Scene_cameraX << 8) / var9; + var4.field1929 = (var4.maxX - Scene_cameraX << 8) / var9; + var4.field1932 = (var4.minY - Scene_cameraY << 8) / var9; + var4.field1928 = (var4.maxY - Scene_cameraY << 8) / var9; Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } @@ -2106,22 +2096,22 @@ public class Scene { boolean var10 = false; - label163: + label144: for (int var11 = var8; var11 <= var9; ++var11) { for (int var12 = var6; var12 <= var7; ++var12) { if (visibleTiles[var11][var12]) { var10 = true; - break label163; + break label144; } } } if (var10) { - var4.field1916 = 5; - var4.field1917 = (var4.minX - Scene_cameraX << 8) / var5; - var4.field1914 = (var4.maxX - Scene_cameraX << 8) / var5; - var4.field1920 = (var4.minZ - Scene_cameraZ << 8) / var5; - var4.field1908 = (var4.maxZ - Scene_cameraZ << 8) / var5; + var4.field1927 = 5; + var4.field1920 = (var4.minX - Scene_cameraX << 8) / var5; + var4.field1929 = (var4.maxX - Scene_cameraX << 8) / var5; + var4.field1926 = (var4.minZ - Scene_cameraZ << 8) / var5; + var4.field1931 = (var4.maxZ - Scene_cameraZ << 8) / var5; Scene_currentOccluders[Scene_currentOccludersCount++] = var4; } } @@ -2131,9 +2121,9 @@ public class Scene { } - @ObfuscatedName("bo") - boolean method3177(int var1, int var2, int var3) { - int var4 = this.field1819[var1][var2][var3]; + @ObfuscatedName("bh") + boolean method3196(int var1, int var2, int var3) { + int var4 = this.field1839[var1][var2][var3]; if (var4 == -Scene_drawnCount) { return false; } else if (var4 == Scene_drawnCount) { @@ -2141,19 +2131,19 @@ public class Scene { } else { int var5 = var2 << 7; int var6 = var3 << 7; - if (this.method3228(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method3228(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method3228(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method3228(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { - this.field1819[var1][var2][var3] = Scene_drawnCount; + if (this.method3243(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method3243(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method3243(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method3243(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { + this.field1839[var1][var2][var3] = Scene_drawnCount; return true; } else { - this.field1819[var1][var2][var3] = -Scene_drawnCount; + this.field1839[var1][var2][var3] = -Scene_drawnCount; return false; } } } - @ObfuscatedName("bd") - boolean method3303(int var1, int var2, int var3, int var4) { - if (!this.method3177(var1, var2, var3)) { + @ObfuscatedName("bg") + boolean method3240(int var1, int var2, int var3, int var4) { + if (!this.method3196(var1, var2, var3)) { return false; } else { int var5 = var2 << 7; @@ -2165,30 +2155,30 @@ public class Scene { if (var4 < 16) { if (var4 == 1) { if (var5 > Scene_cameraX) { - if (!this.method3228(var5, var7, var6)) { + if (!this.method3243(var5, var7, var6)) { return false; } - if (!this.method3228(var5, var7, var6 + 128)) { + if (!this.method3243(var5, var7, var6 + 128)) { return false; } } if (var1 > 0) { - if (!this.method3228(var5, var8, var6)) { + if (!this.method3243(var5, var8, var6)) { return false; } - if (!this.method3228(var5, var8, var6 + 128)) { + if (!this.method3243(var5, var8, var6 + 128)) { return false; } } - if (!this.method3228(var5, var9, var6)) { + if (!this.method3243(var5, var9, var6)) { return false; } - if (!this.method3228(var5, var9, var6 + 128)) { + if (!this.method3243(var5, var9, var6 + 128)) { return false; } @@ -2197,30 +2187,30 @@ public class Scene { if (var4 == 2) { if (var6 < Scene_cameraZ) { - if (!this.method3228(var5, var7, var6 + 128)) { + if (!this.method3243(var5, var7, var6 + 128)) { return false; } - if (!this.method3228(var5 + 128, var7, var6 + 128)) { + if (!this.method3243(var5 + 128, var7, var6 + 128)) { return false; } } if (var1 > 0) { - if (!this.method3228(var5, var8, var6 + 128)) { + if (!this.method3243(var5, var8, var6 + 128)) { return false; } - if (!this.method3228(var5 + 128, var8, var6 + 128)) { + if (!this.method3243(var5 + 128, var8, var6 + 128)) { return false; } } - if (!this.method3228(var5, var9, var6 + 128)) { + if (!this.method3243(var5, var9, var6 + 128)) { return false; } - if (!this.method3228(var5 + 128, var9, var6 + 128)) { + if (!this.method3243(var5 + 128, var9, var6 + 128)) { return false; } @@ -2229,30 +2219,30 @@ public class Scene { if (var4 == 4) { if (var5 < Scene_cameraX) { - if (!this.method3228(var5 + 128, var7, var6)) { + if (!this.method3243(var5 + 128, var7, var6)) { return false; } - if (!this.method3228(var5 + 128, var7, var6 + 128)) { + if (!this.method3243(var5 + 128, var7, var6 + 128)) { return false; } } if (var1 > 0) { - if (!this.method3228(var5 + 128, var8, var6)) { + if (!this.method3243(var5 + 128, var8, var6)) { return false; } - if (!this.method3228(var5 + 128, var8, var6 + 128)) { + if (!this.method3243(var5 + 128, var8, var6 + 128)) { return false; } } - if (!this.method3228(var5 + 128, var9, var6)) { + if (!this.method3243(var5 + 128, var9, var6)) { return false; } - if (!this.method3228(var5 + 128, var9, var6 + 128)) { + if (!this.method3243(var5 + 128, var9, var6 + 128)) { return false; } @@ -2261,30 +2251,30 @@ public class Scene { if (var4 == 8) { if (var6 > Scene_cameraZ) { - if (!this.method3228(var5, var7, var6)) { + if (!this.method3243(var5, var7, var6)) { return false; } - if (!this.method3228(var5 + 128, var7, var6)) { + if (!this.method3243(var5 + 128, var7, var6)) { return false; } } if (var1 > 0) { - if (!this.method3228(var5, var8, var6)) { + if (!this.method3243(var5, var8, var6)) { return false; } - if (!this.method3228(var5 + 128, var8, var6)) { + if (!this.method3243(var5 + 128, var8, var6)) { return false; } } - if (!this.method3228(var5, var9, var6)) { + if (!this.method3243(var5, var9, var6)) { return false; } - if (!this.method3228(var5 + 128, var9, var6)) { + if (!this.method3243(var5 + 128, var9, var6)) { return false; } @@ -2292,49 +2282,49 @@ public class Scene { } } - if (!this.method3228(var5 + 64, var10, var6 + 64)) { + if (!this.method3243(var5 + 64, var10, var6 + 64)) { return false; } else if (var4 == 16) { - return this.method3228(var5, var9, var6 + 128); + return this.method3243(var5, var9, var6 + 128); } else if (var4 == 32) { - return this.method3228(var5 + 128, var9, var6 + 128); + return this.method3243(var5 + 128, var9, var6 + 128); } else if (var4 == 64) { - return this.method3228(var5 + 128, var9, var6); + return this.method3243(var5 + 128, var9, var6); } else if (var4 == 128) { - return this.method3228(var5, var9, var6); + return this.method3243(var5, var9, var6); } else { return true; } } } - @ObfuscatedName("bk") - boolean method3226(int var1, int var2, int var3, int var4) { - if (!this.method3177(var1, var2, var3)) { + @ObfuscatedName("be") + boolean method3241(int var1, int var2, int var3, int var4) { + if (!this.method3196(var1, var2, var3)) { return false; } else { int var5 = var2 << 7; int var6 = var3 << 7; - return this.method3228(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method3228(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method3228(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method3228(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); + return this.method3243(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method3243(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method3243(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method3243(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); } } - @ObfuscatedName("bu") - boolean method3227(int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("bf") + boolean method3367(int var1, int var2, int var3, int var4, int var5, int var6) { int var7; int var8; if (var3 == var2 && var5 == var4) { - if (!this.method3177(var1, var2, var4)) { + if (!this.method3196(var1, var2, var4)) { return false; } else { var7 = var2 << 7; var8 = var4 << 7; - return this.method3228(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method3228(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method3228(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method3228(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); + return this.method3243(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method3243(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method3243(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method3243(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.field1819[var1][var7][var8] == -Scene_drawnCount) { + if (this.field1839[var1][var7][var8] == -Scene_drawnCount) { return false; } } @@ -2343,17 +2333,17 @@ public class Scene { var7 = (var2 << 7) + 1; var8 = (var4 << 7) + 2; int var9 = this.tileHeights[var1][var2][var4] - var6; - if (!this.method3228(var7, var9, var8)) { + if (!this.method3243(var7, var9, var8)) { return false; } else { int var10 = (var3 << 7) - 1; - if (!this.method3228(var10, var9, var8)) { + if (!this.method3243(var10, var9, var8)) { return false; } else { int var11 = (var5 << 7) - 1; - if (!this.method3228(var7, var9, var11)) { + if (!this.method3243(var7, var9, var11)) { return false; - } else if (!this.method3228(var10, var9, var11)) { + } else if (!this.method3243(var10, var9, var11)) { return false; } else { return true; @@ -2363,8 +2353,8 @@ public class Scene { } } - @ObfuscatedName("be") - boolean method3228(int var1, int var2, int var3) { + @ObfuscatedName("ba") + boolean method3243(int var1, int var2, int var3) { for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { Occluder var5 = Scene_currentOccluders[var4]; int var6; @@ -2372,57 +2362,57 @@ public class Scene { int var8; int var9; int var10; - if (var5.field1916 == 1) { + if (var5.field1927 == 1) { var6 = var5.minX - var1; if (var6 > 0) { - var7 = (var6 * var5.field1920 >> 8) + var5.minZ; - var8 = (var6 * var5.field1908 >> 8) + var5.maxZ; - var9 = (var6 * var5.field1921 >> 8) + var5.minY; - var10 = (var6 * var5.field1922 >> 8) + var5.maxY; + var7 = (var6 * var5.field1926 >> 8) + var5.minZ; + var8 = (var6 * var5.field1931 >> 8) + var5.maxZ; + var9 = (var6 * var5.field1932 >> 8) + var5.minY; + var10 = (var6 * var5.field1928 >> 8) + var5.maxY; if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field1916 == 2) { + } else if (var5.field1927 == 2) { var6 = var1 - var5.minX; if (var6 > 0) { - var7 = (var6 * var5.field1920 >> 8) + var5.minZ; - var8 = (var6 * var5.field1908 >> 8) + var5.maxZ; - var9 = (var6 * var5.field1921 >> 8) + var5.minY; - var10 = (var6 * var5.field1922 >> 8) + var5.maxY; + var7 = (var6 * var5.field1926 >> 8) + var5.minZ; + var8 = (var6 * var5.field1931 >> 8) + var5.maxZ; + var9 = (var6 * var5.field1932 >> 8) + var5.minY; + var10 = (var6 * var5.field1928 >> 8) + var5.maxY; if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field1916 == 3) { + } else if (var5.field1927 == 3) { var6 = var5.minZ - var3; if (var6 > 0) { - var7 = (var6 * var5.field1917 >> 8) + var5.minX; - var8 = (var6 * var5.field1914 >> 8) + var5.maxX; - var9 = (var6 * var5.field1921 >> 8) + var5.minY; - var10 = (var6 * var5.field1922 >> 8) + var5.maxY; + var7 = (var6 * var5.field1920 >> 8) + var5.minX; + var8 = (var6 * var5.field1929 >> 8) + var5.maxX; + var9 = (var6 * var5.field1932 >> 8) + var5.minY; + var10 = (var6 * var5.field1928 >> 8) + var5.maxY; if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field1916 == 4) { + } else if (var5.field1927 == 4) { var6 = var3 - var5.minZ; if (var6 > 0) { - var7 = (var6 * var5.field1917 >> 8) + var5.minX; - var8 = (var6 * var5.field1914 >> 8) + var5.maxX; - var9 = (var6 * var5.field1921 >> 8) + var5.minY; - var10 = (var6 * var5.field1922 >> 8) + var5.maxY; + var7 = (var6 * var5.field1920 >> 8) + var5.minX; + var8 = (var6 * var5.field1929 >> 8) + var5.maxX; + var9 = (var6 * var5.field1932 >> 8) + var5.minY; + var10 = (var6 * var5.field1928 >> 8) + var5.maxY; if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { return true; } } - } else if (var5.field1916 == 5) { + } else if (var5.field1927 == 5) { var6 = var2 - var5.minY; if (var6 > 0) { - var7 = (var6 * var5.field1917 >> 8) + var5.minX; - var8 = (var6 * var5.field1914 >> 8) + var5.maxX; - var9 = (var6 * var5.field1920 >> 8) + var5.minZ; - var10 = (var6 * var5.field1908 >> 8) + var5.maxZ; + var7 = (var6 * var5.field1920 >> 8) + var5.minX; + var8 = (var6 * var5.field1929 >> 8) + var5.maxX; + var9 = (var6 * var5.field1926 >> 8) + var5.minZ; + var10 = (var6 * var5.field1931 >> 8) + var5.maxZ; if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { return true; } @@ -2433,7 +2423,7 @@ public class Scene { return false; } - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("Scene_addOccluder") public static void Scene_addOccluder(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { Occluder var8 = new Occluder(); @@ -2451,7 +2441,7 @@ public class Scene { Scene_planeOccluders[var0][Scene_planeOccluderCounts[var0]++] = var8; } - @ObfuscatedName("ak") + @ObfuscatedName("an") @Export("Scene_buildVisiblityMap") public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int var3, int var4) { Scene_viewportXMin = 0; @@ -2484,7 +2474,7 @@ public class Scene { boolean var14 = false; for (int var15 = -var1; var15 <= var2; var15 += 128) { - if (method3212(var12, var0[var8] + var15, var13)) { + if (method3227(var12, var0[var8] + var15, var13)) { var14 = true; break; } @@ -2535,8 +2525,8 @@ public class Scene { } - @ObfuscatedName("aa") - static boolean method3212(int var0, int var1, int var2) { + @ObfuscatedName("ac") + static boolean method3227(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; @@ -2550,19 +2540,19 @@ public class Scene { } } - @ObfuscatedName("aj") - public static boolean method3215() { + @ObfuscatedName("at") + public static boolean method3230() { return viewportWalking && Scene_selectedX != -1; } - @ObfuscatedName("ay") - public static void method3347() { + @ObfuscatedName("aa") + public static void method3346() { Scene_selectedX = -1; viewportWalking = false; } - @ObfuscatedName("aw") - static final int method3221(int var0, int var1) { + @ObfuscatedName("au") + static final int method3236(int var0, int var1) { var1 = (var0 & 127) * var1 >> 7; if (var1 < 2) { var1 = 2; @@ -2573,7 +2563,7 @@ public class Scene { return (var0 & 65408) + var1; } - @ObfuscatedName("bf") + @ObfuscatedName("aj") @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 29129c5b38..db4c1ba62a 100644 --- a/runescape-client/src/main/java/Script.java +++ b/runescape-client/src/main/java/Script.java @@ -4,60 +4,51 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ce") +@ObfuscatedName("cs") @Implements("Script") public class Script extends DualNode { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Leg;" + signature = "Lec;" ) @Export("Script_cached") static EvictingDualNodeHashTable Script_cached; - @ObfuscatedName("ej") - @Export("worldHost") - static String worldHost; - @ObfuscatedName("fs") - @ObfuscatedSignature( - signature = "Lkx;" - ) - @Export("fontPlain11") - static Font fontPlain11; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("opcodes") int[] opcodes; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("intOperands") int[] intOperands; - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("stringOperands") String[] stringOperands; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1902344849 + intValue = 701670427 ) @Export("localIntCount") int localIntCount; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1904164233 + intValue = 12358867 ) @Export("localStringCount") int localStringCount; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -335811903 + intValue = 2127952993 ) @Export("intArgumentCount") int intArgumentCount; - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 931655197 + intValue = -983920549 ) @Export("stringArgumentCount") int stringArgumentCount; - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "[Lln;" + signature = "[Llf;" ) @Export("switches") IterableNodeHashTable[] switches; @@ -69,23 +60,13 @@ public class Script extends DualNode { Script() { } - @ObfuscatedName("d") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(II)[Lln;", - garbageValue = "-1946257941" + signature = "(II)[Llf;", + garbageValue = "-978861309" ) @Export("newIterableNodeHashTable") IterableNodeHashTable[] newIterableNodeHashTable(int var1) { return new IterableNodeHashTable[var1]; } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZZI)V", - garbageValue = "1255823265" - ) - @Export("openURL") - public static void openURL(String var0, boolean var1, boolean var2) { - class224.method4125(var0, var1, "openjs", var2); - } } diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java index 1c2fa8c48b..d40814559b 100644 --- a/runescape-client/src/main/java/ScriptEvent.java +++ b/runescape-client/src/main/java/ScriptEvent.java @@ -4,74 +4,83 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bb") +@ObfuscatedName("bu") @Implements("ScriptEvent") public class ScriptEvent extends Node { - @ObfuscatedName("km") + @ObfuscatedName("ri") @ObfuscatedGetter( - intValue = -2032356267 + intValue = 1137606481 ) - @Export("Client_plane") - static int Client_plane; - @ObfuscatedName("x") + static int field604; + @ObfuscatedName("h") + @ObfuscatedSignature( + signature = "Llh;" + ) + static IndexedSprite field597; + @ObfuscatedName("az") + @ObfuscatedGetter( + intValue = -2018552551 + ) + static int field606; + @ObfuscatedName("m") @Export("args") Object[] args; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("isMouseInputEvent") boolean isMouseInputEvent; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lhe;" + signature = "Lhd;" ) @Export("widget") Widget widget; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 662449011 + intValue = -1176492869 ) @Export("mouseX") int mouseX; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1491668133 + intValue = -1543053859 ) @Export("mouseY") int mouseY; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -44479267 + intValue = 1384344567 ) @Export("opIndex") int opIndex; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Lhe;" + signature = "Lhd;" ) @Export("dragTarget") Widget dragTarget; - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 128989033 + intValue = 710326963 ) @Export("keyTyped") int keyTyped; - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1018201725 + intValue = -649367947 ) @Export("keyPressed") int keyPressed; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("targetName") String targetName; - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 171881153 + intValue = -1551673037 ) - int field604; - @ObfuscatedName("p") + int field600; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -893996953 + intValue = -1226589713 ) @Export("type") int type; @@ -80,59 +89,125 @@ public class ScriptEvent extends Node { this.type = 76; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "([Ljava/lang/Object;I)V", - garbageValue = "-1877597946" + garbageValue = "-2050703759" ) @Export("setArgs") public void setArgs(Object[] var1) { this.args = var1; } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(IB)V", - garbageValue = "77" + garbageValue = "20" ) @Export("setType") public void setType(int var1) { this.type = var1; } - @ObfuscatedName("kv") - @ObfuscatedSignature( - signature = "(IIIILla;Lhg;B)V", - garbageValue = "-20" - ) - @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.method6240(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); - } + @ObfuscatedName("m") + public static final int method1235(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 = var4 * (1.0D + var2); + } else { + var12 = var2 + var4 - var2 * var4; + } + double var14 = 2.0D * var4 - var12; + double var16 = var0 + 0.3333333333333333D; + if (var16 > 1.0D) { + --var16; + } + + double var20 = var0 - 0.3333333333333333D; + if (var20 < 0.0D) { + ++var20; + } + + if (6.0D * var16 < 1.0D) { + var6 = var16 * (var12 - var14) * 6.0D + var14; + } else if (2.0D * var16 < 1.0D) { + var6 = var12; + } else if (3.0D * var16 < 2.0D) { + var6 = (0.6666666666666666D - var16) * (var12 - var14) * 6.0D + var14; + } else { + var6 = var14; + } + + if (var0 * 6.0D < 1.0D) { + var8 = var14 + var0 * 6.0D * (var12 - var14); + } else if (2.0D * var0 < 1.0D) { + var8 = var12; + } else if (var0 * 3.0D < 2.0D) { + var8 = (var12 - var14) * (0.6666666666666666D - var0) * 6.0D + var14; + } else { + var8 = var14; + } + + if (6.0D * var20 < 1.0D) { + var10 = var14 + var20 * 6.0D * (var12 - var14); + } else if (2.0D * var20 < 1.0D) { + var10 = var12; + } else if (3.0D * var20 < 2.0D) { + var10 = (0.6666666666666666D - var20) * (var12 - var14) * 6.0D + var14; + } else { + var10 = var14; } } + + int var22 = (int)(256.0D * var6); + int var13 = (int)(var8 * 256.0D); + int var23 = (int)(var10 * 256.0D); + int var15 = var23 + (var13 << 8) + (var22 << 16); + return var15; } - @ObfuscatedName("kc") + @ObfuscatedName("fv") @ObfuscatedSignature( - signature = "(Lhe;I)I", - garbageValue = "-1130493417" + signature = "(II)V", + garbageValue = "303339948" ) - @Export("getWidgetClickMask") - static int getWidgetClickMask(Widget var0) { - IntegerNode var1 = (IntegerNode)Client.widgetClickMasks.get((long)var0.childIndex + ((long)var0.id << 32)); - return var1 != null ? var1.integer : var0.clickMask; + @Export("setWindowedMode") + static void setWindowedMode(int var0) { + Client.field886 = 0L; + if (var0 >= 2) { + Client.isResizable = true; + } else { + Client.isResizable = false; + } + + if (class58.getWindowedMode() == 1) { + WorldMapSectionType.client.setMaxCanvasSize(765, 503); + } else { + WorldMapSectionType.client.setMaxCanvasSize(7680, 2160); + } + + if (Client.gameState >= 25) { + PacketBufferNode var1 = UserComparator4.getPacketBufferNode(ClientPacket.field2279, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(class58.getWindowedMode()); + var1.packetBuffer.writeShort(Varcs.canvasWidth); + var1.packetBuffer.writeShort(class52.canvasHeight); + Client.packetWriter.addNode(var1); + } + + } + + @ObfuscatedName("hs") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;Ljava/lang/String;IIIII)V", + garbageValue = "-1977726761" + ) + @Export("insertMenuItemNoShift") + public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { + ApproximateRouteStrategy.insertMenuItem(var0, var1, var2, var3, var4, var5, false); } } diff --git a/runescape-client/src/main/java/ScriptFrame.java b/runescape-client/src/main/java/ScriptFrame.java index e644679ee9..82cdd9c194 100644 --- a/runescape-client/src/main/java/ScriptFrame.java +++ b/runescape-client/src/main/java/ScriptFrame.java @@ -4,25 +4,25 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bv") +@ObfuscatedName("bp") @Implements("ScriptFrame") public class ScriptFrame { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lce;" + signature = "Lcs;" ) @Export("script") Script script; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1351429101 + intValue = 1954310333 ) @Export("pc") int pc; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("intLocals") int[] intLocals; - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("stringLocals") String[] stringLocals; @@ -30,204 +30,20 @@ public class ScriptFrame { this.pc = -1; } - @ObfuscatedName("v") + @ObfuscatedName("gb") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1106697441" + signature = "(B)V", + garbageValue = "-32" ) - static void method1242(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var1 != null) { - var1.remove(); - } - } + static void method1201() { + int var0 = Players.Players_count; + int[] var1 = Players.Players_indices; - @ObfuscatedName("hi") - @ObfuscatedSignature( - signature = "(IIIIIB)V", - garbageValue = "-113" - ) - @Export("drawObject") - static final void drawObject(int var0, int var1, int var2, int var3, int var4) { - long var5 = GrandExchangeOfferWorldComparator.scene.getBoundaryObjectTag(var0, var1, var2); - int var7; - int var8; - int var9; - int var10; - int var12; - int var13; - if (var5 != 0L) { - var7 = GrandExchangeOfferWorldComparator.scene.getObjectFlags(var0, var1, var2, var5); - var8 = var7 >> 6 & 3; - var9 = var7 & 31; - var10 = var3; - if (Decimator.method2635(var5)) { - var10 = var4; - } - - int[] var11 = ArchiveDisk.sceneMinimapSprite.pixels; - var12 = var1 * 4 + (103 - var2) * 2048 + 24624; - var13 = WorldMapRectangle.Entity_unpackID(var5); - ObjectDefinition var14 = WorldMapSection2.getObjectDefinition(var13); - if (var14.mapSceneId != -1) { - IndexedSprite var15 = class169.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, (104 - var2 - var14.sizeY) * 4 + var17 + 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; - } - } + for (int var2 = 0; var2 < var0; ++var2) { + if (var1[var2] != Client.combatTargetPlayerIndex && var1[var2] != Client.localPlayerIndex) { + class9.addPlayerToScene(Client.players[var1[var2]], true); } } - var5 = GrandExchangeOfferWorldComparator.scene.getGameObjectTag(var0, var1, var2); - if (var5 != 0L) { - var7 = GrandExchangeOfferWorldComparator.scene.getObjectFlags(var0, var1, var2, var5); - var8 = var7 >> 6 & 3; - var9 = var7 & 31; - var10 = WorldMapRectangle.Entity_unpackID(var5); - ObjectDefinition var24 = WorldMapSection2.getObjectDefinition(var10); - int var19; - if (var24.mapSceneId != -1) { - IndexedSprite var18 = class169.mapSceneSprites[var24.mapSceneId]; - if (var18 != null) { - var13 = (var24.sizeX * 4 - var18.subWidth) / 2; - var19 = (var24.sizeY * 4 - var18.subHeight) / 2; - var18.drawAt(var13 + var1 * 4 + 48, var19 + (104 - var2 - var24.sizeY) * 4 + 48); - } - } else if (var9 == 9) { - var12 = 15658734; - if (Decimator.method2635(var5)) { - var12 = 15597568; - } - - int[] var23 = ArchiveDisk.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 = GrandExchangeOfferWorldComparator.scene.getFloorDecorationTag(var0, var1, var2); - if (0L != var5) { - var7 = WorldMapRectangle.Entity_unpackID(var5); - ObjectDefinition var20 = WorldMapSection2.getObjectDefinition(var7); - if (var20.mapSceneId != -1) { - IndexedSprite var21 = class169.mapSceneSprites[var20.mapSceneId]; - if (var21 != null) { - var10 = (var20.sizeX * 4 - var21.subWidth) / 2; - int var22 = (var20.sizeY * 4 - var21.subHeight) / 2; - var21.drawAt(var10 + var1 * 4 + 48, (104 - var2 - var20.sizeY) * 4 + var22 + 48); - } - } - } - - } - - @ObfuscatedName("hb") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1005499202" - ) - static final void method1241() { - for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { - if (var0.hitpoints == -1) { - var0.delay = 0; - WorldMapSectionType.method348(var0); - } else { - var0.remove(); - } - } - - } - - @ObfuscatedName("iy") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/String;IIIIZI)V", - garbageValue = "-1778070098" - ) - @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/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java index 6b418837a8..8577f2fa32 100644 --- a/runescape-client/src/main/java/SecureRandomCallable.java +++ b/runescape-client/src/main/java/SecureRandomCallable.java @@ -1,230 +1,223 @@ -import java.security.SecureRandom; import java.util.concurrent.Callable; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bx") +@ObfuscatedName("bm") @Implements("SecureRandomCallable") public class SecureRandomCallable implements Callable { + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "Lic;" + ) + @Export("Widget_modelsArchive") + static AbstractArchive Widget_modelsArchive; + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "Lhd;" + ) + static Widget field544; + @ObfuscatedName("cp") + @ObfuscatedGetter( + intValue = -1382936715 + ) + public static int field546; + @ObfuscatedName("ll") + @ObfuscatedSignature( + signature = "Lhd;" + ) + static Widget field542; + SecureRandomCallable() { } public Object call() { - SecureRandom var2 = new SecureRandom(); - var2.nextInt(); - return var2; + return WorldMapIcon_1.method348(); } - @ObfuscatedName("x") + @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1446972814" + signature = "(ILcs;ZI)I", + garbageValue = "1445802198" ) - public static int method1250() { - return ViewportMouse.ViewportMouse_entityCount; - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "([BI)Lce;", - garbageValue = "-932748815" - ) - @Export("newScript") - static Script newScript(byte[] var0) { - Script var1 = new Script(); - Buffer var2 = new Buffer(var0); - var2.offset = var2.array.length - 2; - int var3 = var2.readUnsignedShort(); - int var4 = var2.array.length - 2 - var3 - 12; - var2.offset = var4; - int var5 = var2.readInt(); - var1.localIntCount = var2.readUnsignedShort(); - var1.localStringCount = var2.readUnsignedShort(); - var1.intArgumentCount = var2.readUnsignedShort(); - var1.stringArgumentCount = var2.readUnsignedShort(); - int var6 = var2.readUnsignedByte(); - int var7; - int var8; - if (var6 > 0) { - var1.switches = var1.newIterableNodeHashTable(var6); - - for (var7 = 0; var7 < var6; ++var7) { - var8 = var2.readUnsignedShort(); - IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? Calendar.method4033(var8) : 1); - var1.switches[var7] = var9; - - while (var8-- > 0) { - int var10 = var2.readInt(); - int var11 = var2.readInt(); - var9.put(new IntegerNode(var11), (long)var10); - } - } - } - - var2.offset = 0; - 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(); + static int method1203(int var0, Script var1, boolean var2) { + int var3; + int var4; + if (var0 == ScriptOpcodes.ADD) { + UrlRequester.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var4 + var3; + return 1; + } else if (var0 == ScriptOpcodes.SUB) { + UrlRequester.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3 - var4; + return 1; + } else if (var0 == ScriptOpcodes.MULTIPLY) { + UrlRequester.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3 * var4; + return 1; + } else if (var0 == ScriptOpcodes.DIV) { + UrlRequester.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3 / var4; + return 1; + } else if (var0 == ScriptOpcodes.RANDOM) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); + return 1; + } else if (var0 == ScriptOpcodes.RANDOMINC) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); + return 1; + } else if (var0 == ScriptOpcodes.INTERPOLATE) { + UrlRequester.Interpreter_intStackSize -= 5; + var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + int var5 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2]; + int var6 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 3]; + int var7 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 4]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3 + (var7 - var5) * (var4 - var3) / (var6 - var5); + return 1; + } else if (var0 == ScriptOpcodes.ADDPERCENT) { + UrlRequester.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3 + var3 * var4 / 100; + return 1; + } else if (var0 == ScriptOpcodes.SETBIT) { + UrlRequester.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3 | 1 << var4; + return 1; + } else if (var0 == ScriptOpcodes.CLEARBIT) { + UrlRequester.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); + return 1; + } else if (var0 == ScriptOpcodes.TESTBIT) { + UrlRequester.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.MOD) { + UrlRequester.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3 % var4; + return 1; + } else if (var0 == ScriptOpcodes.POW) { + UrlRequester.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + if (var3 == 0) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; } else { - var1.intOperands[var7] = var2.readUnsignedByte(); - } - } - - return var1; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "-153982607" - ) - static int method1249(int var0, Script var1, boolean var2) { - int var3 = -1; - Widget var4; - if (var0 >= 2000) { - var0 -= 1000; - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var4 = MusicPatchNode.getWidget(var3); - } else { - var4 = var2 ? GrandExchangeOfferNameComparator.field115 : Interpreter.field1130; - } - - 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]; - ItemContainer.invalidateWidget(var4); - WorldMapSection1.client.alignWidget(var4); - if (var3 != -1 && var4.type == 0) { - MouseHandler.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); } 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]; - ItemContainer.invalidateWidget(var4); - WorldMapSection1.client.alignWidget(var4); - if (var3 != -1 && var4.type == 0) { - MouseHandler.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); - } + } else if (var0 == ScriptOpcodes.INVPOW) { + UrlRequester.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + if (var3 == 0) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + return 1; + } else { + switch(var4) { + case 0: + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; + break; + case 1: + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3; + break; + case 2: + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); + break; + case 3: + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); + break; + case 4: + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); + break; + default: + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); + } - return 1; - } else if (var0 == ScriptOpcodes.CC_SETHIDE) { - boolean var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (var5 != var4.isHidden) { - var4.isHidden = var5; - ItemContainer.invalidateWidget(var4); + return 1; } - + } else if (var0 == ScriptOpcodes.AND) { + UrlRequester.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3 & var4; return 1; - } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { - var4.noClickThrough = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + } else if (var0 == ScriptOpcodes.OR) { + UrlRequester.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3 | var4; return 1; - } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { - var4.noScrollThrough = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; + } else if (var0 == ScriptOpcodes.SCALE) { + UrlRequester.Interpreter_intStackSize -= 3; + long var9 = (long)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + long var11 = (long)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + long var13 = (long)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = (int)(var13 * var9 / var11); return 1; } else { return 2; } } - @ObfuscatedName("g") + @ObfuscatedName("fm") @ObfuscatedSignature( - signature = "(Lel;IIII)Z", - garbageValue = "1749928116" + signature = "(Lby;IIB)V", + garbageValue = "72" ) - static final boolean method1252(Model var0, int var1, int var2, int var3) { - boolean var4 = ViewportMouse.ViewportMouse_isInViewport; - if (!var4) { - return false; - } else { - Varcs.method2294(); - int var5 = var0.xMid + var1; - int var6 = var2 + var0.yMid; - int var7 = var3 + var0.zMid; - int var8 = var0.xMidOffset; - int var9 = var0.yMidOffset; - int var10 = var0.zMidOffset; - int var11 = ViewportMouse.field1756 - var5; - int var12 = class300.field3653 - var6; - int var13 = HorizontalAlignment.field3456 - var7; - if (Math.abs(var11) > var8 + class23.field134) { - return false; - } else if (Math.abs(var12) > var9 + ViewportMouse.field1758) { - return false; - } else if (Math.abs(var13) > var10 + AttackOption.field1182) { - return false; - } else if (Math.abs(var13 * Clock.field2061 - var12 * GrandExchangeEvent.field75) > var9 * AttackOption.field1182 + var10 * ViewportMouse.field1758) { - return false; - } else if (Math.abs(var11 * GrandExchangeEvent.field75 - var13 * ViewportMouse.field1753) > var10 * class23.field134 + var8 * AttackOption.field1182) { - return false; - } else { - return Math.abs(var12 * ViewportMouse.field1753 - var11 * Clock.field2061) <= var8 * ViewportMouse.field1758 + var9 * class23.field134; + @Export("performPlayerAnimation") + static void performPlayerAnimation(Player var0, int var1, int var2) { + if (var0.sequence == var1 && var1 != -1) { + int var3 = NetSocket.SequenceDefinition_get(var1).field3561; + if (var3 == 1) { + var0.sequenceFrame = 0; + var0.sequenceFrameCycle = 0; + var0.sequenceDelay = var2; + var0.field1000 = 0; } + + if (var3 == 2) { + var0.field1000 = 0; + } + } else if (var1 == -1 || var0.sequence == -1 || NetSocket.SequenceDefinition_get(var1).field3543 >= NetSocket.SequenceDefinition_get(var0.sequence).field3543) { + var0.sequence = var1; + var0.sequenceFrame = 0; + var0.sequenceFrameCycle = 0; + var0.sequenceDelay = var2; + var0.field1000 = 0; + var0.field1023 = var0.pathLength; } + } - @ObfuscatedName("jg") + @ObfuscatedName("hw") @ObfuscatedSignature( - signature = "([Lhe;IB)V", - garbageValue = "112" + signature = "(Lcu;III)V", + garbageValue = "9999999" ) - @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) { - class198.runIntfCloseListeners(var4.group, var1); - } - } - - ScriptEvent var5; - if (var1 == 0 && var3.onDialogAbort != null) { - var5 = new ScriptEvent(); - var5.widget = var3; - var5.args = var3.onDialogAbort; - GrandExchangeOfferOwnWorldComparator.runScriptEvent(var5); - } - - if (var1 == 1 && var3.onSubChange != null) { - if (var3.childIndex >= 0) { - Widget var6 = MusicPatchNode.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; - GrandExchangeOfferOwnWorldComparator.runScriptEvent(var5); - } - } - } - + static final void method1205(MenuAction var0, int var1, int var2) { + WorldMapSection0.menuAction(var0.param0, var0.param1, var0.opcode, var0.identifier, var0.action, var0.action, var1, var2); } } diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java index a89ce5b197..8050c73f23 100644 --- a/runescape-client/src/main/java/SecureRandomFuture.java +++ b/runescape-client/src/main/java/SecureRandomFuture.java @@ -4,28 +4,24 @@ 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("ca") +@ObfuscatedName("ct") @Implements("SecureRandomFuture") public class SecureRandomFuture { - @ObfuscatedName("ol") - @ObfuscatedSignature( - signature = "Lfq;" + @ObfuscatedName("gv") + @ObfuscatedGetter( + intValue = 1807406559 ) - @Export("mouseWheel") - static MouseWheel mouseWheel; - @ObfuscatedName("ds") - @ObfuscatedSignature( - signature = "Lih;" - ) - @Export("archive9") - static Archive archive9; - @ObfuscatedName("x") + @Export("baseY") + static int baseY; + @ObfuscatedName("m") @Export("executor") ExecutorService executor; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("future") Future future; @@ -34,10 +30,10 @@ public class SecureRandomFuture { this.future = this.executor.submit(new SecureRandomCallable()); } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-128" + signature = "(I)V", + garbageValue = "1768039353" ) @Export("shutdown") void shutdown() { @@ -45,58 +41,127 @@ public class SecureRandomFuture { this.executor = null; } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "-126" + signature = "(I)Z", + garbageValue = "-657646100" ) @Export("isDone") boolean isDone() { return this.future.isDone(); } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)Ljava/security/SecureRandom;", - garbageValue = "876677352" + signature = "(B)Ljava/security/SecureRandom;", + garbageValue = "0" ) @Export("get") SecureRandom get() { try { return (SecureRandom)this.future.get(); - } catch (Exception var4) { - SecureRandom var3 = new SecureRandom(); - var3.nextInt(); - return var3; + } catch (Exception var2) { + return WorldMapIcon_1.method348(); } } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "1233974315" + signature = "(I[BLlp;B)V", + garbageValue = "0" ) - public static int method2226(int var0, int var1) { - int var2; - for (var2 = 1; var1 > 1; var1 >>= 1) { - if ((var1 & 1) != 0) { - var2 = var0 * var2; + static void method2270(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.field3181 == 0) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); } - var0 *= var0; - } - - if (var1 == 1) { - return var0 * var2; - } else { - return var2; + ArchiveDiskActionHandler.field3181 = 600; } } - @ObfuscatedName("s") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(IIIIIZI)Lla;", - garbageValue = "-2006803252" + signature = "(Ljava/lang/CharSequence;IZB)I", + garbageValue = "45" + ) + @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 = var5 * var1 + var10; + if (var9 / var1 != var5) { + throw new NumberFormatException(); + } + + var5 = var9; + var4 = true; + } + + if (!var4) { + throw new NumberFormatException(); + } else { + return var5; + } + } else { + throw new IllegalArgumentException("" + var1); + } + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "(IIIIIZI)Llz;", + garbageValue = "-650607476" ) @Export("getItemSprite") public static final Sprite getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { @@ -106,7 +171,7 @@ public class SecureRandomFuture { var4 = 1; } - long var6 = ((long)var3 << 42) + ((long)var1 << 16) + (long)var0 + ((long)var2 << 38) + ((long)var4 << 40); + long var6 = ((long)var3 << 42) + ((long)var4 << 40) + ((long)var1 << 16) + (long)var0 + ((long)var2 << 38); Sprite var8; if (!var5) { var8 = (Sprite)ItemDefinition.ItemDefinition_cachedSprites.get(var6); @@ -115,7 +180,7 @@ public class SecureRandomFuture { } } - ItemDefinition var9 = AbstractWorldMapData.ItemDefinition_get(var0); + ItemDefinition var9 = KitDefinition.ItemDefinition_get(var0); if (var1 > 1 && var9.countobj != null) { int var10 = -1; @@ -126,28 +191,28 @@ public class SecureRandomFuture { } if (var10 != -1) { - var9 = AbstractWorldMapData.ItemDefinition_get(var10); + var9 = KitDefinition.ItemDefinition_get(var10); } } - Model var19 = var9.getModel(1); - if (var19 == null) { + Model var21 = var9.getModel(1); + if (var21 == null) { return null; } else { - Sprite var20 = null; + Sprite var22 = null; if (var9.noteTemplate != -1) { - var20 = getItemSprite(var9.note, 10, 1, 0, 0, true); - if (var20 == null) { + var22 = getItemSprite(var9.note, 10, 1, 0, 0, true); + if (var22 == null) { return null; } } else if (var9.notedId != -1) { - var20 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); - if (var20 == null) { + var22 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); + if (var22 == null) { return null; } } else if (var9.placeholderTemplate != -1) { - var20 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); - if (var20 == null) { + var22 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); + if (var22 == null) { return null; } } @@ -161,10 +226,10 @@ public class SecureRandomFuture { Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); Rasterizer2D.Rasterizer2D_clear(); Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - Rasterizer3D.method3099(16, 16); - Rasterizer3D.field1772 = false; + Rasterizer3D.method3147(16, 16); + Rasterizer3D.field1789 = false; if (var9.placeholderTemplate != -1) { - var20.drawTransBgAt(0, 0); + var22.drawTransBgAt(0, 0); } int var16 = var9.zoom2d; @@ -176,10 +241,10 @@ public class SecureRandomFuture { int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; - var19.calculateBoundsCylinder(); - var19.method2982(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var19.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); + var21.calculateBoundsCylinder(); + var21.method3010(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var21.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); if (var9.notedId != -1) { - var20.drawTransBgAt(0, 0); + var22.drawTransBgAt(0, 0); } if (var2 >= 1) { @@ -196,11 +261,21 @@ public class SecureRandomFuture { Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); if (var9.noteTemplate != -1) { - var20.drawTransBgAt(0, 0); + var22.drawTransBgAt(0, 0); } if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { - WorldMapSection3.ItemDefinition_fontPlain11.draw(GrandExchangeOfferOwnWorldComparator.method1385(var1), 0, 9, 16776960, 1); + Font var19 = class234.ItemDefinition_fontPlain11; + String var20; + if (var1 < 100000) { + var20 = "" + var1 + ""; + } else if (var1 < 10000000) { + var20 = "" + var1 / 1000 + "K" + ""; + } else { + var20 = "" + var1 / 1000000 + "M" + ""; + } + + var19.draw(var20, 0, 9, 16776960, 1); } if (!var5) { @@ -210,8 +285,89 @@ public class SecureRandomFuture { Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); Rasterizer2D.Rasterizer2D_setClipArray(var15); Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - Rasterizer3D.field1772 = true; + Rasterizer3D.field1789 = true; return var8; } } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + signature = "(ILcs;ZB)I", + garbageValue = "75" + ) + static int method2272(int var0, Script var1, boolean var2) { + int var3; + int var4; + int var6; + if (var0 == ScriptOpcodes.ENUM_STRING) { + UrlRequester.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + EnumDefinition var5 = ItemContainer.getEnum(var3); + if (var5.outputType != 's') { + } + + for (var6 = 0; var6 < var5.outputCount; ++var6) { + if (var4 == var5.keys[var6]) { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var5.strVals[var6]; + var5 = null; + break; + } + } + + if (var5 != null) { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var5.defaultStr; + } + + return 1; + } else if (var0 != ScriptOpcodes.ENUM) { + if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + EnumDefinition var10 = ItemContainer.getEnum(var3); + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var10.size(); + return 1; + } else { + return 2; + } + } else { + UrlRequester.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + int var9 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2]; + var6 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 3]; + EnumDefinition var7 = ItemContainer.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[++WorldMapEvent.Interpreter_stringStackSize - 1] = var7.strVals[var8]; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var7.intVals[var8]; + } + + var7 = null; + break; + } + } + + if (var7 != null) { + if (var4 == 115) { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var7.defaultStr; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var7.defaultInt; + } + } + + return 1; + } else { + if (var4 == 115) { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = "null"; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + } + } } diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java index c8958bdb60..5e33bf0e92 100644 --- a/runescape-client/src/main/java/SequenceDefinition.java +++ b/runescape-client/src/main/java/SequenceDefinition.java @@ -4,87 +4,98 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jc") +@ObfuscatedName("jm") @Implements("SequenceDefinition") public class SequenceDefinition extends DualNode { - @ObfuscatedName("nq") - @ObfuscatedGetter( - intValue = -1632730769 - ) - static int field3526; - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Leg;" + signature = "Lic;" + ) + @Export("SequenceDefinition_archive") + public static AbstractArchive SequenceDefinition_archive; + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "Lic;" + ) + @Export("SequenceDefinition_animationsArchive") + public static AbstractArchive SequenceDefinition_animationsArchive; + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "Lic;" + ) + @Export("SequenceDefinition_skeletonsArchive") + public static AbstractArchive SequenceDefinition_skeletonsArchive; + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "Lec;" ) @Export("SequenceDefinition_cached") static EvictingDualNodeHashTable SequenceDefinition_cached; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Leg;" + signature = "Lec;" ) @Export("SequenceDefinition_cachedFrames") static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; - @ObfuscatedName("o") - public static String field3527; - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("frameIds") public int[] frameIds; - @ObfuscatedName("q") + @ObfuscatedName("n") @Export("chatFrameIds") int[] chatFrameIds; - @ObfuscatedName("z") + @ObfuscatedName("u") @Export("frameLengths") public int[] frameLengths; - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("soundEffects") public int[] soundEffects; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -750244517 + intValue = -1532360493 ) @Export("frameCount") public int frameCount; - @ObfuscatedName("s") - int[] field3517; - @ObfuscatedName("p") - public boolean field3518; - @ObfuscatedName("n") + @ObfuscatedName("w") + int[] field3553; + @ObfuscatedName("y") + public boolean field3558; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1293261891 + intValue = -900038677 ) - public int field3519; - @ObfuscatedName("u") + public int field3543; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1094123699 + intValue = 202902523 ) @Export("shield") public int shield; - @ObfuscatedName("h") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -17515833 + intValue = 1507949653 ) @Export("weapon") public int weapon; - @ObfuscatedName("g") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1281885521 + intValue = -294683655 ) - public int field3522; - @ObfuscatedName("i") + public int field3562; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1964972701 + intValue = 61735455 ) - public int field3520; - @ObfuscatedName("a") + public int field3559; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -457337523 + intValue = 1582527651 ) - public int field3524; - @ObfuscatedName("b") + public int field3560; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -789911207 + intValue = 1066038459 ) - public int field3525; + public int field3561; static { SequenceDefinition_cached = new EvictingDualNodeHashTable(64); @@ -93,20 +104,20 @@ public class SequenceDefinition extends DualNode { SequenceDefinition() { this.frameCount = -1; - this.field3518 = false; - this.field3519 = 5; + this.field3558 = false; + this.field3543 = 5; this.shield = -1; this.weapon = -1; - this.field3522 = 99; - this.field3520 = -1; - this.field3524 = -1; - this.field3525 = 2; + this.field3562 = 99; + this.field3559 = -1; + this.field3560 = -1; + this.field3561 = 2; } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkb;I)V", - garbageValue = "-1859351730" + signature = "(Lkn;I)V", + garbageValue = "-1837396411" ) @Export("decode") void decode(Buffer var1) { @@ -120,10 +131,10 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkb;II)V", - garbageValue = "-951623720" + signature = "(Lkn;II)V", + garbageValue = "-1375281235" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -150,29 +161,29 @@ public class SequenceDefinition extends DualNode { this.frameCount = var1.readUnsignedShort(); } else if (var2 == 3) { var3 = var1.readUnsignedByte(); - this.field3517 = new int[var3 + 1]; + this.field3553 = new int[var3 + 1]; for (var4 = 0; var4 < var3; ++var4) { - this.field3517[var4] = var1.readUnsignedByte(); + this.field3553[var4] = var1.readUnsignedByte(); } - this.field3517[var3] = 9999999; + this.field3553[var3] = 9999999; } else if (var2 == 4) { - this.field3518 = true; + this.field3558 = true; } else if (var2 == 5) { - this.field3519 = var1.readUnsignedByte(); + this.field3543 = var1.readUnsignedByte(); } else if (var2 == 6) { this.shield = var1.readUnsignedShort(); } else if (var2 == 7) { this.weapon = var1.readUnsignedShort(); } else if (var2 == 8) { - this.field3522 = var1.readUnsignedByte(); + this.field3562 = var1.readUnsignedByte(); } else if (var2 == 9) { - this.field3520 = var1.readUnsignedByte(); + this.field3559 = var1.readUnsignedByte(); } else if (var2 == 10) { - this.field3524 = var1.readUnsignedByte(); + this.field3560 = var1.readUnsignedByte(); } else if (var2 == 11) { - this.field3525 = var1.readUnsignedByte(); + this.field3561 = var1.readUnsignedByte(); } else if (var2 == 12) { var3 = var1.readUnsignedByte(); this.chatFrameIds = new int[var3]; @@ -195,40 +206,40 @@ public class SequenceDefinition extends DualNode { } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-18" + signature = "(I)V", + garbageValue = "-1490793911" ) @Export("postDecode") void postDecode() { - if (this.field3520 == -1) { - if (this.field3517 != null) { - this.field3520 = 2; + if (this.field3559 == -1) { + if (this.field3553 != null) { + this.field3559 = 2; } else { - this.field3520 = 0; + this.field3559 = 0; } } - if (this.field3524 == -1) { - if (this.field3517 != null) { - this.field3524 = 2; + if (this.field3560 == -1) { + if (this.field3553 != null) { + this.field3560 = 2; } else { - this.field3524 = 0; + this.field3560 = 0; } } } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Lel;II)Lel;", - garbageValue = "1747843246" + signature = "(Lef;II)Lef;", + garbageValue = "-1881625962" ) @Export("transformActorModel") public Model transformActorModel(Model var1, int var2) { var2 = this.frameIds[var2]; - Frames var3 = GrandExchangeEvents.getFrames(var2 >> 16); + Frames var3 = NetSocket.getFrames(var2 >> 16); var2 &= 65535; if (var3 == null) { return var1.toSharedSequenceModel(true); @@ -239,15 +250,15 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lel;III)Lel;", - garbageValue = "-1535419363" + signature = "(Lef;III)Lef;", + garbageValue = "-1040736484" ) @Export("transformObjectModel") Model transformObjectModel(Model var1, int var2, int var3) { var2 = this.frameIds[var2]; - Frames var4 = GrandExchangeEvents.getFrames(var2 >> 16); + Frames var4 = NetSocket.getFrames(var2 >> 16); var2 &= 65535; if (var4 == null) { return var1.toSharedSequenceModel(true); @@ -275,15 +286,15 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Lel;IB)Lel;", - garbageValue = "66" + signature = "(Lef;II)Lef;", + garbageValue = "-277583954" ) @Export("transformSpotAnimationModel") Model transformSpotAnimationModel(Model var1, int var2) { var2 = this.frameIds[var2]; - Frames var3 = GrandExchangeEvents.getFrames(var2 >> 16); + Frames var3 = NetSocket.getFrames(var2 >> 16); var2 &= 65535; if (var3 == null) { return var1.toSharedSpotAnimationModel(true); @@ -294,21 +305,21 @@ public class SequenceDefinition extends DualNode { } } - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Lel;ILjc;IB)Lel;", - garbageValue = "1" + signature = "(Lef;ILjm;II)Lef;", + garbageValue = "-864862384" ) @Export("applyTransformations") public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, int var4) { var2 = this.frameIds[var2]; - Frames var5 = GrandExchangeEvents.getFrames(var2 >> 16); + Frames var5 = NetSocket.getFrames(var2 >> 16); var2 &= 65535; if (var5 == null) { return var3.transformActorModel(var1, var4); } else { var4 = var3.frameIds[var4]; - Frames var6 = GrandExchangeEvents.getFrames(var4 >> 16); + Frames var6 = NetSocket.getFrames(var4 >> 16); var4 &= 65535; Model var7; if (var6 == null) { @@ -317,21 +328,21 @@ public class SequenceDefinition extends DualNode { return var7; } else { var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); - var7.animate2(var5, var2, var6, var4, this.field3517); + var7.animate2(var5, var2, var6, var4, this.field3553); return var7; } } } - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(Lel;IB)Lel;", - garbageValue = "14" + signature = "(Lef;IB)Lef;", + garbageValue = "32" ) @Export("transformWidgetModel") public Model transformWidgetModel(Model var1, int var2) { int var3 = this.frameIds[var2]; - Frames var4 = GrandExchangeEvents.getFrames(var3 >> 16); + Frames var4 = NetSocket.getFrames(var3 >> 16); var3 &= 65535; if (var4 == null) { return var1.toSharedSequenceModel(true); @@ -340,7 +351,7 @@ public class SequenceDefinition extends DualNode { int var6 = 0; if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { var6 = this.chatFrameIds[var2]; - var5 = GrandExchangeEvents.getFrames(var6 >> 16); + var5 = NetSocket.getFrames(var6 >> 16); var6 &= 65535; } @@ -357,4 +368,18 @@ public class SequenceDefinition extends DualNode { } } } + + @ObfuscatedName("fc") + @ObfuscatedSignature( + signature = "(ZI)V", + garbageValue = "1779036927" + ) + static final void method4973(boolean var0) { + if (var0) { + Client.field708 = Login.field1223 ? class169.field2023 : class169.field2025; + } else { + Client.field708 = NetSocket.clientPreferences.parameters.containsKey(WorldMapAreaData.method759(Login.Login_username)) ? class169.field2028 : class169.field2024; + } + + } } diff --git a/runescape-client/src/main/java/ServerPacket.java b/runescape-client/src/main/java/ServerPacket.java index a1bd73990a..8e55a9879b 100644 --- a/runescape-client/src/main/java/ServerPacket.java +++ b/runescape-client/src/main/java/ServerPacket.java @@ -4,558 +4,543 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gv") +@ObfuscatedName("gu") @Implements("ServerPacket") public class ServerPacket { - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2131; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2119; - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2149; - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2121; - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2122; - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2123; - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2124; - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2169; - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2126; - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2127; - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2197; - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2186; - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2128; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2132; - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2125; - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2133; - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2134; - @ObfuscatedName("a") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2139; - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2204; - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2137; - @ObfuscatedName("r") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2172; - @ObfuscatedName("o") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2163; - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2140; - @ObfuscatedName("j") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2118; - @ObfuscatedName("y") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2142; - @ObfuscatedName("f") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2143; - @ObfuscatedName("ae") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2144; - @ObfuscatedName("an") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2145; - @ObfuscatedName("ai") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2151; - @ObfuscatedName("ap") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2147; - @ObfuscatedName("ab") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2148; - @ObfuscatedName("ar") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2136; - @ObfuscatedName("af") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2150; - @ObfuscatedName("at") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2141; - @ObfuscatedName("al") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2129; - @ObfuscatedName("as") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2153; - @ObfuscatedName("am") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2154; - @ObfuscatedName("au") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2155; - @ObfuscatedName("ao") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2159; - @ObfuscatedName("aq") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2157; - @ObfuscatedName("av") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2158; - @ObfuscatedName("ak") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2178; - @ObfuscatedName("aa") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2160; - @ObfuscatedName("ax") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2161; - @ObfuscatedName("az") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2192; - @ObfuscatedName("aj") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2168; - @ObfuscatedName("ay") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2164; - @ObfuscatedName("ad") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2165; - @ObfuscatedName("ac") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2166; - @ObfuscatedName("ah") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2167; - @ObfuscatedName("ag") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2203; - @ObfuscatedName("aw") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2162; - @ObfuscatedName("bf") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2170; - @ObfuscatedName("bc") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2171; - @ObfuscatedName("bo") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2138; - @ObfuscatedName("bd") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2173; - @ObfuscatedName("bk") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2179; - @ObfuscatedName("bu") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2175; - @ObfuscatedName("be") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2176; - @ObfuscatedName("bg") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2194; - @ObfuscatedName("bt") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2146; - @ObfuscatedName("bh") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2152; - @ObfuscatedName("br") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2180; - @ObfuscatedName("bq") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2181; - @ObfuscatedName("ba") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2182; - @ObfuscatedName("bv") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2183; - @ObfuscatedName("bx") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2184; - @ObfuscatedName("bz") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2120; - @ObfuscatedName("bs") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2185; - @ObfuscatedName("bp") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2187; - @ObfuscatedName("bm") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2188; - @ObfuscatedName("bb") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2177; - @ObfuscatedName("bn") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2190; - @ObfuscatedName("by") - @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgu;" ) public static final ServerPacket field2191; - @ObfuscatedName("bj") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgu;" ) - public static final ServerPacket field2189; - @ObfuscatedName("bi") + public static final ServerPacket field2177; + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2193; - @ObfuscatedName("bl") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2130; - @ObfuscatedName("bw") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2195; - @ObfuscatedName("cw") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2196; - @ObfuscatedName("cc") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2174; - @ObfuscatedName("ch") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2198; - @ObfuscatedName("cr") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2199; - @ObfuscatedName("cq") - @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgu;" ) public static final ServerPacket field2200; - @ObfuscatedName("co") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2201; - @ObfuscatedName("cm") - @ObfuscatedSignature( - signature = "Lgv;" - ) - public static final ServerPacket field2202; - @ObfuscatedName("cu") - @ObfuscatedSignature( - signature = "Lgv;" + signature = "Lgu;" ) public static final ServerPacket field2156; - @ObfuscatedName("ic") - @ObfuscatedGetter( - intValue = 1823465111 + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "Lgu;" ) - @Export("oculusOrbFocalPointY") - static int oculusOrbFocalPointY; - @ObfuscatedName("cs") + public static final ServerPacket field2211; + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2158; + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2219; + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2228; + @ObfuscatedName("a") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2161; + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2169; + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2224; + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2164; + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2155; + @ObfuscatedName("h") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2166; + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2167; + @ObfuscatedName("r") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2168; + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2181; + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2170; + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2232; + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2172; + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2173; + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2189; + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2171; + @ObfuscatedName("b") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2176; + @ObfuscatedName("i") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2165; + @ObfuscatedName("f") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2178; + @ObfuscatedName("ah") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2175; + @ObfuscatedName("ai") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2180; + @ObfuscatedName("ao") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2240; + @ObfuscatedName("ae") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2182; + @ObfuscatedName("ax") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2183; + @ObfuscatedName("ag") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2184; + @ObfuscatedName("ab") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2185; + @ObfuscatedName("am") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2186; + @ObfuscatedName("ak") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2187; + @ObfuscatedName("ad") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2188; + @ObfuscatedName("as") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2160; + @ObfuscatedName("ar") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2220; + @ObfuscatedName("ap") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2162; + @ObfuscatedName("al") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2159; + @ObfuscatedName("an") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2199; + @ObfuscatedName("ac") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2194; + @ObfuscatedName("av") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2157; + @ObfuscatedName("af") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2193; + @ObfuscatedName("at") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2197; + @ObfuscatedName("aa") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2190; + @ObfuscatedName("aw") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2223; + @ObfuscatedName("az") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2163; + @ObfuscatedName("aq") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2201; + @ObfuscatedName("ay") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2202; + @ObfuscatedName("au") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2203; + @ObfuscatedName("aj") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2204; + @ObfuscatedName("bk") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2205; + @ObfuscatedName("bh") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2206; + @ObfuscatedName("bg") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2207; + @ObfuscatedName("be") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2208; + @ObfuscatedName("bf") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2209; + @ObfuscatedName("ba") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2210; + @ObfuscatedName("bd") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2230; + @ObfuscatedName("bb") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2212; + @ObfuscatedName("bw") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2213; + @ObfuscatedName("bq") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2226; + @ObfuscatedName("bn") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2215; + @ObfuscatedName("bc") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2216; + @ObfuscatedName("bo") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2217; + @ObfuscatedName("bp") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2218; + @ObfuscatedName("bm") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2196; + @ObfuscatedName("bl") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2174; + @ObfuscatedName("bv") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2221; + @ObfuscatedName("bi") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2222; + @ObfuscatedName("bz") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2235; + @ObfuscatedName("bu") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2153; + @ObfuscatedName("bx") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2225; + @ObfuscatedName("br") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2195; + @ObfuscatedName("bs") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2227; + @ObfuscatedName("by") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2233; + @ObfuscatedName("bj") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2229; + @ObfuscatedName("bt") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2179; + @ObfuscatedName("cc") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2231; + @ObfuscatedName("cb") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2214; + @ObfuscatedName("ch") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2154; + @ObfuscatedName("cw") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2234; + @ObfuscatedName("cz") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2198; + @ObfuscatedName("cg") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2236; + @ObfuscatedName("cn") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2237; + @ObfuscatedName("ce") + @ObfuscatedSignature( + signature = "Lgu;" + ) + public static final ServerPacket field2238; + @ObfuscatedName("cj") @ObfuscatedGetter( - intValue = -1540694469 + intValue = -1993969829 ) @Export("id") public final int id; - @ObfuscatedName("cg") + @ObfuscatedName("ck") @ObfuscatedGetter( - intValue = -1233445787 + intValue = 731369397 ) @Export("length") public final int length; static { - field2131 = new ServerPacket(0, -2); - field2119 = new ServerPacket(1, 3); - field2149 = new ServerPacket(2, 15); - field2121 = new ServerPacket(3, 1); - field2122 = new ServerPacket(4, 8); - field2123 = new ServerPacket(5, 4); - field2124 = new ServerPacket(6, 8); - field2169 = new ServerPacket(7, 0); - field2126 = new ServerPacket(8, 6); - field2127 = new ServerPacket(9, 1); - field2197 = new ServerPacket(10, 3); - field2186 = new ServerPacket(11, 8); - field2128 = new ServerPacket(12, 0); - field2132 = new ServerPacket(13, 5); - field2125 = new ServerPacket(14, 4); - field2133 = new ServerPacket(15, -2); - field2134 = new ServerPacket(16, 2); - field2139 = new ServerPacket(17, -2); - field2204 = new ServerPacket(18, 6); - field2137 = new ServerPacket(19, 4); - field2172 = new ServerPacket(20, 28); - field2163 = new ServerPacket(21, 1); - field2140 = new ServerPacket(22, 6); - field2118 = new ServerPacket(23, 2); - field2142 = new ServerPacket(24, -2); - field2143 = new ServerPacket(25, 2); - field2144 = new ServerPacket(26, -2); - field2145 = new ServerPacket(27, 6); - field2151 = new ServerPacket(28, 0); - field2147 = new ServerPacket(29, 0); - field2148 = new ServerPacket(30, -2); - field2136 = new ServerPacket(31, 1); - field2150 = new ServerPacket(32, 4); - field2141 = new ServerPacket(33, 14); - field2129 = new ServerPacket(34, 4); - field2153 = new ServerPacket(35, -2); - field2154 = new ServerPacket(36, 0); - field2155 = new ServerPacket(37, 6); - field2159 = new ServerPacket(38, -1); - field2157 = new ServerPacket(39, -1); - field2158 = new ServerPacket(40, 2); - field2178 = new ServerPacket(41, 6); - field2160 = new ServerPacket(42, 5); - field2161 = new ServerPacket(43, 7); - field2192 = new ServerPacket(44, -1); - field2168 = new ServerPacket(45, 10); - field2164 = new ServerPacket(46, 1); - field2165 = new ServerPacket(47, 1); - field2166 = new ServerPacket(48, 6); - field2167 = new ServerPacket(49, -2); - field2203 = new ServerPacket(50, -1); - field2162 = new ServerPacket(51, -2); - field2170 = new ServerPacket(52, 20); - field2171 = new ServerPacket(53, 2); - field2138 = new ServerPacket(54, -2); - field2173 = new ServerPacket(55, 5); - field2179 = new ServerPacket(56, 6); - field2175 = new ServerPacket(57, -2); - field2176 = new ServerPacket(58, 6); - field2194 = new ServerPacket(59, -2); - field2146 = new ServerPacket(60, 2); - field2152 = new ServerPacket(61, -1); - field2180 = new ServerPacket(62, -2); - field2181 = new ServerPacket(63, 4); - field2182 = new ServerPacket(64, 7); - field2183 = new ServerPacket(65, 5); - field2184 = new ServerPacket(66, 0); - field2120 = new ServerPacket(67, -2); - field2185 = new ServerPacket(68, 8); - field2187 = new ServerPacket(69, 6); - field2188 = new ServerPacket(70, 4); - field2177 = new ServerPacket(71, -2); - field2190 = new ServerPacket(72, -2); - field2191 = new ServerPacket(73, -2); - field2189 = new ServerPacket(74, 10); - field2193 = new ServerPacket(75, -1); - field2130 = new ServerPacket(76, -2); - field2195 = new ServerPacket(77, 2); - field2196 = new ServerPacket(78, 5); - field2174 = new ServerPacket(79, -2); - field2198 = new ServerPacket(80, 6); - field2199 = new ServerPacket(81, 2); - field2200 = new ServerPacket(82, 0); - field2201 = new ServerPacket(83, 12); - field2202 = new ServerPacket(84, 2); - field2156 = new ServerPacket(85, 2); + field2191 = new ServerPacket(0, 2); + field2177 = new ServerPacket(1, -2); + field2200 = new ServerPacket(2, -2); + field2156 = new ServerPacket(3, 4); + field2211 = new ServerPacket(4, 4); + field2158 = new ServerPacket(5, 8); + field2219 = new ServerPacket(6, 2); + field2228 = new ServerPacket(7, 6); + field2161 = new ServerPacket(8, 20); + field2169 = new ServerPacket(9, -2); + field2224 = new ServerPacket(10, 6); + field2164 = new ServerPacket(11, 15); + field2155 = new ServerPacket(12, 6); + field2166 = new ServerPacket(13, 2); + field2167 = new ServerPacket(14, 7); + field2168 = new ServerPacket(15, 4); + field2181 = new ServerPacket(16, -2); + field2170 = new ServerPacket(17, 2); + field2232 = new ServerPacket(18, 12); + field2172 = new ServerPacket(19, 2); + field2173 = new ServerPacket(20, -2); + field2189 = new ServerPacket(21, -2); + field2171 = new ServerPacket(22, 5); + field2176 = new ServerPacket(23, 2); + field2165 = new ServerPacket(24, 2); + field2178 = new ServerPacket(25, 0); + field2175 = new ServerPacket(26, 1); + field2180 = new ServerPacket(27, 2); + field2240 = new ServerPacket(28, 6); + field2182 = new ServerPacket(29, -2); + field2183 = new ServerPacket(30, 28); + field2184 = new ServerPacket(31, 6); + field2185 = new ServerPacket(32, 3); + field2186 = new ServerPacket(33, 4); + field2187 = new ServerPacket(34, -2); + field2188 = new ServerPacket(35, 1); + field2160 = new ServerPacket(36, -2); + field2220 = new ServerPacket(37, 0); + field2162 = new ServerPacket(38, 14); + field2159 = new ServerPacket(39, 1); + field2199 = new ServerPacket(40, -1); + field2194 = new ServerPacket(41, 1); + field2157 = new ServerPacket(42, -2); + field2193 = new ServerPacket(43, 6); + field2197 = new ServerPacket(44, 4); + field2190 = new ServerPacket(45, 4); + field2223 = new ServerPacket(46, -2); + field2163 = new ServerPacket(47, 0); + field2201 = new ServerPacket(48, 6); + field2202 = new ServerPacket(49, 6); + field2203 = new ServerPacket(50, 8); + field2204 = new ServerPacket(51, 2); + field2205 = new ServerPacket(52, 5); + field2206 = new ServerPacket(53, 0); + field2207 = new ServerPacket(54, 10); + field2208 = new ServerPacket(55, -2); + field2209 = new ServerPacket(56, 0); + field2210 = new ServerPacket(57, 5); + field2230 = new ServerPacket(58, 6); + field2212 = new ServerPacket(59, -2); + field2213 = new ServerPacket(60, 5); + field2226 = new ServerPacket(61, 6); + field2215 = new ServerPacket(62, 8); + field2216 = new ServerPacket(63, 7); + field2217 = new ServerPacket(64, -1); + field2218 = new ServerPacket(65, 10); + field2196 = new ServerPacket(66, 6); + field2174 = new ServerPacket(67, 1); + field2221 = new ServerPacket(68, 2); + field2222 = new ServerPacket(69, 8); + field2235 = new ServerPacket(70, -2); + field2153 = new ServerPacket(71, 1); + field2225 = new ServerPacket(72, 0); + field2195 = new ServerPacket(73, -2); + field2227 = new ServerPacket(74, 0); + field2233 = new ServerPacket(75, -2); + field2229 = new ServerPacket(76, -2); + field2179 = new ServerPacket(77, -1); + field2231 = new ServerPacket(78, 3); + field2214 = new ServerPacket(79, -2); + field2154 = new ServerPacket(80, 5); + field2234 = new ServerPacket(81, 4); + field2198 = new ServerPacket(82, -1); + field2236 = new ServerPacket(83, -2); + field2237 = new ServerPacket(84, -1); + field2238 = new ServerPacket(85, -1); } ServerPacket(int var1, int var2) { this.id = var1; this.length = var2; } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1077570862" - ) - public static void method3684(int var0) { - MouseHandler.MouseHandler_idleCycles = var0; - } } diff --git a/runescape-client/src/main/java/Skeleton.java b/runescape-client/src/main/java/Skeleton.java index 17e658f8fe..9064706f20 100644 --- a/runescape-client/src/main/java/Skeleton.java +++ b/runescape-client/src/main/java/Skeleton.java @@ -4,25 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eb") +@ObfuscatedName("er") @Implements("Skeleton") public class Skeleton extends Node { - @ObfuscatedName("x") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -1117986987 + intValue = -47286483 + ) + static int field1826; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -747457743 ) @Export("id") int id; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1228230163 + intValue = 386205487 ) @Export("count") int count; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("transformTypes") int[] transformTypes; - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("labels") int[][] labels; @@ -50,46 +55,60 @@ public class Skeleton extends Node { } - @ObfuscatedName("m") + @ObfuscatedName("iz") @ObfuscatedSignature( - signature = "(ILjava/lang/String;Ljava/lang/String;I)V", - garbageValue = "172468289" + signature = "(ZB)V", + garbageValue = "38" ) - @Export("addGameMessage") - static void addGameMessage(int var0, String var1, String var2) { - ChatChannel.addChatMessage(var0, var1, var2, (String)null); + @Export("setTapToDrop") + static void setTapToDrop(boolean var0) { + Client.tapToDrop = var0; } - @ObfuscatedName("hw") + @ObfuscatedName("jo") @ObfuscatedSignature( - signature = "(IIIIIIIIII)V", - garbageValue = "-903187990" + signature = "([Lhd;IB)V", + garbageValue = "34" ) - @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; + @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); + } - 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; + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); + if (var4 != null) { + Language.runIntfCloseListeners(var4.group, var1); + } + } + + ScriptEvent var5; + if (var1 == 0 && var3.onDialogAbort != null) { + var5 = new ScriptEvent(); + var5.widget = var3; + var5.args = var3.onDialogAbort; + InterfaceParent.runScriptEvent(var5); + } + + if (var1 == 1 && var3.onSubChange != null) { + if (var3.childIndex >= 0) { + Widget var6 = WorldMapSprite.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; + InterfaceParent.runScriptEvent(var5); + } } } - if (var9 == null) { - var9 = new PendingSpawn(); - var9.plane = var0; - var9.type = var3; - var9.x = var1; - var9.y = var2; - WorldMapSectionType.method348(var9); - Client.pendingSpawns.addFirst(var9); - } - - var9.id = var4; - var9.field967 = var5; - var9.orientation = var6; - var9.delay = var7; - var9.hitpoints = var8; } } diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java index d3a9a981dd..2d17996541 100644 --- a/runescape-client/src/main/java/Skills.java +++ b/runescape-client/src/main/java/Skills.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ho") +@ObfuscatedName("hf") @Implements("Skills") public class Skills { - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("Skills_enabled") public static final boolean[] Skills_enabled; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("Skills_experienceTable") public static int[] Skills_experienceTable; @@ -27,27 +27,21 @@ public class Skills { } - @ObfuscatedName("z") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)[Lle;", - garbageValue = "1897656979" + signature = "(B)[Lib;", + garbageValue = "0" ) - public static IndexedSprite[] method4214() { - IndexedSprite[] var0 = new IndexedSprite[class335.SpriteBuffer_spriteCount]; + public static StudioGame[] method4272() { + return new StudioGame[]{StudioGame.stellardawn, StudioGame.game5, StudioGame.game3, StudioGame.runescape, StudioGame.game4, StudioGame.oldscape}; + } - for (int var1 = 0; var1 < class335.SpriteBuffer_spriteCount; ++var1) { - IndexedSprite var2 = var0[var1] = new IndexedSprite(); - var2.width = class335.SpriteBuffer_spriteWidth; - var2.height = class335.SpriteBuffer_spriteHeight; - var2.xOffset = class335.SpriteBuffer_xOffsets[var1]; - var2.yOffset = StructDefinition.SpriteBuffer_yOffsets[var1]; - var2.subWidth = class335.SpriteBuffer_spriteWidths[var1]; - var2.subHeight = class335.SpriteBuffer_spriteHeights[var1]; - var2.palette = DefaultsGroup.SpriteBuffer_spritePalette; - var2.pixels = class4.SpriteBuffer_pixels[var1]; - } - - Ignored.method5235(); - return var0; + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "-891910442" + ) + public static int method4271() { + return ++MouseHandler.MouseHandler_idleCycles - 1; } } diff --git a/runescape-client/src/main/java/SoftWrapper.java b/runescape-client/src/main/java/SoftWrapper.java index ab5c3e9a00..8e02bbc531 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("fy") +@ObfuscatedName("fd") @Implements("SoftWrapper") public class SoftWrapper extends Wrapper { - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("ref") SoftReference ref; @@ -15,13 +15,13 @@ public class SoftWrapper extends Wrapper { this.ref = new SoftReference(var1); } - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("get") Object get() { return this.ref.get(); } - @ObfuscatedName("m") + @ObfuscatedName("o") @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 54ef71f04b..68a0047766 100644 --- a/runescape-client/src/main/java/SoundCache.java +++ b/runescape-client/src/main/java/SoundCache.java @@ -3,38 +3,39 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dk") +@ObfuscatedName("do") @Implements("SoundCache") public class SoundCache { - @ObfuscatedName("z") - static byte[][][] field1462; - @ObfuscatedName("x") + @ObfuscatedName("u") + @Export("ItemDefinition_inMembersWorld") + static boolean ItemDefinition_inMembersWorld; + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Liy;" + signature = "Lic;" ) @Export("soundEffectIndex") AbstractArchive soundEffectIndex; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Liy;" + signature = "Lic;" ) @Export("musicSampleIndex") AbstractArchive musicSampleIndex; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Llv;" + signature = "Lle;" ) @Export("musicSamples") NodeHashTable musicSamples; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Llv;" + signature = "Lle;" ) @Export("rawSounds") NodeHashTable rawSounds; @ObfuscatedSignature( - signature = "(Liy;Liy;)V" + signature = "(Lic;Lic;)V" ) public SoundCache(AbstractArchive var1, AbstractArchive var2) { this.musicSamples = new NodeHashTable(256); @@ -43,10 +44,10 @@ public class SoundCache { this.musicSampleIndex = var2; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II[II)Ldm;", - garbageValue = "-1082666612" + signature = "(II[II)Ldp;", + garbageValue = "-1808254786" ) @Export("getSoundEffect0") RawSound getSoundEffect0(int var1, int var2, int[] var3) { @@ -74,10 +75,10 @@ public class SoundCache { } } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II[II)Ldm;", - garbageValue = "-1027789078" + signature = "(II[II)Ldp;", + garbageValue = "1029980223" ) @Export("getMusicSample0") RawSound getMusicSample0(int var1, int var2, int[] var3) { @@ -111,10 +112,10 @@ public class SoundCache { } } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I[II)Ldm;", - garbageValue = "-1326319727" + signature = "(I[IB)Ldp;", + garbageValue = "-87" ) @Export("getSoundEffect") public RawSound getSoundEffect(int var1, int[] var2) { @@ -127,10 +128,10 @@ public class SoundCache { } } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I[II)Ldm;", - garbageValue = "211592248" + signature = "(I[II)Ldp;", + garbageValue = "2095732620" ) @Export("getMusicSample") public RawSound getMusicSample(int var1, int[] var2) { @@ -143,865 +144,68 @@ public class SoundCache { } } - @ObfuscatedName("hg") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(IIIIIIII)V", - garbageValue = "277907731" + signature = "(IB)V", + garbageValue = "104" ) - @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 != ScriptEvent.Client_plane) { - return; + @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; } - long var7 = 0L; - boolean var9 = true; - boolean var10 = false; - boolean var11 = false; - if (var1 == 0) { - var7 = GrandExchangeOfferWorldComparator.scene.getBoundaryObjectTag(var0, var2, var3); - } - - if (var1 == 1) { - var7 = GrandExchangeOfferWorldComparator.scene.getWallDecorationTag(var0, var2, var3); - } - - if (var1 == 2) { - var7 = GrandExchangeOfferWorldComparator.scene.getGameObjectTag(var0, var2, var3); - } - - if (var1 == 3) { - var7 = GrandExchangeOfferWorldComparator.scene.getFloorDecorationTag(var0, var2, var3); - } - - int var12; - if (var7 != 0L) { - var12 = GrandExchangeOfferWorldComparator.scene.getObjectFlags(var0, var2, var3, var7); - int var39 = WorldMapRectangle.Entity_unpackID(var7); - int var40 = var12 & 31; - int var41 = var12 >> 6 & 3; - ObjectDefinition var13; - if (var1 == 0) { - GrandExchangeOfferWorldComparator.scene.removeBoundaryObject(var0, var2, var3); - var13 = WorldMapSection2.getObjectDefinition(var39); - if (var13.interactType != 0) { - Client.collisionMaps[var0].method3635(var2, var3, var40, var41, var13.boolean1); - } - } - - if (var1 == 1) { - GrandExchangeOfferWorldComparator.scene.removeWallDecoration(var0, var2, var3); - } - - if (var1 == 2) { - GrandExchangeOfferWorldComparator.scene.removeGameObject(var0, var2, var3); - var13 = WorldMapSection2.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) { - GrandExchangeOfferWorldComparator.scene.removeFloorDecoration(var0, var2, var3); - var13 = WorldMapSection2.getObjectDefinition(var39); - if (var13.interactType == 1) { - Client.collisionMaps[var0].method3655(var2, var3); - } - } - } - - if (var4 >= 0) { - var12 = var0; - if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { - var12 = var0 + 1; - } - - Scene var42 = GrandExchangeOfferWorldComparator.scene; - CollisionMap var14 = Client.collisionMaps[var0]; - ObjectDefinition var15 = WorldMapSection2.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[var19][var21] + var22[var18][var20] + var22[var19][var20] + var22[var18][var21] >> 2; - int var24 = (var2 << 7) + (var16 << 6); - int var25 = (var3 << 7) + (var17 << 6); - long var26 = IsaacCipher.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 { - var29 = new DynamicObject(var4, 22, var5, var12, var2, var3, var15.animationId, true, (Entity)null); - } - - 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 { - var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, true, (Entity)null); - } - - var42.method3187(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.field544[var5], 0, var26, var28); - if (var15.interactType != 0) { - var14.method3630(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.field542[var5], 0, var26, var28); - if (var15.interactType != 0) { - var14.method3630(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.field544[var5], Tiles.field544[var35], var26, var28); - if (var15.interactType != 0) { - var14.method3630(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.field542[var5], 0, var26, var28); - if (var15.interactType != 0) { - var14.method3630(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.method3187(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.field544[var5], 0, 0, 0, var26, var28); - } else { - Object var32; - long var36; - if (var6 == 5) { - var35 = 16; - var36 = var42.getBoundaryObjectTag(var0, var2, var3); - if (var36 != 0L) { - var35 = WorldMapSection2.getObjectDefinition(WorldMapRectangle.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.field544[var5], 0, var35 * Tiles.field541[var5], var35 * Tiles.field547[var5], var26, var28); - } else if (var6 == 6) { - var35 = 8; - var36 = var42.getBoundaryObjectTag(var0, var2, var3); - if (0L != var36) { - var35 = WorldMapSection2.getObjectDefinition(WorldMapRectangle.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.field546[var5], var35 * Tiles.field552[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 (var36 != 0L) { - var35 = WorldMapSection2.getObjectDefinition(WorldMapRectangle.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.field546[var5], var35 * Tiles.field552[var5], var26, var28); - } - } - } - } else { - if (var15.animationId == -1 && var15.transforms == null) { - var29 = var15.getModel(10, var5, var22, var24, var23, var25); - } else { - var29 = new DynamicObject(var4, 10, var5, var12, var2, var3, var15.animationId, true, (Entity)null); - } - - if (var29 != null) { - var42.method3187(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("hp") + @ObfuscatedName("hu") @ObfuscatedSignature( - signature = "(Lbi;IIBI)V", - garbageValue = "1090203781" + signature = "(ILjava/lang/String;I)V", + garbageValue = "-717528882" ) - static final void method2609(Player var0, int var1, int var2, byte var3) { - int var4 = var0.pathX[0]; - int var5 = var0.pathY[0]; - int var6 = var0.transformedSize(); - if (var4 >= var6 && var4 < 104 - var6 && var5 >= var6 && var5 < 104 - var6) { - if (var1 >= var6 && var1 < 104 - var6 && var2 >= var6 && var2 < 104 - var6) { - int var8 = var0.transformedSize(); - RouteStrategy var9 = WorldMapDecoration.method438(var1, var2); - CollisionMap var10 = Client.collisionMaps[var0.plane]; - int[] var11 = Client.field955; - int[] var12 = Client.field956; + static void method2647(int var0, String var1) { + int var2 = Players.Players_count; + int[] var3 = Players.Players_indices; + boolean var4 = false; + Username var5 = new Username(var1, class195.loginType); - int var13; - int var14; - for (var13 = 0; var13 < 128; ++var13) { - for (var14 = 0; var14 < 128; ++var14) { - class182.directions[var13][var14] = 0; - class182.distances[var13][var14] = 99999999; - } + for (int var6 = 0; var6 < var2; ++var6) { + Player var7 = Client.players[var3[var6]]; + if (var7 != null && var7 != class60.localPlayer && var7.username != null && var7.username.equals(var5)) { + PacketBufferNode var8; + if (var0 == 1) { + var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2271, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeByte(0); + var8.packetBuffer.writeShort(var3[var6]); + Client.packetWriter.addNode(var8); + } else if (var0 == 4) { + var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2261, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShort(var3[var6]); + var8.packetBuffer.method5744(0); + Client.packetWriter.addNode(var8); + } else if (var0 == 6) { + var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2301, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5752(var3[var6]); + var8.packetBuffer.method5744(0); + Client.packetWriter.addNode(var8); + } else if (var0 == 7) { + var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2337, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeIntME(0); + var8.packetBuffer.method5753(var3[var6]); + Client.packetWriter.addNode(var8); } - int var15; - int var16; - byte var17; - byte var18; - int var19; - int var20; - byte var21; - int var22; - int[][] var23; - int var24; - int var25; - int var26; - int var27; - boolean var33; - boolean var34; - int var35; - int var36; - int var38; - if (var8 == 1) { - var15 = var4; - var16 = var5; - var17 = 64; - var18 = 64; - var19 = var4 - var17; - var20 = var5 - var18; - class182.directions[var17][var18] = 99; - class182.distances[var17][var18] = 0; - var21 = 0; - var22 = 0; - class182.bufferX[var21] = var4; - var38 = var21 + 1; - class182.bufferY[var21] = var5; - var23 = var10.flags; - - while (true) { - if (var22 == var38) { - Coord.field2530 = var15; - class182.field2097 = var16; - var34 = false; - break; - } - - var15 = class182.bufferX[var22]; - var16 = class182.bufferY[var22]; - var22 = var22 + 1 & 4095; - var35 = var15 - var19; - var36 = var16 - var20; - var24 = var15 - var10.xInset; - var25 = var16 - var10.yInset; - if (var9.hasArrived(1, var15, var16, var10)) { - Coord.field2530 = var15; - class182.field2097 = var16; - var34 = true; - break; - } - - var26 = class182.distances[var35][var36] + 1; - if (var35 > 0 && class182.directions[var35 - 1][var36] == 0 && (var23[var24 - 1][var25] & 19136776) == 0) { - class182.bufferX[var38] = var15 - 1; - class182.bufferY[var38] = var16; - var38 = var38 + 1 & 4095; - class182.directions[var35 - 1][var36] = 2; - class182.distances[var35 - 1][var36] = var26; - } - - if (var35 < 127 && class182.directions[var35 + 1][var36] == 0 && (var23[var24 + 1][var25] & 19136896) == 0) { - class182.bufferX[var38] = var15 + 1; - class182.bufferY[var38] = var16; - var38 = var38 + 1 & 4095; - class182.directions[var35 + 1][var36] = 8; - class182.distances[var35 + 1][var36] = var26; - } - - if (var36 > 0 && class182.directions[var35][var36 - 1] == 0 && (var23[var24][var25 - 1] & 19136770) == 0) { - class182.bufferX[var38] = var15; - class182.bufferY[var38] = var16 - 1; - var38 = var38 + 1 & 4095; - class182.directions[var35][var36 - 1] = 1; - class182.distances[var35][var36 - 1] = var26; - } - - if (var36 < 127 && class182.directions[var35][var36 + 1] == 0 && (var23[var24][var25 + 1] & 19136800) == 0) { - class182.bufferX[var38] = var15; - class182.bufferY[var38] = var16 + 1; - var38 = var38 + 1 & 4095; - class182.directions[var35][var36 + 1] = 4; - class182.distances[var35][var36 + 1] = var26; - } - - if (var35 > 0 && var36 > 0 && class182.directions[var35 - 1][var36 - 1] == 0 && (var23[var24 - 1][var25 - 1] & 19136782) == 0 && (var23[var24 - 1][var25] & 19136776) == 0 && (var23[var24][var25 - 1] & 19136770) == 0) { - class182.bufferX[var38] = var15 - 1; - class182.bufferY[var38] = var16 - 1; - var38 = var38 + 1 & 4095; - class182.directions[var35 - 1][var36 - 1] = 3; - class182.distances[var35 - 1][var36 - 1] = var26; - } - - if (var35 < 127 && var36 > 0 && class182.directions[var35 + 1][var36 - 1] == 0 && (var23[var24 + 1][var25 - 1] & 19136899) == 0 && (var23[var24 + 1][var25] & 19136896) == 0 && (var23[var24][var25 - 1] & 19136770) == 0) { - class182.bufferX[var38] = var15 + 1; - class182.bufferY[var38] = var16 - 1; - var38 = var38 + 1 & 4095; - class182.directions[var35 + 1][var36 - 1] = 9; - class182.distances[var35 + 1][var36 - 1] = var26; - } - - if (var35 > 0 && var36 < 127 && class182.directions[var35 - 1][var36 + 1] == 0 && (var23[var24 - 1][var25 + 1] & 19136824) == 0 && (var23[var24 - 1][var25] & 19136776) == 0 && (var23[var24][var25 + 1] & 19136800) == 0) { - class182.bufferX[var38] = var15 - 1; - class182.bufferY[var38] = var16 + 1; - var38 = var38 + 1 & 4095; - class182.directions[var35 - 1][var36 + 1] = 6; - class182.distances[var35 - 1][var36 + 1] = var26; - } - - if (var35 < 127 && var36 < 127 && class182.directions[var35 + 1][var36 + 1] == 0 && (var23[var24 + 1][var25 + 1] & 19136992) == 0 && (var23[var24 + 1][var25] & 19136896) == 0 && (var23[var24][var25 + 1] & 19136800) == 0) { - class182.bufferX[var38] = var15 + 1; - class182.bufferY[var38] = var16 + 1; - var38 = var38 + 1 & 4095; - class182.directions[var35 + 1][var36 + 1] = 12; - class182.distances[var35 + 1][var36 + 1] = var26; - } - } - - var33 = var34; - } else if (var8 == 2) { - var15 = var4; - var16 = var5; - var17 = 64; - var18 = 64; - var19 = var4 - var17; - var20 = var5 - var18; - class182.directions[var17][var18] = 99; - class182.distances[var17][var18] = 0; - var21 = 0; - var22 = 0; - class182.bufferX[var21] = var4; - var38 = var21 + 1; - class182.bufferY[var21] = var5; - var23 = var10.flags; - - while (true) { - if (var22 == var38) { - Coord.field2530 = var15; - class182.field2097 = var16; - var34 = false; - break; - } - - var15 = class182.bufferX[var22]; - var16 = class182.bufferY[var22]; - var22 = var22 + 1 & 4095; - var35 = var15 - var19; - var36 = var16 - var20; - var24 = var15 - var10.xInset; - var25 = var16 - var10.yInset; - if (var9.hasArrived(2, var15, var16, var10)) { - Coord.field2530 = var15; - class182.field2097 = var16; - var34 = true; - break; - } - - var26 = class182.distances[var35][var36] + 1; - if (var35 > 0 && class182.directions[var35 - 1][var36] == 0 && (var23[var24 - 1][var25] & 19136782) == 0 && (var23[var24 - 1][var25 + 1] & 19136824) == 0) { - class182.bufferX[var38] = var15 - 1; - class182.bufferY[var38] = var16; - var38 = var38 + 1 & 4095; - class182.directions[var35 - 1][var36] = 2; - class182.distances[var35 - 1][var36] = var26; - } - - if (var35 < 126 && class182.directions[var35 + 1][var36] == 0 && (var23[var24 + 2][var25] & 19136899) == 0 && (var23[var24 + 2][var25 + 1] & 19136992) == 0) { - class182.bufferX[var38] = var15 + 1; - class182.bufferY[var38] = var16; - var38 = var38 + 1 & 4095; - class182.directions[var35 + 1][var36] = 8; - class182.distances[var35 + 1][var36] = var26; - } - - if (var36 > 0 && class182.directions[var35][var36 - 1] == 0 && (var23[var24][var25 - 1] & 19136782) == 0 && (var23[var24 + 1][var25 - 1] & 19136899) == 0) { - class182.bufferX[var38] = var15; - class182.bufferY[var38] = var16 - 1; - var38 = var38 + 1 & 4095; - class182.directions[var35][var36 - 1] = 1; - class182.distances[var35][var36 - 1] = var26; - } - - if (var36 < 126 && class182.directions[var35][var36 + 1] == 0 && (var23[var24][var25 + 2] & 19136824) == 0 && (var23[var24 + 1][var25 + 2] & 19136992) == 0) { - class182.bufferX[var38] = var15; - class182.bufferY[var38] = var16 + 1; - var38 = var38 + 1 & 4095; - class182.directions[var35][var36 + 1] = 4; - class182.distances[var35][var36 + 1] = var26; - } - - if (var35 > 0 && var36 > 0 && class182.directions[var35 - 1][var36 - 1] == 0 && (var23[var24 - 1][var25] & 19136830) == 0 && (var23[var24 - 1][var25 - 1] & 19136782) == 0 && (var23[var24][var25 - 1] & 19136911) == 0) { - class182.bufferX[var38] = var15 - 1; - class182.bufferY[var38] = var16 - 1; - var38 = var38 + 1 & 4095; - class182.directions[var35 - 1][var36 - 1] = 3; - class182.distances[var35 - 1][var36 - 1] = var26; - } - - if (var35 < 126 && var36 > 0 && class182.directions[var35 + 1][var36 - 1] == 0 && (var23[var24 + 1][var25 - 1] & 19136911) == 0 && (var23[var24 + 2][var25 - 1] & 19136899) == 0 && (var23[var24 + 2][var25] & 19136995) == 0) { - class182.bufferX[var38] = var15 + 1; - class182.bufferY[var38] = var16 - 1; - var38 = var38 + 1 & 4095; - class182.directions[var35 + 1][var36 - 1] = 9; - class182.distances[var35 + 1][var36 - 1] = var26; - } - - if (var35 > 0 && var36 < 126 && class182.directions[var35 - 1][var36 + 1] == 0 && (var23[var24 - 1][var25 + 1] & 19136830) == 0 && (var23[var24 - 1][var25 + 2] & 19136824) == 0 && (var23[var24][var25 + 2] & 19137016) == 0) { - class182.bufferX[var38] = var15 - 1; - class182.bufferY[var38] = var16 + 1; - var38 = var38 + 1 & 4095; - class182.directions[var35 - 1][var36 + 1] = 6; - class182.distances[var35 - 1][var36 + 1] = var26; - } - - if (var35 < 126 && var36 < 126 && class182.directions[var35 + 1][var36 + 1] == 0 && (var23[var24 + 1][var25 + 2] & 19137016) == 0 && (var23[var24 + 2][var25 + 2] & 19136992) == 0 && (var23[var24 + 2][var25 + 1] & 19136995) == 0) { - class182.bufferX[var38] = var15 + 1; - class182.bufferY[var38] = var16 + 1; - var38 = var38 + 1 & 4095; - class182.directions[var35 + 1][var36 + 1] = 12; - class182.distances[var35 + 1][var36 + 1] = var26; - } - } - - var33 = var34; - } else { - var15 = var4; - var16 = var5; - var17 = 64; - var18 = 64; - var19 = var4 - var17; - var20 = var5 - var18; - class182.directions[var17][var18] = 99; - class182.distances[var17][var18] = 0; - var21 = 0; - var22 = 0; - class182.bufferX[var21] = var4; - var38 = var21 + 1; - class182.bufferY[var21] = var5; - var23 = var10.flags; - - label822: - while (true) { - label820: - while (true) { - do { - do { - do { - label797: - do { - if (var22 == var38) { - Coord.field2530 = var15; - class182.field2097 = var16; - var34 = false; - break label822; - } - - var15 = class182.bufferX[var22]; - var16 = class182.bufferY[var22]; - var22 = var22 + 1 & 4095; - var35 = var15 - var19; - var36 = var16 - var20; - var24 = var15 - var10.xInset; - var25 = var16 - var10.yInset; - if (var9.hasArrived(var8, var15, var16, var10)) { - Coord.field2530 = var15; - class182.field2097 = var16; - var34 = true; - break label822; - } - - var26 = class182.distances[var35][var36] + 1; - if (var35 > 0 && class182.directions[var35 - 1][var36] == 0 && (var23[var24 - 1][var25] & 19136782) == 0 && (var23[var24 - 1][var8 + var25 - 1] & 19136824) == 0) { - var27 = 1; - - while (true) { - if (var27 >= var8 - 1) { - class182.bufferX[var38] = var15 - 1; - class182.bufferY[var38] = var16; - var38 = var38 + 1 & 4095; - class182.directions[var35 - 1][var36] = 2; - class182.distances[var35 - 1][var36] = var26; - break; - } - - if ((var23[var24 - 1][var27 + var25] & 19136830) != 0) { - break; - } - - ++var27; - } - } - - if (var35 < 128 - var8 && class182.directions[var35 + 1][var36] == 0 && (var23[var24 + var8][var25] & 19136899) == 0 && (var23[var24 + var8][var25 + var8 - 1] & 19136992) == 0) { - var27 = 1; - - while (true) { - if (var27 >= var8 - 1) { - class182.bufferX[var38] = var15 + 1; - class182.bufferY[var38] = var16; - var38 = var38 + 1 & 4095; - class182.directions[var35 + 1][var36] = 8; - class182.distances[var35 + 1][var36] = var26; - break; - } - - if ((var23[var24 + var8][var25 + var27] & 19136995) != 0) { - break; - } - - ++var27; - } - } - - if (var36 > 0 && class182.directions[var35][var36 - 1] == 0 && (var23[var24][var25 - 1] & 19136782) == 0 && (var23[var8 + var24 - 1][var25 - 1] & 19136899) == 0) { - var27 = 1; - - while (true) { - if (var27 >= var8 - 1) { - class182.bufferX[var38] = var15; - class182.bufferY[var38] = var16 - 1; - var38 = var38 + 1 & 4095; - class182.directions[var35][var36 - 1] = 1; - class182.distances[var35][var36 - 1] = var26; - break; - } - - if ((var23[var27 + var24][var25 - 1] & 19136911) != 0) { - break; - } - - ++var27; - } - } - - if (var36 < 128 - var8 && class182.directions[var35][var36 + 1] == 0 && (var23[var24][var25 + var8] & 19136824) == 0 && (var23[var24 + var8 - 1][var25 + var8] & 19136992) == 0) { - var27 = 1; - - while (true) { - if (var27 >= var8 - 1) { - class182.bufferX[var38] = var15; - class182.bufferY[var38] = var16 + 1; - var38 = var38 + 1 & 4095; - class182.directions[var35][var36 + 1] = 4; - class182.distances[var35][var36 + 1] = var26; - break; - } - - if ((var23[var24 + var27][var25 + var8] & 19137016) != 0) { - break; - } - - ++var27; - } - } - - if (var35 > 0 && var36 > 0 && class182.directions[var35 - 1][var36 - 1] == 0 && (var23[var24 - 1][var25 - 1] & 19136782) == 0) { - var27 = 1; - - while (true) { - if (var27 >= var8) { - class182.bufferX[var38] = var15 - 1; - class182.bufferY[var38] = var16 - 1; - var38 = var38 + 1 & 4095; - class182.directions[var35 - 1][var36 - 1] = 3; - class182.distances[var35 - 1][var36 - 1] = var26; - break; - } - - if ((var23[var24 - 1][var27 + (var25 - 1)] & 19136830) != 0 || (var23[var27 + (var24 - 1)][var25 - 1] & 19136911) != 0) { - break; - } - - ++var27; - } - } - - if (var35 < 128 - var8 && var36 > 0 && class182.directions[var35 + 1][var36 - 1] == 0 && (var23[var24 + var8][var25 - 1] & 19136899) == 0) { - var27 = 1; - - while (true) { - if (var27 >= var8) { - class182.bufferX[var38] = var15 + 1; - class182.bufferY[var38] = var16 - 1; - var38 = var38 + 1 & 4095; - class182.directions[var35 + 1][var36 - 1] = 9; - class182.distances[var35 + 1][var36 - 1] = var26; - break; - } - - if ((var23[var24 + var8][var27 + (var25 - 1)] & 19136995) != 0 || (var23[var27 + var24][var25 - 1] & 19136911) != 0) { - break; - } - - ++var27; - } - } - - if (var35 > 0 && var36 < 128 - var8 && class182.directions[var35 - 1][var36 + 1] == 0 && (var23[var24 - 1][var25 + var8] & 19136824) == 0) { - for (var27 = 1; var27 < var8; ++var27) { - if ((var23[var24 - 1][var27 + var25] & 19136830) != 0 || (var23[var27 + (var24 - 1)][var8 + var25] & 19137016) != 0) { - continue label797; - } - } - - class182.bufferX[var38] = var15 - 1; - class182.bufferY[var38] = var16 + 1; - var38 = var38 + 1 & 4095; - class182.directions[var35 - 1][var36 + 1] = 6; - class182.distances[var35 - 1][var36 + 1] = var26; - } - } while(var35 >= 128 - var8); - } while(var36 >= 128 - var8); - } while(class182.directions[var35 + 1][var36 + 1] != 0); - } while((var23[var24 + var8][var8 + var25] & 19136992) != 0); - - for (var27 = 1; var27 < var8; ++var27) { - if ((var23[var27 + var24][var25 + var8] & 19137016) != 0 || (var23[var24 + var8][var25 + var27] & 19136995) != 0) { - continue label820; - } - } - - class182.bufferX[var38] = var15 + 1; - class182.bufferY[var38] = var16 + 1; - var38 = var38 + 1 & 4095; - class182.directions[var35 + 1][var36 + 1] = 12; - class182.distances[var35 + 1][var36 + 1] = var26; - } - } - - var33 = var34; - } - - int var7; - label888: { - var14 = var4 - 64; - var15 = var5 - 64; - var16 = Coord.field2530; - var35 = class182.field2097; - if (!var33) { - var36 = Integer.MAX_VALUE; - var19 = Integer.MAX_VALUE; - byte var37 = 10; - var38 = var9.approxDestinationX; - var22 = var9.approxDestinationY; - int var32 = var9.approxDestinationSizeX; - var24 = var9.approxDestinationSizeY; - - for (var25 = var38 - var37; var25 <= var38 + var37; ++var25) { - for (var26 = var22 - var37; var26 <= var22 + var37; ++var26) { - var27 = var25 - var14; - int var28 = var26 - var15; - if (var27 >= 0 && var28 >= 0 && var27 < 128 && var28 < 128 && class182.distances[var27][var28] < 100) { - int var29 = 0; - if (var25 < var38) { - var29 = var38 - var25; - } else if (var25 > var38 + var32 - 1) { - var29 = var25 - (var32 + var38 - 1); - } - - int var30 = 0; - if (var26 < var22) { - var30 = var22 - var26; - } else if (var26 > var22 + var24 - 1) { - var30 = var26 - (var24 + var22 - 1); - } - - int var31 = var29 * var29 + var30 * var30; - if (var31 < var36 || var31 == var36 && class182.distances[var27][var28] < var19) { - var36 = var31; - var19 = class182.distances[var27][var28]; - var16 = var25; - var35 = var26; - } - } - } - } - - if (var36 == Integer.MAX_VALUE) { - var7 = -1; - break label888; - } - } - - if (var16 == var4 && var5 == var35) { - var7 = 0; - } else { - var18 = 0; - class182.bufferX[var18] = var16; - var36 = var18 + 1; - class182.bufferY[var18] = var35; - - for (var19 = var20 = class182.directions[var16 - var14][var35 - var15]; var16 != var4 || var5 != var35; var19 = class182.directions[var16 - var14][var35 - var15]) { - if (var19 != var20) { - var20 = var19; - class182.bufferX[var36] = var16; - class182.bufferY[var36++] = var35; - } - - if ((var19 & 2) != 0) { - ++var16; - } else if ((var19 & 8) != 0) { - --var16; - } - - if ((var19 & 1) != 0) { - ++var35; - } else if ((var19 & 4) != 0) { - --var35; - } - } - - var38 = 0; - - while (var36-- > 0) { - var11[var38] = class182.bufferX[var36]; - var12[var38++] = class182.bufferY[var36]; - if (var38 >= var11.length) { - break; - } - } - - var7 = var38; - } - } - - var13 = var7; - if (var7 >= 1) { - for (var14 = 0; var14 < var13 - 1; ++var14) { - var0.method1341(Client.field955[var14], Client.field956[var14], var3); - } - - } + var4 = true; + break; } } + + if (!var4) { + ObjectSound.addGameMessage(4, "", "Unable to find " + var1); + } + } } diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java index f79156f479..a02d46de4e 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("dj") +@ObfuscatedName("dr") @Implements("SoundEffect") public class SoundEffect { - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "[Ldp;" + signature = "[Ldq;" ) @Export("instruments") Instrument[] instruments; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("start") int start; - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("end") int end; @ObfuscatedSignature( - signature = "(Lkb;)V" + signature = "(Lkn;)V" ) SoundEffect(Buffer var1) { this.instruments = new Instrument[10]; @@ -38,9 +38,9 @@ public class SoundEffect { this.end = var1.readUnsignedShort(); } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "()Ldm;" + signature = "()Ldp;" ) @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("k") + @ObfuscatedName("q") @Export("calculateDelay") public final int calculateDelay() { int var1 = 9999999; @@ -83,7 +83,7 @@ public class SoundEffect { } } - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("mix") final byte[] mix() { int var1 = 0; @@ -122,9 +122,9 @@ public class SoundEffect { } } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Liy;II)Ldj;" + signature = "(Lic;II)Ldr;" ) @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 a1e736cc96..b028401d84 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("de") +@ObfuscatedName("ds") @Implements("SoundEnvelope") public class SoundEnvelope { @ObfuscatedName("m") @Export("segments") int segments; - @ObfuscatedName("k") + @ObfuscatedName("o") @Export("durations") int[] durations; - @ObfuscatedName("d") + @ObfuscatedName("q") @Export("phases") int[] phases; - @ObfuscatedName("w") + @ObfuscatedName("j") @Export("start") int start; - @ObfuscatedName("v") + @ObfuscatedName("p") @Export("end") int end; - @ObfuscatedName("q") + @ObfuscatedName("g") @Export("form") int form; - @ObfuscatedName("z") + @ObfuscatedName("n") @Export("ticks") int ticks; - @ObfuscatedName("t") + @ObfuscatedName("u") @Export("phaseIndex") int phaseIndex; - @ObfuscatedName("e") + @ObfuscatedName("a") @Export("step") int step; - @ObfuscatedName("s") + @ObfuscatedName("z") @Export("amplitude") int amplitude; - @ObfuscatedName("p") + @ObfuscatedName("w") @Export("max") int max; @@ -50,9 +50,9 @@ public class SoundEnvelope { this.phases[1] = 65535; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkb;)V" + signature = "(Lkn;)V" ) @Export("decode") final void decode(Buffer var1) { @@ -62,9 +62,9 @@ public class SoundEnvelope { this.decodeSegments(var1); } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkb;)V" + signature = "(Lkn;)V" ) @Export("decodeSegments") final void decodeSegments(Buffer var1) { @@ -79,7 +79,7 @@ public class SoundEnvelope { } - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("reset") final void reset() { this.ticks = 0; @@ -89,7 +89,7 @@ public class SoundEnvelope { this.max = 0; } - @ObfuscatedName("d") + @ObfuscatedName("j") @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 96eba3038c..3866192e1e 100644 --- a/runescape-client/src/main/java/SoundSystem.java +++ b/runescape-client/src/main/java/SoundSystem.java @@ -3,25 +3,25 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("dh") +@ObfuscatedName("dg") @Implements("SoundSystem") public class SoundSystem implements Runnable { - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Liy;" - ) - @Export("Widget_modelsArchive") - static AbstractArchive Widget_modelsArchive; - @ObfuscatedName("ij") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1992828169 + intValue = 140612879 ) - @Export("oculusOrbFocalPointX") - static int oculusOrbFocalPointX; - @ObfuscatedName("x") + static int field1466; + @ObfuscatedName("hm") @ObfuscatedSignature( - signature = "[Ldw;" + signature = "[Llz;" + ) + @Export("headIconHintSprites") + static Sprite[] headIconHintSprites; + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "[Ldt;" ) @Export("players") volatile PcmPlayer[] players; @@ -39,8 +39,69 @@ public class SoundSystem implements Runnable { } } } catch (Exception var4) { - WorldMapDecorationType.RunException_sendStackTrace((String)null, var4); + class197.RunException_sendStackTrace((String)null, var4); } } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(IB)I", + garbageValue = "101" + ) + public static int method2628(int var0) { + return class279.method5159(ViewportMouse.ViewportMouse_entityTags[var0]); + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "-123" + ) + public static void method2629() { + try { + JagexCache.JagexCache_dat2File.close(); + + for (int var0 = 0; var0 < WorldMapDecoration.idxCount; ++var0) { + JagexCache.JagexCache_idxFiles[var0].close(); + } + + JagexCache.JagexCache_idx255File.close(); + JagexCache.JagexCache_randomDat.close(); + } catch (Exception var2) { + } + + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "(ILcs;ZI)I", + garbageValue = "1398391910" + ) + static int method2630(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var3 = WorldMapSprite.getWidget(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); + } else { + var3 = var2 ? KeyHandler.field407 : SecureRandomCallable.field544; + } + + if (var0 == ScriptOpcodes.CC_CALLONRESIZE) { + if (Interpreter.field1132 >= 10) { + throw new RuntimeException(); + } else if (var3.onResize == null) { + return 0; + } else { + ScriptEvent var4 = new ScriptEvent(); + var4.widget = var3; + var4.args = var3.onResize; + var4.field600 = Interpreter.field1132 + 1; + Client.scriptEvents.addFirst(var4); + return 1; + } + } else { + return 2; + } + } } diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java index 62f6979ff5..4d1ea197f1 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -4,90 +4,90 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iw") +@ObfuscatedName("ie") @Implements("SpotAnimationDefinition") public class SpotAnimationDefinition extends DualNode { - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Liy;" - ) - @Export("SpotAnimationDefinition_archive") - public static AbstractArchive SpotAnimationDefinition_archive; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Liy;" + signature = "Lic;" ) - @Export("SpotAnimationDefinition_modelArchive") - public static AbstractArchive SpotAnimationDefinition_modelArchive; - @ObfuscatedName("k") + @Export("SpotAnimationDefinition_archive") + static AbstractArchive SpotAnimationDefinition_archive; + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Leg;" + signature = "Lec;" ) @Export("SpotAnimationDefinition_cached") - public static EvictingDualNodeHashTable SpotAnimationDefinition_cached; - @ObfuscatedName("d") + static EvictingDualNodeHashTable SpotAnimationDefinition_cached; + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Leg;" + signature = "Lec;" ) @Export("SpotAnimationDefinition_cachedModels") - public static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; - @ObfuscatedName("w") + static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; + @ObfuscatedName("bw") + @ObfuscatedSignature( + signature = "[Llh;" + ) + @Export("worldSelectFlagSprites") + static IndexedSprite[] worldSelectFlagSprites; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1568663321 + intValue = -504794549 ) @Export("id") int id; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -2124513073 + intValue = 1613969499 ) @Export("archive") int archive; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 872877257 + intValue = -1776408189 ) @Export("sequence") public int sequence; - @ObfuscatedName("z") + @ObfuscatedName("u") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("s") + @ObfuscatedName("w") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1719223697 + intValue = 1855013499 ) @Export("widthScale") int widthScale; - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1056397705 + intValue = 147674657 ) @Export("heightScale") int heightScale; - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 378362489 + intValue = 2103491725 ) @Export("orientation") int orientation; - @ObfuscatedName("h") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -811477227 + intValue = 528387753 ) @Export("ambient") int ambient; - @ObfuscatedName("g") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 551721489 + intValue = -324487403 ) @Export("contrast") int contrast; @@ -106,10 +106,10 @@ public class SpotAnimationDefinition extends DualNode { this.contrast = 0; } - @ObfuscatedName("m") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkb;B)V", - garbageValue = "-55" + signature = "(Lkn;I)V", + garbageValue = "-1363953407" ) @Export("decode") void decode(Buffer var1) { @@ -123,10 +123,10 @@ public class SpotAnimationDefinition extends DualNode { } } - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkb;IB)V", - garbageValue = "0" + signature = "(Lkn;II)V", + garbageValue = "-809461171" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -170,16 +170,16 @@ public class SpotAnimationDefinition extends DualNode { } - @ObfuscatedName("d") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(II)Lel;", - garbageValue = "-1314564797" + signature = "(IB)Lef;", + garbageValue = "-31" ) @Export("getModel") public final Model getModel(int var1) { Model var2 = (Model)SpotAnimationDefinition_cachedModels.get((long)this.id); if (var2 == null) { - ModelData var3 = ModelData.ModelData_get(SpotAnimationDefinition_modelArchive, this.archive, 0); + ModelData var3 = ModelData.ModelData_get(NPC.SpotAnimationDefinition_modelArchive, this.archive, 0); if (var3 == null) { return null; } @@ -203,7 +203,7 @@ public class SpotAnimationDefinition extends DualNode { Model var5; if (this.sequence != -1 && var1 != -1) { - var5 = SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); + var5 = NetSocket.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); } else { var5 = var2.toSharedSpotAnimationModel(true); } @@ -231,27 +231,4 @@ public class SpotAnimationDefinition extends DualNode { return var5; } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(II)Ljc;", - garbageValue = "1802255553" - ) - @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 = Varcs.SequenceDefinition_archive.takeFile(12, var0); - var1 = new SequenceDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); - return var1; - } - } } diff --git a/runescape-client/src/main/java/Sprite.java b/runescape-client/src/main/java/Sprite.java index 17124a7129..140279b00d 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("la") +@ObfuscatedName("lz") @Implements("Sprite") public final class Sprite extends Rasterizer2D { - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("pixels") public int[] pixels; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("subWidth") public int subWidth; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("subHeight") public int subHeight; - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("xOffset") public int xOffset; - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("yOffset") int yOffset; - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("width") public int width; - @ObfuscatedName("q") + @ObfuscatedName("n") @Export("height") public int height; @@ -43,9 +43,9 @@ public final class Sprite extends Rasterizer2D { Sprite() { } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "()Lla;" + signature = "()Llz;" ) @Export("mirrorHorizontally") public Sprite mirrorHorizontally() { @@ -64,9 +64,9 @@ public final class Sprite extends Rasterizer2D { return var1; } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "()Lla;" + signature = "()Llz;" ) @Export("copyNormalized") public Sprite copyNormalized() { @@ -81,13 +81,13 @@ public final class Sprite extends Rasterizer2D { return var1; } - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("setRaster") public void setRaster() { Rasterizer2D.Rasterizer2D_replace(this.pixels, this.subWidth, this.subHeight); } - @ObfuscatedName("d") + @ObfuscatedName("j") @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("w") + @ObfuscatedName("p") @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("v") + @ObfuscatedName("g") @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("q") + @ObfuscatedName("n") @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("z") + @ObfuscatedName("u") @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("t") + @ObfuscatedName("a") @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("e") + @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("p") + @ObfuscatedName("y") @Export("drawTransBgAt") public void drawTransBgAt(int var1, int var2) { var1 += this.xOffset; @@ -316,7 +316,7 @@ public final class Sprite extends Rasterizer2D { } } - @ObfuscatedName("u") + @ObfuscatedName("h") @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("a") + @ObfuscatedName("e") @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("c") + @ObfuscatedName("t") @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("ae") - public void method6234(int var1, int var2, int var3) { + @ObfuscatedName("ah") + public void method6337(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) { - method6235(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); + method6409(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); } else { - method6236(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); + method6362(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); } } } - @ObfuscatedName("ap") - public void method6268(int var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("ae") + public void method6366(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) { - method6238(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); + method6364(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); } else { - method6239(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); + method6365(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); } } } - @ObfuscatedName("af") - public void method6240(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { + @ObfuscatedName("ab") + public void method6408(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("at") + @ObfuscatedName("am") @Export("drawRotatedMaskedCenteredAround") public void drawRotatedMaskedCenteredAround(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int[] var9, int[] var10) { try { @@ -744,8 +744,8 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("as") - public void method6242(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { + @ObfuscatedName("ak") + public void method6435(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("am") - public void method6284(int var1, int var2, int var3, int var4) { - this.method6266(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); + @ObfuscatedName("ad") + public void method6369(int var1, int var2, int var3, int var4) { + this.method6370(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); } - @ObfuscatedName("au") - void method6266(int var1, int var2, int var3, int var4, int var5, int var6) { + @ObfuscatedName("as") + void method6370(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("ao") + @ObfuscatedName("ar") @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("s") + @ObfuscatedName("w") @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("n") + @ObfuscatedName("c") @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("h") + @ObfuscatedName("k") @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("i") + @ObfuscatedName("d") @Export("Sprite_drawTransOverlay") static void Sprite_drawTransOverlay(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { int var11 = 256 - var9; @@ -1505,7 +1505,7 @@ public final class Sprite extends Rasterizer2D { } - @ObfuscatedName("o") + @ObfuscatedName("l") @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("f") + @ObfuscatedName("x") @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("an") - static void method6235(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("ai") + static void method6409(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("ai") - static void method6236(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("ao") + static void method6362(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("ab") - static void method6238(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("ax") + static void method6364(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("ar") - static void method6239(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16) { + @ObfuscatedName("ag") + static void method6365(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 437424925e..1392ccaca1 100644 --- a/runescape-client/src/main/java/SpriteMask.java +++ b/runescape-client/src/main/java/SpriteMask.java @@ -4,25 +4,25 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hg") +@ObfuscatedName("hh") @Implements("SpriteMask") public class SpriteMask extends DualNode { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1355900291 + intValue = 293169349 ) @Export("width") public final int width; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1444758519 + intValue = -1667471455 ) @Export("height") public final int height; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("xWidths") public final int[] xWidths; - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("xStarts") public final int[] xStarts; @@ -33,10 +33,10 @@ public class SpriteMask extends DualNode { this.xStarts = var4; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(III)Z", - garbageValue = "-822552656" + garbageValue = "-679501708" ) @Export("contains") public boolean contains(int var1, int var2) { @@ -50,24 +50,84 @@ public class SpriteMask extends DualNode { return false; } - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(IS)Liu;", - garbageValue = "14194" - ) - public static VarbitDefinition method4061(int var0) { - VarbitDefinition var1 = (VarbitDefinition)VarbitDefinition.VarbitDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = VarbitDefinition.VarbitDefinition_archive.takeFile(14, var0); - var1 = new VarbitDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - VarbitDefinition.VarbitDefinition_cached.put(var1, (long)var0); - return var1; + @ObfuscatedName("m") + @Export("sleepExact") + public static final void sleepExact(long var0) { + try { + Thread.sleep(var0); + } catch (InterruptedException var3) { } + + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "39704682" + ) + @Export("savePreferences") + static void savePreferences() { + AccessFile var0 = null; + + try { + var0 = GameShell.getPreferencesFile("", GrandExchangeOfferWorldComparator.field54.name, true); + Buffer var1 = NetSocket.clientPreferences.toBuffer(); + var0.write(var1.array, 0, var1.offset); + } catch (Exception var3) { + } + + try { + if (var0 != null) { + var0.closeSync(true); + } + } catch (Exception var2) { + } + + } + + @ObfuscatedName("km") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;ZI)V", + garbageValue = "2008753616" + ) + @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 < HitSplatDefinition.ItemDefinition_fileCount; ++var4) { + ItemDefinition var5 = KitDefinition.ItemDefinition_get(var4); + if ((!var1 || var5.isTradable) && var5.noteTemplate == -1 && var5.name.toLowerCase().indexOf(var0) != -1) { + if (var3 >= 250) { + TileItemPile.foundItemIdCount = -1; + WorldMapScaleHandler.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; + } + } + + WorldMapScaleHandler.foundItemIds = var2; + ArchiveLoader.foundItemIndex = 0; + TileItemPile.foundItemIdCount = var3; + String[] var8 = new String[TileItemPile.foundItemIdCount]; + + for (int var9 = 0; var9 < TileItemPile.foundItemIdCount; ++var9) { + var8[var9] = KitDefinition.ItemDefinition_get(var2[var9]).name; + } + + WorldMapDecoration.method400(var8, WorldMapScaleHandler.foundItemIds); } } diff --git a/runescape-client/src/main/java/Strings.java b/runescape-client/src/main/java/Strings.java index abf1afa54a..3475b88d67 100644 --- a/runescape-client/src/main/java/Strings.java +++ b/runescape-client/src/main/java/Strings.java @@ -1,72 +1,25 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hx") +@ObfuscatedName("hc") @Implements("Strings") public class Strings { - @ObfuscatedName("rx") - @ObfuscatedGetter( - intValue = 2019355049 - ) - static int field2759; - @ObfuscatedName("bd") - public static String field2811; - @ObfuscatedName("cy") - public static String field2914; - @ObfuscatedName("jm") - public static String field3026; - @ObfuscatedName("jh") - public static String field2898; - @ObfuscatedName("jk") - public static String field2807; + @ObfuscatedName("be") + public static String field2845; + @ObfuscatedName("ca") + public static String field2856; + @ObfuscatedName("jx") + public static String field3060; + @ObfuscatedName("jp") + public static String field3061; + @ObfuscatedName("jn") + public static String field3062; static { - field2811 = "Please visit the support page for assistance."; - field2914 = "Please visit the support page for assistance."; - field3026 = ""; - field2898 = "Page has opened in a new window."; - field2807 = "(Please check your popup blocker.)"; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "(IS)Lii;", - garbageValue = "18624" - ) - @Export("ServerBuild_get") - public static GameBuild ServerBuild_get(int var0) { - GameBuild[] var1 = Language.method3751(); - - for (int var2 = 0; var2 < var1.length; ++var2) { - GameBuild var3 = var1[var2]; - if (var0 == var3.buildId) { - return var3; - } - } - - return null; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "-1791203071" - ) - static final int method4220(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; - } + field2845 = "Please visit the support page for assistance."; + field2856 = "Please visit the support page for assistance."; + field3060 = ""; + field3061 = "Page has opened in a new window."; + field3062 = "(Please check your popup blocker.)"; } } diff --git a/runescape-client/src/main/java/StructDefinition.java b/runescape-client/src/main/java/StructDefinition.java index b6d993b2e6..3e475cbae2 100644 --- a/runescape-client/src/main/java/StructDefinition.java +++ b/runescape-client/src/main/java/StructDefinition.java @@ -3,39 +3,24 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jq") +@ObfuscatedName("je") @Implements("StructDefinition") public class StructDefinition extends DualNode { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Liy;" + signature = "Lic;" ) @Export("StructDefinition_archive") static AbstractArchive StructDefinition_archive; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Leg;" + signature = "Lec;" ) @Export("StructDefinition_cached") - static EvictingDualNodeHashTable StructDefinition_cached; - @ObfuscatedName("w") - @Export("SpriteBuffer_yOffsets") - static int[] SpriteBuffer_yOffsets; - @ObfuscatedName("p") - @Export("Tiles_lightness") - static int[] Tiles_lightness; - @ObfuscatedName("bv") + public static EvictingDualNodeHashTable StructDefinition_cached; + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lle;" - ) - @Export("worldSelectRightSprite") - static IndexedSprite worldSelectRightSprite; - @ObfuscatedName("gc") - @Export("regions") - static int[] regions; - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Lln;" + signature = "Llf;" ) @Export("params") IterableNodeHashTable params; @@ -47,19 +32,19 @@ public class StructDefinition extends DualNode { StructDefinition() { } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1990105365" + signature = "(B)V", + garbageValue = "-98" ) @Export("postDecode") void postDecode() { } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkb;B)V", - garbageValue = "-61" + signature = "(Lkn;I)V", + garbageValue = "381784776" ) @Export("decode") void decode(Buffer var1) { @@ -73,58 +58,208 @@ public class StructDefinition extends DualNode { } } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Lkb;II)V", - garbageValue = "675280031" + signature = "(Lkn;II)V", + garbageValue = "337645419" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 249) { - this.params = NetCache.readStringIntParameters(var1, this.params); + this.params = WorldMapElement.readStringIntParameters(var1, this.params); } } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( signature = "(III)I", - garbageValue = "1605132881" + garbageValue = "48203250" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - IterableNodeHashTable var4 = this.params; - int var3; - if (var4 == null) { - var3 = var2; - } else { - IntegerNode var5 = (IntegerNode)var4.get((long)var1); - if (var5 == null) { - var3 = var2; - } else { - var3 = var5.integer; - } - } - - return var3; + return Language.method3801(this.params, var1, var2); } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1577444936" + garbageValue = "-1617799993" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return class9.method122(this.params, var1, var2); + return FloorUnderlayDefinition.method4612(this.params, var1, var2); } @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(CS)C", - garbageValue = "255" + signature = "(S)[Lgu;", + garbageValue = "8211" ) - static char method4589(char var0) { - return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; + @Export("ServerPacket_values") + public static ServerPacket[] ServerPacket_values() { + return new ServerPacket[]{ServerPacket.field2191, ServerPacket.field2177, ServerPacket.field2200, ServerPacket.field2156, ServerPacket.field2211, ServerPacket.field2158, ServerPacket.field2219, ServerPacket.field2228, ServerPacket.field2161, ServerPacket.field2169, ServerPacket.field2224, ServerPacket.field2164, ServerPacket.field2155, ServerPacket.field2166, ServerPacket.field2167, ServerPacket.field2168, ServerPacket.field2181, ServerPacket.field2170, ServerPacket.field2232, ServerPacket.field2172, ServerPacket.field2173, ServerPacket.field2189, ServerPacket.field2171, ServerPacket.field2176, ServerPacket.field2165, ServerPacket.field2178, ServerPacket.field2175, ServerPacket.field2180, ServerPacket.field2240, ServerPacket.field2182, ServerPacket.field2183, ServerPacket.field2184, ServerPacket.field2185, ServerPacket.field2186, ServerPacket.field2187, ServerPacket.field2188, ServerPacket.field2160, ServerPacket.field2220, ServerPacket.field2162, ServerPacket.field2159, ServerPacket.field2199, ServerPacket.field2194, ServerPacket.field2157, ServerPacket.field2193, ServerPacket.field2197, ServerPacket.field2190, ServerPacket.field2223, ServerPacket.field2163, ServerPacket.field2201, ServerPacket.field2202, ServerPacket.field2203, ServerPacket.field2204, ServerPacket.field2205, ServerPacket.field2206, ServerPacket.field2207, ServerPacket.field2208, ServerPacket.field2209, ServerPacket.field2210, ServerPacket.field2230, ServerPacket.field2212, ServerPacket.field2213, ServerPacket.field2226, ServerPacket.field2215, ServerPacket.field2216, ServerPacket.field2217, ServerPacket.field2218, ServerPacket.field2196, ServerPacket.field2174, ServerPacket.field2221, ServerPacket.field2222, ServerPacket.field2235, ServerPacket.field2153, ServerPacket.field2225, ServerPacket.field2195, ServerPacket.field2227, ServerPacket.field2233, ServerPacket.field2229, ServerPacket.field2179, ServerPacket.field2231, ServerPacket.field2214, ServerPacket.field2154, ServerPacket.field2234, ServerPacket.field2198, ServerPacket.field2236, ServerPacket.field2237, ServerPacket.field2238}; + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", + garbageValue = "1817057195" + ) + public static String method4718(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(); + } + } + + @ObfuscatedName("jb") + @ObfuscatedSignature( + signature = "(Lhd;IIII)V", + garbageValue = "-1082386904" + ) + @Export("drawMinimap") + static final void drawMinimap(Widget var0, int var1, int var2, int var3) { + Timer.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 = class60.localPlayer.x / 32 + 48; + int var7 = 464 - class60.localPlayer.y / 32; + class3.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 - class60.localPlayer.x / 32; + var10 = Client.mapIconYs[var8] * 4 + 2 - class60.localPlayer.y / 32; + GrandExchangeOffer.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[TileItemPile.Client_plane][var8][var9]; + if (var15 != null) { + var11 = var8 * 4 + 2 - class60.localPlayer.x / 32; + var12 = var9 * 4 + 2 - class60.localPlayer.y / 32; + GrandExchangeOffer.drawSpriteOnMinimap(var1, var2, var11, var12, AttackOption.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 - class60.localPlayer.x / 32; + var12 = var16.y / 32 - class60.localPlayer.y / 32; + GrandExchangeOffer.drawSpriteOnMinimap(var1, var2, var11, var12, AttackOption.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 != class60.localPlayer) { + var12 = var17.x / 32 - class60.localPlayer.x / 32; + int var13 = var17.y / 32 - class60.localPlayer.y / 32; + boolean var14 = false; + if (class60.localPlayer.team != 0 && var17.team != 0 && var17.team == class60.localPlayer.team) { + var14 = true; + } + + if (var17.isFriend()) { + GrandExchangeOffer.drawSpriteOnMinimap(var1, var2, var12, var13, AttackOption.mapDotSprites[3], var4); + } else if (var14) { + GrandExchangeOffer.drawSpriteOnMinimap(var1, var2, var12, var13, AttackOption.mapDotSprites[4], var4); + } else if (var17.isClanMember()) { + GrandExchangeOffer.drawSpriteOnMinimap(var1, var2, var12, var13, AttackOption.mapDotSprites[5], var4); + } else { + GrandExchangeOffer.drawSpriteOnMinimap(var1, var2, var12, var13, AttackOption.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 - class60.localPlayer.x / 32; + var12 = var20.y / 32 - class60.localPlayer.y / 32; + WorldMapRectangle.worldToMinimap(var1, var2, var11, var12, class9.mapMarkerSprites[1], var4); + } + } + + if (Client.hintArrowType == 2) { + var10 = Client.hintArrowX * 4 - class182.baseX * 4 + 2 - class60.localPlayer.x / 32; + var11 = Client.hintArrowY * 4 - SecureRandomFuture.baseY * 4 + 2 - class60.localPlayer.y / 32; + WorldMapRectangle.worldToMinimap(var1, var2, var10, var11, class9.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 / 32 - class60.localPlayer.x / 32; + var12 = var21.y / 32 - class60.localPlayer.y / 32; + WorldMapRectangle.worldToMinimap(var1, var2, var11, var12, class9.mapMarkerSprites[1], var4); + } + } + } + + if (Client.destinationX != 0) { + var10 = Client.destinationX * 4 + 2 - class60.localPlayer.x / 32; + var11 = Client.destinationY * 4 + 2 - class60.localPlayer.y / 32; + GrandExchangeOffer.drawSpriteOnMinimap(var1, var2, var10, var11, class9.mapMarkerSprites[0], var4); + } + + if (!class60.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.field879[var3] = true; + } } } diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java index f7fe8a4565..72ed2e445e 100644 --- a/runescape-client/src/main/java/StudioGame.java +++ b/runescape-client/src/main/java/StudioGame.java @@ -4,52 +4,55 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iv") +@ObfuscatedName("ib") @Implements("StudioGame") public enum StudioGame implements Enumerated { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Liv;" + signature = "Lib;" ) @Export("runescape") runescape("runescape", "RuneScape", 0), - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Liv;" + signature = "Lib;" ) @Export("stellardawn") stellardawn("stellardawn", "Stellar Dawn", 1), - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Liv;" + signature = "Lib;" ) @Export("game3") game3("game3", "Game 3", 2), - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Liv;" + signature = "Lib;" ) @Export("game4") game4("game4", "Game 4", 3), - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Liv;" + signature = "Lib;" ) @Export("game5") game5("game5", "Game 5", 4), - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Liv;" + signature = "Lib;" ) @Export("oldscape") oldscape("oldscape", "RuneScape 2007", 5); - @ObfuscatedName("q") + @ObfuscatedName("gu") + @Export("regionMapArchiveIds") + static int[] regionMapArchiveIds; + @ObfuscatedName("n") @Export("name") public final String name; - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 2013565785 + intValue = 1640024773 ) @Export("id") final int id; @@ -59,690 +62,64 @@ public enum StudioGame implements Enumerated { this.id = var5; } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "56" + signature = "(I)I", + garbageValue = "-995092303" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "([BB)Ljava/lang/String;", - garbageValue = "-100" + signature = "(II)Ljz;", + garbageValue = "916487028" ) - public static String method4242(byte[] var0) { - int var2 = var0.length; - StringBuilder var3 = new StringBuilder(); - - for (int var4 = 0; var4 < var2 + 0; var4 += 3) { - int var5 = var0[var4] & 255; - var3.append(class299.field3646[var5 >>> 2]); - if (var4 < var2 - 1) { - int var6 = var0[var4 + 1] & 255; - var3.append(class299.field3646[(var5 & 3) << 4 | var6 >>> 4]); - if (var4 < var2 - 2) { - int var7 = var0[var4 + 2] & 255; - var3.append(class299.field3646[(var6 & 15) << 2 | var7 >>> 6]).append(class299.field3646[var7 & 63]); - } else { - var3.append(class299.field3646[(var6 & 15) << 2]).append("="); - } - } else { - var3.append(class299.field3646[(var5 & 3) << 4]).append("=="); + @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)); } - } - String var1 = var3.toString(); - return var1; + var1.postDecode(); + NPCDefinition.NpcDefinition_cached.put(var1, (long)var0); + return var1; + } } - @ObfuscatedName("fh") + @ObfuscatedName("ih") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "719259365" + signature = "(IIIIII)V", + garbageValue = "-1280022094" ) - @Export("playSong") - static void playSong(int var0) { - if (var0 == -1 && !Client.field915) { - Client.method1496(); - } else if (var0 != -1 && var0 != Client.currentTrackGroupId && Client.musicVolume != 0 && !Client.field915) { - FaceNormal.playMusicTrack(2, AbstractWorldMapIcon.archive6, var0, 0, Client.musicVolume, false); - } - - Client.currentTrackGroupId = var0; - } - - @ObfuscatedName("io") - @ObfuscatedSignature( - signature = "([Lhe;IIIIIIIIB)V", - garbageValue = "19" - ) - @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 || !AbstractWorldMapData.isComponentHidden(var10)) { - if (var10.contentType > 0) { - UserComparator5.method3521(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) { - GrandExchangeEvents.field70 = var0; - WorldMapDecoration.field245 = var6; - SequenceDefinition.field3526 = var7; - continue; - } - - if (Client.isDraggingWidget && Client.field732) { - var15 = MouseHandler.MouseHandler_x; - var16 = MouseHandler.MouseHandler_y; - var15 -= Client.widgetClickX; - var16 -= Client.widgetClickY; - if (var15 < Client.field859) { - var15 = Client.field859; - } - - if (var15 + var10.width > Client.field859 + Client.clickedWidgetParent.width) { - var15 = Client.field859 + Client.clickedWidgetParent.width - var10.width; - } - - if (var16 < Client.field881) { - var16 = Client.field881; - } - - if (var16 + var10.height > Client.field881 + Client.clickedWidgetParent.height) { - var16 = Client.field881 + 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; - WorldMapData_0.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; - } - - WorldMapData_0.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); - var13 += 15; - } - continue; - } - - if (var10.contentType == 1337) { - Client.viewportX = var12; - Client.viewportY = var13; - Coord.drawEntities(var12, var13, var10.width, var10.height); - Client.field679[var10.rootIndex] = true; - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1338) { - ArchiveLoader.drawMinimap(var10, var12, var13, var11); - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1339) { - AbstractSocket.drawCompass(var10, var12, var13, var11); - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1400) { - GrandExchangeOfferAgeComparator.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); - } - - if (var10.contentType == 1401) { - GrandExchangeOfferAgeComparator.worldMap.drawOverview(var12, var13, var10.width, var10.height); - } - - if (var10.contentType == 1402) { - MilliClock.loginScreenRunesAnimation.draw(var12, Client.cycle); - } - } - - if (var10.type == 0) { - if (!var10.isIf3 && AbstractWorldMapData.isComponentHidden(var10) && var10 != class9.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) { - MusicPatch.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - } - - if (Client.isResizable || Client.field813[var11] || Client.gameDrawingMode > 1) { - if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { - FontName.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 = var21 * (var10.paddingX + 32) + var12; - 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 var43 = var10.getInventorySprite(var19); - if (var43 != null) { - var43.drawTransBgAt(var22, var23); - } else if (Widget.field2565) { - ItemContainer.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 == class236.dragInventoryWidget && var19 == Client.dragItemSlotSource) { - Sprite var27; - if (Client.isItemSelected == 1 && var19 == Client.selectedItemSlot && var10.id == WorldMapSection2.selectedItemWidget) { - var27 = SecureRandomFuture.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false); - } else { - var27 = SecureRandomFuture.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); - } - - if (var27 != null) { - if (var10 == class236.dragInventoryWidget && var19 == Client.dragItemSlotSource) { - var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; - var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; - if (var24 < 5 && var24 > -5) { - var24 = 0; - } - - if (var25 < 5 && var25 > -5) { - var25 = 0; - } - - if (Client.itemDragDuration < 5) { - var24 = 0; - var25 = 0; - } - - var27.drawTransAt(var24 + var22, var23 + var25, 128); - if (var1 != -1) { - Widget var28 = var0[var1 & 65535]; - int var29; - if (var25 + var23 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { - var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field741 / 3; - if (var29 > Client.field741 * 10) { - var29 = Client.field741 * 10; - } - - if (var29 > var28.scrollY) { - var29 = var28.scrollY; - } - - var28.scrollY -= var29; - Client.draggedWidgetY += var29; - ItemContainer.invalidateWidget(var28); - } - - if (var23 + var25 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { - var29 = (var23 + var25 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field741 / 3; - if (var29 > Client.field741 * 10) { - var29 = Client.field741 * 10; - } - - if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { - var29 = var28.scrollHeight - var28.height - var28.scrollY; - } - - var28.scrollY += var29; - Client.draggedWidgetY -= var29; - ItemContainer.invalidateWidget(var28); - } - } - } else if (var10 == WorldMapID.field307 && var19 == Client.field880) { - var27.drawTransAt(var22, var23, 128); - } else { - var27.drawTransBgAt(var22, var23); - } - } else { - ItemContainer.invalidateWidget(var10); - } - } - } - - ++var19; - } - } - } else if (var10.type == 3) { - if (GrandExchangeOfferAgeComparator.runCs1(var10)) { - var19 = var10.color2; - if (var10 == class9.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { - var19 = var10.mouseOverColor2; - } - } else { - var19 = var10.color; - if (var10 == class9.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { - var19 = var10.mouseOverColor; - } - } - - if (var10.fill) { - switch(var10.fillMode.field3873) { - 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.field2565) { - ItemContainer.invalidateWidget(var10); - } - } else { - String var45 = var10.text; - if (GrandExchangeOfferAgeComparator.runCs1(var10)) { - var20 = var10.color2; - if (var10 == class9.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { - var20 = var10.mouseOverColor2; - } - - if (var10.text2.length() > 0) { - var45 = var10.text2; - } - } else { - var20 = var10.color; - if (var10 == class9.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { - var20 = var10.mouseOverColor; - } - } - - if (var10.isIf3 && var10.itemId != -1) { - ItemDefinition var46 = AbstractWorldMapData.ItemDefinition_get(var10.itemId); - var45 = var46.name; - if (var45 == null) { - var45 = "null"; - } - - if ((var46.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { - var45 = class297.colorStartTag(16748608) + var45 + "" + " " + 'x' + UserComparator5.formatItemStacks(var10.itemQuantity); - } - } - - if (var10 == Client.meslayerContinueWidget) { - var45 = "Please wait..."; - var20 = var10.color; - } - - if (!var10.isIf3) { - var45 = WallDecoration.method3403(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(GrandExchangeOfferAgeComparator.runCs1(var10)); - if (var40 != null) { - var40.drawTransBgAt(var12, var13); - } else if (Widget.field2565) { - ItemContainer.invalidateWidget(var10); - } - } else { - if (var10.itemId != -1) { - var40 = SecureRandomFuture.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); - } else { - var40 = var10.getSprite(false); - } - - if (var40 == null) { - if (Widget.field2565) { - ItemContainer.invalidateWidget(var10); - } - } else { - var20 = var40.width; - var21 = var40.height; - if (!var10.spriteTiling) { - var22 = var10.width * 4096 / var20; - if (var10.spriteAngle != 0) { - var40.method6284(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.method6284(var20 / 2 + var12 + var20 * var24, var21 / 2 + var13 + var25 * var21, var10.spriteAngle, 4096); - } else if (var14 != 0) { - var40.drawTransAt(var12 + var24 * var20, var13 + var25 * var21, 256 - (var14 & 255)); - } else { - var40.drawTransBgAt(var12 + var24 * var20, var13 + var21 * var25); - } - } - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - } - } - } - } else { - ItemDefinition var34; - if (var10.type == 6) { - boolean var36 = GrandExchangeOfferAgeComparator.runCs1(var10); - if (var36) { - var20 = var10.sequenceId2; - } else { - var20 = var10.sequenceId; - } - - Model var42 = null; - var22 = 0; - if (var10.itemId != -1) { - var34 = AbstractWorldMapData.ItemDefinition_get(var10.itemId); - if (var34 != null) { - var34 = var34.getCountObj(var10.itemQuantity); - var42 = var34.getModel(1); - if (var42 != null) { - var42.calculateBoundsCylinder(); - var22 = var42.height / 2; - } else { - ItemContainer.invalidateWidget(var10); - } - } - } else if (var10.modelType == 5) { - if (var10.modelId == 0) { - var42 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); - } else { - var42 = ByteArrayPool.localPlayer.getModel(); - } - } else if (var20 == -1) { - var42 = var10.getModel((SequenceDefinition)null, -1, var36, ByteArrayPool.localPlayer.appearance); - if (var42 == null && Widget.field2565) { - ItemContainer.invalidateWidget(var10); - } - } else { - SequenceDefinition var47 = SpotAnimationDefinition.SequenceDefinition_get(var20); - var42 = var10.getModel(var47, var10.modelFrame, var36, ByteArrayPool.localPlayer.appearance); - if (var42 == null && Widget.field2565) { - ItemContainer.invalidateWidget(var10); - } - } - - Rasterizer3D.method3099(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.method2982(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); - } else { - var42.calculateBoundsCylinder(); - if (var10.modelOrthog) { - var42.method3013(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); - } else { - var42.method2982(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY); - } - } - } - - Rasterizer3D.Rasterizer3D_method3(); - } else { - if (var10.type == 7) { - var39 = var10.getFont(); - if (var39 == null) { - if (Widget.field2565) { - ItemContainer.invalidateWidget(var10); - } - continue; - } - - var20 = 0; - - for (var21 = 0; var21 < var10.rawHeight; ++var21) { - for (var22 = 0; var22 < var10.rawWidth; ++var22) { - if (var10.itemIds[var20] > 0) { - var34 = AbstractWorldMapData.ItemDefinition_get(var10.itemIds[var20] - 1); - String var31; - if (var34.isStackable != 1 && var10.itemQuantities[var20] == 1) { - var31 = class297.colorStartTag(16748608) + var34.name + ""; - } else { - var31 = class297.colorStartTag(16748608) + var34.name + "" + " " + 'x' + UserComparator5.formatItemStacks(var10.itemQuantities[var20]); - } - - var25 = var22 * (var10.paddingX + 115) + var12; - 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 == Language.field2368 && Client.field832 == Client.field871) { - var19 = 0; - var20 = 0; - Font var32 = WorldMapData_0.fontPlain12; - String var33 = var10.text; - - String var44; - for (var33 = WallDecoration.method3403(var33, var10); var33.length() > 0; var20 = var20 + var32.ascent + 1) { - var24 = var33.indexOf("
"); - if (var24 != -1) { - var44 = var33.substring(0, var24); - var33 = var33.substring(var24 + 4); - } else { - var44 = var33; - var33 = ""; - } - - 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 (var24 + var19 > var4) { - var24 = var4 - var19; - } - - if (var20 + var25 > var5) { - var25 = var5 - var20; - } - - Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); - Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); - var33 = var10.text; - var26 = var25 + var32.ascent + 2; - - for (var33 = WallDecoration.method3403(var33, var10); var33.length() > 0; var26 = var26 + var32.ascent + 1) { - int var35 = var33.indexOf("
"); - if (var35 != -1) { - var44 = var33.substring(0, var35); - var33 = var33.substring(var35 + 4); - } else { - var44 = var33; - var33 = ""; - } - - 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 { - class60.method997(var19, var20, var21, var22, var10.color, var10.lineWid); - } - } - } - } - } - } - } - } - } - } + @Export("drawScrollBar") + static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { + WorldMapElement.scrollBarSprites[0].drawAt(var0, var1); + WorldMapElement.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field736); + int var5 = var3 * (var3 - 32) / var4; + if (var5 < 8) { + var5 = 8; } + int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field737); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field739); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field739); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field739); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field739); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field694); + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field694); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field694); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var5 + var6 + var1 + 14, 15, Client.field694); } } diff --git a/runescape-client/src/main/java/Task.java b/runescape-client/src/main/java/Task.java index 39f88ba5f8..8c58bfe57c 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("fr") +@ObfuscatedName("fa") @Implements("Task") public class Task { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lfr;" + signature = "Lfa;" ) @Export("next") Task next; - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("status") public volatile int status; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -2125226355 + intValue = -681465255 ) @Export("type") int type; - @ObfuscatedName("q") + @ObfuscatedName("n") @Export("intArgument") public int intArgument; - @ObfuscatedName("z") + @ObfuscatedName("u") @Export("objectArgument") Object objectArgument; - @ObfuscatedName("t") + @ObfuscatedName("a") @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 31378aaae6..ef2ca3dc07 100644 --- a/runescape-client/src/main/java/TaskHandler.java +++ b/runescape-client/src/main/java/TaskHandler.java @@ -1,3 +1,4 @@ +import java.applet.Applet; import java.io.DataInputStream; import java.net.InetAddress; import java.net.Socket; @@ -7,37 +8,36 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fs") +@ObfuscatedName("fm") @Implements("TaskHandler") public class TaskHandler implements Runnable { - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("javaVendor") public static String javaVendor; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("javaVersion") public static String javaVersion; - @ObfuscatedName("fq") + @ObfuscatedName("jq") @ObfuscatedSignature( - signature = "Lkx;" + signature = "Lhd;" ) - @Export("fontBold12") - static Font fontBold12; - @ObfuscatedName("k") + static Widget field2066; + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lfr;" + signature = "Lfa;" ) @Export("current") Task current; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lfr;" + signature = "Lfa;" ) @Export("task") Task task; - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("thread") Thread thread; - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("isClosed") boolean isClosed; @@ -61,10 +61,10 @@ public class TaskHandler implements Runnable { this.thread.start(); } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-64" + signature = "(I)V", + garbageValue = "622783218" ) @Export("close") public final void close() { @@ -80,10 +80,10 @@ public class TaskHandler implements Runnable { } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIILjava/lang/Object;I)Lfr;", - garbageValue = "-957641141" + signature = "(IIILjava/lang/Object;I)Lfa;", + garbageValue = "962190485" ) @Export("newTask") final Task newTask(int var1, int var2, int var3, Object var4) { @@ -104,20 +104,20 @@ public class TaskHandler implements Runnable { } } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Ljava/lang/String;IB)Lfr;", - garbageValue = "-83" + signature = "(Ljava/lang/String;II)Lfa;", + garbageValue = "746026781" ) @Export("newSocketTask") public final Task newSocketTask(String var1, int var2) { return this.newTask(1, var2, 0, var1); } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Ljava/lang/Runnable;IB)Lfr;", - garbageValue = "-108" + signature = "(Ljava/lang/Runnable;II)Lfa;", + garbageValue = "2089571271" ) @Export("newThreadTask") public final Task newThreadTask(Runnable var1, int var2) { @@ -172,74 +172,393 @@ public class TaskHandler implements Runnable { } } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(CB)B", - garbageValue = "108" + signature = "(Ljava/applet/Applet;Ljava/lang/String;I)V", + garbageValue = "-1144544095" ) - @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; + public static void method3606(Applet var0, String var1) { + class60.applet = var0; + if (var1 != null) { + class60.field450 = var1; + } + + } + + @ObfuscatedName("fa") + @ObfuscatedSignature( + signature = "(Lcc;IB)V", + garbageValue = "-73" + ) + @Export("updateActorSequence") + static final void updateActorSequence(Actor var0, int var1) { + int var2; + int var3; + int var4; + SequenceDefinition var11; + if (var0.field966 >= Client.cycle) { + var2 = Math.max(1, var0.field966 - Client.cycle); + var3 = var0.field967 * 64 + var0.field995 * 128; + var4 = var0.field967 * 64 + var0.field1008 * 128; + var0.x += (var3 - var0.x) / var2; + var0.y += (var4 - var0.y) / var2; + var0.field1022 = 0; + var0.orientation = var0.field1006; + } else { + int var5; + int var7; + if (var0.field1011 >= Client.cycle) { + if (var0.field1011 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > NetSocket.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { + var2 = var0.field1011 - var0.field966; + var3 = Client.cycle - var0.field966; + var4 = var0.field967 * 64 + var0.field995 * 128; + var5 = var0.field967 * 64 + var0.field1008 * 128; + int var6 = var0.field967 * 64 + var0.field1007 * 128; + var7 = var0.field967 * 64 + var0.field1009 * 128; + var0.x = (var6 * var3 + var4 * (var2 - var3)) / var2; + var0.y = (var7 * var3 + var5 * (var2 - var3)) / var2; + } + + var0.field1022 = 0; + var0.orientation = var0.field1006; + var0.rotation = var0.orientation; + } else { + var0.movementSequence = var0.idleSequence; + if (var0.pathLength == 0) { + var0.field1022 = 0; + } else { + label550: { + if (var0.sequence != -1 && var0.sequenceDelay == 0) { + var11 = NetSocket.SequenceDefinition_get(var0.sequence); + if (var0.field1023 > 0 && var11.field3559 == 0) { + ++var0.field1022; + break label550; + } + + if (var0.field1023 <= 0 && var11.field3560 == 0) { + ++var0.field1022; + break label550; + } + } + + var2 = var0.x; + var3 = var0.y; + var4 = var0.field967 * 64 + var0.pathX[var0.pathLength - 1] * 128; + var5 = var0.field967 * 64 + var0.pathY[var0.pathLength - 1] * 128; + 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 var14 = 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.orientation != var0.rotation && var0.targetIndex == -1 && var0.field1017 != 0) { + var9 = 2; + } + + if (var0.pathLength > 2) { + var9 = 6; + } + + if (var0.pathLength > 3) { + var9 = 8; + } + + if (var0.field1022 > 0 && var0.pathLength > 1) { + var9 = 8; + --var0.field1022; + } + } else { + if (var0.pathLength > 1) { + var9 = 6; + } + + if (var0.pathLength > 2) { + var9 = 8; + } + + if (var0.field1022 > 0 && var0.pathLength > 1) { + var9 = 8; + --var0.field1022; + } + } + + if (var14 == 2) { + var9 <<= 1; + } + + if (var9 >= 8 && var0.walkSequence == var0.movementSequence && var0.runSequence != -1) { + var0.movementSequence = var0.runSequence; + } + + if (var4 != var2 || var3 != var5) { + 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.field1023 > 0) { + --var0.field1023; + } + } + } else { + var0.x = var4; + var0.y = var5; + --var0.pathLength; + if (var0.field1023 > 0) { + --var0.field1023; + } + } + } + } + } + } + + if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { + var0.sequence = -1; + var0.spotAnimation = -1; + var0.field966 = 0; + var0.field1011 = 0; + var0.x = var0.pathX[0] * 128 + var0.field967 * 64; + var0.y = var0.pathY[0] * 128 + var0.field967 * 64; + var0.method1810(); + } + + if (class60.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { + var0.sequence = -1; + var0.spotAnimation = -1; + var0.field966 = 0; + var0.field1011 = 0; + var0.x = var0.pathX[0] * 128 + var0.field967 * 64; + var0.y = var0.field967 * 64 + var0.pathY[0] * 128; + var0.method1810(); + } + + if (var0.field1017 != 0) { + if (var0.targetIndex != -1) { + Object var15 = null; + if (var0.targetIndex < 32768) { + var15 = Client.npcs[var0.targetIndex]; + } else if (var0.targetIndex >= 32768) { + var15 = Client.players[var0.targetIndex - 32768]; + } + + if (var15 != null) { + var3 = var0.x - ((Actor)var15).x; + var4 = var0.y - ((Actor)var15).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.field992 != -1 && (var0.pathLength == 0 || var0.field1022 > 0)) { + var0.orientation = var0.field992; + var0.field992 = -1; + } + + var2 = var0.orientation - var0.rotation & 2047; + if (var2 == 0 && var0.false0) { + var0.targetIndex = -1; + var0.false0 = false; + } + + if (var2 != 0) { + ++var0.field1016; + boolean var13; + if (var2 > 1024) { + var0.rotation -= var0.field1017; + var13 = true; + if (var2 < var0.field1017 || var2 > 2048 - var0.field1017) { + var0.rotation = var0.orientation; + var13 = false; + } + + if (var0.movementSequence == var0.idleSequence && (var0.field1016 > 25 || var13)) { + if (var0.turnLeftSequence != -1) { + var0.movementSequence = var0.turnLeftSequence; + } else { + var0.movementSequence = var0.walkSequence; + } + } + } else { + var0.rotation += var0.field1017; + var13 = true; + if (var2 < var0.field1017 || var2 > 2048 - var0.field1017) { + var0.rotation = var0.orientation; + var13 = false; + } + + if (var0.movementSequence == var0.idleSequence && (var0.field1016 > 25 || var13)) { + if (var0.turnRightSequence != -1) { + var0.movementSequence = var0.turnRightSequence; + } else { + var0.movementSequence = var0.walkSequence; + } + } + } + + var0.rotation &= 2047; + } else { + var0.field1016 = 0; + } + } + + var0.isWalking = false; + if (var0.movementSequence != -1) { + var11 = NetSocket.SequenceDefinition_get(var0.movementSequence); + if (var11 != null && var11.frameIds != null) { + ++var0.movementFrameCycle; + if (var0.movementFrame < var11.frameIds.length && var0.movementFrameCycle > var11.frameLengths[var0.movementFrame]) { + var0.movementFrameCycle = 1; + ++var0.movementFrame; + GrandExchangeOfferOwnWorldComparator.addSequenceSoundEffect(var11, var0.movementFrame, var0.x, var0.y); + } + + if (var0.movementFrame >= var11.frameIds.length) { + var0.movementFrameCycle = 0; + var0.movementFrame = 0; + GrandExchangeOfferOwnWorldComparator.addSequenceSoundEffect(var11, var0.movementFrame, var0.x, var0.y); + } + } else { + var0.movementSequence = -1; + } + } + + if (var0.spotAnimation != -1 && Client.cycle >= var0.field987) { + if (var0.spotAnimationFrame < 0) { + var0.spotAnimationFrame = 0; + } + + var2 = class4.SpotAnimationDefinition_get(var0.spotAnimation).sequence; + if (var2 != -1) { + SequenceDefinition var12 = NetSocket.SequenceDefinition_get(var2); + if (var12 != null && var12.frameIds != null) { + ++var0.spotAnimationFrameCycle; + if (var0.spotAnimationFrame < var12.frameIds.length && var0.spotAnimationFrameCycle > var12.frameLengths[var0.spotAnimationFrame]) { + var0.spotAnimationFrameCycle = 1; + ++var0.spotAnimationFrame; + GrandExchangeOfferOwnWorldComparator.addSequenceSoundEffect(var12, var0.spotAnimationFrame, var0.x, var0.y); + } + + if (var0.spotAnimationFrame >= var12.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var12.frameIds.length)) { + var0.spotAnimation = -1; + } + } else { + var0.spotAnimation = -1; + } + } else { + var0.spotAnimation = -1; + } + } + + if (var0.sequence != -1 && var0.sequenceDelay <= 1) { + var11 = NetSocket.SequenceDefinition_get(var0.sequence); + if (var11.field3559 == 1 && var0.field1023 > 0 && var0.field966 <= Client.cycle && var0.field1011 < Client.cycle) { + var0.sequenceDelay = 1; + return; + } + } + + if (var0.sequence != -1 && var0.sequenceDelay == 0) { + var11 = NetSocket.SequenceDefinition_get(var0.sequence); + if (var11 != null && var11.frameIds != null) { + ++var0.sequenceFrameCycle; + if (var0.sequenceFrame < var11.frameIds.length && var0.sequenceFrameCycle > var11.frameLengths[var0.sequenceFrame]) { + var0.sequenceFrameCycle = 1; + ++var0.sequenceFrame; + GrandExchangeOfferOwnWorldComparator.addSequenceSoundEffect(var11, var0.sequenceFrame, var0.x, var0.y); + } + + if (var0.sequenceFrame >= var11.frameIds.length) { + var0.sequenceFrame -= var11.frameCount; + ++var0.field1000; + if (var0.field1000 >= var11.field3562) { + var0.sequence = -1; + } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var11.frameIds.length) { + GrandExchangeOfferOwnWorldComparator.addSequenceSoundEffect(var11, var0.sequenceFrame, var0.x, var0.y); + } else { + var0.sequence = -1; + } + } + + var0.isWalking = var11.field3558; + } else { + var0.sequence = -1; + } + } + + if (var0.sequenceDelay > 0) { + --var0.sequenceDelay; } - return var1; } } diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java index ddc39a4746..550cb52a28 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("et") +@ObfuscatedName("eo") @Implements("Texture") public class Texture extends Node { - @ObfuscatedName("h") + @ObfuscatedName("k") @Export("Texture_animatedPixels") static int[] Texture_animatedPixels; - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("averageRGB") int averageRGB; - @ObfuscatedName("v") - boolean field1638; - @ObfuscatedName("q") + @ObfuscatedName("g") + boolean field1650; + @ObfuscatedName("n") @Export("fileIds") int[] fileIds; + @ObfuscatedName("u") + int[] field1652; + @ObfuscatedName("a") + int[] field1653; @ObfuscatedName("z") - int[] field1640; - @ObfuscatedName("t") - int[] field1633; - @ObfuscatedName("e") - int[] field1634; - @ObfuscatedName("s") + int[] field1654; + @ObfuscatedName("w") @Export("animationDirection") int animationDirection; - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("animationSpeed") int animationSpeed; - @ObfuscatedName("n") + @ObfuscatedName("c") @Export("pixels") int[] pixels; - @ObfuscatedName("u") + @ObfuscatedName("h") @Export("isLoaded") boolean isLoaded; @ObfuscatedSignature( - signature = "(Lkb;)V" + signature = "(Lkn;)V" ) Texture(Buffer var1) { this.isLoaded = false; this.averageRGB = var1.readUnsignedShort(); - this.field1638 = var1.readUnsignedByte() == 1; + this.field1650 = 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.field1640 = new int[var2 - 1]; + this.field1652 = new int[var2 - 1]; for (var3 = 0; var3 < var2 - 1; ++var3) { - this.field1640[var3] = var1.readUnsignedByte(); + this.field1652[var3] = var1.readUnsignedByte(); } } if (var2 > 1) { - this.field1633 = new int[var2 - 1]; + this.field1653 = new int[var2 - 1]; for (var3 = 0; var3 < var2 - 1; ++var3) { - this.field1633[var3] = var1.readUnsignedByte(); + this.field1653[var3] = var1.readUnsignedByte(); } } - this.field1634 = new int[var2]; + this.field1654 = new int[var2]; for (var3 = 0; var3 < var2; ++var3) { - this.field1634[var3] = var1.readInt(); + this.field1654[var3] = var1.readInt(); } this.animationDirection = var1.readUnsignedByte(); @@ -82,9 +82,9 @@ public class Texture extends Node { } } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(DILiy;)Z" + signature = "(DILic;)Z" ) @Export("load") boolean load(double var1, int var3, AbstractArchive var4) { @@ -99,55 +99,71 @@ public class Texture extends Node { this.pixels = new int[var5]; for (int var6 = 0; var6 < this.fileIds.length; ++var6) { - IndexedSprite var7 = class322.method5972(var4, this.fileIds[var6]); + int var8 = this.fileIds[var6]; + byte[] var10 = var4.takeFileFlat(var8); + boolean var9; + if (var10 == null) { + var9 = false; + } else { + class3.SpriteBuffer_decode(var10); + var9 = true; + } + + IndexedSprite var7; + if (!var9) { + var7 = null; + } else { + var7 = AttackOption.method2173(); + } + var7.normalize(); - byte[] var8 = var7.pixels; - int[] var9 = var7.palette; - int var10 = this.field1634[var6]; - if ((var10 & -16777216) == 16777216) { + var10 = var7.pixels; + int[] var11 = var7.palette; + int var12 = this.field1654[var6]; + if ((var12 & -16777216) == 16777216) { } - if ((var10 & -16777216) == 33554432) { + if ((var12 & -16777216) == 33554432) { } - int var11; - int var12; int var13; int var14; - if ((var10 & -16777216) == 50331648) { - var11 = var10 & 16711935; - var12 = var10 >> 8 & 255; + int var15; + int var16; + if ((var12 & -16777216) == 50331648) { + var13 = var12 & 16711935; + var14 = var12 >> 8 & 255; - for (var13 = 0; var13 < var9.length; ++var13) { - var14 = var9[var13]; - if (var14 >> 8 == (var14 & 65535)) { - var14 &= 255; - var9[var13] = var11 * var14 >> 8 & 16711935 | var12 * var14 & 65280; + for (var15 = 0; var15 < var11.length; ++var15) { + var16 = var11[var15]; + if (var16 >> 8 == (var16 & 65535)) { + var16 &= 255; + var11[var15] = var13 * var16 >> 8 & 16711935 | var14 * var16 & 65280; } } } - for (var11 = 0; var11 < var9.length; ++var11) { - var9[var11] = Rasterizer3D.Rasterizer3D_brighten(var9[var11], var1); + for (var13 = 0; var13 < var11.length; ++var13) { + var11[var13] = Rasterizer3D.Rasterizer3D_brighten(var11[var13], var1); } if (var6 == 0) { - var11 = 0; + var13 = 0; } else { - var11 = this.field1640[var6 - 1]; + var13 = this.field1652[var6 - 1]; } - if (var11 == 0) { + if (var13 == 0) { if (var3 == var7.subWidth) { - for (var12 = 0; var12 < var5; ++var12) { - this.pixels[var12] = var9[var8[var12] & 255]; + for (var14 = 0; var14 < var5; ++var14) { + this.pixels[var14] = var11[var10[var14] & 255]; } } else if (var7.subWidth == 64 && var3 == 128) { - var12 = 0; + var14 = 0; - for (var13 = 0; var13 < var3; ++var13) { - for (var14 = 0; var14 < var3; ++var14) { - this.pixels[var12++] = var9[var8[(var13 >> 1 << 6) + (var14 >> 1)] & 255]; + for (var15 = 0; var15 < var3; ++var15) { + for (var16 = 0; var16 < var3; ++var16) { + this.pixels[var14++] = var11[var10[(var15 >> 1 << 6) + (var16 >> 1)] & 255]; } } } else { @@ -155,36 +171,36 @@ public class Texture extends Node { throw new RuntimeException(); } - var12 = 0; + var14 = 0; - for (var13 = 0; var13 < var3; ++var13) { - for (var14 = 0; var14 < var3; ++var14) { - this.pixels[var12++] = var9[var8[(var14 << 1) + (var13 << 1 << 7)] & 255]; + for (var15 = 0; var15 < var3; ++var15) { + for (var16 = 0; var16 < var3; ++var16) { + this.pixels[var14++] = var11[var10[(var16 << 1) + (var15 << 1 << 7)] & 255]; } } } } - if (var11 == 1) { + if (var13 == 1) { } - if (var11 == 2) { + if (var13 == 2) { } - if (var11 == 3) { + if (var13 == 3) { } } return true; } - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("reset") void reset() { this.pixels = null; } - @ObfuscatedName("k") + @ObfuscatedName("q") @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 43ef95f519..bf0e426e64 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("eu") +@ObfuscatedName("ey") @Implements("TextureLoader") public interface TextureLoader { - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(II)[I", - garbageValue = "-1464136827" + garbageValue = "1948753683" ) @Export("getTexturePixels") int[] getTexturePixels(int var1); - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IS)I", - garbageValue = "-26354" + signature = "(II)I", + garbageValue = "1038437362" ) @Export("getAverageTextureRGB") int getAverageTextureRGB(int var1); - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "19136776" + signature = "(IB)Z", + garbageValue = "54" ) - boolean vmethod3388(int var1); + boolean vmethod3404(int var1); - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "649013843" + signature = "(IB)Z", + garbageValue = "18" ) @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 0e70bf808a..ff9dee7566 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -3,63 +3,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("di") +@ObfuscatedName("du") @Implements("TextureProvider") public class TextureProvider implements TextureLoader { - @ObfuscatedName("rl") - @ObfuscatedGetter( - intValue = -726366613 - ) - static int field1549; - @ObfuscatedName("sy") - @ObfuscatedGetter( - intValue = 33349477 - ) - @Export("foundItemIdCount") - static int foundItemIdCount; - @ObfuscatedName("x") + @ObfuscatedName("y") + @Export("Tiles_lightness") + static int[] Tiles_lightness; + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "[Let;" + signature = "[Leo;" ) @Export("textures") Texture[] textures; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Ljh;" + signature = "Ljp;" ) @Export("deque") NodeDeque deque; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1467645999 + intValue = 1950202761 ) @Export("capacity") int capacity; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 2063974961 + intValue = 742782017 ) @Export("remaining") int remaining; - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("brightness") double brightness; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 499295403 + intValue = -1900729685 ) @Export("textureSize") int textureSize; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Liy;" + signature = "Lic;" ) @Export("archive") AbstractArchive archive; @ObfuscatedSignature( - signature = "(Liy;Liy;IDI)V" + signature = "(Lic;Lic;IDI)V" ) public TextureProvider(AbstractArchive var1, AbstractArchive var2, int var3, double var4, int var6) { this.deque = new NodeDeque(); @@ -82,10 +75,10 @@ public class TextureProvider implements TextureLoader { } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1161894618" + garbageValue = "-1846975444" ) @Export("getLoadedPercentage") public int getLoadedPercentage() { @@ -101,7 +94,7 @@ public class TextureProvider implements TextureLoader { for (int var7 = 0; var7 < var6.length; ++var7) { int var8 = var6[var7]; - if (this.archive.method4251(var8)) { + if (this.archive.method4359(var8)) { ++var2; } } @@ -115,17 +108,17 @@ public class TextureProvider implements TextureLoader { } } - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("setBrightness") public void setBrightness(double var1) { this.brightness = var1; this.clear(); } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(II)[I", - garbageValue = "-1464136827" + garbageValue = "1948753683" ) @Export("getTexturePixels") public int[] getTexturePixels(int var1) { @@ -155,39 +148,39 @@ public class TextureProvider implements TextureLoader { return null; } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IS)I", - garbageValue = "-26354" + signature = "(II)I", + garbageValue = "1038437362" ) @Export("getAverageTextureRGB") public int getAverageTextureRGB(int var1) { return this.textures[var1] != null ? this.textures[var1].averageRGB : 0; } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "19136776" + signature = "(IB)Z", + garbageValue = "54" ) - public boolean vmethod3388(int var1) { - return this.textures[var1].field1638; + public boolean vmethod3404(int var1) { + return this.textures[var1].field1650; } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "649013843" + signature = "(IB)Z", + garbageValue = "18" ) @Export("isLowDetail") public boolean isLowDetail(int var1) { return this.textureSize == 64; } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1982258351" + garbageValue = "-426854674" ) @Export("clear") public void clear() { @@ -201,10 +194,10 @@ public class TextureProvider implements TextureLoader { this.remaining = this.capacity; } - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "2066840456" + garbageValue = "245586965" ) @Export("animate") public void animate(int var1) { @@ -217,4 +210,248 @@ public class TextureProvider implements TextureLoader { } } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + signature = "(ILcs;ZI)I", + garbageValue = "1729691421" + ) + static int method2888(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.OC_NAME) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = KitDefinition.ItemDefinition_get(var3).name; + return 1; + } else { + int var4; + ItemDefinition var5; + if (var0 == ScriptOpcodes.OC_OP) { + UrlRequester.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + var5 = KitDefinition.ItemDefinition_get(var3); + if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_IOP) { + UrlRequester.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + var5 = KitDefinition.ItemDefinition_get(var3); + if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_COST) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = KitDefinition.ItemDefinition_get(var3).price; + return 1; + } else if (var0 == ScriptOpcodes.OC_STACKABLE) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = KitDefinition.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; + return 1; + } else { + ItemDefinition var6; + if (var0 == ScriptOpcodes.OC_CERT) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + var6 = KitDefinition.ItemDefinition_get(var3); + if (var6.noteTemplate == -1 && var6.note >= 0) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var6.note; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_UNCERT) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + var6 = KitDefinition.ItemDefinition_get(var3); + if (var6.noteTemplate >= 0 && var6.note >= 0) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var6.note; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_MEMBERS) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = KitDefinition.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + var6 = KitDefinition.ItemDefinition_get(var3); + if (var6.placeholderTemplate == -1 && var6.placeholder >= 0) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var6.placeholder; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + var6 = KitDefinition.ItemDefinition_get(var3); + if (var6.placeholderTemplate >= 0 && var6.placeholder >= 0) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var6.placeholder; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } else if (var0 == ScriptOpcodes.OC_FIND) { + String var7 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + SpriteMask.findItemDefinitions(var7, var4 == 1); + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = TileItemPile.foundItemIdCount; + return 1; + } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { + if (var0 == ScriptOpcodes.OC_FINDRESET) { + ArchiveLoader.foundItemIndex = 0; + return 1; + } else { + return 2; + } + } else { + if (WorldMapScaleHandler.foundItemIds != null && ArchiveLoader.foundItemIndex < TileItemPile.foundItemIdCount) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = WorldMapScaleHandler.foundItemIds[++ArchiveLoader.foundItemIndex - 1] & '\uffff'; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; + } + + return 1; + } + } + } + } + + @ObfuscatedName("bc") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)I", + garbageValue = "1974416966" + ) + public static int method2873(String var0) { + return var0.length() + 2; + } + + @ObfuscatedName("gz") + @ObfuscatedSignature( + signature = "(IIZB)V", + garbageValue = "-64" + ) + static final void method2900(int var0, int var1, boolean var2) { + if (!var2 || var0 != WorldMapCacheName.field328 || class22.field104 != var1) { + WorldMapCacheName.field328 = var0; + class22.field104 = var1; + ClientPreferences.updateGameState(25); + ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait.", true); + int var3 = class182.baseX; + int var4 = SecureRandomFuture.baseY; + class182.baseX = (var0 - 6) * 8; + SecureRandomFuture.baseY = (var1 - 6) * 8; + int var5 = class182.baseX - var3; + int var6 = SecureRandomFuture.baseY - var4; + var3 = class182.baseX; + var4 = SecureRandomFuture.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; + } + + 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; + } + + var21.x -= var5 * 128; + 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; var18 != var13; var13 += var22) { + for (var14 = var10; var11 != var14; var14 += var12) { + int var15 = var13 + var5; + int var16 = var6 + var14; + + for (int var17 = 0; var17 < 4; ++var17) { + if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { + Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; + } else { + Client.groundItems[var17][var13][var14] = null; + } + } + } + } + + for (PendingSpawn 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; + MouseHandler.cameraX -= var5 << 7; + ObjectSound.cameraZ -= var6 << 7; + class225.oculusOrbFocalPointX -= var5 << 7; + HealthBarDefinition.oculusOrbFocalPointY -= var6 << 7; + Client.field937 = -1; + Client.graphicsObjects.clear(); + Client.projectiles.clear(); + + for (var14 = 0; var14 < 4; ++var14) { + Client.collisionMaps[var14].clear(); + } + + } + } } diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java index 6738249166..73ab6a33f9 100644 --- a/runescape-client/src/main/java/Tile.java +++ b/runescape-client/src/main/java/Tile.java @@ -4,129 +4,135 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eq") +@ObfuscatedName("ea") @Implements("Tile") public final class Tile extends Node { - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 1748623045 + @ObfuscatedName("df") + @ObfuscatedSignature( + signature = "Lig;" ) - @Export("y") - int y; + @Export("archive9") + static Archive archive9; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1599333141 + intValue = 7067627 ) @Export("plane") int plane; - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 109834917 + intValue = 1147939477 ) @Export("x") int x; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1556991301 + intValue = -646787087 + ) + @Export("y") + int y; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = -250018079 ) @Export("originalPlane") int originalPlane; - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lev;" - ) - @Export("paint") - TilePaint paint; - @ObfuscatedName("v") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "Lex;" ) + @Export("paint") + TilePaint paint; + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "Lej;" + ) @Export("model") TileModel model; - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "Lep;" - ) - @Export("boundaryObject") - BoundaryObject boundaryObject; - @ObfuscatedName("z") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "Lez;" ) + @Export("boundaryObject") + BoundaryObject boundaryObject; + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Lep;" + ) @Export("wallDecoration") WallDecoration wallDecoration; - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Leo;" + signature = "Leu;" ) @Export("floorDecoration") FloorDecoration floorDecoration; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Ldn;" + signature = "Ldj;" ) @Export("tileItemPile") TileItemPile tileItemPile; - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -540738689 + intValue = -149176885 ) @Export("gameObjectsCount") int gameObjectsCount; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "[Lek;" + signature = "[Lev;" ) @Export("gameObjects") GameObject[] gameObjects; - @ObfuscatedName("n") + @ObfuscatedName("c") @Export("gameObjectEdgeMasks") int[] gameObjectEdgeMasks; - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1811636757 + intValue = -1097023535 ) @Export("gameObjectsEdgeMask") int gameObjectsEdgeMask; - @ObfuscatedName("h") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1955523497 + intValue = 432677957 ) @Export("minPlane") int minPlane; - @ObfuscatedName("g") + @ObfuscatedName("r") @Export("drawPrimary") boolean drawPrimary; - @ObfuscatedName("i") + @ObfuscatedName("s") @Export("drawSecondary") boolean drawSecondary; - @ObfuscatedName("a") + @ObfuscatedName("v") @Export("drawGameObjects") boolean drawGameObjects; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -566961841 + intValue = -1728513867 ) @Export("drawGameObjectEdges") int drawGameObjectEdges; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = 1085148465 + ) + int field1690; @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1786439481 + intValue = -1172057717 ) - int field1678; - @ObfuscatedName("r") + int field1691; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 340621657 + intValue = -881770719 ) - int field1679; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -596765939 - ) - int field1680; - @ObfuscatedName("c") + int field1692; + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "Leq;" + signature = "Lea;" ) @Export("linkedBelowTile") Tile linkedBelowTile; @@ -140,215 +146,22 @@ public final class Tile extends Node { this.y = var3; } - @ObfuscatedName("gg") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-628211228" + signature = "(B)Lgj;", + garbageValue = "3" ) - static final void method2961() { - int var0; - int var1; - int var2; - int var3; - int var4; - int var5; - if (Client.oculusOrbState == 0) { - var0 = ByteArrayPool.localPlayer.x; - var1 = ByteArrayPool.localPlayer.y; - if (SoundSystem.oculusOrbFocalPointX - var0 < -500 || SoundSystem.oculusOrbFocalPointX - var0 > 500 || ServerPacket.oculusOrbFocalPointY - var1 < -500 || ServerPacket.oculusOrbFocalPointY - var1 > 500) { - SoundSystem.oculusOrbFocalPointX = var0; - ServerPacket.oculusOrbFocalPointY = var1; - } - - if (var0 != SoundSystem.oculusOrbFocalPointX) { - SoundSystem.oculusOrbFocalPointX += (var0 - SoundSystem.oculusOrbFocalPointX) / 16; - } - - if (var1 != ServerPacket.oculusOrbFocalPointY) { - ServerPacket.oculusOrbFocalPointY += (var1 - ServerPacket.oculusOrbFocalPointY) / 16; - } - - var2 = SoundSystem.oculusOrbFocalPointX >> 7; - var3 = ServerPacket.oculusOrbFocalPointY >> 7; - var4 = class277.getTileHeight(SoundSystem.oculusOrbFocalPointX, ServerPacket.oculusOrbFocalPointY, ScriptEvent.Client_plane); - var5 = 0; - int var6; - if (var2 > 3 && var3 > 3 && var2 < 100 && var3 < 100) { - for (var6 = var2 - 4; var6 <= var2 + 4; ++var6) { - for (int var7 = var3 - 4; var7 <= var3 + 4; ++var7) { - int var8 = ScriptEvent.Client_plane; - if (var8 < 3 && (Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) { - ++var8; - } - - int var9 = var4 - Tiles.Tiles_heights[var8][var6][var7]; - if (var9 > var5) { - var5 = var9; - } - } - } - } - - var6 = var5 * 192; - if (var6 > 98048) { - var6 = 98048; - } - - if (var6 < 32768) { - var6 = 32768; - } - - if (var6 > Client.field941) { - Client.field941 += (var6 - Client.field941) / 24; - } else if (var6 < Client.field941) { - Client.field941 += (var6 - Client.field941) / 80; - } - - Client.field756 = class277.getTileHeight(ByteArrayPool.localPlayer.x, ByteArrayPool.localPlayer.y, ScriptEvent.Client_plane) - Client.camFollowHeight; - } else if (Client.oculusOrbState == 1) { - if (Client.field770 && ByteArrayPool.localPlayer != null) { - var0 = ByteArrayPool.localPlayer.pathX[0]; - var1 = ByteArrayPool.localPlayer.pathY[0]; - if (var0 >= 0 && var1 >= 0 && var0 < 104 && var1 < 104) { - SoundSystem.oculusOrbFocalPointX = ByteArrayPool.localPlayer.x; - var2 = class277.getTileHeight(ByteArrayPool.localPlayer.x, ByteArrayPool.localPlayer.y, ScriptEvent.Client_plane) - Client.camFollowHeight; - if (var2 < Client.field756) { - Client.field756 = var2; - } - - ServerPacket.oculusOrbFocalPointY = ByteArrayPool.localPlayer.y; - Client.field770 = false; - } - } - - short var10 = -1; - if (KeyHandler.KeyHandler_pressedKeys[33]) { - var10 = 0; - } else if (KeyHandler.KeyHandler_pressedKeys[49]) { - var10 = 1024; - } - - if (KeyHandler.KeyHandler_pressedKeys[48]) { - if (var10 == 0) { - var10 = 1792; - } else if (var10 == 1024) { - var10 = 1280; - } else { - var10 = 1536; - } - } else if (KeyHandler.KeyHandler_pressedKeys[50]) { - if (var10 == 0) { - var10 = 256; - } else if (var10 == 1024) { - var10 = 768; - } else { - var10 = 512; - } - } - - byte var11 = 0; - if (KeyHandler.KeyHandler_pressedKeys[35]) { - var11 = -1; - } else if (KeyHandler.KeyHandler_pressedKeys[51]) { - var11 = 1; - } - - var2 = 0; - if (var10 >= 0 || var11 != 0) { - var2 = KeyHandler.KeyHandler_pressedKeys[81] ? Client.oculusOrbSlowedSpeed * -493333163 * 145031165 : Client.oculusOrbNormalSpeed * -720897331 * -412319227; - var2 *= 16; - Client.field724 = var10; - Client.field759 = var11; - } - - if (Client.field757 < var2) { - Client.field757 += var2 / 8; - if (Client.field757 > var2) { - Client.field757 = var2; - } - } else if (Client.field757 > var2) { - Client.field757 = Client.field757 * 9 / 10; - } - - if (Client.field757 > 0) { - var3 = Client.field757 / 16; - if (Client.field724 >= 0) { - var0 = Client.field724 - WorldMapIcon_1.cameraYaw & 2047; - var4 = Rasterizer3D.Rasterizer3D_sine[var0]; - var5 = Rasterizer3D.Rasterizer3D_cosine[var0]; - SoundSystem.oculusOrbFocalPointX += var4 * var3 / 65536; - ServerPacket.oculusOrbFocalPointY += var5 * var3 / 65536; - } - - if (Client.field759 != 0) { - Client.field756 += var3 * Client.field759; - if (Client.field756 > 0) { - Client.field756 = 0; - } - } - } else { - Client.field724 = -1; - Client.field759 = -1; - } - - if (KeyHandler.KeyHandler_pressedKeys[13]) { - Client.packetWriter.addNode(FaceNormal.getPacketBufferNode(ClientPacket.field2306, Client.packetWriter.isaacCipher)); - Client.oculusOrbState = 0; - } - } - - if (MouseHandler.MouseHandler_currentButton == 4 && class217.mouseCam) { - var0 = MouseHandler.MouseHandler_y - Client.mouseCamClickedY; - Client.camAngleDX = var0 * 2; - Client.mouseCamClickedY = var0 != -1 && var0 != 1 ? (Client.mouseCamClickedY + MouseHandler.MouseHandler_y) / 2 : MouseHandler.MouseHandler_y * -1802673633 * 1852676575; - 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 * 9279483 * 178641715; + public static PacketBufferNode method2990() { + PacketBufferNode var0; + if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { + var0 = new PacketBufferNode(); } 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; + var0 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; } - 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; - } - - } - - @ObfuscatedName("hu") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "109" - ) - @Export("addCancelMenuEntry") - static void addCancelMenuEntry() { - AbstractByteArrayCopier.method4023(); - Client.menuActions[0] = "Cancel"; - Client.menuTargets[0] = ""; - Client.menuOpcodes[0] = 1006; - Client.menuShiftClick[0] = false; - Client.menuOptionsCount = 1; + var0.clientPacket = null; + var0.clientPacketLength = 0; + var0.packetBuffer = new PacketBuffer(5000); + return var0; } } diff --git a/runescape-client/src/main/java/TileItem.java b/runescape-client/src/main/java/TileItem.java index b220a1bcc4..d215d4965d 100644 --- a/runescape-client/src/main/java/TileItem.java +++ b/runescape-client/src/main/java/TileItem.java @@ -7,21 +7,15 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("cf") @Implements("TileItem") public final class TileItem extends Entity { - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lag;" - ) - @Export("worldMapEvent") - static WorldMapEvent worldMapEvent; - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 809859925 + intValue = 2027317293 ) @Export("id") int id; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1293976509 + intValue = -1677245385 ) @Export("quantity") int quantity; @@ -29,13 +23,113 @@ public final class TileItem extends Entity { TileItem() { } - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(I)Lel;", - garbageValue = "480835067" + signature = "(I)Lef;", + garbageValue = "1832696685" ) @Export("getModel") protected final Model getModel() { - return AbstractWorldMapData.ItemDefinition_get(this.id).getModel(this.quantity); + return KitDefinition.ItemDefinition_get(this.id).getModel(this.quantity); + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(Lic;II)Lhi;", + garbageValue = "-1379318821" + ) + static MusicPatch method2255(AbstractArchive var0, int var1) { + byte[] var2 = var0.takeFileFlat(var1); + return var2 == null ? null : new MusicPatch(var2); + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(Lic;B)V", + garbageValue = "14" + ) + public static void method2256(AbstractArchive var0) { + VarpDefinition.VarpDefinition_archive = var0; + VarpDefinition.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + signature = "(CI)Z", + garbageValue = "16711935" + ) + @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("k") + @ObfuscatedSignature( + signature = "(II)I", + garbageValue = "-145657229" + ) + public static int method2259(int var0) { + if (var0 > 0) { + return 1; + } else { + return var0 < 0 ? -1 : 0; + } + } + + @ObfuscatedName("fs") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "748561937" + ) + static final void method2260() { + int var0 = Players.Players_count; + int[] var1 = Players.Players_indices; + + for (int var2 = 0; var2 < var0; ++var2) { + Player var3 = Client.players[var1[var2]]; + if (var3 != null) { + TaskHandler.updateActorSequence(var3, 1); + } + } + + } + + @ObfuscatedName("gp") + @ObfuscatedSignature( + signature = "(IIIIIIIIII)V", + garbageValue = "393644147" + ) + @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; + MusicPatchNode2.method3819(var9); + Client.pendingSpawns.addFirst(var9); + } + + var9.id = var4; + var9.field962 = var5; + var9.orientation = var6; + var9.delay = var7; + var9.hitpoints = var8; } } diff --git a/runescape-client/src/main/java/TileItemPile.java b/runescape-client/src/main/java/TileItemPile.java index bc0cd5a173..ea68e52239 100644 --- a/runescape-client/src/main/java/TileItemPile.java +++ b/runescape-client/src/main/java/TileItemPile.java @@ -1,61 +1,332 @@ +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("dn") +@ObfuscatedName("dj") @Implements("TileItemPile") public final class TileItemPile { - @ObfuscatedName("x") + @ObfuscatedName("sa") @ObfuscatedGetter( - intValue = -626858235 + intValue = 1773920485 ) - @Export("y") - int y; + @Export("foundItemIdCount") + static int foundItemIdCount; + @ObfuscatedName("al") + @Export("null_string") + protected static String null_string; + @ObfuscatedName("kc") + @ObfuscatedGetter( + intValue = -1785150485 + ) + @Export("Client_plane") + static int Client_plane; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lee;" + signature = "Lel;" ) @Export("second") Entity second; - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1402854643 + intValue = 1942211729 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -921383543 + intValue = 548225741 ) @Export("x") int x; - @ObfuscatedName("w") + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 1448931095 + ) + @Export("y") + int y; + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Lee;" + signature = "Lel;" ) @Export("first") Entity first; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lee;" + signature = "Lel;" ) @Export("third") Entity third; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedGetter( - longValue = 1345007712428644829L + longValue = 8936593533857120715L ) @Export("tag") long tag; - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -720251669 + intValue = 1184518539 ) @Export("height") int height; TileItemPile() { } + + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;S)Ljava/lang/String;", + garbageValue = "256" + ) + public static String method2903(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 = class296.method5464(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("r") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)V", + garbageValue = "1884532154" + ) + static final void method2904(String var0) { + StringBuilder var10000 = new StringBuilder(); + Object var10001 = null; + var10000 = var10000.append("Please remove ").append(var0); + var10001 = null; + String var1 = var10000.append(" from your friend list first").toString(); + ObjectSound.addGameMessage(30, "", var1); + } + + @ObfuscatedName("am") + @ObfuscatedSignature( + signature = "(ILcs;ZS)I", + garbageValue = "1024" + ) + static int method2902(int var0, Script var1, boolean var2) { + String var3; + int var4; + if (var0 == ScriptOpcodes.APPEND_NUM) { + var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3 + var4; + return 1; + } else { + String var9; + if (var0 == ScriptOpcodes.APPEND) { + WorldMapEvent.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[WorldMapEvent.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[WorldMapEvent.Interpreter_stringStackSize + 1]; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3 + var9; + return 1; + } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { + var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3 + class298.intToString(var4, true); + return 1; + } else if (var0 == ScriptOpcodes.LOWERCASE) { + var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3.toLowerCase(); + return 1; + } else { + int var6; + int var10; + if (var0 == ScriptOpcodes.FROMDATE) { + var10 = Interpreter.Interpreter_intStack[--UrlRequester.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[++WorldMapEvent.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[--UrlRequester.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = Integer.toString(var10); + return 1; + } else if (var0 == ScriptOpcodes.COMPARE) { + WorldMapEvent.Interpreter_stringStackSize -= 2; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = TileItem.method2259(FriendLoginUpdate.compareStrings(Interpreter.Interpreter_stringStack[WorldMapEvent.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[WorldMapEvent.Interpreter_stringStackSize + 1], UserComparator9.clientLanguage)); + return 1; + } else { + int var5; + byte[] var13; + Font var14; + if (var0 == ScriptOpcodes.PARAHEIGHT) { + var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; + UrlRequester.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + var13 = GameBuild.archive13.takeFile(var5, 0); + var14 = new Font(var13); + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var14.lineCount(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.PARAWIDTH) { + var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; + UrlRequester.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + var13 = GameBuild.archive13.takeFile(var5, 0); + var14 = new Font(var13); + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var14.lineWidth(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { + WorldMapEvent.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[WorldMapEvent.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[WorldMapEvent.Interpreter_stringStackSize + 1]; + if (Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1) { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3; + } else { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var9; + } + + return 1; + } else if (var0 == ScriptOpcodes.ESCAPE) { + var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); + return 1; + } else if (var0 == ScriptOpcodes.APPEND_CHAR) { + var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3 + (char)var4; + return 1; + } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { + var10 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = TileItem.isCharPrintable((char)var10) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { + var10 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Varps.isAlphaNumeric((char)var10) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { + var10 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = GameObject.isCharAlphabetic((char)var10) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { + var10 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = class296.isDigit((char)var10) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.STRING_LENGTH) { + var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; + if (var3 != null) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.length(); + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.SUBSTRING) { + var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; + UrlRequester.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3.substring(var4, var5); + return 1; + } else if (var0 == ScriptOpcodes.REMOVETAGS) { + var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.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[++WorldMapEvent.Interpreter_stringStackSize - 1] = var17.toString(); + return 1; + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { + var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.indexOf(var4); + return 1; + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { + WorldMapEvent.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[WorldMapEvent.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[WorldMapEvent.Interpreter_stringStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.indexOf(var9, var5); + return 1; + } else if (var0 == ScriptOpcodes.UPPERCASE) { + var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3.toUpperCase(); + return 1; + } else { + return 2; + } + } + } else { + WorldMapEvent.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[WorldMapEvent.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[WorldMapEvent.Interpreter_stringStackSize + 1]; + if (class60.localPlayer.appearance != null && class60.localPlayer.appearance.isFemale) { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var9; + } else { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3; + } + + return 1; + } + } + } + } + + @ObfuscatedName("gn") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-907670239" + ) + static final void method2901() { + Client.field787 = 0; + int var0 = (class60.localPlayer.x >> 7) + class182.baseX; + int var1 = (class60.localPlayer.y >> 7) + SecureRandomFuture.baseY; + if (var0 >= 3053 && var0 <= 3156 && var1 >= 3056 && var1 <= 3136) { + Client.field787 = 1; + } + + if (var0 >= 3072 && var0 <= 3118 && var1 >= 9492 && var1 <= 9535) { + Client.field787 = 1; + } + + if (Client.field787 == 1 && var0 >= 3139 && var0 <= 3199 && var1 >= 3008 && var1 <= 3062) { + Client.field787 = 0; + } + + } } diff --git a/runescape-client/src/main/java/TileModel.java b/runescape-client/src/main/java/TileModel.java index 9d4e81d3af..ce21dcf4f7 100644 --- a/runescape-client/src/main/java/TileModel.java +++ b/runescape-client/src/main/java/TileModel.java @@ -2,76 +2,76 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ex") +@ObfuscatedName("ej") @Implements("TileModel") public final class TileModel { - @ObfuscatedName("g") - static int[] field1615; - @ObfuscatedName("i") - static int[] field1605; - @ObfuscatedName("a") - static int[] field1613; - @ObfuscatedName("b") - static int[] field1623; - @ObfuscatedName("l") - static int[] field1620; @ObfuscatedName("r") - static final int[][] field1617; - @ObfuscatedName("o") + static int[] field1632; + @ObfuscatedName("s") + static int[] field1625; + @ObfuscatedName("v") + static int[] field1634; + @ObfuscatedName("d") + static int[] field1635; + @ObfuscatedName("e") + static int[] field1636; + @ObfuscatedName("l") + static final int[][] field1637; + @ObfuscatedName("t") static final int[][] field1626; - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("vertexX") int[] vertexX; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("vertexY") int[] vertexY; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("vertexZ") int[] vertexZ; - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("triangleColorA") int[] triangleColorA; - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("triangleColorB") int[] triangleColorB; - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("triangleColorC") int[] triangleColorC; - @ObfuscatedName("q") + @ObfuscatedName("n") @Export("faceX") int[] faceX; - @ObfuscatedName("z") + @ObfuscatedName("u") @Export("faceY") int[] faceY; - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("faceZ") int[] faceZ; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("triangleTextureId") int[] triangleTextureId; - @ObfuscatedName("s") + @ObfuscatedName("w") @Export("isFlat") boolean isFlat; - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("shape") int shape; - @ObfuscatedName("n") + @ObfuscatedName("c") @Export("rotation") int rotation; - @ObfuscatedName("u") + @ObfuscatedName("h") @Export("underlayRgb") int underlayRgb; - @ObfuscatedName("h") + @ObfuscatedName("k") @Export("overlayRgb") int overlayRgb; static { - field1615 = new int[6]; - field1605 = new int[6]; - field1613 = new int[6]; - field1623 = new int[6]; - field1620 = new int[6]; - field1617 = 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}}; + field1632 = new int[6]; + field1625 = new int[6]; + field1634 = new int[6]; + field1635 = new int[6]; + field1636 = new int[6]; + field1637 = 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}}; field1626 = 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}}; } @@ -89,7 +89,7 @@ public final class TileModel { int var21 = var20 / 2; int var22 = var20 / 4; int var23 = var20 * 3 / 4; - int[] var24 = field1617[var1]; + int[] var24 = field1637[var1]; int var25 = var24.length; this.vertexX = new int[var25]; this.vertexY = new int[var25]; diff --git a/runescape-client/src/main/java/TilePaint.java b/runescape-client/src/main/java/TilePaint.java index cbacf6f81f..55f6289bf7 100644 --- a/runescape-client/src/main/java/TilePaint.java +++ b/runescape-client/src/main/java/TilePaint.java @@ -1,52 +1,55 @@ +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("ev") +@ObfuscatedName("ex") @Implements("TilePaint") public final class TilePaint { - @ObfuscatedName("sl") + @ObfuscatedName("hw") @ObfuscatedGetter( - longValue = 8743466258274073007L + intValue = -120739893 ) - static long field1802; - @ObfuscatedName("x") + @Export("cameraPitch") + static int cameraPitch; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 2078169707 + intValue = -2010588443 ) @Export("swColor") int swColor; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 321008861 + intValue = 276331811 ) @Export("seColor") int seColor; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -841305589 + intValue = 249410369 ) @Export("neColor") int neColor; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 658515107 + intValue = 911673263 ) @Export("nwColor") int nwColor; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1776502689 + intValue = 1767061331 ) @Export("texture") int texture; - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("isFlat") boolean isFlat; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1035631343 + intValue = -1091728871 ) @Export("rgb") int rgb; @@ -61,4 +64,49 @@ public final class TilePaint { this.rgb = var6; this.isFlat = var7; } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(IIII)I", + garbageValue = "1631719470" + ) + public static int method3187(int var0, int var1, int var2) { + var2 &= 3; + if (var2 == 0) { + return var0; + } else if (var2 == 1) { + return var1; + } else { + return var2 == 2 ? 7 - var0 : 7 - var1; + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "215317048" + ) + public static void method3186() { + if (KeyHandler.KeyHandler_instance != null) { + synchronized(KeyHandler.KeyHandler_instance) { + KeyHandler.KeyHandler_instance = null; + } + } + + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "6" + ) + static void method3188() { + Iterator var0 = Messages.Messages_hashTable.iterator(); + + while (var0.hasNext()) { + Message var1 = (Message)var0.next(); + var1.clearIsFromIgnored(); + } + + } } diff --git a/runescape-client/src/main/java/Tiles.java b/runescape-client/src/main/java/Tiles.java index 1ed9ba3963..5dde27a7c6 100644 --- a/runescape-client/src/main/java/Tiles.java +++ b/runescape-client/src/main/java/Tiles.java @@ -3,283 +3,888 @@ 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("bo") @Implements("Tiles") public final class Tiles { - @ObfuscatedName("qs") - @ObfuscatedSignature( - signature = "Ldz;" - ) - @Export("pcmStreamMixer") - static PcmStreamMixer pcmStreamMixer; - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("Tiles_heights") static int[][][] Tiles_heights; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("Tiles_renderFlags") static byte[][][] Tiles_renderFlags; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -824487333 + intValue = -896466609 ) @Export("Tiles_minPlane") static int Tiles_minPlane; - @ObfuscatedName("d") - static byte[][][] field538; - @ObfuscatedName("v") - static byte[][][] field539; - @ObfuscatedName("q") - static byte[][][] field540; - @ObfuscatedName("t") - static int[][] field545; - @ObfuscatedName("n") - @Export("Tiles_hueMultiplier") - static int[] Tiles_hueMultiplier; - @ObfuscatedName("b") - static final int[] field544; - @ObfuscatedName("l") - static final int[] field542; - @ObfuscatedName("r") - static final int[] field541; - @ObfuscatedName("o") - static final int[] field547; - @ObfuscatedName("c") - static final int[] field546; @ObfuscatedName("j") - static final int[] field552; - @ObfuscatedName("y") + static byte[][][] field530; + @ObfuscatedName("p") + static byte[][][] field524; + @ObfuscatedName("g") + static byte[][][] field525; + @ObfuscatedName("a") + static int[][] field526; + @ObfuscatedName("d") + static final int[] field527; + @ObfuscatedName("e") + static final int[] field528; + @ObfuscatedName("l") + static final int[] field523; + @ObfuscatedName("t") + static final int[] field529; + @ObfuscatedName("x") + static final int[] field531; + @ObfuscatedName("b") + static final int[] field533; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -408208893 + intValue = 1455417145 ) - static int field550; + static int field535; @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 747701179 + intValue = 342314257 ) - static int field548; + static int field520; static { Tiles_heights = new int[4][105][105]; Tiles_renderFlags = new byte[4][104][104]; Tiles_minPlane = 99; - field544 = new int[]{1, 2, 4, 8}; - field542 = new int[]{16, 32, 64, 128}; - field541 = new int[]{1, 0, -1, 0}; - field547 = new int[]{0, -1, 0, 1}; - field546 = new int[]{1, -1, -1, 1}; - field552 = new int[]{-1, -1, 1, 1}; - field550 = (int)(Math.random() * 17.0D) - 8; - field548 = (int)(Math.random() * 33.0D) - 16; + field527 = new int[]{1, 2, 4, 8}; + field528 = new int[]{16, 32, 64, 128}; + field523 = new int[]{1, 0, -1, 0}; + field529 = new int[]{0, -1, 0, 1}; + field531 = new int[]{1, -1, -1, 1}; + field533 = new int[]{-1, -1, 1, 1}; + field535 = (int)(Math.random() * 17.0D) - 8; + field520 = (int)(Math.random() * 33.0D) - 16; } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(Ljava/lang/CharSequence;I)I", - garbageValue = "3344543" + garbageValue = "492291254" ) @Export("parseInt") public static int parseInt(CharSequence var0) { - return class105.parseIntCustomRadix(var0, 10, true); + return SecureRandomFuture.parseIntCustomRadix(var0, 10, true); } - @ObfuscatedName("au") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Ljw;I)Z", - garbageValue = "-1065823023" + signature = "(II)V", + garbageValue = "-1908314929" ) - static boolean method1239(ObjectDefinition var0) { - if (var0.transforms != null) { - int[] var1 = var0.transforms; + public static void method1200(int var0) { + if (var0 != -1) { + if (UserComparator6.Widget_loadedInterfaces[var0]) { + Widget.Widget_archive.clearFilesGroup(var0); + if (Widget.Widget_interfaceComponents[var0] != null) { + boolean var1 = true; - for (int var2 = 0; var2 < var1.length; ++var2) { - int var3 = var1[var2]; - ObjectDefinition var4 = WorldMapSection2.getObjectDefinition(var3); - if (var4.mapIconId != -1) { - return 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; + } + + UserComparator6.Widget_loadedInterfaces[var0] = false; } } - } else if (var0.mapIconId != -1) { - return true; } - - return false; } - @ObfuscatedName("gl") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "29" + signature = "(IIIZIZI)V", + garbageValue = "2067665025" ) - static final int method1238() { - if (GrandExchangeOfferOwnWorldComparator.clientPreferences.roofsHidden) { - return ScriptEvent.Client_plane; + @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 = class13.World_worlds[var6]; + class13.World_worlds[var6] = class13.World_worlds[var1]; + class13.World_worlds[var1] = var8; + + for (int var9 = var0; var9 < var1; ++var9) { + if (ItemContainer.method1225(class13.World_worlds[var9], var8, var2, var3, var4, var5) <= 0) { + World var10 = class13.World_worlds[var9]; + class13.World_worlds[var9] = class13.World_worlds[var7]; + class13.World_worlds[var7++] = var10; + } + } + + class13.World_worlds[var1] = class13.World_worlds[var7]; + class13.World_worlds[var7] = var8; + doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); + doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); + } + + } + + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "(ILcs;ZI)I", + garbageValue = "1760711343" + ) + static int method1199(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { + var0 -= 1000; + var3 = WorldMapSprite.getWidget(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); } else { - int var0 = class277.getTileHeight(WorldMapRectangle.cameraX, class200.cameraZ, ScriptEvent.Client_plane); - return var0 - GrandExchangeOfferWorldComparator.cameraY < 800 && (Tiles_renderFlags[ScriptEvent.Client_plane][WorldMapRectangle.cameraX >> 7][class200.cameraZ >> 7] & 4) != 0 ? ScriptEvent.Client_plane : 3; + var3 = var2 ? KeyHandler.field407 : SecureRandomCallable.field544; } + + String var4 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; + int[] var5 = null; + if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { + int var6 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + if (var6 > 0) { + for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--UrlRequester.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[--WorldMapEvent.Interpreter_stringStackSize]; + } else { + var8[var7] = new Integer(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); + } + } + + var7 = Interpreter.Interpreter_intStack[--UrlRequester.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.field2719 = var8; + } else { + if (var0 != ScriptOpcodes.CC_SETONRESIZE) { + return 2; + } + + var3.onResize = var8; + } + + var3.hasListener = true; + return 1; } - @ObfuscatedName("jx") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(Lhe;II)I", - garbageValue = "2058882289" + signature = "(I)I", + garbageValue = "1187650171" ) - static final int method1227(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; + static final int method1180() { + return ViewportMouse.ViewportMouse_y; + } - while (true) { - int var6 = var2[var4++]; - int var7 = 0; - byte var8 = 0; - if (var6 == 0) { - return var3; + @ObfuscatedName("ib") + @ObfuscatedSignature( + signature = "([Lhd;IIIIIIIII)V", + garbageValue = "-2136045116" + ) + @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 || !Entity.isComponentHidden(var10)) { + if (var10.contentType > 0) { + class4.method57(var10); } - if (var6 == 1) { - var7 = Client.currentLevels[var2[var4++]]; - } + 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) { + class25.field124 = var0; + Clock.field2092 = var6; + Client.field950 = var7; + continue; + } - 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 = MusicPatchNode.getWidget(var9); - var11 = var2[var4++]; - if (var11 != -1 && (!AbstractWorldMapData.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 (Client.isDraggingWidget && Client.field692) { + var15 = MouseHandler.MouseHandler_x; + var16 = MouseHandler.MouseHandler_y; + var15 -= Client.widgetClickX; + var16 -= Client.widgetClickY; + if (var15 < Client.field852) { + var15 = Client.field852; } - } - } - 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 = ByteArrayPool.localPlayer.combatLevel; - } - - if (var6 == 9) { - for (var9 = 0; var9 < 25; ++var9) { - if (Skills.Skills_enabled[var9]) { - var7 += Client.levels[var9]; + if (var15 + var10.width > Client.field852 + Client.clickedWidgetParent.width) { + var15 = Client.field852 + Client.clickedWidgetParent.width - var10.width; } - } - } - if (var6 == 10) { - var9 = var2[var4++] << 16; - var9 += var2[var4++]; - var10 = MusicPatchNode.getWidget(var9); - var11 = var2[var4++]; - if (var11 != -1 && (!AbstractWorldMapData.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { - for (var12 = 0; var12 < var10.itemIds.length; ++var12) { - if (var11 + 1 == var10.itemIds[var12]) { - var7 = 999999999; - break; - } + if (var16 < Client.field853) { + var16 = Client.field853; } + + if (var16 + var10.height > Client.field853 + Client.clickedWidgetParent.height) { + var16 = Client.field853 + Client.clickedWidgetParent.height - var10.height; + } + + var12 = var15; + var13 = var16; + } + + if (!var10.isScrollBar) { + var14 = 128; } } - 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 = Projectile.getVarbit(var9); - } - - if (var6 == 15) { - var8 = 1; - } - - if (var6 == 16) { - var8 = 2; - } - - if (var6 == 17) { - var8 = 3; - } - - if (var6 == 18) { - var7 = (ByteArrayPool.localPlayer.x >> 7) + class69.baseX; - } - - if (var6 == 19) { - var7 = (ByteArrayPool.localPlayer.y >> 7) + class89.baseY; - } - - if (var6 == 20) { - var7 = var2[var4++]; - } - - if (var8 == 0) { - if (var5 == 0) { - var3 += var7; + 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 (var5 == 1) { - var3 -= var7; + if (var22 < var13) { + var20 = var22; + var22 = var13; } - if (var5 == 2 && var7 != 0) { - var3 /= var7; - } - - if (var5 == 3) { - var3 *= var7; - } - - var5 = 0; + ++var21; + ++var22; + var15 = var19 > var2 ? var19 : var2; + var16 = var20 > var3 ? var20 : var3; + var17 = var21 < var4 ? var21 : var4; + var18 = var22 < var5 ? var22 : var5; } else { - var5 = var8; + 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; + MusicPatchNode2.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; + } + + MusicPatchNode2.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); + var13 += 15; + } + continue; + } + + if (var10.contentType == 1337) { + Client.viewportX = var12; + Client.viewportY = var13; + KeyHandler.drawEntities(var12, var13, var10.width, var10.height); + Client.field813[var10.rootIndex] = true; + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + continue; + } + + if (var10.contentType == 1338) { + StructDefinition.drawMinimap(var10, var12, var13, var11); + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + continue; + } + + if (var10.contentType == 1339) { + class296.drawCompass(var10, var12, var13, var11); + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + continue; + } + + if (var10.contentType == 1400) { + class228.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); + } + + if (var10.contentType == 1401) { + class228.worldMap.drawOverview(var12, var13, var10.width, var10.height); + } + + if (var10.contentType == 1402) { + Login.loginScreenRunesAnimation.draw(var12, Client.cycle); + } + } + + if (var10.type == 0) { + if (!var10.isIf3 && Entity.isComponentHidden(var10) && var10 != WorldMapSection1.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) { + NetFileRequest.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); + } + + if (Client.isResizable || Client.field880[var11] || Client.gameDrawingMode > 1) { + if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { + StudioGame.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 var46 = var10.getInventorySprite(var19); + if (var46 != null) { + var46.drawTransBgAt(var22, var23); + } else if (Widget.field2600) { + class234.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 == KeyHandler.dragInventoryWidget && var19 == Client.dragItemSlotSource) { + Sprite var27; + if (Client.isItemSelected == 1 && var19 == LoginScreenAnimation.selectedItemSlot && var10.id == AbstractUserComparator.selectedItemWidget) { + var27 = SecureRandomFuture.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false); + } else { + var27 = SecureRandomFuture.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); + } + + if (var27 != null) { + if (var10 == KeyHandler.dragInventoryWidget && var19 == Client.dragItemSlotSource) { + var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; + var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; + if (var24 < 5 && var24 > -5) { + var24 = 0; + } + + if (var25 < 5 && var25 > -5) { + var25 = 0; + } + + if (Client.itemDragDuration < 5) { + var24 = 0; + var25 = 0; + } + + var27.drawTransAt(var22 + var24, var25 + var23, 128); + if (var1 != -1) { + Widget var28 = var0[var1 & 65535]; + int var29; + if (var25 + var23 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { + var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field747 / 3; + if (var29 > Client.field747 * 10) { + var29 = Client.field747 * 10; + } + + if (var29 > var28.scrollY) { + var29 = var28.scrollY; + } + + var28.scrollY -= var29; + Client.draggedWidgetY += var29; + class234.invalidateWidget(var28); + } + + if (var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { + var29 = (var23 + var25 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field747 / 3; + if (var29 > Client.field747 * 10) { + var29 = Client.field747 * 10; + } + + if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { + var29 = var28.scrollHeight - var28.height - var28.scrollY; + } + + var28.scrollY += var29; + Client.draggedWidgetY -= var29; + class234.invalidateWidget(var28); + } + } + } else if (var10 == class194.field2356 && var19 == Client.field668) { + var27.drawTransAt(var22, var23, 128); + } else { + var27.drawTransBgAt(var22, var23); + } + } else { + class234.invalidateWidget(var10); + } + } + } + + ++var19; + } + } + } else if (var10.type == 3) { + if (DevicePcmPlayerProvider.runCs1(var10)) { + var19 = var10.color2; + if (var10 == WorldMapSection1.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { + var19 = var10.mouseOverColor2; + } + } else { + var19 = var10.color; + if (var10 == WorldMapSection1.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { + var19 = var10.mouseOverColor; + } + } + + if (var10.fill) { + switch(var10.fillMode.field3882) { + 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.field2600) { + class234.invalidateWidget(var10); + } + } else { + String var44 = var10.text; + if (DevicePcmPlayerProvider.runCs1(var10)) { + var20 = var10.color2; + if (var10 == WorldMapSection1.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { + var20 = var10.mouseOverColor2; + } + + if (var10.text2.length() > 0) { + var44 = var10.text2; + } + } else { + var20 = var10.color; + if (var10 == WorldMapSection1.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { + var20 = var10.mouseOverColor; + } + } + + if (var10.isIf3 && var10.itemId != -1) { + ItemDefinition var47 = KitDefinition.ItemDefinition_get(var10.itemId); + var44 = var47.name; + if (var44 == null) { + var44 = "null"; + } + + if ((var47.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { + var44 = ItemContainer.colorStartTag(16748608) + var44 + "" + " " + 'x' + WorldMapAreaData.formatItemStacks(var10.itemQuantity); + } + } + + if (var10 == Client.meslayerContinueWidget) { + var44 = "Please wait..."; + var20 = var10.color; + } + + if (!var10.isIf3) { + var44 = BZip2State.method6001(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(DevicePcmPlayerProvider.runCs1(var10)); + if (var40 != null) { + var40.drawTransBgAt(var12, var13); + } else if (Widget.field2600) { + class234.invalidateWidget(var10); + } + } else { + if (var10.itemId != -1) { + var40 = SecureRandomFuture.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); + } else { + var40 = var10.getSprite(false); + } + + if (var40 == null) { + if (Widget.field2600) { + class234.invalidateWidget(var10); + } + } else { + var20 = var40.width; + var21 = var40.height; + if (!var10.spriteTiling) { + var22 = var10.width * 4096 / var20; + if (var10.spriteAngle != 0) { + var40.method6369(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.method6369(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 + var24 * var20, var13 + var21 * var25); + } + } + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); + } + } + } + } else { + ItemDefinition var32; + if (var10.type == 6) { + boolean var36 = DevicePcmPlayerProvider.runCs1(var10); + if (var36) { + var20 = var10.sequenceId2; + } else { + var20 = var10.sequenceId; + } + + Model var41 = null; + var22 = 0; + if (var10.itemId != -1) { + var32 = KitDefinition.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 { + class234.invalidateWidget(var10); + } + } + } else if (var10.modelType == 5) { + if (var10.modelId == 0) { + var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); + } else { + var41 = class60.localPlayer.getModel(); + } + } else if (var20 == -1) { + var41 = var10.getModel((SequenceDefinition)null, -1, var36, class60.localPlayer.appearance); + if (var41 == null && Widget.field2600) { + class234.invalidateWidget(var10); + } + } else { + SequenceDefinition var45 = NetSocket.SequenceDefinition_get(var20); + var41 = var10.getModel(var45, var10.modelFrame, var36, class60.localPlayer.appearance); + if (var41 == null && Widget.field2600) { + class234.invalidateWidget(var10); + } + } + + Rasterizer3D.method3147(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.method3010(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); + } else { + var41.calculateBoundsCylinder(); + if (var10.modelOrthog) { + var41.method3011(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); + } else { + var41.method3010(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.field2600) { + class234.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 = KitDefinition.ItemDefinition_get(var10.itemIds[var20] - 1); + String var34; + if (var32.isStackable != 1 && var10.itemQuantities[var20] == 1) { + var34 = ItemContainer.colorStartTag(16748608) + var32.name + ""; + } else { + var34 = ItemContainer.colorStartTag(16748608) + var32.name + "" + " " + 'x' + WorldMapAreaData.formatItemStacks(var10.itemQuantities[var20]); + } + + var25 = var22 * (var10.paddingX + 115) + var12; + var26 = (var10.paddingY + 12) * var21 + var13; + if (var10.textXAlignment == 0) { + var39.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1); + } else if (var10.textXAlignment == 1) { + var39.drawCentered(var34, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1); + } else { + var39.drawRightAligned(var34, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1); + } + } + + ++var20; + } + } + } + + if (var10.type == 8 && var10 == SecureRandomCallable.field542 && Client.field825 == Client.field824) { + var19 = 0; + var20 = 0; + Font var31 = MusicPatchNode2.fontPlain12; + String var33 = var10.text; + + String var43; + for (var33 = BZip2State.method6001(var33, var10); var33.length() > 0; var20 = var20 + var31.ascent + 1) { + var24 = var33.indexOf("
"); + if (var24 != -1) { + var43 = var33.substring(0, var24); + var33 = var33.substring(var24 + 4); + } else { + var43 = var33; + var33 = ""; + } + + 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 (var25 + var20 > var5) { + var25 = var5 - var20; + } + + Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); + Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); + var33 = var10.text; + var26 = var25 + var31.ascent + 2; + + for (var33 = BZip2State.method6001(var33, var10); var33.length() > 0; var26 = var26 + var31.ascent + 1) { + int var35 = var33.indexOf("
"); + if (var35 != -1) { + var43 = var33.substring(0, var35); + var33 = var33.substring(var35 + 4); + } else { + var43 = var33; + var33 = ""; + } + + var31.draw(var43, var24 + 3, var26, 0, -1); + } + } + + if (var10.type == 9) { + if (var10.field2633) { + 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 { + UserComparator5.method3540(var19, var20, var21, var22, var10.color, var10.lineWid); + } + } + } + } + } + } + } } } - } catch (Exception var14) { - return -1; } - } else { - return -2; } + } } diff --git a/runescape-client/src/main/java/Timer.java b/runescape-client/src/main/java/Timer.java index fb3ab50a8e..4946d22ef8 100644 --- a/runescape-client/src/main/java/Timer.java +++ b/runescape-client/src/main/java/Timer.java @@ -4,176 +4,835 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jr") +@ObfuscatedName("jy") @Implements("Timer") public class Timer { - @ObfuscatedName("pc") - @Export("ClanChat_inClanChat") - static boolean ClanChat_inClanChat; - @ObfuscatedName("x") - @ObfuscatedGetter( - longValue = -8528403584903631725L + @ObfuscatedName("hi") + @ObfuscatedSignature( + signature = "[Llz;" ) - long field3585; + @Export("crossSprites") + static Sprite[] crossSprites; @ObfuscatedName("m") @ObfuscatedGetter( - longValue = 882289502926238735L + longValue = 7552119433294969811L ) - long field3577; - @ObfuscatedName("k") - public boolean field3581; - @ObfuscatedName("d") + long field3613; + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = -5644251787443381573L + longValue = 6826365957378108595L ) - long field3579; - @ObfuscatedName("w") - @ObfuscatedGetter( - longValue = -4670592391922777709L - ) - long field3580; - @ObfuscatedName("v") - @ObfuscatedGetter( - longValue = 5855944608867181493L - ) - long field3576; + long field3612; @ObfuscatedName("q") + public boolean field3618; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1581851235 + longValue = 3366476848742949295L ) - int field3578; + long field3611; + @ObfuscatedName("p") + @ObfuscatedGetter( + longValue = -6463393078579201841L + ) + long field3617; + @ObfuscatedName("g") + @ObfuscatedGetter( + longValue = 585068566334505215L + ) + long field3609; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 1658064199 + ) + int field3614; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 936590501 + ) + int field3615; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 656692765 + ) + int field3616; @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1287309283 + intValue = -538696129 ) - int field3583; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 2047115993 - ) - int field3584; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -763716735 - ) - int field3586; + int field3610; public Timer() { - this.field3585 = -1L; - this.field3577 = -1L; - this.field3581 = false; - this.field3579 = 0L; - this.field3580 = 0L; - this.field3576 = 0L; - this.field3578 = 0; - this.field3583 = 0; - this.field3584 = 0; - this.field3586 = 0; - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-2076802679" - ) - public void method5051() { - this.field3585 = class217.currentTimeMillis(); + this.field3613 = -1L; + this.field3612 = -1L; + this.field3618 = false; + this.field3611 = 0L; + this.field3617 = 0L; + this.field3609 = 0L; + this.field3614 = 0; + this.field3615 = 0; + this.field3616 = 0; + this.field3610 = 0; } @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1352651256" + garbageValue = "-1434550274" ) - public void method5050() { - if (this.field3585 != -1L) { - this.field3580 = class217.currentTimeMillis() - this.field3585; - this.field3585 = -1L; + public void method5162() { + this.field3613 = MilliClock.currentTimeMillis(); + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1764633933" + ) + public void method5161() { + if (this.field3613 != -1L) { + this.field3617 = MilliClock.currentTimeMillis() - this.field3613; + this.field3613 = -1L; } } - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "-21" - ) - public void method5044(int var1) { - this.field3577 = class217.currentTimeMillis(); - this.field3578 = var1; - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-529025809" - ) - public void method5045() { - if (-1L != this.field3577) { - this.field3579 = class217.currentTimeMillis() - this.field3577; - this.field3577 = -1L; - } - - ++this.field3584; - this.field3581 = true; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-93976035" - ) - public void method5046() { - this.field3581 = false; - this.field3583 = 0; - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1352132310" - ) - public void method5047() { - this.method5045(); - } - @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkb;I)V", - garbageValue = "1742077322" + signature = "(II)V", + garbageValue = "457646537" + ) + public void method5184(int var1) { + this.field3612 = MilliClock.currentTimeMillis(); + this.field3614 = var1; + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "-15" + ) + public void method5178() { + if (-1L != this.field3612) { + this.field3611 = MilliClock.currentTimeMillis() - this.field3612; + this.field3612 = -1L; + } + + ++this.field3616; + this.field3618 = true; + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "535522707" + ) + public void method5165() { + this.field3618 = false; + this.field3615 = 0; + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-932156837" + ) + public void method5166() { + this.method5178(); + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "(Lkn;I)V", + garbageValue = "-152968698" ) @Export("write") public void write(Buffer var1) { - long var2 = this.field3580; - var2 /= 10L; - if (var2 < 0L) { - var2 = 0L; - } else if (var2 > 65535L) { - var2 = 65535L; + NetSocket.method3677(var1, this.field3617); + NetSocket.method3677(var1, this.field3611); + NetSocket.method3677(var1, this.field3609); + var1.writeShort(this.field3614); + var1.writeShort(this.field3615); + var1.writeShort(this.field3616); + var1.writeShort(this.field3610); + } + + @ObfuscatedName("fp") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-2109175482" + ) + @Export("playPcmPlayers") + static final void playPcmPlayers() { + if (class58.pcmPlayer1 != null) { + class58.pcmPlayer1.run(); } - var1.writeShort((int)var2); - long var4 = this.field3579; - var4 /= 10L; - if (var4 < 0L) { - var4 = 0L; - } else if (var4 > 65535L) { - var4 = 65535L; + if (class2.pcmPlayer0 != null) { + class2.pcmPlayer0.run(); } - var1.writeShort((int)var4); - long var6 = this.field3576; - var6 /= 10L; - if (var6 < 0L) { - var6 = 0L; - } else if (var6 > 65535L) { - var6 = 65535L; - } + } - var1.writeShort((int)var6); - var1.writeShort(this.field3578); - var1.writeShort(this.field3583); - var1.writeShort(this.field3584); - var1.writeShort(this.field3586); + @ObfuscatedName("gu") + @ObfuscatedSignature( + signature = "(Lcc;IIIIIB)V", + garbageValue = "103" + ) + @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; + int var93; + if (var1 < var75 && var0.playerCycle == Client.cycle) { + var10 = (Player)var0; + boolean var9; + if (Client.drawPlayerNames == 0) { + var9 = false; + } else { + boolean var78; + if (var10 == class60.localPlayer) { + var78 = (Client.drawPlayerNames & 8) != 0; + var9 = var78; + } else { + var78 = class7.method98(); + boolean var12; + if (!var78) { + var12 = (Client.drawPlayerNames & 1) != 0; + var78 = var12 && var10.isFriend(); + } + + var12 = var78; + if (!var78) { + boolean var80 = (Client.drawPlayerNames & 2) != 0; + var12 = var80 && var10.isClanMember(); + } + + var9 = var12; + } + } + + if (var9) { + Player var11 = (Player)var0; + if (var1 < var75) { + var93 = var0.defaultHeight + 15; + HealthBar.worldToScreen(var0.x, var0.y, var93); + AbstractFont var13 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); + byte var14 = 9; + var13.drawCentered(var11.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var14, 16777215, 0); + var8 = 18; + } + } + } + + int var89 = -2; + int var15; + int var16; + int var22; + int var23; + if (!var0.healthBars.method5014()) { + DirectByteArrayCopier.method4090(var0, var0.defaultHeight + 15); + + for (HealthBar var90 = (HealthBar)var0.healthBars.last(); var90 != null; var90 = (HealthBar)var0.healthBars.previous()) { + HealthBarUpdate var91 = var90.get(Client.cycle); + if (var91 == null) { + if (var90.isEmpty()) { + var90.remove(); + } + } else { + HealthBarDefinition var76 = var90.definition; + Sprite var94 = var76.getBackSprite(); + Sprite var77 = var76.getFrontSprite(); + var16 = 0; + if (var94 != null && var77 != null) { + if (var76.widthPadding * 2 < var77.subWidth) { + var16 = var76.widthPadding; + } + + var15 = var77.subWidth - var16 * 2; + } else { + var15 = var76.width; + } + + int var17 = 255; + boolean var18 = true; + int var19 = Client.cycle - var91.cycle; + int var20 = var15 * var91.health2 / var76.width; + int var21; + int var97; + if (var91.cycleOffset > var19) { + var21 = var76.field3317 == 0 ? 0 : var76.field3317 * (var19 / var76.field3317); + var22 = var15 * var91.health / var76.width; + var97 = var21 * (var20 - var22) / var91.cycleOffset + var22; + } else { + var97 = var20; + var21 = var76.int5 + var91.cycleOffset - var19; + if (var76.int3 >= 0) { + var17 = (var21 << 8) / (var76.int5 - var76.int3); + } + } + + if (var91.health2 > 0 && var97 < 1) { + var97 = 1; + } + + if (var94 != null && var77 != null) { + if (var15 == var97) { + var97 += var16 * 2; + } else { + var97 += var16; + } + + var21 = var94.subHeight; + var89 += var21; + var22 = var2 + Client.viewportTempX - (var15 >> 1); + var23 = var3 + Client.viewportTempY - var89; + var22 -= var16; + if (var17 >= 0 && var17 < 255) { + var94.drawTransAt(var22, var23, var17); + Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var97, var23 + var21); + var77.drawTransAt(var22, var23, var17); + } else { + var94.drawTransBgAt(var22, var23); + Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var97 + var22, var21 + var23); + var77.drawTransBgAt(var22, var23); + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); + var89 += 2; + } else { + var89 += 5; + if (Client.viewportTempX > -1) { + var21 = var2 + Client.viewportTempX - (var15 >> 1); + var22 = var3 + Client.viewportTempY - var89; + Rasterizer2D.Rasterizer2D_fillRectangle(var21, var22, var97, 5, 65280); + Rasterizer2D.Rasterizer2D_fillRectangle(var21 + var97, var22, var15 - var97, 5, 16711680); + } + + var89 += 2; + } + } + } + } + + if (var89 == -2) { + var89 += 7; + } + + var89 += var8; + int var99; + if (var1 < var75) { + var10 = (Player)var0; + if (var10.isHidden) { + return; + } + + if (var10.headIconPk != -1 || var10.headIconPrayer != -1) { + DirectByteArrayCopier.method4090(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + if (var10.headIconPk != -1) { + var89 += 25; + CollisionMap.headIconPkSprites[var10.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var89); + } + + if (var10.headIconPrayer != -1) { + var89 += 25; + KeyHandler.headIconPrayerSprites[var10.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var89); + } + } + } + + if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { + DirectByteArrayCopier.method4090(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + var89 += SoundSystem.headIconHintSprites[1].subHeight; + SoundSystem.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var89); + } + } + } else { + NPCDefinition var92 = ((NPC)var0).definition; + if (var92.transforms != null) { + var92 = var92.transform(); + } + + if (var92.headIconPrayer >= 0 && var92.headIconPrayer < KeyHandler.headIconPrayerSprites.length) { + DirectByteArrayCopier.method4090(var0, var0.defaultHeight + 15); + if (Client.viewportTempX > -1) { + KeyHandler.headIconPrayerSprites[var92.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); + } + } + + if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { + var99 = var0.defaultHeight + 15; + HealthBar.worldToScreen(var0.x, var0.y, var99); + if (Client.viewportTempX > -1) { + SoundSystem.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); + } + } + } + + if (var0.overheadText != null && (var1 >= var75 || !var0.field979 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { + DirectByteArrayCopier.method4090(var0, var0.defaultHeight); + if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { + Client.overheadTextXOffsets[Client.overheadTextCount] = GrandExchangeOfferNameComparator.fontBold12.stringWidth(var0.overheadText) / 2; + Client.overheadTextAscents[Client.overheadTextCount] = GrandExchangeOfferNameComparator.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) { + var99 = var0.hitSplatCycles[var79]; + var93 = var0.hitSplatTypes[var79]; + HitSplatDefinition var95 = null; + int var96 = 0; + HitSplatDefinition var81; + if (var93 >= 0) { + if (var99 <= Client.cycle) { + continue; + } + + var16 = var0.hitSplatTypes[var79]; + var81 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var16); + HitSplatDefinition var82; + if (var81 != null) { + var82 = var81; + } else { + byte[] var84 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var16); + var81 = new HitSplatDefinition(); + if (var84 != null) { + var81.decode(new Buffer(var84)); + } + + HitSplatDefinition.HitSplatDefinition_cached.put(var81, (long)var16); + var82 = var81; + } + + var95 = var82; + var96 = var82.field3364; + if (var82 != null && var82.transforms != null) { + var95 = var82.transform(); + if (var95 == null) { + var0.hitSplatCycles[var79] = -1; + continue; + } + } + } else if (var99 < 0) { + continue; + } + + var15 = var0.hitSplatTypes2[var79]; + HitSplatDefinition var83 = null; + HitSplatDefinition var100; + if (var15 >= 0) { + var100 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var15); + if (var100 != null) { + var81 = var100; + } else { + byte[] var85 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var15); + var100 = new HitSplatDefinition(); + if (var85 != null) { + var100.decode(new Buffer(var85)); + } + + HitSplatDefinition.HitSplatDefinition_cached.put(var100, (long)var15); + var81 = var100; + } + + var83 = var81; + if (var81 != null && var81.transforms != null) { + var83 = var81.transform(); + } + } + + if (var99 - var96 <= Client.cycle) { + if (var95 == null) { + var0.hitSplatCycles[var79] = -1; + } else { + DirectByteArrayCopier.method4090(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; + } + + var100 = null; + Sprite var101 = null; + Sprite var86 = null; + Sprite var87 = 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; + Sprite var102 = var95.method4755(); + int var43; + if (var102 != null) { + var22 = var102.subWidth; + var43 = var102.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var26 = var102.xOffset; + } + + var101 = var95.method4756(); + if (var101 != null) { + var23 = var101.subWidth; + var43 = var101.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var27 = var101.xOffset; + } + + var86 = var95.method4752(); + if (var86 != null) { + var24 = var86.subWidth; + var43 = var86.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var28 = var86.xOffset; + } + + var87 = var95.method4763(); + if (var87 != null) { + var25 = var87.subWidth; + var43 = var87.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var29 = var87.xOffset; + } + + if (var83 != null) { + var30 = var83.method4755(); + if (var30 != null) { + var34 = var30.subWidth; + var43 = var30.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var38 = var30.xOffset; + } + + var31 = var83.method4756(); + if (var31 != null) { + var35 = var31.subWidth; + var43 = var31.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var39 = var31.xOffset; + } + + var32 = var83.method4752(); + if (var32 != null) { + var36 = var32.subWidth; + var43 = var32.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var40 = var32.xOffset; + } + + var33 = var83.method4763(); + if (var33 != null) { + var37 = var33.subWidth; + var43 = var33.subHeight; + if (var43 > var42) { + var42 = var43; + } + + var41 = var33.xOffset; + } + } + + Font var88 = var95.getFont(); + if (var88 == null) { + var88 = WorldMapLabel.fontPlain11; + } + + Font var44; + if (var83 != null) { + var44 = var83.getFont(); + if (var44 == null) { + var44 = WorldMapLabel.fontPlain11; + } + } else { + var44 = WorldMapLabel.fontPlain11; + } + + String var45 = null; + String var46 = null; + boolean var47 = false; + int var48 = 0; + var45 = var95.getString(var0.hitSplatValues[var79]); + int var98 = var88.stringWidth(var45); + if (var83 != null) { + var46 = var83.getString(var0.hitSplatValues2[var79]); + var48 = var44.stringWidth(var46); + } + + int var49 = 0; + int var50 = 0; + if (var23 > 0) { + if (var86 == null && var87 == null) { + var49 = 1; + } else { + var49 = var98 / var23 + 1; + } + } + + if (var83 != null && var35 > 0) { + if (var32 == null && var33 == null) { + var50 = 1; + } else { + var50 = var48 / var35 + 1; + } + } + + int var51 = 0; + int var52 = var51; + if (var22 > 0) { + var51 += var22; + } + + var51 += 2; + int var53 = var51; + if (var24 > 0) { + var51 += var24; + } + + int var54 = var51; + int var55 = var51; + int var56; + if (var23 > 0) { + var56 = var49 * var23; + var51 += var56; + var55 += (var56 - var98) / 2; + } else { + var51 += var98; + } + + 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 (var83 != null) { + var51 += 2; + var57 = var51; + if (var34 > 0) { + var51 += var34; + } + + var51 += 2; + var58 = var51; + if (var36 > 0) { + var51 += var36; + } + + var59 = var51; + var61 = var51; + if (var35 > 0) { + var62 = var50 * var35; + var51 += var62; + var61 += (var62 - var48) / 2; + } else { + var51 += var48; + } + + var60 = var51; + if (var37 > 0) { + var51 += var37; + } + } + + var62 = var0.hitSplatCycles[var79] - Client.cycle; + int var63 = var95.field3369 - var62 * var95.field3369 / var95.field3364; + int var64 = var62 * var95.field3370 / var95.field3364 + -var95.field3370; + 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 + var95.field3374 + 15; + int var70 = var69 - var88.maxAscent; + int var71 = var69 + var88.maxDescent; + if (var70 < var66) { + var67 = var70; + } + + if (var71 > var68) { + var68 = var71; + } + + int var72 = 0; + int var73; + int var74; + if (var83 != null) { + var72 = var66 + var83.field3374 + 15; + var73 = var72 - var44.maxAscent; + var74 = var72 + var44.maxDescent; + if (var73 < var67) { + ; + } + + if (var74 > var68) { + ; + } + } + + var73 = 255; + if (var95.field3363 >= 0) { + var73 = (var62 << 8) / (var95.field3364 - var95.field3363); + } + + if (var73 >= 0 && var73 < 255) { + if (var102 != null) { + var102.drawTransAt(var52 + var65 - var26, var66, var73); + } + + if (var86 != null) { + var86.drawTransAt(var53 + var65 - var28, var66, var73); + } + + if (var101 != null) { + for (var74 = 0; var74 < var49; ++var74) { + var101.drawTransAt(var74 * var23 + (var65 + var54 - var27), var66, var73); + } + } + + if (var87 != null) { + var87.drawTransAt(var65 + var56 - var29, var66, var73); + } + + var88.drawAlpha(var45, var55 + var65, var69, var95.textColor, 0, var73); + if (var83 != null) { + if (var30 != null) { + var30.drawTransAt(var57 + var65 - var38, var66, var73); + } + + if (var32 != null) { + var32.drawTransAt(var65 + var58 - var40, var66, var73); + } + + if (var31 != null) { + for (var74 = 0; var74 < var50; ++var74) { + var31.drawTransAt(var74 * var35 + (var65 + var59 - var39), var66, var73); + } + } + + if (var33 != null) { + var33.drawTransAt(var60 + var65 - var41, var66, var73); + } + + var44.drawAlpha(var46, var61 + var65, var72, var83.textColor, 0, var73); + } + } else { + if (var102 != null) { + var102.drawTransBgAt(var65 + var52 - var26, var66); + } + + if (var86 != null) { + var86.drawTransBgAt(var53 + var65 - var28, var66); + } + + if (var101 != null) { + for (var74 = 0; var74 < var49; ++var74) { + var101.drawTransBgAt(var74 * var23 + (var54 + var65 - var27), var66); + } + } + + if (var87 != null) { + var87.drawTransBgAt(var56 + var65 - var29, var66); + } + + var88.draw(var45, var65 + var55, var69, var95.textColor | -16777216, 0); + if (var83 != null) { + if (var30 != null) { + var30.drawTransBgAt(var65 + var57 - var38, var66); + } + + if (var32 != null) { + var32.drawTransBgAt(var58 + var65 - var40, var66); + } + + if (var31 != null) { + for (var74 = 0; var74 < var50; ++var74) { + var31.drawTransBgAt(var35 * var74 + (var59 + var65 - var39), var66); + } + } + + if (var33 != null) { + var33.drawTransBgAt(var65 + var60 - var41, var66); + } + + var44.draw(var46, var61 + var65, var72, var83.textColor | -16777216, 0); + } + } + } + } + } + } + + } } } diff --git a/runescape-client/src/main/java/TriBool.java b/runescape-client/src/main/java/TriBool.java index fec80da4aa..ff0e723310 100644 --- a/runescape-client/src/main/java/TriBool.java +++ b/runescape-client/src/main/java/TriBool.java @@ -1,26 +1,36 @@ +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.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; -@ObfuscatedName("kv") +@ObfuscatedName("kf") @Implements("TriBool") public class TriBool { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lkv;" + signature = "Lkf;" ) @Export("TriBool_unknown") public static final TriBool TriBool_unknown; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lkv;" + signature = "Lkf;" ) @Export("TriBool_true") public static final TriBool TriBool_true; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lkv;" + signature = "Lkf;" ) @Export("TriBool_false") public static final TriBool TriBool_false; @@ -34,70 +44,103 @@ public class TriBool { TriBool() { } - @ObfuscatedName("x") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1231904010" + signature = "(Lkb;B)V", + garbageValue = "-64" ) - static void method5249() { - for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var0.stream1 != null) { - Tiles.pcmStreamMixer.removeSubStream(var0.stream1); - var0.stream1 = null; + @Export("performReflectionCheck") + public static void performReflectionCheck(PacketBuffer var0) { + ReflectionCheck var1 = (ReflectionCheck)class105.reflectionChecks.last(); + if (var1 != null) { + int var2 = var0.offset; + var0.writeInt(var1.id); + + for (int var3 = 0; var3 < var1.size; ++var3) { + if (var1.creationErrors[var3] != 0) { + var0.writeByte(var1.creationErrors[var3]); + } else { + try { + int var4 = var1.operations[var3]; + Field var5; + int var6; + if (var4 == 0) { + var5 = var1.fields[var3]; + var6 = Reflection.getInt(var5, (Object)null); + var0.writeByte(0); + var0.writeInt(var6); + } else if (var4 == 1) { + var5 = var1.fields[var3]; + Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); + var0.writeByte(0); + } else if (var4 == 2) { + var5 = var1.fields[var3]; + var6 = var5.getModifiers(); + var0.writeByte(0); + var0.writeInt(var6); + } + + Method var25; + if (var4 != 3) { + if (var4 == 4) { + var25 = var1.methods[var3]; + var6 = var25.getModifiers(); + var0.writeByte(0); + var0.writeInt(var6); + } + } else { + var25 = var1.methods[var3]; + byte[][] var10 = var1.arguments[var3]; + Object[] var7 = new Object[var10.length]; + + for (int var8 = 0; var8 < var10.length; ++var8) { + ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); + var7[var8] = var9.readObject(); + } + + Object var11 = Reflection.invoke(var25, (Object)null, var7); + if (var11 == null) { + var0.writeByte(0); + } else if (var11 instanceof Number) { + var0.writeByte(1); + var0.writeLong(((Number)var11).longValue()); + } else if (var11 instanceof String) { + var0.writeByte(2); + var0.writeStringCp1252NullTerminated((String)var11); + } else { + var0.writeByte(4); + } + } + } catch (ClassNotFoundException var13) { + var0.writeByte(-10); + } catch (InvalidClassException var14) { + var0.writeByte(-11); + } catch (StreamCorruptedException var15) { + var0.writeByte(-12); + } catch (OptionalDataException var16) { + var0.writeByte(-13); + } catch (IllegalAccessException var17) { + var0.writeByte(-14); + } catch (IllegalArgumentException var18) { + var0.writeByte(-15); + } catch (InvocationTargetException var19) { + var0.writeByte(-16); + } catch (SecurityException var20) { + var0.writeByte(-17); + } catch (IOException var21) { + var0.writeByte(-18); + } catch (NullPointerException var22) { + var0.writeByte(-19); + } catch (Exception var23) { + var0.writeByte(-20); + } catch (Throwable var24) { + var0.writeByte(-21); + } + } } - if (var0.stream2 != null) { - Tiles.pcmStreamMixer.removeSubStream(var0.stream2); - var0.stream2 = null; - } + var0.writeCrc(var2); + var1.remove(); } - - ObjectSound.objectSounds.clear(); - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(Lkj;B)V", - garbageValue = "-100" - ) - @Export("updatePlayer") - static final void updatePlayer(PacketBuffer var0) { - var0.importIndex(); - int var1 = Client.localPlayerIndex; - Player var2 = ByteArrayPool.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 - class69.baseX; - var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); - var2.pathY[0] = var6 - class89.baseY; - var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); - ScriptEvent.Client_plane = var2.plane = var4; - if (Players.field1269[var1] != null) { - var2.read(Players.field1269[var1]); - } - - Players.Players_count = 0; - Players.Players_indices[++Players.Players_count - 1] = var1; - Players.field1267[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.field1267[var7] = 0; - } - } - - var0.exportIndex(); } } diff --git a/runescape-client/src/main/java/UrlRequest.java b/runescape-client/src/main/java/UrlRequest.java index 7a9f843ec0..a989b25d1d 100644 --- a/runescape-client/src/main/java/UrlRequest.java +++ b/runescape-client/src/main/java/UrlRequest.java @@ -1,26 +1,22 @@ +import java.awt.Desktop; +import java.awt.Desktop.Action; +import java.net.URI; import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ew") +@ObfuscatedName("eb") @Implements("UrlRequest") public class UrlRequest { - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "Ldk;" - ) - @Export("soundCache") - public static SoundCache soundCache; - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("url") final URL url; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("isDone0") volatile boolean isDone0; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("response0") volatile byte[] response0; @@ -28,61 +24,64 @@ public class UrlRequest { this.url = var1; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1424081834" + garbageValue = "-1247069155" ) @Export("isDone") public boolean isDone() { return this.isDone0; } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)[B", - garbageValue = "484192233" + garbageValue = "1076365281" ) @Export("getResponse") public byte[] getResponse() { return this.response0; } - @ObfuscatedName("c") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "65535" + signature = "(Ljava/lang/String;ZLjava/lang/String;ZI)V", + garbageValue = "-2122321724" ) - static int method3423(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { - var3 = MusicPatchNode.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 = MusicPatchNode.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; + static void method3426(String var0, boolean var1, String var2, boolean var3) { + if (var1) { + if (!var3 && Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { + try { + Desktop.getDesktop().browse(new URI(var0)); + return; + } catch (Exception var5) { + } } - 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; + if (class60.field450.startsWith("win") && !var3) { + FloorUnderlayDefinition.method4608(var0, 0); + return; } - return 1; - } else if (var0 == ScriptOpcodes.IF_GETTOP) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.rootInterface; - return 1; + if (class60.field450.startsWith("mac")) { + GrandExchangeOfferTotalQuantityComparator.method165(var0, 1, var2); + return; + } + + FloorUnderlayDefinition.method4608(var0, 2); } else { - return 2; + FloorUnderlayDefinition.method4608(var0, 3); } + + } + + @ObfuscatedName("gx") + @ObfuscatedSignature( + signature = "(IIIIB)V", + garbageValue = "60" + ) + static final void method3432(int var0, int var1, int var2, int var3) { + TileItemPile.method2901(); } } diff --git a/runescape-client/src/main/java/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java index 59751e6717..4acf5e36b3 100644 --- a/runescape-client/src/main/java/UrlRequester.java +++ b/runescape-client/src/main/java/UrlRequester.java @@ -7,27 +7,33 @@ import java.util.LinkedList; import java.util.Queue; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ey") +@ObfuscatedName("eh") @Implements("UrlRequester") public class UrlRequester implements Runnable { - @ObfuscatedName("fx") - @ObfuscatedSignature( - signature = "Llt;" + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 735302127 ) - static AbstractSocket field1960; - @ObfuscatedName("gb") - @Export("xteaKeys") - static int[][] xteaKeys; - @ObfuscatedName("x") + @Export("Interpreter_intStackSize") + static int Interpreter_intStackSize; + @ObfuscatedName("gk") + @ObfuscatedSignature( + signature = "Llz;" + ) + @Export("redHintArrowSprite") + static Sprite redHintArrowSprite; + @ObfuscatedName("m") @Export("thread") final Thread thread; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("isClosed") volatile boolean isClosed; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("requests") Queue requests; @@ -38,10 +44,10 @@ public class UrlRequester implements Runnable { this.thread.start(); } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljava/net/URL;B)Lew;", - garbageValue = "81" + signature = "(Ljava/net/URL;I)Leb;", + garbageValue = "1883643384" ) @Export("request") public UrlRequest request(URL var1) { @@ -53,10 +59,10 @@ public class UrlRequester implements Runnable { } } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "0" + garbageValue = "1" ) @Export("close") public void close() { @@ -119,9 +125,154 @@ public class UrlRequester implements Runnable { } } catch (Exception var17) { - WorldMapDecorationType.RunException_sendStackTrace((String)null, var17); + class197.RunException_sendStackTrace((String)null, var17); } } } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + signature = "(ILcs;ZB)I", + garbageValue = "23" + ) + static int method3424(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.CLIENTCLOCK) { + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = Client.cycle; + return 1; + } else { + int var3; + int var4; + if (var0 == ScriptOpcodes.INV_GETOBJ) { + Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = HealthBarDefinition.method4673(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INV_GETNUM) { + Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = UserComparator6.ItemContainer_getCount(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INV_TOTAL) { + Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = ArchiveLoader.method1212(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INV_SIZE) { + var3 = Interpreter.Interpreter_intStack[--Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = class247.getInvDefinition(var3).size; + return 1; + } else if (var0 == ScriptOpcodes.STAT) { + var3 = Interpreter.Interpreter_intStack[--Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = Client.currentLevels[var3]; + return 1; + } else if (var0 == ScriptOpcodes.STAT_BASE) { + var3 = Interpreter.Interpreter_intStack[--Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = Client.levels[var3]; + return 1; + } else if (var0 == ScriptOpcodes.STAT_XP) { + var3 = Interpreter.Interpreter_intStack[--Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = Client.experience[var3]; + return 1; + } else { + int var5; + if (var0 == ScriptOpcodes.COORD) { + var3 = TileItemPile.Client_plane; + var4 = (class60.localPlayer.x >> 7) + class182.baseX; + var5 = (class60.localPlayer.y >> 7) + SecureRandomFuture.baseY; + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); + return 1; + } else if (var0 == ScriptOpcodes.COORDX) { + var3 = Interpreter.Interpreter_intStack[--Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 >> 14 & 16383; + return 1; + } else if (var0 == ScriptOpcodes.COORDZ) { + var3 = Interpreter.Interpreter_intStack[--Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 >> 28; + return 1; + } else if (var0 == ScriptOpcodes.COORDY) { + var3 = Interpreter.Interpreter_intStack[--Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 & 16383; + return 1; + } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { + Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = HealthBarDefinition.method4673(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { + Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = UserComparator6.ItemContainer_getCount(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { + Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = ArchiveLoader.method1212(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { + if (Client.staffModLevel >= 2) { + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = Client.staffModLevel; + } else { + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.REBOOTTIMER) { + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = Client.rebootTimer; + return 1; + } else if (var0 == ScriptOpcodes.MAP_WORLD) { + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = Client.worldId; + return 1; + } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = Client.runEnergy; + return 1; + } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = Client.weight; + return 1; + } else if (var0 == ScriptOpcodes.PLAYERMOD) { + if (Client.playerMod) { + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDFLAGS) { + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = Client.worldProperties; + return 1; + } else if (var0 == ScriptOpcodes.MOVECOORD) { + Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 2]; + int var6 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 3]; + var3 += var4 << 14; + var3 += var5 << 28; + var3 += var6; + Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3; + return 1; + } else { + return 2; + } + } + } + } + + @ObfuscatedName("ia") + @ObfuscatedSignature( + signature = "(S)I", + garbageValue = "-5481" + ) + static final int method3421() { + return Client.menuOptionsCount - 1; + } } diff --git a/runescape-client/src/main/java/User.java b/runescape-client/src/main/java/User.java index 8fb7a6ebd9..a91c1b7686 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("jd") +@ObfuscatedName("jf") @Implements("User") public class User implements Comparable { - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lku;" + signature = "Lkq;" ) @Export("username") Username username; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lku;" + signature = "Lkq;" ) @Export("previousUsername") Username previousUsername; @@ -22,40 +22,40 @@ public class User implements Comparable { User() { } - @ObfuscatedName("ar") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(I)Lku;", - garbageValue = "-1106641864" + signature = "(I)Lkq;", + garbageValue = "352262046" ) @Export("getUsername") public Username getUsername() { return this.username; } - @ObfuscatedName("af") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(I)Ljava/lang/String;", - garbageValue = "1751830464" + signature = "(B)Ljava/lang/String;", + garbageValue = "111" ) @Export("getName") public String getName() { return this.username == null ? "" : this.username.getName(); } - @ObfuscatedName("at") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(I)Ljava/lang/String;", - garbageValue = "-1275191870" + garbageValue = "-461021692" ) @Export("getPreviousName") public String getPreviousName() { return this.previousUsername == null ? "" : this.previousUsername.getName(); } - @ObfuscatedName("as") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lku;Lku;S)V", - garbageValue = "255" + signature = "(Lkq;Lkq;I)V", + garbageValue = "-1982838307" ) @Export("set") void set(Username var1, Username var2) { @@ -67,10 +67,10 @@ public class User implements Comparable { } } - @ObfuscatedName("am") + @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(Ljd;I)I", - garbageValue = "-1956183743" + signature = "(Ljf;I)I", + garbageValue = "334051838" ) @Export("compareTo_user") public int compareTo_user(User var1) { @@ -80,4 +80,66 @@ public class User implements Comparable { public int compareTo(Object var1) { return this.compareTo_user((User)var1); } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "406400151" + ) + static void method5228() { + 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; + } + + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "([BI)V", + garbageValue = "-519092714" + ) + @Export("ByteArrayPool_release") + public static synchronized void ByteArrayPool_release(byte[] var0) { + if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < 1000) { + ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; + } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < 250) { + ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; + } else if (var0.length == 30000 && ByteArrayPool.ByteArrayPool_largeCount < 50) { + ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; + } else { + if (Fonts.ByteArrayPool_arrays != null) { + for (int var1 = 0; var1 < ParamDefinition.ByteArrayPool_alternativeSizes.length; ++var1) { + if (var0.length == ParamDefinition.ByteArrayPool_alternativeSizes[var1] && VarbitDefinition.ByteArrayPool_altSizeArrayCounts[var1] < Fonts.ByteArrayPool_arrays[var1].length) { + Fonts.ByteArrayPool_arrays[var1][VarbitDefinition.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; + return; + } + } + } + + } + } } diff --git a/runescape-client/src/main/java/UserComparator1.java b/runescape-client/src/main/java/UserComparator1.java index 5d5578b64e..8657d62087 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("ll") +@ObfuscatedName("la") @Implements("UserComparator1") public class UserComparator1 implements Comparator { @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "Liy;" - ) - @Export("HitSplatDefinition_spritesArchive") - public static AbstractArchive HitSplatDefinition_spritesArchive; - @ObfuscatedName("x") @Export("reversed") final boolean reversed; @@ -21,10 +15,10 @@ public class UserComparator1 implements Comparator { this.reversed = var1; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljd;Ljd;I)I", - garbageValue = "-1609540202" + signature = "(Ljf;Ljf;I)I", + garbageValue = "1065681362" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { diff --git a/runescape-client/src/main/java/UserComparator10.java b/runescape-client/src/main/java/UserComparator10.java index aa37892007..43c1a67c83 100644 --- a/runescape-client/src/main/java/UserComparator10.java +++ b/runescape-client/src/main/java/UserComparator10.java @@ -1,12 +1,19 @@ +import java.util.Date; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fi") +@ObfuscatedName("fq") @Implements("UserComparator10") public class UserComparator10 extends AbstractUserComparator { - @ObfuscatedName("x") + @ObfuscatedName("ef") + @ObfuscatedSignature( + signature = "Llq;" + ) + @Export("spriteIds") + static GraphicsDefaults spriteIds; + @ObfuscatedName("m") @Export("reversed") final boolean reversed; @@ -14,10 +21,10 @@ public class UserComparator10 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lke;Lke;I)I", - garbageValue = "1762023297" + signature = "(Lkx;Lkx;I)I", + garbageValue = "-227570330" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -31,4 +38,39 @@ public class UserComparator10 extends AbstractUserComparator { public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } + + @ObfuscatedName("ks") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)V", + garbageValue = "-856816613" + ) + static void method3522(String var0) { + Client.field871 = var0; + + try { + String var1 = WorldMapSectionType.client.getParameter(Integer.toString(18)); + String var2 = WorldMapSectionType.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 { + String var4 = var3 + "; Expires="; + long var6 = MilliClock.currentTimeMillis() + 94608000000L; + Calendar.Calendar_calendar.setTime(new Date(var6)); + int var8 = Calendar.Calendar_calendar.get(7); + int var9 = Calendar.Calendar_calendar.get(5); + int var10 = Calendar.Calendar_calendar.get(2); + int var11 = Calendar.Calendar_calendar.get(1); + int var12 = Calendar.Calendar_calendar.get(11); + int var13 = Calendar.Calendar_calendar.get(12); + int var14 = Calendar.Calendar_calendar.get(13); + String var5 = Calendar.DAYS_OF_THE_WEEK[var8 - 1] + ", " + var9 / 10 + var9 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var10] + "-" + var11 + " " + var12 / 10 + var12 % 10 + ":" + var13 / 10 + var13 % 10 + ":" + var14 / 10 + var14 % 10 + " GMT"; + var3 = var4 + var5 + "; Max-Age=" + 94608000L; + } + + class56.method919(WorldMapSectionType.client, "document.cookie=\"" + var3 + "\""); + } catch (Throwable var15) { + } + + } } diff --git a/runescape-client/src/main/java/UserComparator2.java b/runescape-client/src/main/java/UserComparator2.java index 7c36f801f8..f7129c055c 100644 --- a/runescape-client/src/main/java/UserComparator2.java +++ b/runescape-client/src/main/java/UserComparator2.java @@ -1,19 +1,16 @@ +import java.lang.reflect.Field; +import java.lang.reflect.Method; import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; -@ObfuscatedName("lh") +@ObfuscatedName("lt") @Implements("UserComparator2") public class UserComparator2 implements Comparator { - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "[Lch;" - ) - @Export("World_worlds") - static World[] World_worlds; - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("reversed") final boolean reversed; @@ -21,10 +18,10 @@ public class UserComparator2 implements Comparator { this.reversed = var1; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljd;Ljd;I)I", - garbageValue = "-426139063" + signature = "(Ljf;Ljf;I)I", + garbageValue = "1905433483" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { @@ -38,4 +35,119 @@ public class UserComparator2 implements Comparator { public boolean equals(Object var1) { return super.equals(var1); } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(Lkn;II)V", + garbageValue = "1240194067" + ) + @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] = ByteArrayPool.loadClassFromDescriptor(var8[var12]); + } + + Class var22 = ByteArrayPool.loadClassFromDescriptor(var20); + if (ByteArrayPool.loadClassFromDescriptor(var5).getClassLoader() == null) { + throw new SecurityException(); + } + + Method[] var13 = ByteArrayPool.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 (ByteArrayPool.loadClassFromDescriptor(var5).getClassLoader() == null) { + throw new SecurityException(); + } + + var2.fields[var3] = Reflection.findField(ByteArrayPool.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; + } + } + + class105.reflectionChecks.addFirst(var2); + } } diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java index 1145db98ff..ec6e9a1c5d 100644 --- a/runescape-client/src/main/java/UserComparator3.java +++ b/runescape-client/src/main/java/UserComparator3.java @@ -1,18 +1,30 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fp") +@ObfuscatedName("fy") @Implements("UserComparator3") public class UserComparator3 extends AbstractUserComparator { - @ObfuscatedName("pl") - @ObfuscatedSignature( - signature = "Llg;" + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 822744565 ) - @Export("privateChatMode") - static PrivateChatMode privateChatMode; - @ObfuscatedName("x") + static int field2009; + @ObfuscatedName("gj") + @ObfuscatedSignature( + signature = "Lem;" + ) + @Export("scene") + static Scene scene; + @ObfuscatedName("jf") + @ObfuscatedSignature( + signature = "Ldu;" + ) + @Export("textureProvider") + static TextureProvider textureProvider; + @ObfuscatedName("m") @Export("reversed") final boolean reversed; @@ -20,10 +32,10 @@ public class UserComparator3 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lke;Lke;I)I", - garbageValue = "1767041351" + signature = "(Lkx;Lkx;I)I", + garbageValue = "1287219897" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -38,23 +50,133 @@ public class UserComparator3 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lch;S)V", - garbageValue = "5308" + signature = "(CB)B", + garbageValue = "-48" ) - @Export("changeWorld") - static void changeWorld(World var0) { - if (var0.isMembersOnly() != Client.isMembersWorld) { - Client.isMembersWorld = var0.isMembersOnly(); - ArchiveLoader.method1254(var0.isMembersOnly()); + @Export("charToByteCp1252") + public static byte charToByteCp1252(char var0) { + byte var1; + if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) { + var1 = (byte)var0; + } else if (var0 == 8364) { + var1 = -128; + } else if (var0 == 8218) { + var1 = -126; + } else if (var0 == 402) { + var1 = -125; + } else if (var0 == 8222) { + var1 = -124; + } else if (var0 == 8230) { + var1 = -123; + } else if (var0 == 8224) { + var1 = -122; + } else if (var0 == 8225) { + var1 = -121; + } else if (var0 == 710) { + var1 = -120; + } else if (var0 == 8240) { + var1 = -119; + } else if (var0 == 352) { + var1 = -118; + } else if (var0 == 8249) { + var1 = -117; + } else if (var0 == 338) { + var1 = -116; + } else if (var0 == 381) { + var1 = -114; + } else if (var0 == 8216) { + var1 = -111; + } else if (var0 == 8217) { + var1 = -110; + } else if (var0 == 8220) { + var1 = -109; + } else if (var0 == 8221) { + var1 = -108; + } else if (var0 == 8226) { + var1 = -107; + } else if (var0 == 8211) { + var1 = -106; + } else if (var0 == 8212) { + var1 = -105; + } else if (var0 == 732) { + var1 = -104; + } else if (var0 == 8482) { + var1 = -103; + } else if (var0 == 353) { + var1 = -102; + } else if (var0 == 8250) { + var1 = -101; + } else if (var0 == 339) { + var1 = -100; + } else if (var0 == 382) { + var1 = -98; + } else if (var0 == 376) { + var1 = -97; + } else { + var1 = 63; + } + + return var1; + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(Lic;Lic;ZLko;S)V", + garbageValue = "22791" + ) + public static void method3548(AbstractArchive var0, AbstractArchive var1, boolean var2, Font var3) { + VarcInt.ItemDefinition_archive = var0; + ItemDefinition.ItemDefinition_modelArchive = var1; + SoundCache.ItemDefinition_inMembersWorld = var2; + HitSplatDefinition.ItemDefinition_fileCount = VarcInt.ItemDefinition_archive.getGroupFileCount(10); + class234.ItemDefinition_fontPlain11 = var3; + } + + @ObfuscatedName("if") + @ObfuscatedSignature( + signature = "(Lhd;IIZS)V", + garbageValue = "1700" + ) + @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.field2741 * var0.height / var0.field2641; + } + + if (var0.heightAlignment == 4) { + var0.height = var0.width * var0.field2641 / var0.field2741; + } + + 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); } - Script.worldHost = var0.host; - Client.worldId = var0.id; - Client.worldProperties = var0.properties; - WorldMapLabelSize.port1 = Client.gameBuild == 0 ? 43594 : var0.id + 40000; - GrandExchangeOfferAgeComparator.port2 = Client.gameBuild == 0 ? 443 : var0.id + 50000; - class280.port3 = WorldMapLabelSize.port1; } } diff --git a/runescape-client/src/main/java/UserComparator4.java b/runescape-client/src/main/java/UserComparator4.java index 7e8af183d1..aa5093565a 100644 --- a/runescape-client/src/main/java/UserComparator4.java +++ b/runescape-client/src/main/java/UserComparator4.java @@ -4,16 +4,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ff") +@ObfuscatedName("fc") @Implements("UserComparator4") public class UserComparator4 implements Comparator { - @ObfuscatedName("ot") - @ObfuscatedSignature( - signature = "Lcp;" - ) - @Export("varcs") - static Varcs varcs; - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("reversed") final boolean reversed; @@ -21,45 +15,136 @@ public class UserComparator4 implements Comparator { this.reversed = var1; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lke;Lke;I)I", - garbageValue = "1812606392" + signature = "(Lkx;Lkx;I)I", + garbageValue = "-1314738925" ) @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("fy") - @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "120" - ) - static int method3482(int var0) { - return var0 * 3 + 600; + public boolean equals(Object var1) { + return super.equals(var1); } - @ObfuscatedName("gy") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "1975650180" + signature = "(Lgn;Llb;I)Lgj;", + garbageValue = "527815306" ) - static final void method3490(int var0, int var1) { - if (Client.hintArrowType == 2) { - WorldMapSection0.worldToScreen((Client.hintArrowX - class69.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - class89.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); - if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { - class4.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); - } + @Export("getPacketBufferNode") + public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { + PacketBufferNode var2; + if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { + var2 = new PacketBufferNode(); + } else { + var2 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; + } + var2.clientPacket = var0; + var2.clientPacketLength = var0.length; + if (var2.clientPacketLength == -1) { + var2.packetBuffer = new PacketBuffer(260); + } else if (var2.clientPacketLength == -2) { + var2.packetBuffer = new PacketBuffer(10000); + } else if (var2.clientPacketLength <= 18) { + var2.packetBuffer = new PacketBuffer(20); + } else if (var2.clientPacketLength <= 98) { + var2.packetBuffer = new PacketBuffer(100); + } else { + var2.packetBuffer = new PacketBuffer(260); + } + + var2.packetBuffer.setIsaacCipher(var1); + var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); + var2.index = 0; + return var2; + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(Lic;Lic;Lic;Lic;B)V", + garbageValue = "-47" + ) + public static void method3495(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, AbstractArchive var3) { + Widget.Widget_archive = var0; + SecureRandomCallable.Widget_modelsArchive = var1; + class349.Widget_spritesArchive = var2; + WorldMapLabel.Widget_fontsArchive = var3; + Widget.Widget_interfaceComponents = new Widget[Widget.Widget_archive.getGroupCount()][]; + UserComparator6.Widget_loadedInterfaces = new boolean[Widget.Widget_archive.getGroupCount()]; + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(II)Z", + garbageValue = "-2121734057" + ) + @Export("loadInterface") + public static boolean loadInterface(int var0) { + if (UserComparator6.Widget_loadedInterfaces[var0]) { + return true; + } else if (!Widget.Widget_archive.tryLoadGroup(var0)) { + return false; + } else { + int var1 = Widget.Widget_archive.getGroupFileCount(var0); + if (var1 == 0) { + UserComparator6.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)); + } + } + } + } + + UserComparator6.Widget_loadedInterfaces[var0] = true; + return true; + } + } + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "1503044626" + ) + @Export("runWidgetOnLoadListener") + static void runWidgetOnLoadListener(int var0) { + if (var0 != -1) { + if (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; + WorldMapLabel.runScript(var4, 5000000); + } + } + + } } } } diff --git a/runescape-client/src/main/java/UserComparator5.java b/runescape-client/src/main/java/UserComparator5.java index 0725847680..deb0a9df23 100644 --- a/runescape-client/src/main/java/UserComparator5.java +++ b/runescape-client/src/main/java/UserComparator5.java @@ -3,10 +3,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fc") +@ObfuscatedName("fx") @Implements("UserComparator5") public class UserComparator5 extends AbstractUserComparator { - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("reversed") final boolean reversed; @@ -14,10 +14,10 @@ public class UserComparator5 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lke;Lke;I)I", - garbageValue = "261090852" + signature = "(Lkx;Lkx;B)I", + garbageValue = "0" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -36,85 +36,69 @@ public class UserComparator5 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("t") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1985272675" + signature = "(Lkn;IB)Ljava/lang/String;", + garbageValue = "2" ) - public static void method3520() { - KitDefinition.KitDefinition_cached.clear(); - } + static String method3534(Buffer var0, int var1) { + try { + int var2 = var0.readUShortSmart(); + if (var2 > var1) { + var2 = var1; + } - @ObfuscatedName("gf") - @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "-447176134" - ) - static final void method3523(int var0, int var1, int var2, int var3) { - ViewportMouse.method3091(); - } - - @ObfuscatedName("if") - @ObfuscatedSignature( - signature = "(IB)Ljava/lang/String;", - garbageValue = "0" - ) - @Export("formatItemStacks") - static final String formatItemStacks(int var0) { - String var1 = Integer.toString(var0); - - for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { - var1 = var1.substring(0, var2) + "," + var1.substring(var2); - } - - if (var1.length() > 9) { - return " " + class297.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; - } else { - return var1.length() > 6 ? " " + class297.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + class297.colorStartTag(16776960) + var1 + ""; + byte[] var3 = new byte[var2]; + var0.offset += class219.huffman.decompress(var0.array, var0.offset, var3, 0, var2); + String var4 = MouseRecorder.decodeStringCp1252(var3, 0, var2); + return var4; + } catch (Exception var6) { + return "Cabbage"; } } - @ObfuscatedName("jt") + @ObfuscatedName("in") @ObfuscatedSignature( - signature = "(Lhe;I)V", - garbageValue = "-1600087023" + signature = "(IIIIIIS)V", + garbageValue = "-4011" ) - static final void method3521(Widget var0) { - int var1 = var0.contentType; - if (var1 == 324) { - if (Client.field945 == -1) { - Client.field945 = var0.spriteId2; - Client.field946 = var0.spriteId; - } + static final void method3540(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 (Client.playerAppearance.isFemale) { - var0.spriteId2 = Client.field945; + if (var10 != 0) { + int var11 = (var6 << 16) / var10; + int var12 = (var7 << 16) / var10; + if (var12 <= var11) { + var11 = -var11; } else { - var0.spriteId2 = Client.field946; + var12 = -var12; } - } else if (var1 == 325) { - if (Client.field945 == -1) { - Client.field945 = var0.spriteId2; - Client.field946 = var0.spriteId; - } - - if (Client.playerAppearance.isFemale) { - var0.spriteId2 = Client.field946; - } else { - var0.spriteId2 = Client.field945; - } - - } 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; + int var13 = var5 * var12 >> 17; + int var14 = var5 * var12 + 1 >> 17; + int var15 = var5 * var11 >> 17; + int var16 = var5 * var11 + 1 >> 17; + var0 -= Rasterizer2D.Rasterizer2D_xClipStart; + var1 -= Rasterizer2D.Rasterizer2D_yClipStart; + int var17 = var0 + var13; + int var18 = var0 - var14; + int var19 = var0 + var6 - var14; + int var20 = var0 + var13 + var6; + int var21 = var15 + var1; + int var22 = var1 - var16; + int var23 = var7 + var1 - var16; + int var24 = var7 + var15 + var1; + Rasterizer3D.method3144(var17, var18, var19); + Rasterizer3D.method3124(var21, var22, var23, var17, var18, var19, var4); + Rasterizer3D.method3144(var17, var19, var20); + Rasterizer3D.method3124(var21, var23, var24, var17, var19, var20, var4); } } } diff --git a/runescape-client/src/main/java/UserComparator6.java b/runescape-client/src/main/java/UserComparator6.java index 38e97ac252..048896f832 100644 --- a/runescape-client/src/main/java/UserComparator6.java +++ b/runescape-client/src/main/java/UserComparator6.java @@ -3,13 +3,19 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fx") +@ObfuscatedName("fo") @Implements("UserComparator6") public class UserComparator6 extends AbstractUserComparator { - @ObfuscatedName("s") - @Export("Tiles_saturation") - static int[] Tiles_saturation; - @ObfuscatedName("x") + @ObfuscatedName("u") + @Export("Widget_loadedInterfaces") + static boolean[] Widget_loadedInterfaces; + @ObfuscatedName("gp") + @ObfuscatedSignature( + signature = "[Llh;" + ) + @Export("mapSceneSprites") + static IndexedSprite[] mapSceneSprites; + @ObfuscatedName("m") @Export("reversed") final boolean reversed; @@ -17,10 +23,10 @@ public class UserComparator6 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lke;Lke;I)I", - garbageValue = "1973806284" + signature = "(Lkx;Lkx;S)I", + garbageValue = "2600" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -34,4 +40,31 @@ public class UserComparator6 extends AbstractUserComparator { public int compare(Object var1, Object var2) { return this.compareBuddy((Buddy)var1, (Buddy)var2); } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(IIB)I", + garbageValue = "-59" + ) + @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("gf") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "0" + ) + static void method3564() { + if (Client.renderSelf) { + class9.addPlayerToScene(class60.localPlayer, false); + } + + } } diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java index b849851171..29b56a0d1e 100644 --- a/runescape-client/src/main/java/UserComparator7.java +++ b/runescape-client/src/main/java/UserComparator7.java @@ -1,12 +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; -@ObfuscatedName("fv") +@ObfuscatedName("fk") @Implements("UserComparator7") public class UserComparator7 extends AbstractUserComparator { - @ObfuscatedName("x") + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -221140543 + ) + static int field2003; + @ObfuscatedName("dv") + @ObfuscatedSignature( + signature = "Lig;" + ) + @Export("archive6") + static Archive archive6; + @ObfuscatedName("m") @Export("reversed") final boolean reversed; @@ -14,10 +26,10 @@ public class UserComparator7 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lke;Lke;I)I", - garbageValue = "-1450384887" + signature = "(Lkx;Lkx;B)I", + garbageValue = "-76" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -32,18 +44,75 @@ public class UserComparator7 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("n") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Liy;III)Z", - garbageValue = "-1163904871" + signature = "(Ljava/lang/CharSequence;I)Z", + garbageValue = "-71116023" ) - public static boolean method3516(AbstractArchive var0, int var1, int var2) { - byte[] var3 = var0.takeFile(var1, var2); - if (var3 == null) { - return false; - } else { - MusicPatch.SpriteBuffer_decode(var3); - return true; + @Export("isNumber") + public static boolean isNumber(CharSequence var0) { + boolean var2 = false; + boolean var3 = false; + int var4 = 0; + int var5 = var0.length(); + int var6 = 0; + + boolean var1; + while (true) { + if (var6 >= var5) { + var1 = var3; + break; + } + + 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; } } diff --git a/runescape-client/src/main/java/UserComparator8.java b/runescape-client/src/main/java/UserComparator8.java index 6cb1a19756..f6e04e6e30 100644 --- a/runescape-client/src/main/java/UserComparator8.java +++ b/runescape-client/src/main/java/UserComparator8.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("fo") +@ObfuscatedName("fp") @Implements("UserComparator8") public class UserComparator8 extends AbstractUserComparator { - @ObfuscatedName("x") + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 682159937 + ) + @Export("SpriteBuffer_spriteHeight") + static int SpriteBuffer_spriteHeight; + @ObfuscatedName("m") @Export("reversed") final boolean reversed; @@ -14,10 +21,10 @@ public class UserComparator8 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lke;Lke;I)I", - garbageValue = "-956709758" + signature = "(Lkx;Lkx;B)I", + garbageValue = "101" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -36,127 +43,12 @@ public class UserComparator8 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("gk") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "87" + signature = "(Lic;B)V", + garbageValue = "-79" ) - static final int method3503() { - if (GrandExchangeOfferOwnWorldComparator.clientPreferences.roofsHidden) { - return ScriptEvent.Client_plane; - } else { - int var0 = 3; - if (ApproximateRouteStrategy.cameraPitch < 310) { - int var1; - int var2; - if (Client.oculusOrbState == 1) { - var1 = SoundSystem.oculusOrbFocalPointX >> 7; - var2 = ServerPacket.oculusOrbFocalPointY >> 7; - } else { - var1 = ByteArrayPool.localPlayer.x >> 7; - var2 = ByteArrayPool.localPlayer.y >> 7; - } - - int var3 = WorldMapRectangle.cameraX >> 7; - int var4 = class200.cameraZ >> 7; - if (var3 < 0 || var4 < 0 || var3 >= 104 || var4 >= 104) { - return ScriptEvent.Client_plane; - } - - if (var1 < 0 || var2 < 0 || var1 >= 104 || var2 >= 104) { - return ScriptEvent.Client_plane; - } - - if ((Tiles.Tiles_renderFlags[ScriptEvent.Client_plane][var3][var4] & 4) != 0) { - var0 = ScriptEvent.Client_plane; - } - - int var5; - if (var1 > var3) { - var5 = var1 - var3; - } else { - var5 = var3 - var1; - } - - int var6; - if (var2 > var4) { - var6 = var2 - var4; - } else { - var6 = var4 - var2; - } - - int var7; - int var8; - if (var5 > var6) { - var7 = var6 * 65536 / var5; - var8 = 32768; - - while (var1 != var3) { - if (var3 < var1) { - ++var3; - } else if (var3 > var1) { - --var3; - } - - if ((Tiles.Tiles_renderFlags[ScriptEvent.Client_plane][var3][var4] & 4) != 0) { - var0 = ScriptEvent.Client_plane; - } - - var8 += var7; - if (var8 >= 65536) { - var8 -= 65536; - if (var4 < var2) { - ++var4; - } else if (var4 > var2) { - --var4; - } - - if ((Tiles.Tiles_renderFlags[ScriptEvent.Client_plane][var3][var4] & 4) != 0) { - var0 = ScriptEvent.Client_plane; - } - } - } - } else if (var6 > 0) { - var7 = var5 * 65536 / var6; - var8 = 32768; - - while (var4 != var2) { - if (var4 < var2) { - ++var4; - } else if (var4 > var2) { - --var4; - } - - if ((Tiles.Tiles_renderFlags[ScriptEvent.Client_plane][var3][var4] & 4) != 0) { - var0 = ScriptEvent.Client_plane; - } - - var8 += var7; - if (var8 >= 65536) { - var8 -= 65536; - if (var3 < var1) { - ++var3; - } else if (var3 > var1) { - --var3; - } - - if ((Tiles.Tiles_renderFlags[ScriptEvent.Client_plane][var3][var4] & 4) != 0) { - var0 = ScriptEvent.Client_plane; - } - } - } - } - } - - if (ByteArrayPool.localPlayer.x >= 0 && ByteArrayPool.localPlayer.y >= 0 && ByteArrayPool.localPlayer.x < 13312 && ByteArrayPool.localPlayer.y < 13312) { - if ((Tiles.Tiles_renderFlags[ScriptEvent.Client_plane][ByteArrayPool.localPlayer.x >> 7][ByteArrayPool.localPlayer.y >> 7] & 4) != 0) { - var0 = ScriptEvent.Client_plane; - } - - return var0; - } else { - return ScriptEvent.Client_plane; - } - } + public static void method3520(AbstractArchive var0) { + class349.EnumDefinition_archive = var0; } } diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java index 1bc92a84b7..3daeafa733 100644 --- a/runescape-client/src/main/java/UserComparator9.java +++ b/runescape-client/src/main/java/UserComparator9.java @@ -3,16 +3,22 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fd") +@ObfuscatedName("ft") @Implements("UserComparator9") public class UserComparator9 extends AbstractUserComparator { - @ObfuscatedName("eo") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lih;" + signature = "Lkn;" ) - @Export("archive18") - static Archive archive18; - @ObfuscatedName("x") + @Export("NetCache_reference") + public static Buffer NetCache_reference; + @ObfuscatedName("bw") + @ObfuscatedSignature( + signature = "Lgz;" + ) + @Export("clientLanguage") + static Language clientLanguage; + @ObfuscatedName("m") @Export("reversed") final boolean reversed; @@ -20,10 +26,10 @@ public class UserComparator9 extends AbstractUserComparator { this.reversed = var1; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lke;Lke;I)I", - garbageValue = "-54374446" + signature = "(Lkx;Lkx;I)I", + garbageValue = "239506152" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -38,173 +44,57 @@ public class UserComparator9 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II)Ljn;", - garbageValue = "-1711395255" + signature = "(I)[Lgx;", + garbageValue = "-1951189301" ) - @Export("FloorUnderlayDefinition_get") - public static FloorOverlayDefinition FloorUnderlayDefinition_get(int var0) { - FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var0); - var1 = new FloorOverlayDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2), var0); - } - - var1.postDecode(); - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0); - return var1; - } + static LoginPacket[] method3512() { + return new LoginPacket[]{LoginPacket.field2346, LoginPacket.field2347, LoginPacket.field2345, LoginPacket.field2350, LoginPacket.field2352, LoginPacket.field2348}; } - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(B)Lgq;", - garbageValue = "-87" - ) - public static PacketBufferNode method3496() { - return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; - } - - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1233574382" + garbageValue = "17173130" ) - static void method3498() { - Tiles.Tiles_minPlane = 99; - Tiles.field538 = new byte[4][104][104]; - class348.field4061 = new byte[4][104][104]; - Tiles.field539 = new byte[4][104][104]; - Tiles.field540 = new byte[4][104][104]; - WorldMapSection3.field404 = new int[4][105][105]; - SoundCache.field1462 = new byte[4][105][105]; - Tiles.field545 = new int[105][105]; - GrandExchangeOfferAgeComparator.Tiles_hue = new int[104]; - UserComparator6.Tiles_saturation = new int[104]; - StructDefinition.Tiles_lightness = new int[104]; - Tiles.Tiles_hueMultiplier = new int[104]; - FriendSystem.field1086 = new int[104]; - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "([Lch;II[I[II)V", - garbageValue = "943885059" - ) - @Export("sortWorlds") - static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) { - if (var1 < var2) { - int var5 = var1 - 1; - int var6 = var2 + 1; - int var7 = (var2 + var1) / 2; - World var8 = var0[var7]; - var0[var7] = var0[var1]; - var0[var1] = var8; - - while (var5 < var6) { - boolean var9 = true; - - int var10; - int var11; - int var12; - do { - --var6; - - for (var10 = 0; var10 < 4; ++var10) { - if (var3[var10] == 2) { - var11 = var0[var6].index; - var12 = var8.index; - } else if (var3[var10] == 1) { - var11 = var0[var6].population; - var12 = var8.population; - if (var11 == -1 && var4[var10] == 1) { - var11 = 2001; - } - - if (var12 == -1 && var4[var10] == 1) { - var12 = 2001; - } - } else if (var3[var10] == 3) { - var11 = var0[var6].isMembersOnly() ? 1 : 0; - var12 = var8.isMembersOnly() ? 1 : 0; - } else { - var11 = var0[var6].id; - var12 = var8.id; - } - - if (var11 != var12) { - if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { - var9 = false; - } - break; - } - - if (var10 == 3) { - var9 = false; - } - } - } while(var9); - - var9 = true; - - do { - ++var5; - - for (var10 = 0; var10 < 4; ++var10) { - if (var3[var10] == 2) { - var11 = var0[var5].index; - var12 = var8.index; - } else if (var3[var10] == 1) { - var11 = var0[var5].population; - var12 = var8.population; - if (var11 == -1 && var4[var10] == 1) { - var11 = 2001; - } - - if (var12 == -1 && var4[var10] == 1) { - var12 = 2001; - } - } else if (var3[var10] == 3) { - var11 = var0[var5].isMembersOnly() ? 1 : 0; - var12 = var8.isMembersOnly() ? 1 : 0; - } else { - var11 = var0[var5].id; - var12 = var8.id; - } - - if (var11 != var12) { - if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { - var9 = false; - } - break; - } - - if (var10 == 3) { - var9 = false; - } - } - } while(var9); - - if (var5 < var6) { - World var13 = var0[var5]; - var0[var5] = var0[var6]; - var0[var6] = var13; - } + public static void method3509() { + if (MouseHandler.MouseHandler_instance != null) { + synchronized(MouseHandler.MouseHandler_instance) { + MouseHandler.MouseHandler_instance = null; } - - sortWorlds(var0, var1, var6, var3, var4); - sortWorlds(var0, var6 + 1, var2, var3, var4); } } - @ObfuscatedName("v") - public static int method3500(long var0) { - return (int)(var0 >>> 7 & 127L); + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(Lic;IIIZB)V", + garbageValue = "18" + ) + public static void method3513(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { + class206.field2439 = 1; + Huffman.musicTrackArchive = var0; + class206.musicTrackGroupId = var1; + MilliClock.musicTrackFileId = var2; + class206.musicTrackVolume = var3; + class336.musicTrackBoolean = var4; + class206.field2442 = 10000; + } + + @ObfuscatedName("fx") + @ObfuscatedSignature( + signature = "(IB)V", + garbageValue = "41" + ) + @Export("playSong") + static void playSong(int var0) { + if (var0 == -1 && !Client.field743) { + class89.method2161(); + } else if (var0 != -1 && var0 != Client.currentTrackGroupId && Client.musicVolume != 0 && !Client.field743) { + MenuAction.playMusicTrack(2, UserComparator7.archive6, var0, 0, Client.musicVolume, false); + } + + Client.currentTrackGroupId = var0; } } diff --git a/runescape-client/src/main/java/UserList.java b/runescape-client/src/main/java/UserList.java index fa30605a75..a697b6cfee 100644 --- a/runescape-client/src/main/java/UserList.java +++ b/runescape-client/src/main/java/UserList.java @@ -6,36 +6,35 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("kw") +@ObfuscatedName("ku") @Implements("UserList") public abstract class UserList { - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 359260523 + intValue = -233955523 ) @Export("capacity") final int capacity; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1553317273 + intValue = 2126526035 ) @Export("size") int size; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "[Ljd;" + signature = "[Ljf;" ) @Export("array") User[] array; - @ObfuscatedName("q") + @ObfuscatedName("n") @Export("usernamesMap") HashMap usernamesMap; - @ObfuscatedName("z") + @ObfuscatedName("u") @Export("previousUsernamesMap") HashMap previousUsernamesMap; - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("comparator") Comparator comparator; @@ -48,26 +47,26 @@ public abstract class UserList { this.previousUsernamesMap = new HashMap(var1 / 8); } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)Ljd;", - garbageValue = "-1332552421" + signature = "(I)Ljf;", + garbageValue = "551595115" ) @Export("newInstance") abstract User newInstance(); - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)[Ljd;", - garbageValue = "-667029686" + signature = "(II)[Ljf;", + garbageValue = "1959965595" ) @Export("newTypedArray") abstract User[] newTypedArray(int var1); - @ObfuscatedName("e") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1068929306" + garbageValue = "-830188441" ) @Export("clear") public void clear() { @@ -77,30 +76,30 @@ public abstract class UserList { this.previousUsernamesMap.clear(); } - @ObfuscatedName("s") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "4" + signature = "(I)I", + garbageValue = "-729089769" ) @Export("getSize") public int getSize() { return this.size; } - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "1500565158" + signature = "(B)Z", + garbageValue = "-38" ) @Export("isFull") public boolean isFull() { - return this.capacity == this.size; + return this.size == this.capacity; } - @ObfuscatedName("n") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(Lku;I)Z", - garbageValue = "330121019" + signature = "(Lkq;I)Z", + garbageValue = "-1632091525" ) @Export("contains") public boolean contains(Username var1) { @@ -111,10 +110,10 @@ public abstract class UserList { } } - @ObfuscatedName("u") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lku;I)Ljd;", - garbageValue = "2044020824" + signature = "(Lkq;I)Ljf;", + garbageValue = "-1715419579" ) @Export("getByUsername") public User getByUsername(Username var1) { @@ -122,30 +121,30 @@ public abstract class UserList { return var2 != null ? var2 : this.getByPreviousUsername(var1); } - @ObfuscatedName("h") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(Lku;I)Ljd;", - garbageValue = "-678771148" + signature = "(Lkq;I)Ljf;", + garbageValue = "181197805" ) @Export("getByCurrentUsername") User getByCurrentUsername(Username var1) { return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); } - @ObfuscatedName("g") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lku;I)Ljd;", - garbageValue = "1317746514" + signature = "(Lkq;I)Ljf;", + garbageValue = "-1953560186" ) @Export("getByPreviousUsername") User getByPreviousUsername(Username var1) { return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); } - @ObfuscatedName("i") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Lku;I)Z", - garbageValue = "-734937712" + signature = "(Lkq;I)Z", + garbageValue = "-1728392725" ) @Export("removeByUsername") public final boolean removeByUsername(Username var1) { @@ -158,10 +157,10 @@ public abstract class UserList { } } - @ObfuscatedName("a") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(Ljd;I)V", - garbageValue = "-941355814" + signature = "(Ljf;I)V", + garbageValue = "1431327027" ) @Export("remove") final void remove(User var1) { @@ -172,20 +171,20 @@ public abstract class UserList { } } - @ObfuscatedName("o") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(Lku;I)Ljd;", - garbageValue = "-2093018234" + signature = "(Lkq;I)Ljf;", + garbageValue = "1944275129" ) @Export("addLastNoPreviousUsername") User addLastNoPreviousUsername(Username var1) { return this.addLast(var1, (Username)null); } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(Lku;Lku;B)Ljd;", - garbageValue = "50" + signature = "(Lkq;Lkq;B)Ljf;", + garbageValue = "-18" ) @Export("addLast") User addLast(Username var1, Username var2) { @@ -200,10 +199,10 @@ public abstract class UserList { } } - @ObfuscatedName("f") + @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(IS)Ljd;", - garbageValue = "-13330" + signature = "(II)Ljf;", + garbageValue = "421321691" ) @Export("get") public final User get(int var1) { @@ -214,10 +213,10 @@ public abstract class UserList { } } - @ObfuscatedName("ae") + @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "5757" + signature = "(I)V", + garbageValue = "-1382907285" ) @Export("sort") public final void sort() { @@ -229,10 +228,10 @@ public abstract class UserList { } - @ObfuscatedName("an") + @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "(Ljd;Lku;Lku;I)V", - garbageValue = "577990406" + signature = "(Ljf;Lkq;Lkq;B)V", + garbageValue = "30" ) @Export("changeName") final void changeName(User var1, Username var2, Username var3) { @@ -241,10 +240,10 @@ public abstract class UserList { this.mapPut(var1); } - @ObfuscatedName("ai") + @ObfuscatedName("ae") @ObfuscatedSignature( - signature = "(Ljd;I)I", - garbageValue = "-1683425809" + signature = "(Ljf;I)I", + garbageValue = "-473551805" ) @Export("indexOf") final int indexOf(User var1) { @@ -257,10 +256,10 @@ public abstract class UserList { return -1; } - @ObfuscatedName("ap") + @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "(Ljd;B)V", - garbageValue = "28" + signature = "(Ljf;S)V", + garbageValue = "28740" ) @Export("mapRemove") final void mapRemove(User var1) { @@ -274,20 +273,20 @@ public abstract class UserList { } } - @ObfuscatedName("ab") + @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "(Ljd;I)V", - garbageValue = "1612214268" + signature = "(Ljf;B)V", + garbageValue = "-110" ) @Export("arrayAddLast") final void arrayAddLast(User var1) { this.array[++this.size - 1] = var1; } - @ObfuscatedName("ar") + @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "(Ljd;I)V", - garbageValue = "1080849523" + signature = "(Ljf;I)V", + garbageValue = "-810709212" ) @Export("mapPut") final void mapPut(User var1) { @@ -301,10 +300,10 @@ public abstract class UserList { } - @ObfuscatedName("af") + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "-23" + signature = "(II)V", + garbageValue = "-1444172767" ) @Export("arrayRemove") final void arrayRemove(int var1) { @@ -315,20 +314,20 @@ public abstract class UserList { } - @ObfuscatedName("at") + @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-18" + signature = "(I)V", + garbageValue = "594179920" ) @Export("removeComparator") public final void removeComparator() { this.comparator = null; } - @ObfuscatedName("as") + @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "(Ljava/util/Comparator;I)V", - garbageValue = "-1901322261" + signature = "(Ljava/util/Comparator;B)V", + garbageValue = "-90" ) @Export("addComparator") public final void addComparator(Comparator var1) { @@ -340,201 +339,70 @@ public abstract class UserList { } - @ObfuscatedName("x") + @ObfuscatedName("hj") @ObfuscatedSignature( - signature = "(Liy;S)V", - garbageValue = "32619" + signature = "(I)V", + garbageValue = "-1614220910" ) - public static void method5179(AbstractArchive var0) { - InvDefinition.InvDefinition_archive = var0; - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "(ILce;ZB)I", - garbageValue = "43" - ) - static int method5225(int var0, Script var1, boolean var2) { - int var4 = -1; - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var3 = MusicPatchNode.getWidget(var4); - } else { - var3 = var2 ? GrandExchangeOfferNameComparator.field115 : Interpreter.field1130; + static final void method5333() { + 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.field907[++Client.field687 - 1] = Client.npcIndices[var2]; + } } - if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { - Interpreter.Interpreter_intStackSize -= 2; - var3.scrollX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; - if (var3.scrollX > var3.scrollWidth - var3.width) { - var3.scrollX = var3.scrollWidth - var3.width; - } - - if (var3.scrollX < 0) { - var3.scrollX = 0; - } - - var3.scrollY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; - if (var3.scrollY > var3.scrollHeight - var3.height) { - var3.scrollY = var3.scrollHeight - var3.height; - } - - if (var3.scrollY < 0) { - var3.scrollY = 0; - } - - ItemContainer.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { - var3.color = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - ItemContainer.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETFILL) { - var3.fill = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - ItemContainer.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTRANS) { - var3.transparencyTop = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - ItemContainer.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { - var3.lineWid = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - ItemContainer.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { - var3.spriteId2 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - ItemContainer.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { - var3.spriteAngle = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - ItemContainer.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTILING) { - var3.spriteTiling = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - ItemContainer.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODEL) { - var3.modelType = 1; - var3.modelId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - ItemContainer.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]; - ItemContainer.invalidateWidget(var3); - return 1; + if (var1 > Client.npcCount) { + throw new RuntimeException(""); } 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; - ItemContainer.invalidateWidget(var3); - } + Client.npcCount = 0; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { - var3.modelOrthog = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - ItemContainer.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; - ItemContainer.invalidateWidget(var3); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { - var3.fontId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - ItemContainer.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]; - ItemContainer.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { - var3.textShadowed = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - ItemContainer.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { - var3.outline = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - ItemContainer.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { - var3.spriteShadow = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - ItemContainer.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { - var3.spriteFlipV = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - ItemContainer.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { - var3.spriteFlipH = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - ItemContainer.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]; - ItemContainer.invalidateWidget(var3); - if (var4 != -1 && var3.type == 0) { - MouseHandler.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var4 >> 16], var3, false); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { - class58.resumePauseWidget(var3.id, var3.childIndex); - Client.meslayerContinueWidget = var3; - ItemContainer.invalidateWidget(var3); - return 1; - } else if (var0 == 1122) { - var3.spriteId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - ItemContainer.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { - var3.color2 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - ItemContainer.invalidateWidget(var3); - return 1; - } else if (var0 == 1124) { - var3.transparencyBot = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - ItemContainer.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETFILLMODE) { - var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - class332 var6 = (class332)GrandExchangeEvent.findEnumerated(MusicPatchNode.FillMode_values(), var8); - if (var6 != null) { - var3.fillMode = var6; - ItemContainer.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; + 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 { - return 2; + int var6 = var0.readBits(2); + if (var6 == 0) { + Client.npcIndices[++Client.npcCount - 1] = var3; + var4.npcCycle = Client.cycle; + Client.field719[++Client.field718 - 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.method2150(var7, (byte)1); + var8 = var0.readBits(1); + if (var8 == 1) { + Client.field719[++Client.field718 - 1] = var3; + } + } else if (var6 == 2) { + Client.npcIndices[++Client.npcCount - 1] = var3; + var4.npcCycle = Client.cycle; + var7 = var0.readBits(3); + var4.method2150(var7, (byte)2); + var8 = var0.readBits(3); + var4.method2150(var8, (byte)2); + int var9 = var0.readBits(1); + if (var9 == 1) { + Client.field719[++Client.field718 - 1] = var3; + } + } else if (var6 == 3) { + Client.field907[++Client.field687 - 1] = var3; + } + } } } + } } } diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java index 0534a391dc..e1d52cf7ac 100644 --- a/runescape-client/src/main/java/Username.java +++ b/runescape-client/src/main/java/Username.java @@ -3,219 +3,48 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ku") +@ObfuscatedName("kq") @Implements("Username") public class Username implements Comparable { - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("name") String name; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("cleanName") String cleanName; @ObfuscatedSignature( - signature = "(Ljava/lang/String;Lmx;)V" + signature = "(Ljava/lang/String;Lmo;)V" ) public Username(String var1, LoginType var2) { this.name = var1; - 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 <= class228.method4205(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 (AbstractWorldMapIcon.isAlphaNumeric(var10)) { - var11 = true; - } else { - char[] var16 = class348.field4062; - int var13 = 0; - - label89: - while (true) { - char var14; - if (var13 >= var16.length) { - var16 = class348.field4063; - - for (var13 = 0; var13 < var16.length; ++var13) { - var14 = var16[var13]; - if (var14 == var10) { - var11 = true; - break label89; - } - } - - var11 = false; - break; - } - - var14 = var16[var13]; - if (var14 == var10) { - 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; + this.cleanName = class280.method5160(var1, var2); } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I)Ljava/lang/String;", - garbageValue = "-317689789" + garbageValue = "-633298311" ) @Export("getName") public String getName() { return this.name; } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-1005152425" + signature = "(B)Z", + garbageValue = "0" ) @Export("hasCleanName") public boolean hasCleanName() { return this.cleanName != null; } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lku;B)I", - garbageValue = "-36" + signature = "(Lkq;I)I", + garbageValue = "820506062" ) @Export("compareToTyped") public int compareToTyped(Username var1) { @@ -253,21 +82,12 @@ public class Username implements Comparable { return this.compareToTyped((Username)var1); } - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Liy;Ljava/lang/String;Ljava/lang/String;B)[Lle;", - garbageValue = "93" + signature = "(Ljava/lang/CharSequence;II)I", + garbageValue = "-794040320" ) - public static IndexedSprite[] method5271(AbstractArchive var0, String var1, String var2) { - int var3 = var0.getGroupId(var1); - int var4 = var0.getFileId(var3, var2); - IndexedSprite[] var5; - if (!UserComparator7.method3516(var0, var3, var4)) { - var5 = null; - } else { - var5 = Skills.method4214(); - } - - return var5; + public static int method5398(CharSequence var0, int var1) { + return SecureRandomFuture.parseIntCustomRadix(var0, var1, true); } } diff --git a/runescape-client/src/main/java/Usernamed.java b/runescape-client/src/main/java/Usernamed.java index 6b5e73e43f..41b685745a 100644 --- a/runescape-client/src/main/java/Usernamed.java +++ b/runescape-client/src/main/java/Usernamed.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kt") +@ObfuscatedName("kp") @Implements("Usernamed") public interface Usernamed { - @ObfuscatedName("kd") + @ObfuscatedName("kr") @ObfuscatedSignature( - signature = "(I)Lku;", - garbageValue = "-1860083598" + signature = "(B)Lkq;", + garbageValue = "-76" ) @Export("username") Username username(); diff --git a/runescape-client/src/main/java/VarbitDefinition.java b/runescape-client/src/main/java/VarbitDefinition.java index 81e54a7ee9..25b009924e 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("iu") +@ObfuscatedName("iv") @Implements("VarbitDefinition") public class VarbitDefinition extends DualNode { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Liy;" + signature = "Lic;" ) @Export("VarbitDefinition_archive") public static AbstractArchive VarbitDefinition_archive; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Leg;" + signature = "Lec;" ) @Export("VarbitDefinition_cached") public static EvictingDualNodeHashTable VarbitDefinition_cached; - @ObfuscatedName("k") + @ObfuscatedName("u") + @Export("ByteArrayPool_altSizeArrayCounts") + static int[] ByteArrayPool_altSizeArrayCounts; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -927244413 + intValue = -85877297 ) @Export("baseVar") public int baseVar; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -326860353 + intValue = -392632623 ) @Export("startBit") public int startBit; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1659687913 + intValue = 196486925 ) @Export("endBit") public int endBit; @@ -44,8 +47,8 @@ public class VarbitDefinition extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkb;B)V", - garbageValue = "113" + signature = "(Lkn;I)V", + garbageValue = "-1405036764" ) @Export("decode") public void decode(Buffer var1) { @@ -59,10 +62,10 @@ public class VarbitDefinition extends DualNode { } } - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkb;II)V", - garbageValue = "842018241" + signature = "(Lkn;II)V", + garbageValue = "692433347" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -73,4 +76,60 @@ public class VarbitDefinition extends DualNode { } } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(I)[Lis;", + garbageValue = "-2057939908" + ) + @Export("PlayerType_values") + public static PlayerType[] PlayerType_values() { + return new PlayerType[]{PlayerType.PlayerType_ultimateIronman, PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_ironman, PlayerType.PlayerType_normal, PlayerType.PlayerType_playerModerator}; + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(II)Lii;", + garbageValue = "-266354668" + ) + @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 = class198.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; + } + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "(IIII)I", + garbageValue = "828959828" + ) + static final int method4696(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 = Messages.method2350(var3, var5); + int var8 = Messages.method2350(var3 + 1, var5); + int var9 = Messages.method2350(var3, var5 + 1); + int var10 = Messages.method2350(var3 + 1, var5 + 1); + int var12 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; + int var11 = ((65536 - var12) * var7 >> 16) + (var12 * var8 >> 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) + (var16 * var13 >> 16); + return var15; + } } diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java index c459e7c93a..dac3272608 100644 --- a/runescape-client/src/main/java/VarcInt.java +++ b/runescape-client/src/main/java/VarcInt.java @@ -3,22 +3,34 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("it") +@ObfuscatedName("iu") @Implements("VarcInt") public class VarcInt extends DualNode { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Liy;" + signature = "Lic;" ) @Export("VarcInt_archive") public static AbstractArchive VarcInt_archive; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Leg;" + signature = "Lec;" ) @Export("VarcInt_cached") public static EvictingDualNodeHashTable VarcInt_cached; - @ObfuscatedName("k") + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "Lic;" + ) + @Export("ItemDefinition_archive") + static AbstractArchive ItemDefinition_archive; + @ObfuscatedName("eu") + @ObfuscatedSignature( + signature = "Lig;" + ) + @Export("archive18") + static Archive archive18; + @ObfuscatedName("q") @Export("persist") public boolean persist; @@ -32,29 +44,47 @@ public class VarcInt extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkb;B)V", - garbageValue = "-75" + signature = "(Lkn;B)V", + garbageValue = "121" ) - public void method4487(Buffer var1) { + public void method4573(Buffer var1) { while (true) { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return; } - this.method4488(var1, var2); + this.method4569(var1, var2); } } - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkb;II)V", - garbageValue = "-1942328984" + signature = "(Lkn;II)V", + garbageValue = "1038318542" ) - void method4488(Buffer var1, int var2) { + void method4569(Buffer var1, int var2) { if (var2 == 2) { this.persist = true; } } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + signature = "(Ldf;I)V", + garbageValue = "1745274917" + ) + @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/Varcs.java b/runescape-client/src/main/java/Varcs.java index 9bb7b88614..172fa6d532 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -9,42 +9,36 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cp") +@ObfuscatedName("cy") @Implements("Varcs") public class Varcs { - @ObfuscatedName("sm") - @ObfuscatedSignature( - signature = "Lmq;" + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -1058708955 ) - @Export("platformInfo") - static PlatformInfo platformInfo; - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Liy;" - ) - @Export("SequenceDefinition_archive") - public static AbstractArchive SequenceDefinition_archive; - @ObfuscatedName("k") + @Export("canvasWidth") + public static int canvasWidth; + @ObfuscatedName("q") @Export("intsPersistence") boolean[] intsPersistence; - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("map") Map map; - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("strings") String[] strings; - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("unwrittenChanges") boolean unwrittenChanges; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedGetter( - longValue = 4946671747010980607L + longValue = -7654666675170575125L ) - long field1281; + long field1291; Varcs() { this.unwrittenChanges = false; - int var1 = GrandExchangeOffer.archive2.getGroupFileCount(19); + int var1 = Clock.archive2.getGroupFileCount(19); this.map = new HashMap(); this.intsPersistence = new boolean[var1]; @@ -58,7 +52,7 @@ public class Varcs { byte[] var5 = VarcInt.VarcInt_archive.takeFile(19, var2); var4 = new VarcInt(); if (var5 != null) { - var4.method4487(new Buffer(var5)); + var4.method4573(new Buffer(var5)); } VarcInt.VarcInt_cached.put(var4, (long)var2); @@ -69,18 +63,18 @@ public class Varcs { } var2 = 0; - if (GrandExchangeOffer.archive2.method4353(15)) { - var2 = GrandExchangeOffer.archive2.getGroupFileCount(15); + if (Clock.archive2.method4452(15)) { + var2 = Clock.archive2.getGroupFileCount(15); } this.strings = new String[var2]; this.read(); } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "1118908426" + garbageValue = "-1324015283" ) @Export("setInt") void setInt(int var1, int var2) { @@ -91,10 +85,10 @@ public class Varcs { } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(IB)I", - garbageValue = "-101" + garbageValue = "16" ) @Export("getInt") int getInt(int var1) { @@ -102,20 +96,20 @@ public class Varcs { return var2 instanceof Integer ? (Integer)var2 : -1; } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(ILjava/lang/String;I)V", - garbageValue = "1504120549" + garbageValue = "105969632" ) @Export("setString") void setString(int var1, String var2) { this.map.put(var1, var2); } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(II)Ljava/lang/String;", - garbageValue = "-1244262565" + garbageValue = "-1642204852" ) @Export("getString") String getString(int var1) { @@ -123,30 +117,30 @@ public class Varcs { return var2 instanceof String ? (String)var2 : ""; } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(ILjava/lang/String;S)V", - garbageValue = "10505" + signature = "(ILjava/lang/String;B)V", + garbageValue = "14" ) @Export("setStringOld") void setStringOld(int var1, String var2) { this.strings[var1] = var2; } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(IB)Ljava/lang/String;", - garbageValue = "61" + signature = "(II)Ljava/lang/String;", + garbageValue = "658470799" ) @Export("getStringOld") String getStringOld(int var1) { return this.strings[var1]; } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1883661666" + garbageValue = "-943211657" ) @Export("clearTransient") void clearTransient() { @@ -163,20 +157,20 @@ public class Varcs { } - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(ZS)Lmb;", - garbageValue = "6254" + signature = "(ZI)Lmy;", + garbageValue = "-297386898" ) @Export("getPreferencesFile") AccessFile getPreferencesFile(boolean var1) { - return KeyHandler.getPreferencesFile("2", WorldMapArchiveLoader.field3965.name, var1); + return GameShell.getPreferencesFile("2", GrandExchangeOfferWorldComparator.field54.name, var1); } - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "316912893" + garbageValue = "-1923811872" ) @Export("write") void write() { @@ -196,55 +190,107 @@ public class Varcs { if (var7 instanceof Integer) { var2 += 4; } else if (var7 instanceof String) { - var2 += class234.stringCp1252NullTerminatedByteSize((String)var7); + var2 += DynamicObject.stringCp1252NullTerminatedByteSize((String)var7); } ++var3; } } - Buffer var24 = new Buffer(var2); - var24.writeByte(2); - var24.writeShort(var3); - Iterator var25 = this.map.entrySet().iterator(); + Buffer var33 = new Buffer(var2); + var33.writeByte(2); + var33.writeShort(var3); + Iterator var34 = this.map.entrySet().iterator(); - while (var25.hasNext()) { - Entry var13 = (Entry)var25.next(); - int var14 = (Integer)var13.getKey(); - if (this.intsPersistence[var14]) { - var24.writeShort(var14); - Object var8 = var13.getValue(); - class3 var9 = class3.method38(var8.getClass()); - var24.writeByte(var9.field9); - class0 var10 = class3.method40(var8.getClass()); - var10.vmethod64(var8, var24); + label183: + while (true) { + Entry var21; + int var22; + do { + if (!var34.hasNext()) { + var1.write(var33.array, 0, var33.offset); + break label183; + } + + var21 = (Entry)var34.next(); + var22 = (Integer)var21.getKey(); + } while(!this.intsPersistence[var22]); + + var33.writeShort(var22); + Object var8 = var21.getValue(); + Class var10 = var8.getClass(); + class3[] var11 = new class3[]{class3.field9, class3.field8, class3.field10}; + class3[] var12 = var11; + int var13 = 0; + + class3 var9; + class3 var14; + while (true) { + if (var13 >= var12.length) { + var9 = null; + break; + } + + var14 = var12[var13]; + if (var10 == var14.field12) { + var9 = var14; + break; + } + + ++var13; } - } - var1.write(var24.array, 0, var24.offset); - } catch (Exception var22) { + var33.writeByte(var9.field15); + Class var23 = var8.getClass(); + class3[] var15 = new class3[]{class3.field9, class3.field8, class3.field10}; + class3[] var16 = var15; + int var17 = 0; + + while (true) { + if (var17 >= var16.length) { + var14 = null; + break; + } + + class3 var18 = var16[var17]; + if (var23 == var18.field12) { + var14 = var18; + break; + } + + ++var17; + } + + if (var14 == null) { + throw new IllegalArgumentException(); + } + + class0 var35 = var14.field13; + var35.vmethod59(var8, var33); + } + } catch (Exception var31) { } finally { try { var1.close(); - } catch (Exception var21) { + } catch (Exception var30) { } } this.unwrittenChanges = false; - this.field1281 = class217.currentTimeMillis(); + this.field1291 = MilliClock.currentTimeMillis(); } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "349952581" + signature = "(B)V", + garbageValue = "-50" ) @Export("read") void read() { AccessFile var1 = this.getPreferencesFile(false); - label225: { + label230: { try { byte[] var2 = new byte[(int)var1.length()]; @@ -256,67 +302,68 @@ public class Varcs { } } - Buffer var14 = new Buffer(var2); - if (var14.array.length - var14.offset < 1) { - return; - } + Buffer var15 = new Buffer(var2); + if (var15.array.length - var15.offset >= 1) { + int var16 = var15.readUnsignedByte(); + if (var16 >= 0 && var16 <= 2) { + int var7; + int var8; + int var9; + int var17; + if (var16 >= 2) { + var17 = var15.readUnsignedShort(); + var7 = 0; - 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 >= var17) { + break label230; + } - while (true) { - if (var7 >= var16) { - break label225; + var8 = var15.readUnsignedShort(); + var9 = var15.readUnsignedByte(); + class3[] var10 = new class3[]{class3.field9, class3.field8, class3.field10}; + class3 var11 = (class3)FaceNormal.findEnumerated(var10, var9); + Object var12 = var11.method40(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); + } } - var8 = var14.readUnsignedShort(); - var9 = var14.readUnsignedByte(); - class3 var10 = (class3)GrandExchangeEvent.findEnumerated(class3.method46(), var9); - Object var11 = var10.method42(var14); - if (this.intsPersistence[var8]) { - this.map.put(var8, var11); + var7 = var15.readUnsignedShort(); + var8 = 0; + + while (true) { + if (var8 >= var7) { + break label230; + } + + var15.readUnsignedShort(); + var15.readStringCp1252NullTerminated(); + ++var8; } - - ++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 label225; - } - - var14.readUnsignedShort(); - var14.readStringCp1252NullTerminated(); - ++var8; } } + + return; } - } catch (Exception var25) { - break label225; + } catch (Exception var26) { + break label230; } finally { try { var1.close(); - } catch (Exception var24) { + } catch (Exception var25) { } } @@ -327,83 +374,26 @@ public class Varcs { this.unwrittenChanges = false; } - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "973740896" + garbageValue = "999745813" ) @Export("tryWrite") void tryWrite() { - if (this.unwrittenChanges && this.field1281 < class217.currentTimeMillis() - 60000L) { + if (this.unwrittenChanges && this.field1291 < MilliClock.currentTimeMillis() - 60000L) { this.write(); } } - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "2008113856" + signature = "(B)Z", + garbageValue = "0" ) @Export("hasUnwrittenChanges") boolean hasUnwrittenChanges() { return this.unwrittenChanges; } - - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "906944643" - ) - static final void method2294() { - 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.method3151(var7, var4, var1, var0); - int var11 = Rasterizer3D.method3118(var7, var4, var1, var0); - var7 = var10; - var10 = Rasterizer3D.method3151(var9, var5, var1, var0); - int var12 = Rasterizer3D.method3118(var9, var5, var1, var0); - var9 = var10; - var10 = Rasterizer3D.method3115(var6, var11, var3, var2); - var11 = Rasterizer3D.method3116(var6, var11, var3, var2); - var6 = var10; - var10 = Rasterizer3D.method3115(var8, var12, var3, var2); - var12 = Rasterizer3D.method3116(var8, var12, var3, var2); - ViewportMouse.field1756 = (var6 + var10) / 2; - class300.field3653 = (var9 + var7) / 2; - HorizontalAlignment.field3456 = (var12 + var11) / 2; - ViewportMouse.field1753 = (var10 - var6) / 2; - Clock.field2061 = (var9 - var7) / 2; - GrandExchangeEvent.field75 = (var12 - var11) / 2; - class23.field134 = Math.abs(ViewportMouse.field1753); - ViewportMouse.field1758 = Math.abs(Clock.field2061); - AttackOption.field1182 = Math.abs(GrandExchangeEvent.field75); - } - } - - @ObfuscatedName("hc") - @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "-938707872" - ) - static int method2295(int var0, int var1) { - int var2 = var1 - 334; - if (var2 < 0) { - var2 = 0; - } else if (var2 > 100) { - var2 = 100; - } - - int var3 = (Client.zoomWidth - Client.zoomHeight) * var2 / 100 + Client.zoomHeight; - return var0 * var3 / 256; - } } diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java index d63eedb537..e0e316435a 100644 --- a/runescape-client/src/main/java/VarpDefinition.java +++ b/runescape-client/src/main/java/VarpDefinition.java @@ -4,36 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ik") +@ObfuscatedName("iy") @Implements("VarpDefinition") public class VarpDefinition extends DualNode { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Liy;" + signature = "Lic;" ) @Export("VarpDefinition_archive") - public static AbstractArchive VarpDefinition_archive; - @ObfuscatedName("m") + static AbstractArchive VarpDefinition_archive; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 701979543 + intValue = 359147415 ) @Export("VarpDefinition_fileCount") public static int VarpDefinition_fileCount; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Leg;" + signature = "Lec;" ) @Export("VarpDefinition_cached") - public static EvictingDualNodeHashTable VarpDefinition_cached; - @ObfuscatedName("hs") - @ObfuscatedSignature( - signature = "[Lla;" - ) - @Export("mapDotSprites") - static Sprite[] mapDotSprites; - @ObfuscatedName("d") + static EvictingDualNodeHashTable VarpDefinition_cached; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -2041406857 + intValue = 1217664323 ) @Export("type") public int type; @@ -46,10 +40,10 @@ public class VarpDefinition extends DualNode { this.type = 0; } - @ObfuscatedName("m") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkb;I)V", - garbageValue = "888817873" + signature = "(Lkn;I)V", + garbageValue = "319289372" ) @Export("decode") void decode(Buffer var1) { @@ -63,10 +57,10 @@ public class VarpDefinition extends DualNode { } } - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lkb;II)V", - garbageValue = "-478549548" + signature = "(Lkn;II)V", + garbageValue = "1792997667" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -75,19 +69,4 @@ public class VarpDefinition extends DualNode { } } - - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "42" - ) - public static int method4453(int var0, int var1) { - int var2; - for (var2 = 0; var1 > 0; --var1) { - var2 = var2 << 1 | var0 & 1; - var0 >>>= 1; - } - - return var2; - } } diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java index 8333968854..bb617ec988 100644 --- a/runescape-client/src/main/java/Varps.java +++ b/runescape-client/src/main/java/Varps.java @@ -1,35 +1,20 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ht") @Implements("Varps") public class Varps { - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("Varps_masks") static int[] Varps_masks; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("Varps_temp") public static int[] Varps_temp; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("Varps_main") public static int[] Varps_main; - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "Liy;" - ) - @Export("Widget_spritesArchive") - static AbstractArchive Widget_spritesArchive; - @ObfuscatedName("i") - public static String[] field2522; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 675557919 - ) - @Export("canvasHeight") - public static int canvasHeight; static { Varps_masks = new int[32]; @@ -43,4 +28,14 @@ public class Varps { Varps_temp = new int[4000]; Varps_main = new int[4000]; } + + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "(CB)Z", + garbageValue = "72" + ) + @Export("isAlphaNumeric") + public static boolean isAlphaNumeric(char var0) { + return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; + } } diff --git a/runescape-client/src/main/java/VertexNormal.java b/runescape-client/src/main/java/VertexNormal.java index e811b513a1..8915ed6da8 100644 --- a/runescape-client/src/main/java/VertexNormal.java +++ b/runescape-client/src/main/java/VertexNormal.java @@ -4,32 +4,36 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("en") +@ObfuscatedName("et") @Implements("VertexNormal") public class VertexNormal { @ObfuscatedName("z") - public static short[][] field1764; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 1214687281 + @ObfuscatedSignature( + signature = "Leb;" ) - @Export("y") - int y; + @Export("World_request") + static UrlRequest World_request; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -412976723 + intValue = 923161949 ) @Export("x") int x; - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1667952739 + intValue = 126098109 + ) + @Export("y") + int y; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -662882065 ) @Export("z") int z; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 284274911 + intValue = -1696865585 ) @Export("magnitude") int magnitude; @@ -38,7 +42,7 @@ public class VertexNormal { } @ObfuscatedSignature( - signature = "(Len;)V" + signature = "(Let;)V" ) VertexNormal(VertexNormal var1) { this.x = var1.x; @@ -46,35 +50,4 @@ public class VertexNormal { this.z = var1.z; this.magnitude = var1.magnitude; } - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "([BI)Lkx;", - garbageValue = "-1694309156" - ) - public static Font method3094(byte[] var0) { - if (var0 == null) { - return null; - } else { - Font var1 = new Font(var0, class335.SpriteBuffer_xOffsets, StructDefinition.SpriteBuffer_yOffsets, class335.SpriteBuffer_spriteWidths, class335.SpriteBuffer_spriteHeights, DefaultsGroup.SpriteBuffer_spritePalette, class4.SpriteBuffer_pixels); - Ignored.method5235(); - return var1; - } - } - - @ObfuscatedName("fu") - @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "-399" - ) - static final void method3093() { - if (Client.logoutTimer > 0) { - Huffman.logOut(); - } else { - Client.timer.method5050(); - MouseRecorder.updateGameState(40); - UrlRequester.field1960 = Client.packetWriter.getSocket(); - Client.packetWriter.removeSocket(); - } - } } diff --git a/runescape-client/src/main/java/VerticalAlignment.java b/runescape-client/src/main/java/VerticalAlignment.java index f154ad6bc5..a6c2fdbdd0 100644 --- a/runescape-client/src/main/java/VerticalAlignment.java +++ b/runescape-client/src/main/java/VerticalAlignment.java @@ -1,38 +1,41 @@ +import java.lang.management.GarbageCollectorMXBean; +import java.lang.management.ManagementFactory; +import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ie") +@ObfuscatedName("if") @Implements("VerticalAlignment") public enum VerticalAlignment implements Enumerated { - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lie;" - ) - field3193(0, 0), @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lie;" + signature = "Lif;" + ) + field3226(2, 0), + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "Lif;" ) @Export("VerticalAlignment_centered") VerticalAlignment_centered(1, 1), - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lie;" + signature = "Lif;" ) - field3196(2, 2); + field3230(0, 2); - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1209420553 + intValue = -296657291 ) @Export("value") public final int value; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1378606847 + intValue = -1007871837 ) @Export("id") final int id; @@ -42,27 +45,88 @@ public enum VerticalAlignment implements Enumerated { this.id = var4; } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "56" + signature = "(I)I", + garbageValue = "-995092303" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("fq") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "-738770564" + signature = "(III)Lcs;", + garbageValue = "1496312280" ) - @Export("playSoundJingle") - static void playSoundJingle(int var0, int var1) { - if (Client.musicVolume != 0 && var0 != -1) { - ApproximateRouteStrategy.method1321(WorldMapRegion.archive11, var0, 0, Client.musicVolume, false); - Client.field915 = true; + static Script method4517(int var0, int var1) { + Script var2 = (Script)Script.Script_cached.get((long)(var0 << 16)); + if (var2 != null) { + return var2; + } else { + String var3 = String.valueOf(var0); + int var4 = Message.archive12.getGroupId(var3); + if (var4 == -1) { + return null; + } else { + byte[] var5 = Message.archive12.takeFileFlat(var4); + if (var5 != null) { + if (var5.length <= 1) { + return null; + } + + var2 = WorldMapAreaData.newScript(var5); + if (var2 != null) { + Script.Script_cached.put(var2, (long)(var0 << 16)); + return var2; + } + } + + return null; + } + } + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + signature = "(I)I", + garbageValue = "735302127" + ) + @Export("getGcDuration") + protected static int getGcDuration() { + int var0 = 0; + if (MusicPatchPcmStream.garbageCollector == null || !MusicPatchPcmStream.garbageCollector.isValid()) { + try { + Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); + + while (var1.hasNext()) { + GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); + if (var2.isValid()) { + MusicPatchPcmStream.garbageCollector = var2; + GameShell.garbageCollectorLastCheckTimeMs = -1L; + GameShell.garbageCollectorLastCollectionTime = -1L; + } + } + } catch (Throwable var11) { + } } + if (MusicPatchPcmStream.garbageCollector != null) { + long var9 = MilliClock.currentTimeMillis(); + long var3 = MusicPatchPcmStream.garbageCollector.getCollectionTime(); + if (GameShell.garbageCollectorLastCollectionTime != -1L) { + long var5 = var3 - GameShell.garbageCollectorLastCollectionTime; + long var7 = var9 - GameShell.garbageCollectorLastCheckTimeMs; + if (var7 != 0L) { + var0 = (int)(100L * var5 / var7); + } + } + + GameShell.garbageCollectorLastCollectionTime = var3; + GameShell.garbageCollectorLastCheckTimeMs = var9; + } + + return var0; } } diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java index 5221288ad8..ec921d0449 100644 --- a/runescape-client/src/main/java/ViewportMouse.java +++ b/runescape-client/src/main/java/ViewportMouse.java @@ -1,5 +1,3 @@ -import java.io.File; -import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; @@ -9,48 +7,53 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ei") @Implements("ViewportMouse") public class ViewportMouse { - @ObfuscatedName("x") - @Export("ViewportMouse_isInViewport") - static boolean ViewportMouse_isInViewport; @ObfuscatedName("m") + @Export("ViewportMouse_isInViewport") + public static boolean ViewportMouse_isInViewport; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -3434347 + intValue = 1395390715 ) @Export("ViewportMouse_x") - static int ViewportMouse_x; - @ObfuscatedName("k") + public static int ViewportMouse_x; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1088872185 + intValue = 70898143 ) @Export("ViewportMouse_y") - static int ViewportMouse_y; - @ObfuscatedName("d") + public static int ViewportMouse_y; + @ObfuscatedName("j") @Export("ViewportMouse_false0") - static boolean ViewportMouse_false0; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 1287512303 - ) - static int field1756; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -128272745 - ) - static int field1753; + public static boolean ViewportMouse_false0; @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 2142328087 + intValue = 1666776935 ) - static int field1758; + static int field1770; @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 148493353 + intValue = -94383227 + ) + static int field1771; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -272779311 + ) + static int field1775; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 1341524287 + ) + static int field1773; + @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 2037239641 ) @Export("ViewportMouse_entityCount") - static int ViewportMouse_entityCount; - @ObfuscatedName("h") + public static int ViewportMouse_entityCount; + @ObfuscatedName("k") @Export("ViewportMouse_entityTags") - static long[] ViewportMouse_entityTags; + public static long[] ViewportMouse_entityTags; static { ViewportMouse_isInViewport = false; @@ -61,117 +64,36 @@ public class ViewportMouse { ViewportMouse_entityTags = new long[1000]; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)Ljava/io/File;", - garbageValue = "-880025172" + signature = "(IIB)I", + garbageValue = "-104" ) - @Export("getFile") - public static File getFile(String var0) { - if (!FileSystem.FileSystem_hasPermissions) { - throw new RuntimeException(""); - } else { - File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); - if (var1 != null) { - return var1; - } else { - File var2 = new File(FileSystem.FileSystem_cacheDir, var0); - RandomAccessFile var3 = null; - - try { - File var4 = new File(var2.getParent()); - if (!var4.exists()) { - throw new RuntimeException(""); - } else { - var3 = new RandomAccessFile(var2, "rw"); - int var5 = var3.read(); - var3.seek(0L); - var3.write(var5); - var3.seek(0L); - var3.close(); - FileSystem.FileSystem_cacheFiles.put(var0, var2); - return var2; - } - } catch (Exception var8) { - try { - if (var3 != null) { - var3.close(); - var3 = null; - } - } catch (Exception var7) { - } - - throw new RuntimeException(); - } - } - } + public static int method3091(int var0, int var1) { + return (var0 << 8) + var1; } - @ObfuscatedName("gp") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "-3489" + signature = "(CI)Z", + garbageValue = "998588366" ) - static final void method3091() { - Client.field794 = 0; - int var0 = (ByteArrayPool.localPlayer.x >> 7) + class69.baseX; - int var1 = (ByteArrayPool.localPlayer.y >> 7) + class89.baseY; - if (var0 >= 3053 && var0 <= 3156 && var1 >= 3056 && var1 <= 3136) { - Client.field794 = 1; - } - - if (var0 >= 3072 && var0 <= 3118 && var1 >= 9492 && var1 <= 9535) { - Client.field794 = 1; - } - - if (Client.field794 == 1 && var0 >= 3139 && var0 <= 3199 && var1 >= 3008 && var1 <= 3062) { - Client.field794 = 0; - } - - } - - @ObfuscatedName("ji") - @ObfuscatedSignature( - signature = "(Lhe;IIIIIII)V", - garbageValue = "-1829231425" - ) - static final void method3092(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (Client.field746) { - Client.alternativeScrollbarWidth = 32; + public static boolean method3071(char var0) { + if (var0 >= ' ' && var0 < 127 || var0 > 127 && var0 < 160 || var0 > 160 && var0 <= 255) { + return true; } else { - Client.alternativeScrollbarWidth = 0; - } + if (var0 != 0) { + char[] var1 = class297.cp1252AsciiExtension; - Client.field746 = false; - int var7; - if (MouseHandler.MouseHandler_currentButton == 1 || !class217.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { - if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { - var0.scrollY -= 4; - ItemContainer.invalidateWidget(var0); - } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { - var0.scrollY += 4; - ItemContainer.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; + for (int var2 = 0; var2 < var1.length; ++var2) { + char var3 = var1[var2]; + if (var0 == var3) { + return true; + } } - - int var8 = var6 - var2 - 16 - var7 / 2; - int var9 = var3 - 32 - var7; - var0.scrollY = var8 * (var4 - var3) / var9; - ItemContainer.invalidateWidget(var0); - Client.field746 = 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; - ItemContainer.invalidateWidget(var0); - } + return false; } - } } diff --git a/runescape-client/src/main/java/VorbisCodebook.java b/runescape-client/src/main/java/VorbisCodebook.java index e1b170e720..766326288c 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("dq") +@ObfuscatedName("dl") @Implements("VorbisCodebook") public class VorbisCodebook { - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("dimensions") int dimensions; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("entries") int entries; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("lengthMap") int[] lengthMap; - @ObfuscatedName("d") - int[] field1362; - @ObfuscatedName("w") - float[][] field1360; - @ObfuscatedName("v") + @ObfuscatedName("j") + int[] field1378; + @ObfuscatedName("p") + float[][] field1379; + @ObfuscatedName("g") @Export("keys") int[] keys; @@ -35,7 +35,7 @@ public class VorbisCodebook { var2 = 0; for (var3 = VorbisSample.readBits(5) + 1; var2 < this.entries; ++var3) { - int var4 = VorbisSample.readBits(PacketBufferNode.iLog(this.entries - var2)); + int var4 = VorbisSample.readBits(WorldMapSection3.iLog(this.entries - var2)); for (var5 = 0; var5 < var4; ++var5) { this.lengthMap[var2++] = var3; @@ -53,7 +53,7 @@ public class VorbisCodebook { } } - this.method2445(); + this.method2467(); 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.field1362 = new int[var7]; + this.field1378 = new int[var7]; int var8; for (var8 = 0; var8 < var7; ++var8) { - this.field1362[var8] = VorbisSample.readBits(var5); + this.field1378[var8] = VorbisSample.readBits(var5); } - this.field1360 = new float[this.entries][this.dimensions]; + this.field1379 = 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.field1362[var12] * var16 + var15 + var9; - this.field1360[var8][var11] = var13; + float var13 = (float)this.field1378[var12] * var16 + var15 + var9; + this.field1379[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.field1362[var10] * var16 + var15 + var9; - this.field1360[var8][var11] = var17; + float var17 = (float)this.field1378[var10] * var16 + var15 + var9; + this.field1379[var8][var11] = var17; if (var6) { var9 = var17; } @@ -114,8 +114,8 @@ public class VorbisCodebook { } - @ObfuscatedName("m") - void method2445() { + @ObfuscatedName("o") + void method2467() { int[] var1 = new int[this.entries]; int[] var2 = new int[33]; @@ -132,33 +132,33 @@ public class VorbisCodebook { var5 = 1 << 32 - var4; var6 = var2[var4]; var1[var3] = var6; - int var12; + int var9; if ((var6 & var5) != 0) { var7 = var2[var4 - 1]; } else { var7 = var6 | var5; for (var8 = var4 - 1; var8 >= 1; --var8) { - var12 = var2[var8]; - if (var12 != var6) { + var9 = var2[var8]; + if (var9 != var6) { break; } var10 = 1 << 32 - var8; - if ((var12 & var10) != 0) { + if ((var9 & var10) != 0) { var2[var8] = var2[var8 - 1]; break; } - var2[var8] = var12 | var10; + var2[var8] = var9 | var10; } } var2[var4] = var7; for (var8 = var4 + 1; var8 <= 32; ++var8) { - var12 = var2[var8]; - if (var12 == var6) { + var9 = var2[var8]; + if (var9 == var6) { var2[var8] = var7; } } @@ -187,13 +187,13 @@ public class VorbisCodebook { } if (var6 >= this.keys.length) { - int[] var9 = new int[this.keys.length * 2]; + int[] var12 = new int[this.keys.length * 2]; for (var10 = 0; var10 < this.keys.length; ++var10) { - var9[var10] = this.keys[var10]; + var12[var10] = this.keys[var10]; } - this.keys = var9; + this.keys = var12; } var8 >>>= 1; @@ -208,8 +208,8 @@ public class VorbisCodebook { } - @ObfuscatedName("k") - int method2452() { + @ObfuscatedName("q") + int method2461() { int var1; for (var1 = 0; this.keys[var1] >= 0; var1 = VorbisSample.readBit() != 0 ? this.keys[var1] : var1 + 1) { } @@ -217,16 +217,16 @@ public class VorbisCodebook { return ~this.keys[var1]; } - @ObfuscatedName("d") - float[] method2455() { - return this.field1360[this.method2452()]; + @ObfuscatedName("j") + float[] method2465() { + return this.field1379[this.method2461()]; } - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("mapType1QuantValues") static int mapType1QuantValues(int var0, int var1) { int var2; - for (var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; SecureRandomFuture.method2226(var2, var1) > var0; --var2) { + for (var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; class22.method227(var2, var1) > var0; --var2) { } return var2; diff --git a/runescape-client/src/main/java/VorbisFloor.java b/runescape-client/src/main/java/VorbisFloor.java index 9e2e9ccfb5..1f0ea5fdb5 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("db") +@ObfuscatedName("dc") @Implements("VorbisFloor") public class VorbisFloor { - @ObfuscatedName("x") - static final int[] field1417; @ObfuscatedName("m") + static final int[] field1433; + @ObfuscatedName("o") @Export("VorbisFloor_decibelStatics") static final float[] VorbisFloor_decibelStatics; - @ObfuscatedName("e") - static int[] field1418; - @ObfuscatedName("s") - static int[] field1412; - @ObfuscatedName("p") - static boolean[] field1419; - @ObfuscatedName("k") - int[] field1408; - @ObfuscatedName("d") + @ObfuscatedName("z") + static int[] field1424; + @ObfuscatedName("w") + static int[] field1434; + @ObfuscatedName("y") + static boolean[] field1435; + @ObfuscatedName("q") + int[] field1426; + @ObfuscatedName("j") @Export("multiplier") int multiplier; - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("partitionClassList") int[] partitionClassList; - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("classDimensions") int[] classDimensions; - @ObfuscatedName("q") + @ObfuscatedName("n") @Export("classSubClasses") int[] classSubClasses; - @ObfuscatedName("z") + @ObfuscatedName("u") @Export("classMasterbooks") int[] classMasterbooks; - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("subclassBooks") int[][] subclassBooks; static { - field1417 = new int[]{256, 128, 86, 64}; + field1433 = 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,29 +92,29 @@ public class VorbisFloor { var5 += this.classDimensions[this.partitionClassList[var9]]; } - this.field1408 = new int[var5]; - this.field1408[0] = 0; - this.field1408[1] = 1 << var4; + this.field1426 = new int[var5]; + this.field1426[0] = 0; + this.field1426[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.field1408[var5++] = VorbisSample.readBits(var4); + this.field1426[var5++] = VorbisSample.readBits(var4); } } - if (field1418 == null || field1418.length < var5) { - field1418 = new int[var5]; - field1412 = new int[var5]; - field1419 = new boolean[var5]; + if (field1424 == null || field1424.length < var5) { + field1424 = new int[var5]; + field1434 = new int[var5]; + field1435 = new boolean[var5]; } } } - @ObfuscatedName("k") + @ObfuscatedName("q") int method2532(int var1, int var2, int var3, int var4, int var5) { int var6 = var4 - var2; int var7 = var3 - var1; @@ -124,8 +124,8 @@ public class VorbisFloor { return var6 < 0 ? var2 - var10 : var10 + var2; } - @ObfuscatedName("d") - void method2514(int var1, int var2, int var3, int var4, float[] var5, int var6) { + @ObfuscatedName("j") + void method2533(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("w") + @ObfuscatedName("p") @Export("VarbisFloor_sort") void VarbisFloor_sort(int var1, int var2) { if (var1 < var2) { int var3 = var1; - int var4 = field1418[var1]; - int var5 = field1412[var1]; - boolean var6 = field1419[var1]; + int var4 = field1424[var1]; + int var5 = field1434[var1]; + boolean var6 = field1435[var1]; for (int var7 = var1 + 1; var7 <= var2; ++var7) { - int var8 = field1418[var7]; + int var8 = field1424[var7]; if (var8 < var4) { - field1418[var3] = var8; - field1412[var3] = field1412[var7]; - field1419[var3] = field1419[var7]; + field1424[var3] = var8; + field1434[var3] = field1434[var7]; + field1435[var3] = field1435[var7]; ++var3; - field1418[var7] = field1418[var3]; - field1412[var7] = field1412[var3]; - field1419[var7] = field1419[var3]; + field1424[var7] = field1424[var3]; + field1434[var7] = field1434[var3]; + field1435[var7] = field1435[var3]; } } - field1418[var3] = var4; - field1412[var3] = var5; - field1419[var3] = var6; + field1424[var3] = var4; + field1434[var3] = var5; + field1435[var3] = var6; this.VarbisFloor_sort(var1, var3 - 1); this.VarbisFloor_sort(var3 + 1, var2); } } - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("readSubmapFloor") boolean readSubmapFloor() { boolean var1 = VorbisSample.readBit() != 0; if (!var1) { return false; } else { - int var2 = this.field1408.length; + int var2 = this.field1426.length; int var3; for (var3 = 0; var3 < var2; ++var3) { - field1418[var3] = this.field1408[var3]; + field1424[var3] = this.field1426[var3]; } - var3 = field1417[this.multiplier - 1]; - int var4 = PacketBufferNode.iLog(var3 - 1); - field1412[0] = VorbisSample.readBits(var4); - field1412[1] = VorbisSample.readBits(var4); + var3 = field1433[this.multiplier - 1]; + int var4 = WorldMapSection3.iLog(var3 - 1); + field1434[0] = VorbisSample.readBits(var4); + field1434[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]].method2452(); + var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method2461(); } for (int var12 = 0; var12 < var8; ++var12) { int var13 = this.subclassBooks[var7][var11 & var10]; var11 >>>= var9; - field1412[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method2452() : 0; + field1434[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method2461() : 0; } } @@ -224,12 +224,12 @@ public class VorbisFloor { } } - @ObfuscatedName("q") - void method2517(float[] var1, int var2) { - int var3 = this.field1408.length; - int var4 = field1417[this.multiplier - 1]; - boolean[] var5 = field1419; - field1419[1] = true; + @ObfuscatedName("n") + void method2536(float[] var1, int var2) { + int var3 = this.field1426.length; + int var4 = field1433[this.multiplier - 1]; + boolean[] var5 = field1435; + field1435[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 = method2511(field1418, var6); - var8 = method2519(field1418, var6); - var9 = this.method2532(field1418[var7], field1412[var7], field1418[var8], field1412[var8], field1418[var6]); - var10 = field1412[var6]; + var7 = method2554(field1424, var6); + var8 = method2544(field1424, var6); + var9 = this.method2532(field1424[var7], field1434[var7], field1424[var8], field1434[var8], field1424[var6]); + var10 = field1434[var6]; int var11 = var4 - var9; int var13 = (var11 < var9 ? var11 : var9) << 1; if (var10 != 0) { - boolean[] var14 = field1419; - field1419[var8] = true; + boolean[] var14 = field1435; + field1435[var8] = true; var14[var7] = true; - field1419[var6] = true; + field1435[var6] = true; if (var10 >= var13) { - field1412[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; + field1434[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; } else { - field1412[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; + field1434[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; } } else { - field1419[var6] = false; - field1412[var6] = var9; + field1435[var6] = false; + field1434[var6] = var9; } } this.VarbisFloor_sort(0, var3 - 1); var6 = 0; - var7 = field1412[0] * this.multiplier; + var7 = field1434[0] * this.multiplier; for (var8 = 1; var8 < var3; ++var8) { - if (field1419[var8]) { - var9 = field1418[var8]; - var10 = field1412[var8] * this.multiplier; - this.method2514(var6, var7, var9, var10, var1, var2); + if (field1435[var8]) { + var9 = field1424[var8]; + var10 = field1434[var8] * this.multiplier; + this.method2533(var6, var7, var9, var10, var1, var2); if (var9 >= var2) { return; } @@ -286,8 +286,8 @@ public class VorbisFloor { } - @ObfuscatedName("x") - static int method2511(int[] var0, int var1) { + @ObfuscatedName("m") + static int method2554(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("m") - static int method2519(int[] var0, int var1) { + @ObfuscatedName("o") + static int method2544(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 0b2092c769..d85e468cbc 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("dt") +@ObfuscatedName("dz") @Implements("VorbisMapping") public class VorbisMapping { - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("submaps") int submaps; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("mappingMux") int mappingMux; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("submapFloor") int[] submapFloor; - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("submapResidue") int[] submapResidue; diff --git a/runescape-client/src/main/java/VorbisResidue.java b/runescape-client/src/main/java/VorbisResidue.java index 6b00c93b74..e38170aed8 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("dr") +@ObfuscatedName("de") @Implements("VorbisResidue") public class VorbisResidue { - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("residueType") int residueType; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("begin") int begin; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("end") int end; - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("partitionSize") int partitionSize; - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("classifications") int classifications; - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("classbook") int classbook; - @ObfuscatedName("q") + @ObfuscatedName("n") @Export("cascade") int[] cascade; @@ -56,8 +56,8 @@ public class VorbisResidue { } - @ObfuscatedName("x") - void method2634(float[] var1, int var2, boolean var3) { + @ObfuscatedName("m") + void method2652(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].method2452(); + var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method2461(); 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.method2455(); + float[] var17 = var14.method2465(); 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.method2455(); + float[] var19 = var14.method2465(); 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 14d5df7b72..d84d61692e 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("dl") +@ObfuscatedName("di") @Implements("VorbisSample") public class VorbisSample extends Node { - @ObfuscatedName("q") + @ObfuscatedName("n") @Export("VorbisSample_bytes") static byte[] VorbisSample_bytes; - @ObfuscatedName("z") + @ObfuscatedName("u") @Export("VorbisSample_byteOffset") static int VorbisSample_byteOffset; - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("VorbisSample_bitOffset") static int VorbisSample_bitOffset; - @ObfuscatedName("e") + @ObfuscatedName("z") @Export("VorbisSample_blockSize0") static int VorbisSample_blockSize0; - @ObfuscatedName("s") + @ObfuscatedName("w") @Export("VorbisSample_blockSize1") static int VorbisSample_blockSize1; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "[Ldq;" + signature = "[Ldl;" ) @Export("VorbisSample_codebooks") static VorbisCodebook[] VorbisSample_codebooks; - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "[Ldb;" + signature = "[Ldc;" ) @Export("VorbisSample_floors") static VorbisFloor[] VorbisSample_floors; - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "[Ldr;" + signature = "[Lde;" ) @Export("VorbisSample_residues") static VorbisResidue[] VorbisSample_residues; - @ObfuscatedName("h") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "[Ldt;" + signature = "[Ldz;" ) @Export("VorbisSample_mappings") static VorbisMapping[] VorbisSample_mappings; - @ObfuscatedName("g") + @ObfuscatedName("r") @Export("VorbisSample_blockFlags") static boolean[] VorbisSample_blockFlags; - @ObfuscatedName("i") + @ObfuscatedName("s") @Export("VorbisSample_mapping") static int[] VorbisSample_mapping; - @ObfuscatedName("a") - static boolean field1386; - @ObfuscatedName("c") - static float[] field1391; - @ObfuscatedName("j") - static float[] field1392; - @ObfuscatedName("y") - static float[] field1393; - @ObfuscatedName("f") - static float[] field1377; - @ObfuscatedName("ae") - static float[] field1395; - @ObfuscatedName("an") - static float[] field1396; - @ObfuscatedName("ai") - static float[] field1397; - @ObfuscatedName("ap") - static int[] field1398; - @ObfuscatedName("ab") - static int[] field1369; + @ObfuscatedName("v") + static boolean field1416; @ObfuscatedName("x") - byte[][] field1381; + static float[] field1407; + @ObfuscatedName("b") + static float[] field1408; + @ObfuscatedName("i") + static float[] field1414; + @ObfuscatedName("f") + static float[] field1410; + @ObfuscatedName("ah") + static float[] field1411; + @ObfuscatedName("ai") + static float[] field1412; + @ObfuscatedName("ao") + static float[] field1413; + @ObfuscatedName("ae") + static int[] field1402; + @ObfuscatedName("ax") + static int[] field1415; @ObfuscatedName("m") + byte[][] field1398; + @ObfuscatedName("o") @Export("sampleRate") int sampleRate; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("sampleCount") int sampleCount; - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("start") int start; - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("end") int end; - @ObfuscatedName("v") - boolean field1387; - @ObfuscatedName("b") - float[] field1380; + @ObfuscatedName("g") + boolean field1409; + @ObfuscatedName("d") + float[] field1385; + @ObfuscatedName("e") + int field1392; @ObfuscatedName("l") - int field1388; - @ObfuscatedName("r") - int field1389; - @ObfuscatedName("o") - boolean field1384; - @ObfuscatedName("ar") + int field1405; + @ObfuscatedName("t") + boolean field1406; + @ObfuscatedName("ag") @Export("samples") byte[] samples; - @ObfuscatedName("af") - int field1401; - @ObfuscatedName("at") - int field1402; + @ObfuscatedName("ab") + int field1417; + @ObfuscatedName("am") + int field1388; static { - field1386 = false; + field1416 = false; } VorbisSample(byte[] var1) { this.read(var1); } - @ObfuscatedName("w") + @ObfuscatedName("p") @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.field1387 = true; + this.field1409 = true; } int var3 = var2.readInt(); - this.field1381 = new byte[var3][]; + this.field1398 = 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.field1381[var4] = var7; + this.field1398[var4] = var7; } } - @ObfuscatedName("q") - float[] method2494(int var1) { - VorbisSample_setData(this.field1381[var1], 0); + @ObfuscatedName("n") + float[] method2499(int var1) { + VorbisSample_setData(this.field1398[var1], 0); readBit(); - int var2 = readBits(PacketBufferNode.iLog(VorbisSample_mapping.length - 1)); + int var2 = readBits(WorldMapSection3.iLog(VorbisSample_mapping.length - 1)); boolean var3 = VorbisSample_blockFlags[var2]; int var4 = var3 ? VorbisSample_blockSize1 : VorbisSample_blockSize0; boolean var5 = false; @@ -192,41 +192,41 @@ public class VorbisSample extends Node { for (var17 = 0; var17 < var14.submaps; ++var17) { VorbisResidue var18 = VorbisSample_residues[var14.submapResidue[var17]]; - float[] var19 = field1391; - var18.method2634(var19, var4 >> 1, var45); + float[] var19 = field1407; + var18.method2652(var19, var4 >> 1, var45); } int var40; if (!var15) { var17 = var14.mappingMux; var40 = var14.submapFloor[var17]; - VorbisSample_floors[var40].method2517(field1391, var4 >> 1); + VorbisSample_floors[var40].method2536(field1407, var4 >> 1); } - int var42; + int var41; if (var15) { for (var17 = var4 >> 1; var17 < var4; ++var17) { - field1391[var17] = 0.0F; + field1407[var17] = 0.0F; } } else { var17 = var4 >> 1; var40 = var4 >> 2; - var42 = var4 >> 3; - float[] var43 = field1391; + var41 = var4 >> 3; + float[] var20 = field1407; int var21; for (var21 = 0; var21 < var17; ++var21) { - var43[var21] *= 0.5F; + var20[var21] *= 0.5F; } for (var21 = var17; var21 < var4; ++var21) { - var43[var21] = -var43[var4 - var21 - 1]; + var20[var21] = -var20[var4 - var21 - 1]; } - float[] var44 = var3 ? field1395 : field1392; - float[] var22 = var3 ? field1396 : field1393; - float[] var23 = var3 ? field1397 : field1377; - int[] var24 = var3 ? field1369 : field1398; + float[] var44 = var3 ? field1411 : field1408; + float[] var22 = var3 ? field1412 : field1414; + float[] var23 = var3 ? field1413 : field1410; + int[] var24 = var3 ? field1415 : field1402; int var25; float var26; @@ -234,30 +234,30 @@ public class VorbisSample extends Node { float var28; float var29; for (var25 = 0; var25 < var40; ++var25) { - var26 = var43[var25 * 4] - var43[var4 - var25 * 4 - 1]; - var27 = var43[var25 * 4 + 2] - var43[var4 - var25 * 4 - 3]; + var26 = var20[var25 * 4] - var20[var4 - var25 * 4 - 1]; + var27 = var20[var25 * 4 + 2] - var20[var4 - var25 * 4 - 3]; var28 = var44[var25 * 2]; var29 = var44[var25 * 2 + 1]; - var43[var4 - var25 * 4 - 1] = var26 * var28 - var27 * var29; - var43[var4 - var25 * 4 - 3] = var26 * var29 + var27 * var28; + var20[var4 - var25 * 4 - 1] = var26 * var28 - var27 * var29; + var20[var4 - var25 * 4 - 3] = var26 * var29 + var27 * var28; } float var30; float var31; - for (var25 = 0; var25 < var42; ++var25) { - var26 = var43[var17 + var25 * 4 + 3]; - var27 = var43[var17 + var25 * 4 + 1]; - var28 = var43[var25 * 4 + 3]; - var29 = var43[var25 * 4 + 1]; - var43[var17 + var25 * 4 + 3] = var26 + var28; - var43[var17 + var25 * 4 + 1] = var27 + var29; + for (var25 = 0; var25 < var41; ++var25) { + var26 = var20[var17 + var25 * 4 + 3]; + var27 = var20[var17 + var25 * 4 + 1]; + var28 = var20[var25 * 4 + 3]; + var29 = var20[var25 * 4 + 1]; + var20[var17 + var25 * 4 + 3] = var26 + var28; + var20[var17 + var25 * 4 + 1] = var27 + var29; var30 = var44[var17 - 4 - var25 * 4]; var31 = var44[var17 - 3 - var25 * 4]; - var43[var25 * 4 + 3] = (var26 - var28) * var30 - (var27 - var29) * var31; - var43[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31; + var20[var25 * 4 + 3] = (var26 - var28) * var30 - (var27 - var29) * var31; + var20[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31; } - var25 = PacketBufferNode.iLog(var4 - 1); + var25 = WorldMapSection3.iLog(var4 - 1); int var47; int var48; @@ -273,133 +273,133 @@ public class VorbisSample extends Node { for (int var32 = 0; var32 < var4 >> var47 + 4; ++var32) { int var33 = var32 * 4; - float var34 = var43[var51 - 1 - var33]; - float var35 = var43[var51 - 3 - var33]; - float var36 = var43[var52 - 1 - var33]; - float var37 = var43[var52 - 3 - var33]; - var43[var51 - 1 - var33] = var34 + var36; - var43[var51 - 3 - var33] = var35 + var37; + float var34 = var20[var51 - 1 - var33]; + float var35 = var20[var51 - 3 - var33]; + float var36 = var20[var52 - 1 - var33]; + float var37 = var20[var52 - 3 - var33]; + var20[var51 - 1 - var33] = var34 + var36; + var20[var51 - 3 - var33] = var35 + var37; float var38 = var44[var32 * var49]; float var39 = var44[var32 * var49 + 1]; - var43[var52 - 1 - var33] = (var34 - var36) * var38 - (var35 - var37) * var39; - var43[var52 - 3 - var33] = (var35 - var37) * var38 + (var34 - var36) * var39; + var20[var52 - 1 - var33] = (var34 - var36) * var38 - (var35 - var37) * var39; + var20[var52 - 3 - var33] = (var35 - var37) * var38 + (var34 - var36) * var39; } } } - for (var47 = 1; var47 < var42 - 1; ++var47) { + for (var47 = 1; var47 < var41 - 1; ++var47) { var48 = var24[var47]; if (var47 < var48) { var49 = var47 * 8; var50 = var48 * 8; - var30 = var43[var49 + 1]; - var43[var49 + 1] = var43[var50 + 1]; - var43[var50 + 1] = var30; - var30 = var43[var49 + 3]; - var43[var49 + 3] = var43[var50 + 3]; - var43[var50 + 3] = var30; - var30 = var43[var49 + 5]; - var43[var49 + 5] = var43[var50 + 5]; - var43[var50 + 5] = var30; - var30 = var43[var49 + 7]; - var43[var49 + 7] = var43[var50 + 7]; - var43[var50 + 7] = var30; + var30 = var20[var49 + 1]; + var20[var49 + 1] = var20[var50 + 1]; + var20[var50 + 1] = var30; + var30 = var20[var49 + 3]; + var20[var49 + 3] = var20[var50 + 3]; + var20[var50 + 3] = var30; + var30 = var20[var49 + 5]; + var20[var49 + 5] = var20[var50 + 5]; + var20[var50 + 5] = var30; + var30 = var20[var49 + 7]; + var20[var49 + 7] = var20[var50 + 7]; + var20[var50 + 7] = var30; } } for (var47 = 0; var47 < var17; ++var47) { - var43[var47] = var43[var47 * 2 + 1]; + var20[var47] = var20[var47 * 2 + 1]; } - for (var47 = 0; var47 < var42; ++var47) { - var43[var4 - 1 - var47 * 2] = var43[var47 * 4]; - var43[var4 - 2 - var47 * 2] = var43[var47 * 4 + 1]; - var43[var4 - var40 - 1 - var47 * 2] = var43[var47 * 4 + 2]; - var43[var4 - var40 - 2 - var47 * 2] = var43[var47 * 4 + 3]; + for (var47 = 0; var47 < var41; ++var47) { + var20[var4 - 1 - var47 * 2] = var20[var47 * 4]; + var20[var4 - 2 - var47 * 2] = var20[var47 * 4 + 1]; + var20[var4 - var40 - 1 - var47 * 2] = var20[var47 * 4 + 2]; + var20[var4 - var40 - 2 - var47 * 2] = var20[var47 * 4 + 3]; } - for (var47 = 0; var47 < var42; ++var47) { + for (var47 = 0; var47 < var41; ++var47) { var27 = var23[var47 * 2]; var28 = var23[var47 * 2 + 1]; - var29 = var43[var17 + var47 * 2]; - var30 = var43[var17 + var47 * 2 + 1]; - var31 = var43[var4 - 2 - var47 * 2]; - float var53 = var43[var4 - 1 - var47 * 2]; + var29 = var20[var17 + var47 * 2]; + var30 = var20[var17 + var47 * 2 + 1]; + var31 = var20[var4 - 2 - var47 * 2]; + float var53 = var20[var4 - 1 - var47 * 2]; float var54 = var28 * (var29 - var31) + var27 * (var30 + var53); - var43[var17 + var47 * 2] = (var29 + var31 + var54) * 0.5F; - var43[var4 - 2 - var47 * 2] = (var29 + var31 - var54) * 0.5F; + var20[var17 + var47 * 2] = (var29 + var31 + var54) * 0.5F; + var20[var4 - 2 - var47 * 2] = (var29 + var31 - var54) * 0.5F; var54 = var28 * (var30 + var53) - var27 * (var29 - var31); - var43[var17 + var47 * 2 + 1] = (var30 - var53 + var54) * 0.5F; - var43[var4 - 1 - var47 * 2] = (-var30 + var53 + var54) * 0.5F; + var20[var17 + var47 * 2 + 1] = (var30 - var53 + var54) * 0.5F; + var20[var4 - 1 - var47 * 2] = (-var30 + var53 + var54) * 0.5F; } for (var47 = 0; var47 < var40; ++var47) { - var43[var47] = var43[var17 + var47 * 2] * var22[var47 * 2] + var43[var17 + var47 * 2 + 1] * var22[var47 * 2 + 1]; - var43[var17 - 1 - var47] = var43[var17 + var47 * 2] * var22[var47 * 2 + 1] - var43[var17 + var47 * 2 + 1] * var22[var47 * 2]; + var20[var47] = var20[var17 + var47 * 2] * var22[var47 * 2] + var20[var17 + var47 * 2 + 1] * var22[var47 * 2 + 1]; + var20[var17 - 1 - var47] = var20[var17 + var47 * 2] * var22[var47 * 2 + 1] - var20[var17 + var47 * 2 + 1] * var22[var47 * 2]; } for (var47 = 0; var47 < var40; ++var47) { - var43[var47 + (var4 - var40)] = -var43[var47]; + var20[var47 + (var4 - var40)] = -var20[var47]; } for (var47 = 0; var47 < var40; ++var47) { - var43[var47] = var43[var40 + var47]; + var20[var47] = var20[var40 + var47]; } for (var47 = 0; var47 < var40; ++var47) { - var43[var40 + var47] = -var43[var40 - var47 - 1]; + var20[var40 + var47] = -var20[var40 - var47 - 1]; } for (var47 = 0; var47 < var40; ++var47) { - var43[var17 + var47] = var43[var4 - var47 - 1]; + var20[var17 + var47] = var20[var4 - var47 - 1]; } float[] var10000; for (var47 = var8; var47 < var9; ++var47) { var27 = (float)Math.sin(((double)(var47 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D); - var10000 = field1391; + var10000 = field1407; 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 = field1391; + var10000 = field1407; var10000[var47] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } } - float[] var41 = null; - if (this.field1388 > 0) { - var40 = var4 + this.field1388 >> 2; - var41 = new float[var40]; - int var20; - if (!this.field1384) { - for (var42 = 0; var42 < this.field1389; ++var42) { - var20 = var42 + (this.field1388 >> 1); - var41[var42] += this.field1380[var20]; + float[] var42 = null; + if (this.field1392 > 0) { + var40 = var4 + this.field1392 >> 2; + var42 = new float[var40]; + int var43; + if (!this.field1406) { + for (var41 = 0; var41 < this.field1405; ++var41) { + var43 = var41 + (this.field1392 >> 1); + var42[var41] += this.field1385[var43]; } } if (!var15) { - for (var42 = var8; var42 < var4 >> 1; ++var42) { - var20 = var41.length - (var4 >> 1) + var42; - var41[var20] += field1391[var42]; + for (var41 = var8; var41 < var4 >> 1; ++var41) { + var43 = var42.length - (var4 >> 1) + var41; + var42[var43] += field1407[var41]; } } } - float[] var46 = this.field1380; - this.field1380 = field1391; - field1391 = var46; - this.field1388 = var4; - this.field1389 = var12 - (var4 >> 1); - this.field1384 = var15; - return var41; + float[] var46 = this.field1385; + this.field1385 = field1407; + field1407 = var46; + this.field1392 = var4; + this.field1405 = var12 - (var4 >> 1); + this.field1406 = var15; + return var42; } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "([I)Ldm;" + signature = "([I)Ldp;" ) @Export("toRawSound") RawSound toRawSound(int[] var1) { @@ -407,21 +407,21 @@ public class VorbisSample extends Node { return null; } else { if (this.samples == null) { - this.field1388 = 0; - this.field1380 = new float[VorbisSample_blockSize1]; + this.field1392 = 0; + this.field1385 = new float[VorbisSample_blockSize1]; this.samples = new byte[this.sampleCount]; - this.field1401 = 0; - this.field1402 = 0; + this.field1417 = 0; + this.field1388 = 0; } - for (; this.field1402 < this.field1381.length; ++this.field1402) { + for (; this.field1388 < this.field1398.length; ++this.field1388) { if (var1 != null && var1[0] <= 0) { return null; } - float[] var2 = this.method2494(this.field1402); + float[] var2 = this.method2499(this.field1388); if (var2 != null) { - int var3 = this.field1401; + int var3 = this.field1417; 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.field1401; + var1[0] -= var3 - this.field1417; } - this.field1401 = var3; + this.field1417 = var3; } } - this.field1380 = null; + this.field1385 = null; byte[] var7 = this.samples; this.samples = null; - return new RawSound(this.sampleRate, var7, this.start, this.end, this.field1387); + return new RawSound(this.sampleRate, var7, this.start, this.end, this.field1409); } } - @ObfuscatedName("x") + @ObfuscatedName("m") @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("m") + @ObfuscatedName("o") @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("k") + @ObfuscatedName("q") @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("d") + @ObfuscatedName("j") @Export("readBits") static int readBits(int var0) { int var1 = 0; @@ -507,12 +507,12 @@ public class VorbisSample extends Node { return var1; } - @ObfuscatedName("v") - static void method2478(byte[] var0) { + @ObfuscatedName("g") + static void method2508(byte[] var0) { VorbisSample_setData(var0, 0); VorbisSample_blockSize0 = 1 << readBits(4); VorbisSample_blockSize1 = 1 << readBits(4); - field1391 = new float[VorbisSample_blockSize1]; + field1407 = new float[VorbisSample_blockSize1]; int var1; int var2; @@ -546,22 +546,22 @@ public class VorbisSample extends Node { } int[] var14 = new int[var5]; - int var10 = PacketBufferNode.iLog(var5 - 1); + int var10 = WorldMapSection3.iLog(var5 - 1); for (int var11 = 0; var11 < var5; ++var11) { - var14[var11] = VarpDefinition.method4453(var11, var10); + var14[var11] = class8.method104(var11, var10); } if (var1 != 0) { - field1395 = var6; - field1396 = var12; - field1397 = var13; - field1369 = var14; + field1411 = var6; + field1412 = var12; + field1413 = var13; + field1415 = var14; } else { - field1392 = var6; - field1393 = var12; - field1377 = var13; - field1398 = var14; + field1408 = var6; + field1414 = var12; + field1410 = var13; + field1402 = var14; } } @@ -612,31 +612,31 @@ public class VorbisSample extends Node { } - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Liy;)Z" + signature = "(Lic;)Z" ) - static boolean method2474(AbstractArchive var0) { - if (!field1386) { + static boolean method2500(AbstractArchive var0) { + if (!field1416) { byte[] var1 = var0.takeFile(0, 0); if (var1 == null) { return false; } - method2478(var1); - field1386 = true; + method2508(var1); + field1416 = true; } return true; } - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(Liy;II)Ldl;" + signature = "(Lic;II)Ldi;" ) @Export("readMusicSample") static VorbisSample readMusicSample(AbstractArchive var0, int var1, int var2) { - if (!method2474(var0)) { + if (!method2500(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 3ccedbc68e..806ae72796 100644 --- a/runescape-client/src/main/java/WallDecoration.java +++ b/runescape-client/src/main/java/WallDecoration.java @@ -4,72 +4,72 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ez") +@ObfuscatedName("ep") @Implements("WallDecoration") public final class WallDecoration { - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -1214014955 - ) - @Export("y") - int y; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -166681381 + intValue = 1099689565 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1454515853 + intValue = 1128423733 ) @Export("x") int x; - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -985506123 + intValue = -242275183 + ) + @Export("y") + int y; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 255410517 ) @Export("orientation") int orientation; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 817578233 + intValue = -1472318581 ) @Export("orientation2") int orientation2; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1515780955 + intValue = 96520519 ) @Export("xOffset") int xOffset; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -102361683 + intValue = -752151105 ) @Export("yOffset") int yOffset; - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Lee;" + signature = "Lel;" ) @Export("entity1") public Entity entity1; - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Lee;" + signature = "Lel;" ) @Export("entity2") public Entity entity2; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - longValue = -7258048285485333861L + longValue = 7567781693564802897L ) @Export("tag") public long tag; - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1418566089 + intValue = 1087358253 ) @Export("flags") int flags; @@ -79,61 +79,99 @@ public final class WallDecoration { this.flags = 0; } - @ObfuscatedName("x") + @ObfuscatedName("fu") @ObfuscatedSignature( - signature = "(I[BLlq;S)V", - garbageValue = "4729" + signature = "(Ljava/lang/String;I)V", + garbageValue = "764201281" ) - static void method3402(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); + @Export("doCheat") + static final void doCheat(String var0) { + if (var0.equalsIgnoreCase("toggleroof")) { + NetSocket.clientPreferences.roofsHidden = !NetSocket.clientPreferences.roofsHidden; + SpriteMask.savePreferences(); + if (NetSocket.clientPreferences.roofsHidden) { + ObjectSound.addGameMessage(99, "", "Roofs are now all hidden"); + } else { + ObjectSound.addGameMessage(99, "", "Roofs will only be removed selectively"); + } } - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { - if (ArchiveDiskActionHandler.field3151 == 0) { - class197.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); - class197.ArchiveDiskActionHandler_thread.setDaemon(true); - class197.ArchiveDiskActionHandler_thread.start(); - class197.ArchiveDiskActionHandler_thread.setPriority(5); + 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(); } - ArchiveDiskActionHandler.field3151 = 600; + if (var0.equalsIgnoreCase("showcoord")) { + class228.worldMap.showCoord = !class228.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")) { + CollisionMap.method3707(); + } } + + PacketBufferNode var1 = UserComparator4.getPacketBufferNode(ClientPacket.field2268, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(var0.length() + 1); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); } - @ObfuscatedName("iw") + @ObfuscatedName("ir") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Lhe;I)Ljava/lang/String;", - garbageValue = "-748115662" + signature = "(Lhd;Ljo;IIZI)V", + garbageValue = "-771039466" ) - static String method3403(String var0, Widget var1) { - if (var0.indexOf("%") != -1) { - for (int var2 = 1; var2 <= 5; ++var2) { - while (true) { - int var3 = var0.indexOf("%" + var2); - if (var3 == -1) { - break; - } - - String var4 = var0.substring(0, var3); - int var6 = Tiles.method1227(var1, var2 - 1); - String var5; - if (var6 < 999999999) { - var5 = Integer.toString(var6); - } else { - var5 = "*"; - } - - var0 = var4 + var5 + var0.substring(var3 + 2); - } + @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) { + ApproximateRouteStrategy.insertMenuItem(var7, ItemContainer.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); } - return var0; } } diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index 84f050de55..11c2137794 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -3,702 +3,692 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("he") +@ObfuscatedName("hd") @Implements("Widget") public class Widget extends Node { - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "[[Lhe;" + signature = "[[Lhd;" ) @Export("Widget_interfaceComponents") public static Widget[][] Widget_interfaceComponents; - @ObfuscatedName("z") - @Export("Widget_loadedInterfaces") - static boolean[] Widget_loadedInterfaces; - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Liy;" + signature = "Lic;" ) @Export("Widget_archive") static AbstractArchive Widget_archive; - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Liy;" - ) - @Export("Widget_fontsArchive") - static AbstractArchive Widget_fontsArchive; - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "Leg;" + signature = "Lec;" ) @Export("Widget_cachedSprites") - public static EvictingDualNodeHashTable Widget_cachedSprites; - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Leg;" - ) - @Export("Widget_cachedModels") - public static EvictingDualNodeHashTable Widget_cachedModels; + static EvictingDualNodeHashTable Widget_cachedSprites; @ObfuscatedName("h") @ObfuscatedSignature( - signature = "Leg;" + signature = "Lec;" + ) + @Export("Widget_cachedModels") + static EvictingDualNodeHashTable Widget_cachedModels; + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Lec;" ) @Export("Widget_cachedFonts") - public static EvictingDualNodeHashTable Widget_cachedFonts; - @ObfuscatedName("g") + static EvictingDualNodeHashTable Widget_cachedFonts; + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "Leg;" + signature = "Lec;" ) @Export("Widget_cachedSpriteMasks") - public static EvictingDualNodeHashTable Widget_cachedSpriteMasks; - @ObfuscatedName("i") - public static boolean field2565; - @ObfuscatedName("a") + static EvictingDualNodeHashTable Widget_cachedSpriteMasks; + @ObfuscatedName("s") + public static boolean field2600; + @ObfuscatedName("v") @Export("isIf3") public boolean isIf3; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -957641141 + intValue = 1532053467 ) @Export("id") public int id; - @ObfuscatedName("l") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -611900971 + intValue = 94060767 ) @Export("childIndex") public int childIndex; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -802488779 + intValue = 1914677931 ) @Export("type") public int type; - @ObfuscatedName("o") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -248776571 + intValue = 650107535 ) @Export("buttonType") public int buttonType; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1856343159 + intValue = 1929640649 ) @Export("contentType") public int contentType; - @ObfuscatedName("j") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1508256889 + intValue = 671987209 ) @Export("xAlignment") public int xAlignment; - @ObfuscatedName("y") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 286003577 + intValue = -1358214717 ) @Export("yAlignment") public int yAlignment; @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1131410983 + intValue = 1288389301 ) @Export("widthAlignment") public int widthAlignment; - @ObfuscatedName("ae") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = 357993753 + intValue = 147496779 ) @Export("heightAlignment") public int heightAlignment; - @ObfuscatedName("an") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = -1997338621 + intValue = -108757037 ) @Export("rawX") public int rawX; - @ObfuscatedName("ai") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -1586734249 + intValue = -1114050541 ) @Export("rawY") public int rawY; - @ObfuscatedName("ap") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -1225404085 + intValue = -426293773 ) @Export("rawWidth") public int rawWidth; - @ObfuscatedName("ab") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -568238685 + intValue = 1314381509 ) @Export("rawHeight") public int rawHeight; - @ObfuscatedName("ar") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 893339967 + intValue = 1103460101 ) @Export("x") public int x; - @ObfuscatedName("af") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -426365475 + intValue = 102959843 ) @Export("y") public int y; - @ObfuscatedName("at") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -1065823023 + intValue = -75340697 ) @Export("width") public int width; - @ObfuscatedName("al") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 379197055 + intValue = -2125257181 ) @Export("height") public int height; + @ObfuscatedName("ad") + @ObfuscatedGetter( + intValue = -30981469 + ) + public int field2741; @ObfuscatedName("as") @ObfuscatedGetter( - intValue = 162401447 + intValue = -1536699571 ) - public int field2584; - @ObfuscatedName("am") + public int field2641; + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 1885155777 - ) - public int field2585; - @ObfuscatedName("au") - @ObfuscatedGetter( - intValue = 1237608307 + intValue = 1118896329 ) @Export("parentId") public int parentId; - @ObfuscatedName("ao") + @ObfuscatedName("ap") @Export("isHidden") public boolean isHidden; - @ObfuscatedName("aq") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 615773905 + intValue = 1010580353 ) @Export("scrollX") public int scrollX; - @ObfuscatedName("av") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 1171290753 + intValue = 1724100971 ) @Export("scrollY") public int scrollY; - @ObfuscatedName("ak") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 108625295 + intValue = 1772823043 ) @Export("scrollWidth") public int scrollWidth; - @ObfuscatedName("aa") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 1982360223 + intValue = -519746393 ) @Export("scrollHeight") public int scrollHeight; - @ObfuscatedName("ax") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 1176894453 + intValue = -1542653287 ) @Export("color") public int color; - @ObfuscatedName("az") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 306036279 + intValue = -2094712983 ) @Export("color2") public int color2; - @ObfuscatedName("aj") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = 466751965 + intValue = -583623665 ) @Export("mouseOverColor") public int mouseOverColor; - @ObfuscatedName("ay") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = 1324656195 + intValue = 1750494175 ) @Export("mouseOverColor2") public int mouseOverColor2; - @ObfuscatedName("ad") + @ObfuscatedName("az") @Export("fill") public boolean fill; - @ObfuscatedName("ac") + @ObfuscatedName("aq") @ObfuscatedSignature( - signature = "Llu;" + signature = "Llw;" ) @Export("fillMode") public class332 fillMode; - @ObfuscatedName("ah") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 14590311 + intValue = 374007217 ) @Export("transparencyTop") public int transparencyTop; - @ObfuscatedName("ag") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 974116043 + intValue = -1124278239 ) @Export("transparencyBot") public int transparencyBot; - @ObfuscatedName("aw") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 2009428193 + intValue = 1598998121 ) @Export("lineWid") public int lineWid; - @ObfuscatedName("bf") - public boolean field2601; - @ObfuscatedName("bc") + @ObfuscatedName("bk") + public boolean field2633; + @ObfuscatedName("bh") @ObfuscatedGetter( - intValue = 66057751 + intValue = -26976881 ) @Export("spriteId2") public int spriteId2; - @ObfuscatedName("bo") + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = -1011748949 + intValue = 735913065 ) @Export("spriteId") public int spriteId; - @ObfuscatedName("bd") + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = -911208959 + intValue = -1395543785 ) @Export("spriteAngle") public int spriteAngle; - @ObfuscatedName("bk") + @ObfuscatedName("bf") @Export("spriteTiling") public boolean spriteTiling; - @ObfuscatedName("bu") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = -551996645 + intValue = 1014909581 ) @Export("outline") public int outline; - @ObfuscatedName("be") + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = 898417273 + intValue = 511945889 ) @Export("spriteShadow") public int spriteShadow; - @ObfuscatedName("bg") + @ObfuscatedName("bb") @Export("spriteFlipV") public boolean spriteFlipV; - @ObfuscatedName("bt") + @ObfuscatedName("bw") @Export("spriteFlipH") public boolean spriteFlipH; - @ObfuscatedName("bh") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = -1679439917 + intValue = 2063868425 ) @Export("modelType") public int modelType; - @ObfuscatedName("br") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = 483051319 + intValue = 2132248089 ) @Export("modelId") public int modelId; - @ObfuscatedName("bq") + @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = 125406963 + intValue = 1137051425 ) @Export("modelType2") int modelType2; - @ObfuscatedName("ba") + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = 1734767957 + intValue = -2115206777 ) @Export("modelId2") int modelId2; - @ObfuscatedName("bv") + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = -166910705 + intValue = -1819802445 ) @Export("sequenceId") public int sequenceId; - @ObfuscatedName("bx") + @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = -389521949 + intValue = -1542616685 ) @Export("sequenceId2") public int sequenceId2; - @ObfuscatedName("bz") + @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = 1269071469 + intValue = 775491195 ) @Export("modelOffsetX") public int modelOffsetX; - @ObfuscatedName("bs") + @ObfuscatedName("bv") @ObfuscatedGetter( - intValue = -924975785 + intValue = 1987076219 ) @Export("modelOffsetY") public int modelOffsetY; - @ObfuscatedName("bp") + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = -1358169901 + intValue = -1572125175 ) @Export("modelAngleX") public int modelAngleX; - @ObfuscatedName("bm") + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = 283299325 + intValue = -34840117 ) @Export("modelAngleY") public int modelAngleY; - @ObfuscatedName("bb") + @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = 1945900441 + intValue = 1647170417 ) @Export("modelAngleZ") public int modelAngleZ; - @ObfuscatedName("bn") + @ObfuscatedName("bx") @ObfuscatedGetter( - intValue = -1346742871 + intValue = 433394219 ) @Export("modelZoom") public int modelZoom; + @ObfuscatedName("br") + @ObfuscatedGetter( + intValue = -2079945959 + ) + public int field2657; + @ObfuscatedName("bs") + @ObfuscatedGetter( + intValue = 295500307 + ) + public int field2658; @ObfuscatedName("by") - @ObfuscatedGetter( - intValue = -1413539479 - ) - public int field2622; - @ObfuscatedName("bj") - @ObfuscatedGetter( - intValue = 1706662487 - ) - public int field2623; - @ObfuscatedName("bi") @Export("modelOrthog") public boolean modelOrthog; - @ObfuscatedName("bl") + @ObfuscatedName("bj") @Export("modelTransparency") public boolean modelTransparency; - @ObfuscatedName("bw") + @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = 1321908019 + intValue = 904576921 ) @Export("itemQuantityMode") public int itemQuantityMode; - @ObfuscatedName("cw") + @ObfuscatedName("cc") @ObfuscatedGetter( - intValue = -1118352365 + intValue = -732516347 ) @Export("fontId") public int fontId; - @ObfuscatedName("cc") + @ObfuscatedName("cb") @Export("text") public String text; @ObfuscatedName("ch") @Export("text2") public String text2; - @ObfuscatedName("cr") + @ObfuscatedName("cw") @ObfuscatedGetter( - intValue = -1838623877 + intValue = 1932808517 ) @Export("textLineHeight") public int textLineHeight; - @ObfuscatedName("cq") + @ObfuscatedName("cz") @ObfuscatedGetter( - intValue = -1124877935 + intValue = -1100910863 ) @Export("textXAlignment") public int textXAlignment; - @ObfuscatedName("co") + @ObfuscatedName("cg") @ObfuscatedGetter( - intValue = 1212909225 + intValue = -1006232377 ) @Export("textYAlignment") public int textYAlignment; - @ObfuscatedName("cm") + @ObfuscatedName("cn") @Export("textShadowed") public boolean textShadowed; - @ObfuscatedName("cu") + @ObfuscatedName("ce") @ObfuscatedGetter( - intValue = 99927781 + intValue = -1719700201 ) @Export("paddingX") public int paddingX; - @ObfuscatedName("cs") + @ObfuscatedName("cj") @ObfuscatedGetter( - intValue = -534420979 + intValue = -895052993 ) @Export("paddingY") public int paddingY; - @ObfuscatedName("cg") + @ObfuscatedName("ck") @Export("inventoryXOffsets") public int[] inventoryXOffsets; - @ObfuscatedName("cd") + @ObfuscatedName("cv") @Export("inventoryYOffsets") public int[] inventoryYOffsets; - @ObfuscatedName("cx") + @ObfuscatedName("cp") @Export("inventorySprites") public int[] inventorySprites; - @ObfuscatedName("cn") + @ObfuscatedName("ci") @Export("itemActions") public String[] itemActions; - @ObfuscatedName("ci") + @ObfuscatedName("cu") @ObfuscatedGetter( - intValue = 1025348499 + intValue = 1451565177 ) @Export("clickMask") public int clickMask; - @ObfuscatedName("cz") - public boolean field2641; - @ObfuscatedName("cb") - public byte[][] field2555; + @ObfuscatedName("cq") + public boolean field2709; + @ObfuscatedName("co") + public byte[][] field2647; + @ObfuscatedName("ca") + public byte[][] field2678; + @ObfuscatedName("cd") + public int[] field2679; @ObfuscatedName("cy") - public byte[][] field2643; - @ObfuscatedName("cj") - public int[] field2644; - @ObfuscatedName("cp") - public int[] field2695; - @ObfuscatedName("dv") + public int[] field2680; + @ObfuscatedName("dx") @Export("dataText") public String dataText; - @ObfuscatedName("dd") + @ObfuscatedName("dw") @Export("actions") public String[] actions; - @ObfuscatedName("du") + @ObfuscatedName("dm") @ObfuscatedSignature( - signature = "Lhe;" + signature = "Lhd;" ) @Export("parent") public Widget parent; - @ObfuscatedName("dz") + @ObfuscatedName("dd") @ObfuscatedGetter( - intValue = -1434163873 + intValue = -730835665 ) @Export("dragZoneSize") public int dragZoneSize; - @ObfuscatedName("dg") + @ObfuscatedName("dh") @ObfuscatedGetter( - intValue = -1149387947 + intValue = 2091861089 ) @Export("dragThreshold") public int dragThreshold; - @ObfuscatedName("dq") + @ObfuscatedName("dl") @Export("isScrollBar") public boolean isScrollBar; - @ObfuscatedName("dj") + @ObfuscatedName("dr") @Export("spellActionName") public String spellActionName; - @ObfuscatedName("dl") + @ObfuscatedName("di") @Export("hasListener") public boolean hasListener; - @ObfuscatedName("dm") + @ObfuscatedName("dp") @Export("onLoad") public Object[] onLoad; - @ObfuscatedName("db") + @ObfuscatedName("dc") @Export("onClick") public Object[] onClick; - @ObfuscatedName("dw") + @ObfuscatedName("dt") @Export("onClickRepeat") public Object[] onClickRepeat; - @ObfuscatedName("de") + @ObfuscatedName("ds") @Export("onRelease") public Object[] onRelease; - @ObfuscatedName("dh") + @ObfuscatedName("dg") @Export("onHold") public Object[] onHold; - @ObfuscatedName("dk") + @ObfuscatedName("do") @Export("onMouseOver") public Object[] onMouseOver; - @ObfuscatedName("da") + @ObfuscatedName("dn") @Export("onMouseRepeat") public Object[] onMouseRepeat; - @ObfuscatedName("do") + @ObfuscatedName("db") @Export("onMouseLeave") public Object[] onMouseLeave; - @ObfuscatedName("dr") + @ObfuscatedName("de") @Export("onDrag") public Object[] onDrag; - @ObfuscatedName("dx") + @ObfuscatedName("dv") @Export("onDragComplete") public Object[] onDragComplete; - @ObfuscatedName("dy") + @ObfuscatedName("dk") @Export("onTargetEnter") public Object[] onTargetEnter; - @ObfuscatedName("dc") + @ObfuscatedName("da") @Export("onTargetLeave") public Object[] onTargetLeave; - @ObfuscatedName("ds") + @ObfuscatedName("df") @Export("onVarTransmit") public Object[] onVarTransmit; - @ObfuscatedName("dt") + @ObfuscatedName("dz") @Export("varTransmitTriggers") public int[] varTransmitTriggers; - @ObfuscatedName("dp") + @ObfuscatedName("dq") @Export("onInvTransmit") public Object[] onInvTransmit; - @ObfuscatedName("df") + @ObfuscatedName("dy") @Export("invTransmitTriggers") public int[] invTransmitTriggers; - @ObfuscatedName("di") + @ObfuscatedName("du") @Export("onStatTransmit") public Object[] onStatTransmit; - @ObfuscatedName("dn") + @ObfuscatedName("dj") @Export("statTransmitTriggers") public int[] statTransmitTriggers; - @ObfuscatedName("ea") + @ObfuscatedName("ek") @Export("onTimer") public Object[] onTimer; - @ObfuscatedName("ex") + @ObfuscatedName("ej") @Export("onOp") public Object[] onOp; - @ObfuscatedName("eo") + @ObfuscatedName("eu") @Export("onScroll") public Object[] onScroll; - @ObfuscatedName("et") + @ObfuscatedName("eo") @Export("onChatTransmit") public Object[] onChatTransmit; - @ObfuscatedName("eh") + @ObfuscatedName("es") @Export("onKey") public Object[] onKey; - @ObfuscatedName("eq") + @ObfuscatedName("ea") @Export("onFriendTransmit") public Object[] onFriendTransmit; - @ObfuscatedName("el") + @ObfuscatedName("ef") @Export("onClanTransmit") public Object[] onClanTransmit; @ObfuscatedName("ei") @Export("onMiscTransmit") public Object[] onMiscTransmit; - @ObfuscatedName("en") + @ObfuscatedName("et") @Export("onDialogAbort") public Object[] onDialogAbort; - @ObfuscatedName("ec") + @ObfuscatedName("eq") @Export("onSubChange") public Object[] onSubChange; - @ObfuscatedName("ev") + @ObfuscatedName("ex") @Export("onResize") public Object[] onResize; - @ObfuscatedName("eb") + @ObfuscatedName("er") @Export("onStockTransmit") public Object[] onStockTransmit; - @ObfuscatedName("ej") - public Object[] field2691; - @ObfuscatedName("ed") + @ObfuscatedName("em") + public Object[] field2719; + @ObfuscatedName("en") @Export("cs1Instructions") public int[][] cs1Instructions; - @ObfuscatedName("ee") + @ObfuscatedName("el") @Export("cs1Comparisons") public int[] cs1Comparisons; - @ObfuscatedName("ep") + @ObfuscatedName("ez") @Export("cs1ComparisonValues") public int[] cs1ComparisonValues; - @ObfuscatedName("er") + @ObfuscatedName("ed") @ObfuscatedGetter( - intValue = 58254591 + intValue = -1020277937 ) @Export("mouseOverRedirect") public int mouseOverRedirect; - @ObfuscatedName("ef") + @ObfuscatedName("eg") @Export("spellName") public String spellName; - @ObfuscatedName("eu") + @ObfuscatedName("ey") @Export("buttonText") public String buttonText; - @ObfuscatedName("em") + @ObfuscatedName("ew") @Export("itemIds") public int[] itemIds; - @ObfuscatedName("ez") + @ObfuscatedName("ep") @Export("itemQuantities") public int[] itemQuantities; - @ObfuscatedName("ek") + @ObfuscatedName("ev") @ObfuscatedGetter( - intValue = -1761852993 + intValue = -2118409911 ) @Export("itemId") public int itemId; - @ObfuscatedName("ey") + @ObfuscatedName("eh") @ObfuscatedGetter( - intValue = 612667463 + intValue = 488452853 ) @Export("itemQuantity") public int itemQuantity; - @ObfuscatedName("ew") + @ObfuscatedName("eb") @ObfuscatedGetter( - intValue = 1022717263 + intValue = 1121550345 ) @Export("modelFrame") public int modelFrame; - @ObfuscatedName("eg") + @ObfuscatedName("ec") @ObfuscatedGetter( - intValue = -1039552423 + intValue = 404689141 ) @Export("modelFrameCycle") public int modelFrameCycle; - @ObfuscatedName("es") + @ObfuscatedName("ee") @ObfuscatedSignature( - signature = "[Lhe;" + signature = "[Lhd;" ) @Export("children") public Widget[] children; - @ObfuscatedName("fk") + @ObfuscatedName("fe") @Export("containsMouse") public boolean containsMouse; - @ObfuscatedName("fw") + @ObfuscatedName("fi") @Export("isClicked") public boolean isClicked; - @ObfuscatedName("fl") + @ObfuscatedName("fr") @ObfuscatedGetter( - intValue = -1024561307 + intValue = -1318677179 ) - public int field2700; - @ObfuscatedName("fy") - @ObfuscatedGetter( - intValue = 1220339105 - ) - public int field2701; - @ObfuscatedName("ff") - @ObfuscatedGetter( - intValue = -524679265 - ) - public int field2620; + public int field2735; @ObfuscatedName("fd") @ObfuscatedGetter( - intValue = -1480837579 + intValue = 1691925671 ) - public int field2588; - @ObfuscatedName("fo") + public int field2736; + @ObfuscatedName("fc") @ObfuscatedGetter( - intValue = -612332201 + intValue = 717903213 + ) + public int field2643; + @ObfuscatedName("ft") + @ObfuscatedGetter( + intValue = 989290657 + ) + public int field2721; + @ObfuscatedName("fp") + @ObfuscatedGetter( + intValue = -775158901 ) @Export("rootIndex") public int rootIndex; - @ObfuscatedName("fi") + @ObfuscatedName("fq") @ObfuscatedGetter( - intValue = 847308047 + intValue = -1023305039 ) @Export("cycle") public int cycle; - @ObfuscatedName("fv") - public int[] field2706; - @ObfuscatedName("fc") + @ObfuscatedName("fk") + public int[] field2723; + @ObfuscatedName("fx") @Export("noClickThrough") public boolean noClickThrough; - @ObfuscatedName("fp") + @ObfuscatedName("fy") @Export("noScrollThrough") public boolean noScrollThrough; - @ObfuscatedName("fg") - public boolean field2658; + @ObfuscatedName("fn") + public boolean field2744; static { Widget_cachedSprites = new EvictingDualNodeHashTable(200); Widget_cachedModels = new EvictingDualNodeHashTable(50); Widget_cachedFonts = new EvictingDualNodeHashTable(20); Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(8); - field2565 = false; + field2600 = false; } public Widget() { @@ -719,8 +709,8 @@ public class Widget extends Node { this.y = 0; this.width = 0; this.height = 0; - this.field2584 = 1; - this.field2585 = 1; + this.field2741 = 1; + this.field2641 = 1; this.parentId = -1; this.isHidden = false; this.scrollX = 0; @@ -736,7 +726,7 @@ public class Widget extends Node { this.transparencyTop = 0; this.transparencyBot = 0; this.lineWid = 1; - this.field2601 = false; + this.field2633 = false; this.spriteId2 = -1; this.spriteId = -1; this.spriteAngle = 0; @@ -755,8 +745,8 @@ public class Widget extends Node { this.modelAngleY = 0; this.modelAngleZ = 0; this.modelZoom = 100; - this.field2622 = 0; - this.field2623 = 0; + this.field2657 = 0; + this.field2658 = 0; this.modelOrthog = false; this.modelTransparency = false; this.itemQuantityMode = 2; @@ -770,7 +760,7 @@ public class Widget extends Node { this.paddingX = 0; this.paddingY = 0; this.clickMask = 0; - this.field2641 = false; + this.field2709 = false; this.dataText = ""; this.parent = null; this.dragZoneSize = 0; @@ -787,21 +777,21 @@ public class Widget extends Node { this.modelFrameCycle = 0; this.containsMouse = false; this.isClicked = false; - this.field2700 = -1; - this.field2701 = 0; - this.field2620 = 0; - this.field2588 = 0; + this.field2735 = -1; + this.field2736 = 0; + this.field2643 = 0; + this.field2721 = 0; this.rootIndex = -1; this.cycle = -1; this.noClickThrough = false; this.noScrollThrough = false; - this.field2658 = false; + this.field2744 = false; } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lkb;B)V", - garbageValue = "-113" + signature = "(Lkn;S)V", + garbageValue = "27305" ) @Export("decodeLegacy") void decodeLegacy(Buffer var1) { @@ -870,7 +860,7 @@ public class Widget extends Node { if (this.type == 2) { this.itemIds = new int[this.rawWidth * this.rawHeight]; - this.itemQuantities = new int[this.rawHeight * this.rawWidth]; + this.itemQuantities = new int[this.rawWidth * this.rawHeight]; var4 = var1.readUnsignedByte(); if (var4 == 1) { this.clickMask |= 268435456; @@ -912,9 +902,9 @@ public class Widget extends Node { this.itemActions = new String[5]; for (var8 = 0; var8 < 5; ++var8) { - String var11 = var1.readStringCp1252NullTerminated(); - if (var11.length() > 0) { - this.itemActions[var8] = var11; + String var10 = var1.readStringCp1252NullTerminated(); + if (var10.length() > 0) { + this.itemActions[var8] = var10; this.clickMask |= 1 << var8 + 23; } } @@ -1005,9 +995,9 @@ public class Widget extends Node { this.itemActions = new String[5]; for (var5 = 0; var5 < 5; ++var5) { - String var10 = var1.readStringCp1252NullTerminated(); - if (var10.length() > 0) { - this.itemActions[var5] = var10; + String var11 = var1.readStringCp1252NullTerminated(); + if (var11.length() > 0) { + this.itemActions[var5] = var11; this.clickMask |= 1 << var5 + 23; } } @@ -1055,10 +1045,10 @@ public class Widget extends Node { } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Lkb;I)V", - garbageValue = "1292756714" + signature = "(Lkn;B)V", + garbageValue = "0" ) @Export("decode") void decode(Buffer var1) { @@ -1125,7 +1115,7 @@ public class Widget extends Node { this.modelOrthog = var1.readUnsignedByte() == 1; var1.readUnsignedShort(); if (this.widthAlignment != 0) { - this.field2622 = var1.readUnsignedShort(); + this.field2657 = var1.readUnsignedShort(); } if (this.heightAlignment != 0) { @@ -1156,7 +1146,7 @@ public class Widget extends Node { if (this.type == 9) { this.lineWid = var1.readUnsignedByte(); this.color = var1.readInt(); - this.field2601 = var1.readUnsignedByte() == 1; + this.field2633 = var1.readUnsignedByte() == 1; } this.clickMask = var1.readMedium(); @@ -1197,10 +1187,10 @@ public class Widget extends Node { this.statTransmitTriggers = this.readListenerTriggers(var1); } - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Lkb;I)[Ljava/lang/Object;", - garbageValue = "2142536544" + signature = "(Lkn;I)[Ljava/lang/Object;", + garbageValue = "2034218421" ) @Export("readListener") Object[] readListener(Buffer var1) { @@ -1224,10 +1214,10 @@ public class Widget extends Node { } } - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(Lkb;I)[I", - garbageValue = "-1956943483" + signature = "(Lkn;S)[I", + garbageValue = "-3542" ) @Export("readListenerTriggers") int[] readListenerTriggers(Buffer var1) { @@ -1245,10 +1235,10 @@ public class Widget extends Node { } } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "880946996" + garbageValue = "429586427" ) @Export("swapItems") public void swapItems(int var1, int var2) { @@ -1260,14 +1250,14 @@ public class Widget extends Node { this.itemQuantities[var1] = var3; } - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(ZB)Lla;", - garbageValue = "-39" + signature = "(ZB)Llz;", + garbageValue = "1" ) @Export("getSprite") public Sprite getSprite(boolean var1) { - field2565 = false; + field2600 = false; int var2; if (var1) { var2 = this.spriteId; @@ -1278,14 +1268,14 @@ public class Widget extends Node { if (var2 == -1) { return null; } else { - long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipH ? 1L : 0L) << 39) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipV ? 1L : 0L) << 38); + long var3 = ((this.spriteFlipH ? 1L : 0L) << 39) + ((this.spriteFlipV ? 1L : 0L) << 38) + ((long)this.outline << 36) + (long)var2 + ((long)this.spriteShadow << 40); Sprite var5 = (Sprite)Widget_cachedSprites.get(var3); if (var5 != null) { return var5; } else { - var5 = MusicPatchNode2.SpriteBuffer_getSprite(Varps.Widget_spritesArchive, var2, 0); + var5 = GameShell.SpriteBuffer_getSprite(class349.Widget_spritesArchive, var2, 0); if (var5 == null) { - field2565 = true; + field2600 = true; return null; } else { if (this.spriteFlipV) { @@ -1319,14 +1309,14 @@ public class Widget extends Node { } } - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(B)Lkx;", - garbageValue = "-18" + signature = "(B)Lko;", + garbageValue = "24" ) @Export("getFont") public Font getFont() { - field2565 = false; + field2600 = false; if (this.fontId == -1) { return null; } else { @@ -1334,35 +1324,26 @@ public class Widget extends Node { if (var1 != null) { return var1; } else { - AbstractArchive var3 = Varps.Widget_spritesArchive; - AbstractArchive var4 = Widget_fontsArchive; - int var5 = this.fontId; - Font var2; - if (!UserComparator7.method3516(var3, var5, 0)) { - var2 = null; + var1 = Frames.method3394(class349.Widget_spritesArchive, WorldMapLabel.Widget_fontsArchive, this.fontId, 0); + if (var1 != null) { + Widget_cachedFonts.put(var1, (long)this.fontId); } else { - var2 = VertexNormal.method3094(var4.takeFile(var5, 0)); + field2600 = true; } - if (var2 != null) { - Widget_cachedFonts.put(var2, (long)this.fontId); - } else { - field2565 = true; - } - - return var2; + return var1; } } } - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(IB)Lla;", - garbageValue = "14" + signature = "(II)Llz;", + garbageValue = "2132771251" ) @Export("getInventorySprite") public Sprite getInventorySprite(int var1) { - field2565 = false; + field2600 = false; if (var1 >= 0 && var1 < this.inventorySprites.length) { int var2 = this.inventorySprites[var1]; if (var2 == -1) { @@ -1372,11 +1353,11 @@ public class Widget extends Node { if (var3 != null) { return var3; } else { - var3 = MusicPatchNode2.SpriteBuffer_getSprite(Varps.Widget_spritesArchive, var2, 0); + var3 = GameShell.SpriteBuffer_getSprite(class349.Widget_spritesArchive, var2, 0); if (var3 != null) { Widget_cachedSprites.put(var3, (long)var2); } else { - field2565 = true; + field2600 = true; } return var3; @@ -1387,14 +1368,14 @@ public class Widget extends Node { } } - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(Ljc;IZLhk;B)Lel;", - garbageValue = "73" + signature = "(Ljm;IZLhv;I)Lef;", + garbageValue = "-893461893" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerAppearance var4) { - field2565 = false; + field2600 = false; int var5; int var6; if (var3) { @@ -1414,9 +1395,9 @@ public class Widget extends Node { if (var7 == null) { ModelData var8; if (var5 == 1) { - var8 = ModelData.ModelData_get(SoundSystem.Widget_modelsArchive, var6, 0); + var8 = ModelData.ModelData_get(SecureRandomCallable.Widget_modelsArchive, var6, 0); if (var8 == null) { - field2565 = true; + field2600 = true; return null; } @@ -1424,9 +1405,9 @@ public class Widget extends Node { } if (var5 == 2) { - var8 = class237.getNpcDefinition(var6).getModelData(); + var8 = StudioGame.getNpcDefinition(var6).getModelData(); if (var8 == null) { - field2565 = true; + field2600 = true; return null; } @@ -1440,7 +1421,7 @@ public class Widget extends Node { var8 = var4.getModelData(); if (var8 == null) { - field2565 = true; + field2600 = true; return null; } @@ -1448,10 +1429,10 @@ public class Widget extends Node { } if (var5 == 4) { - ItemDefinition var9 = AbstractWorldMapData.ItemDefinition_get(var6); + ItemDefinition var9 = KitDefinition.ItemDefinition_get(var6); var8 = var9.getModelData(10); if (var8 == null) { - field2565 = true; + field2600 = true; return null; } @@ -1469,10 +1450,10 @@ public class Widget extends Node { } } - @ObfuscatedName("h") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(ZB)Lhg;", - garbageValue = "-84" + signature = "(ZI)Lhh;", + garbageValue = "-1801496414" ) @Export("getSpriteMask") public SpriteMask getSpriteMask(boolean var1) { @@ -1480,11 +1461,11 @@ public class Widget extends Node { var1 = false; } - int var2 = var1 ? this.spriteId * -1011748949 * -1444834557 : this.spriteId2 * -2111921753 * 66057751; + int var2 = var1 ? this.spriteId * 735913065 * -114644007 : this.spriteId2 * -26976881 * 953426287; if (var2 == -1) { return null; } else { - long var3 = ((this.spriteFlipV ? 1L : 0L) << 38) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.spriteShadow << 40); + long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((this.spriteFlipV ? 1L : 0L) << 38) + (long)var2 + ((long)this.outline << 36); SpriteMask var5 = (SpriteMask)Widget_cachedSpriteMasks.get(var3); if (var5 != null) { return var5; @@ -1528,10 +1509,10 @@ public class Widget extends Node { } } - @ObfuscatedName("g") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(ILjava/lang/String;I)V", - garbageValue = "-207986115" + garbageValue = "1766154663" ) @Export("setAction") public void setAction(int var1, String var2) { @@ -1549,366 +1530,32 @@ public class Widget extends Node { this.actions[var1] = var2; } - @ObfuscatedName("ae") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "1024781244" + signature = "(II)I", + garbageValue = "863764794" ) - static int method4183(int var0, Script var1, boolean var2) { - String var3; - if (var0 == ScriptOpcodes.MES) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - Skeleton.addGameMessage(0, "", var3); - return 1; - } else if (var0 == ScriptOpcodes.ANIM) { - Interpreter.Interpreter_intStackSize -= 2; - GrandExchangeOfferWorldComparator.performPlayerAnimation(ByteArrayPool.localPlayer, Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); - return 1; - } else if (var0 == ScriptOpcodes.IF_CLOSE) { - if (!Interpreter.field1126) { - Interpreter.field1125 = true; - } - - return 1; + @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 { - int var10; - if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var10 = 0; - if (MusicPatch.isNumber(var3)) { - var10 = Tiles.parseInt(var3); - } - - PacketBufferNode var12 = FaceNormal.getPacketBufferNode(ClientPacket.field2279, 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 = FaceNormal.getPacketBufferNode(ClientPacket.field2213, 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 = FaceNormal.getPacketBufferNode(ClientPacket.field2273, 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[--Interpreter.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - class39.method646(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 = MusicPatchNode.getWidget(var9); - Player.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 ? GrandExchangeOfferNameComparator.field115 : Interpreter.field1130; - Player.clickWidget(var11, var15, var10); - return 1; - } else if (var0 == ScriptOpcodes.MOUSECAM) { - class217.mouseCam = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferOwnWorldComparator.clientPreferences.roofsHidden ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { - GrandExchangeOfferOwnWorldComparator.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - WorldMapArea.savePreferences(); - return 1; - } else if (var0 == ScriptOpcodes.OPENURL) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - boolean var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Script.openURL(var3, var4, false); - return 1; - } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { - var15 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var14 = FaceNormal.getPacketBufferNode(ClientPacket.field2253, 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 = FaceNormal.getPacketBufferNode(ClientPacket.field2214, Client.packetWriter.isaacCipher); - var6.packetBuffer.writeShort(1 + class234.stringCp1252NullTerminatedByteSize(var7) + class234.stringCp1252NullTerminatedByteSize(var5)); - var6.packetBuffer.method5727(var15); - var6.packetBuffer.writeStringCp1252NullTerminated(var7); - 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) { - class2.setTapToDrop(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1); - return 1; - } else if (var0 == ScriptOpcodes.GETTAPTODROP) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection3.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] = WorldMapLabel.canvasWidth; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Varps.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.field842 = 3; - Client.field843 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - return 1; - } else if (var0 == 3137) { - Client.field842 = 2; - Client.field843 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - return 1; - } else if (var0 == 3138) { - Client.field842 = 0; - return 1; - } else if (var0 == 3139) { - Client.field842 = 1; - return 1; - } else if (var0 == 3140) { - Client.field842 = 3; - Client.field843 = var2 ? GrandExchangeOfferNameComparator.field115.id * -1381479581 * -957641141 : Interpreter.field1130.id * -1381479581 * -957641141; - return 1; - } else { - boolean var8; - if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { - var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - GrandExchangeOfferOwnWorldComparator.clientPreferences.hideUsername = var8; - WorldMapArea.savePreferences(); - return 1; - } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferOwnWorldComparator.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) { - GrandExchangeOfferOwnWorldComparator.clientPreferences.rememberedUsername = ""; - WorldMapArea.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 == GrandExchangeOfferOwnWorldComparator.clientPreferences.titleMusicDisabled) { - GrandExchangeOfferOwnWorldComparator.clientPreferences.titleMusicDisabled = !var8; - WorldMapArea.savePreferences(); - } - - return 1; - } else if (var0 == ScriptOpcodes.GETTITLEMUSICENABLED) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferOwnWorldComparator.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] = GrandExchangeOfferWorldComparator.method147(); - 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 if (var0 == 3176) { - return 1; - } else if (var0 == 3177) { - return 1; - } else if (var0 == 3178) { - --Interpreter.Interpreter_stringStackSize; - return 1; - } else if (var0 == 3179) { - return 1; - } else if (var0 == 3180) { - --Interpreter.Interpreter_stringStackSize; - return 1; - } else { - return 2; - } - } - } + 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; } } diff --git a/runescape-client/src/main/java/World.java b/runescape-client/src/main/java/World.java index 576f46a3f7..0aa20c972f 100644 --- a/runescape-client/src/main/java/World.java +++ b/runescape-client/src/main/java/World.java @@ -7,57 +7,63 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ch") @Implements("World") public class World { - @ObfuscatedName("v") + @ObfuscatedName("po") + @ObfuscatedSignature( + signature = "Lls;" + ) + @Export("privateChatMode") + static PrivateChatMode privateChatMode; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1328454415 + intValue = -1441971191 ) @Export("World_count") static int World_count; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 89189373 + intValue = -1186159091 ) @Export("World_listCount") static int World_listCount; - @ObfuscatedName("z") + @ObfuscatedName("u") @Export("World_sortOption2") static int[] World_sortOption2; - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("World_sortOption1") static int[] World_sortOption1; - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1023289861 + intValue = 1957394053 ) @Export("id") int id; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -522510299 + intValue = 698149195 ) @Export("properties") int properties; - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1229908449 + intValue = 291989859 ) @Export("population") int population; - @ObfuscatedName("u") + @ObfuscatedName("h") @Export("host") String host; - @ObfuscatedName("h") + @ObfuscatedName("k") @Export("activity") String activity; - @ObfuscatedName("g") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1299711201 + intValue = -1891315591 ) @Export("location") int location; - @ObfuscatedName("i") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -281997857 + intValue = 198131919 ) @Export("index") int index; @@ -72,147 +78,637 @@ public class World { World() { } - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "-87" + signature = "(I)Z", + garbageValue = "-1952948484" ) @Export("isMembersOnly") boolean isMembersOnly() { return (1 & this.properties) != 0; } - @ObfuscatedName("e") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1374980076" + garbageValue = "-964696384" ) - boolean method1869() { + boolean method1874() { return (2 & this.properties) != 0; } - @ObfuscatedName("s") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1915504932" + garbageValue = "-1522011023" ) @Export("isPvp") boolean isPvp() { return (4 & this.properties) != 0; } - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "53" + signature = "(I)Z", + garbageValue = "1974803313" ) - boolean method1871() { + boolean method1841() { return (8 & this.properties) != 0; } - @ObfuscatedName("n") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "248561667" + signature = "(B)Z", + garbageValue = "15" ) @Export("isDeadman") boolean isDeadman() { return (536870912 & this.properties) != 0; } - @ObfuscatedName("u") + @ObfuscatedName("k") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1399101886" + garbageValue = "607891956" ) @Export("isBeta") boolean isBeta() { return (33554432 & this.properties) != 0; } - @ObfuscatedName("h") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "20" + signature = "(I)Z", + garbageValue = "1312079731" ) - boolean method1879() { + boolean method1835() { return (1073741824 & this.properties) != 0; } - @ObfuscatedName("x") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Liy;Liy;Liy;Liy;S)V", - garbageValue = "-3755" + signature = "(IIILga;Lfz;I)Z", + garbageValue = "1323151453" ) - public static void method1908(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, AbstractArchive var3) { - Widget.Widget_archive = var0; - SoundSystem.Widget_modelsArchive = var1; - Varps.Widget_spritesArchive = var2; - Widget.Widget_fontsArchive = var3; - Widget.Widget_interfaceComponents = new Widget[Widget.Widget_archive.getGroupCount()][]; - Widget.Widget_loadedInterfaces = new boolean[Widget.Widget_archive.getGroupCount()]; - } + static final boolean method1856(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; + class182.directions[var7][var8] = 99; + class182.distances[var7][var8] = 0; + byte var11 = 0; + int var12 = 0; + class182.bufferX[var11] = var0; + int var20 = var11 + 1; + class182.bufferY[var11] = var1; + int[][] var13 = var4.flags; - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(CB)Z", - garbageValue = "34" - ) - @Export("isCharAlphabetic") - public static boolean isCharAlphabetic(char var0) { - return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; - } + while (true) { + label309: + while (true) { + int var14; + int var15; + int var16; + int var17; + int var18; + int var19; + do { + do { + do { + label286: + do { + if (var12 == var20) { + class182.field2132 = var5; + GrandExchangeOfferOwnWorldComparator.field666 = var6; + return false; + } - @ObfuscatedName("ht") - @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "-1848249905" - ) - @Export("updateItemPile") - static final void updateItemPile(int var0, int var1) { - NodeDeque var2 = Client.groundItems[ScriptEvent.Client_plane][var0][var1]; - if (var2 == null) { - GrandExchangeOfferWorldComparator.scene.removeGroundItemPile(ScriptEvent.Client_plane, var0, var1); - } else { - long var3 = -99999999L; - TileItem var5 = null; + var5 = class182.bufferX[var12]; + var6 = class182.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)) { + class182.field2132 = var5; + GrandExchangeOfferOwnWorldComparator.field666 = var6; + return true; + } - TileItem var6; - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { - ItemDefinition var7 = AbstractWorldMapData.ItemDefinition_get(var6.id); - long var8 = (long)var7.price; - if (var7.isStackable == 1) { - var8 *= (long)(var6.quantity + 1); - } + var16 = class182.distances[var18][var19] + 1; + if (var18 > 0 && class182.directions[var18 - 1][var19] == 0 && (var13[var14 - 1][var15] & 19136782) == 0 && (var13[var14 - 1][var15 + var2 - 1] & 19136824) == 0) { + var17 = 1; - if (var8 > var3) { - var3 = var8; - var5 = var6; - } - } + while (true) { + if (var17 >= var2 - 1) { + class182.bufferX[var20] = var5 - 1; + class182.bufferY[var20] = var6; + var20 = var20 + 1 & 4095; + class182.directions[var18 - 1][var19] = 2; + class182.distances[var18 - 1][var19] = var16; + break; + } - if (var5 == null) { - GrandExchangeOfferWorldComparator.scene.removeGroundItemPile(ScriptEvent.Client_plane, var0, var1); - } else { - var2.addLast(var5); - TileItem var12 = null; - TileItem var11 = null; + if ((var13[var14 - 1][var15 + var17] & 19136830) != 0) { + break; + } - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { - if (var6.id != var5.id) { - if (var12 == null) { - var12 = var6; - } + ++var17; + } + } - if (var12.id != var6.id && var11 == null) { - var11 = var6; - } + if (var18 < 128 - var2 && class182.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) { + class182.bufferX[var20] = var5 + 1; + class182.bufferY[var20] = var6; + var20 = var20 + 1 & 4095; + class182.directions[var18 + 1][var19] = 8; + class182.distances[var18 + 1][var19] = var16; + break; + } + + if ((var13[var14 + var2][var15 + var17] & 19136995) != 0) { + break; + } + + ++var17; + } + } + + if (var19 > 0 && class182.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) { + class182.bufferX[var20] = var5; + class182.bufferY[var20] = var6 - 1; + var20 = var20 + 1 & 4095; + class182.directions[var18][var19 - 1] = 1; + class182.distances[var18][var19 - 1] = var16; + break; + } + + if ((var13[var14 + var17][var15 - 1] & 19136911) != 0) { + break; + } + + ++var17; + } + } + + if (var19 < 128 - var2 && class182.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) { + class182.bufferX[var20] = var5; + class182.bufferY[var20] = var6 + 1; + var20 = var20 + 1 & 4095; + class182.directions[var18][var19 + 1] = 4; + class182.distances[var18][var19 + 1] = var16; + break; + } + + if ((var13[var14 + var17][var15 + var2] & 19137016) != 0) { + break; + } + + ++var17; + } + } + + if (var18 > 0 && var19 > 0 && class182.directions[var18 - 1][var19 - 1] == 0 && (var13[var14 - 1][var15 - 1] & 19136782) == 0) { + var17 = 1; + + while (true) { + if (var17 >= var2) { + class182.bufferX[var20] = var5 - 1; + class182.bufferY[var20] = var6 - 1; + var20 = var20 + 1 & 4095; + class182.directions[var18 - 1][var19 - 1] = 3; + class182.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 && class182.directions[var18 + 1][var19 - 1] == 0 && (var13[var14 + var2][var15 - 1] & 19136899) == 0) { + var17 = 1; + + while (true) { + if (var17 >= var2) { + class182.bufferX[var20] = var5 + 1; + class182.bufferY[var20] = var6 - 1; + var20 = var20 + 1 & 4095; + class182.directions[var18 + 1][var19 - 1] = 9; + class182.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 && class182.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 label286; + } + } + + class182.bufferX[var20] = var5 - 1; + class182.bufferY[var20] = var6 + 1; + var20 = var20 + 1 & 4095; + class182.directions[var18 - 1][var19 + 1] = 6; + class182.distances[var18 - 1][var19 + 1] = var16; + } + } while(var18 >= 128 - var2); + } while(var19 >= 128 - var2); + } while(class182.directions[var18 + 1][var19 + 1] != 0); + } while((var13[var14 + var2][var15 + var2] & 19136992) != 0); + + for (var17 = 1; var17 < var2; ++var17) { + if ((var13[var14 + var17][var15 + var2] & 19137016) != 0 || (var13[var14 + var2][var17 + var15] & 19136995) != 0) { + continue label309; } } - long var9 = IsaacCipher.calculateTag(var0, var1, 3, false, 0); - GrandExchangeOfferWorldComparator.scene.newGroundItemPile(ScriptEvent.Client_plane, var0, var1, class277.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, ScriptEvent.Client_plane), var5, var9, var12, var11); + class182.bufferX[var20] = var5 + 1; + class182.bufferY[var20] = var6 + 1; + var20 = var20 + 1 & 4095; + class182.directions[var18 + 1][var19 + 1] = 12; + class182.distances[var18 + 1][var19 + 1] = var16; } } } + + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "(Lko;Lko;Lko;B)V", + garbageValue = "-14" + ) + @Export("drawTitle") + static void drawTitle(Font var0, Font var1, Font var2) { + Login.xPadding = (Varcs.canvasWidth - 765) / 2; + Login.loginBoxX = Login.xPadding + 202; + Login.loginBoxCenter = Login.loginBoxX + 180; + if (Login.worldSelectOpen) { + Language.method3786(var0, var1); + } else { + Login.leftTitleSprite.drawAt(Login.xPadding, 0); + ItemContainer.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); + int var4; + if (Client.gameState == 0 || Client.gameState == 5) { + byte var3 = 20; + var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); + var4 = 253 - var3; + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); + var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); + } + + String var5; + String var19; + short var22; + int var23; + short var24; + if (Client.gameState == 20) { + HealthBar.titleboxSprite.drawAt(Login.loginBoxX + 180 - HealthBar.titleboxSprite.subWidth / 2, 271 - HealthBar.titleboxSprite.subHeight / 2); + var22 = 201; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16776960, 0); + var23 = var22 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16776960, 0); + var23 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16776960, 0); + var23 += 15; + var23 += 7; + if (Login.loginIndex != 4) { + var0.draw("Login: ", Login.loginBoxX + 180 - 110, var23, 16777215, 0); + var24 = 200; + + for (var5 = FaceNormal.method3392(); var0.stringWidth(var5) > var24; var5 = var5.substring(0, var5.length() - 1)) { + } + + var0.draw(AbstractFont.escapeBrackets(var5), Login.loginBoxX + 180 - 70, var23, 16777215, 0); + var23 += 15; + + for (var19 = WorldMapRegion.method613(Login.Login_password); var0.stringWidth(var19) > var24; var19 = var19.substring(1)) { + } + + var0.draw("Password: " + var19, Login.loginBoxX + 180 - 108, var23, 16777215, 0); + var23 += 15; + } + } + + if (Client.gameState == 10 || Client.gameState == 11) { + HealthBar.titleboxSprite.drawAt(Login.loginBoxX, 171); + short var17; + if (Login.loginIndex == 0) { + var22 = 251; + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var22, 16776960, 0); + var23 = var22 + 30; + var4 = Login.loginBoxX + 180 - 80; + var17 = 291; + Fonts.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); + var0.drawLines("New User", var4 - 73, var17 - 20, 144, 40, 16777215, 0, 1, 1, 0); + var4 = Login.loginBoxX + 180 + 80; + Fonts.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); + var0.drawLines("Existing User", var4 - 73, var17 - 20, 144, 40, 16777215, 0, 1, 1, 0); + } else if (Login.loginIndex == 1) { + var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); + var22 = 236; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16777215, 0); + var23 = var22 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16777215, 0); + var23 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16777215, 0); + var23 += 15; + var4 = Login.loginBoxX + 180 - 80; + var17 = 321; + Fonts.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); + var0.drawCentered("Continue", var4, var17 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180 + 80; + Fonts.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); + var0.drawCentered("Cancel", var4, var17 + 5, 16777215, 0); + } else { + int var7; + if (Login.loginIndex == 2) { + var22 = 201; + var0.drawCentered(Login.Login_response1, Login.loginBoxCenter, var22, 16776960, 0); + var23 = var22 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxCenter, var23, 16776960, 0); + var23 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxCenter, var23, 16776960, 0); + var23 += 15; + var23 += 7; + var0.draw("Login: ", Login.loginBoxCenter - 110, var23, 16777215, 0); + var24 = 200; + + for (var5 = FaceNormal.method3392(); var0.stringWidth(var5) > var24; var5 = var5.substring(1)) { + } + + var0.draw(AbstractFont.escapeBrackets(var5) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? ItemContainer.colorStartTag(16776960) + "|" : ""), Login.loginBoxCenter - 70, var23, 16777215, 0); + var23 += 15; + + for (var19 = WorldMapRegion.method613(Login.Login_password); var0.stringWidth(var19) > var24; var19 = var19.substring(1)) { + } + + var0.draw("Password: " + var19 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? ItemContainer.colorStartTag(16776960) + "|" : ""), Login.loginBoxCenter - 108, var23, 16777215, 0); + var23 += 15; + var22 = 277; + var7 = Login.loginBoxCenter + -117; + boolean var9 = Client.Login_isUsernameRemembered; + boolean var10 = Login.field1209; + IndexedSprite var8 = var9 ? (var10 ? ScriptEvent.field597 : GameShell.options_buttons_2Sprite) : (var10 ? class336.field3912 : Login.options_buttons_0Sprite); + var8.drawAt(var7, var22); + var7 = var7 + var8.subWidth + 5; + var1.draw("Remember username", var7, var22 + 13, 16776960, 0); + var7 = Login.loginBoxCenter + 24; + boolean var13 = NetSocket.clientPreferences.hideUsername; + boolean var14 = Login.field1231; + IndexedSprite var12 = var13 ? (var14 ? ScriptEvent.field597 : GameShell.options_buttons_2Sprite) : (var14 ? class336.field3912 : Login.options_buttons_0Sprite); + var12.drawAt(var7, var22); + var7 = var7 + var12.subWidth + 5; + var1.draw("Hide username", var7, var22 + 13, 16776960, 0); + var23 = var22 + 15; + int var15 = Login.loginBoxCenter - 80; + short var16 = 321; + Fonts.titlebuttonSprite.drawAt(var15 - 73, var16 - 20); + var0.drawCentered("Login", var15, var16 + 5, 16777215, 0); + var15 = Login.loginBoxCenter + 80; + Fonts.titlebuttonSprite.drawAt(var15 - 73, var16 - 20); + var0.drawCentered("Cancel", var15, var16 + 5, 16777215, 0); + var22 = 357; + switch(Login.field1213) { + case 2: + WorldMapID.field300 = "Having trouble logging in?"; + break; + default: + WorldMapID.field300 = "Can't login? Click here."; + } + + ItemContainer.field567 = new Bounds(Login.loginBoxCenter, var22, var1.stringWidth(WorldMapID.field300), 11); + GrandExchangeOffer.field87 = new Bounds(Login.loginBoxCenter, var22, var1.stringWidth("Still having trouble logging in?"), 11); + var1.drawCentered(WorldMapID.field300, Login.loginBoxCenter, var22, 16777215, 0); + } else if (Login.loginIndex == 3) { + var22 = 201; + var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var22, 16776960, 0); + var23 = var22 + 20; + var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var23, 16776960, 0); + var23 += 15; + var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var23, 16776960, 0); + var23 += 15; + var4 = Login.loginBoxX + 180; + var17 = 276; + Fonts.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); + var2.drawCentered("Try again", var4, var17 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180; + var17 = 326; + Fonts.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); + var2.drawCentered("Forgotten password?", var4, var17 + 5, 16777215, 0); + } else { + short var20; + if (Login.loginIndex == 4) { + var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); + var22 = 236; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16777215, 0); + var23 = var22 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16777215, 0); + var23 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16777215, 0); + var23 += 15; + var0.draw("PIN: " + WorldMapRegion.method613(ClanMate.otp) + (Client.cycle % 40 < 20 ? ItemContainer.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var23, 16777215, 0); + var23 -= 8; + var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var23, 16776960, 0); + var23 += 15; + var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var23, 16776960, 0); + var4 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; + int var27 = var23 - var0.ascent; + IndexedSprite var29; + if (Login.field1223) { + var29 = GameShell.options_buttons_2Sprite; + } else { + var29 = Login.options_buttons_0Sprite; + } + + var29.drawAt(var4, var27); + var23 += 15; + var7 = Login.loginBoxX + 180 - 80; + var20 = 321; + Fonts.titlebuttonSprite.drawAt(var7 - 73, var20 - 20); + var0.drawCentered("Continue", var7, var20 + 5, 16777215, 0); + var7 = Login.loginBoxX + 180 + 80; + Fonts.titlebuttonSprite.drawAt(var7 - 73, var20 - 20); + var0.drawCentered("Cancel", var7, var20 + 5, 16777215, 0); + var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var20 + 36, 255, 0); + } else if (Login.loginIndex == 5) { + var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); + var22 = 221; + var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16776960, 0); + var23 = var22 + 15; + var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16776960, 0); + var23 += 15; + var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16776960, 0); + var23 += 15; + var23 += 14; + var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var23, 16777215, 0); + var24 = 174; + + for (var5 = FaceNormal.method3392(); var0.stringWidth(var5) > var24; var5 = var5.substring(1)) { + } + + var0.draw(AbstractFont.escapeBrackets(var5) + (Client.cycle % 40 < 20 ? ItemContainer.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var23, 16777215, 0); + var23 += 15; + int var6 = Login.loginBoxX + 180 - 80; + short var26 = 321; + Fonts.titlebuttonSprite.drawAt(var6 - 73, var26 - 20); + var0.drawCentered("Recover", var6, var26 + 5, 16777215, 0); + var6 = Login.loginBoxX + 180 + 80; + Fonts.titlebuttonSprite.drawAt(var6 - 73, var26 - 20); + var0.drawCentered("Back", var6, var26 + 5, 16777215, 0); + var26 = 356; + var1.drawCentered("Still having trouble logging in?", Login.loginBoxCenter, var26, 268435455, 0); + } else if (Login.loginIndex == 6) { + var22 = 201; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16776960, 0); + var23 = var22 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16776960, 0); + var23 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16776960, 0); + var23 += 15; + var4 = Login.loginBoxX + 180; + var17 = 321; + Fonts.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); + var0.drawCentered("Back", var4, var17 + 5, 16777215, 0); + } else if (Login.loginIndex == 7) { + var22 = 216; + var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var22, 16776960, 0); + var23 = var22 + 15; + var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var23, 16776960, 0); + var23 += 15; + var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var23, 16776960, 0); + var23 += 15; + var4 = Login.loginBoxX + 180 - 80; + var17 = 321; + Fonts.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); + var0.drawCentered("Set Date of Birth", var4, var17 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180 + 80; + Fonts.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); + var0.drawCentered("Back", var4, var17 + 5, 16777215, 0); + } else if (Login.loginIndex == 8) { + var22 = 216; + var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var22, 16776960, 0); + var23 = var22 + 15; + var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var23, 16776960, 0); + var23 += 15; + var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var23, 16776960, 0); + var23 += 15; + var4 = Login.loginBoxX + 180 - 80; + var17 = 321; + Fonts.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); + var0.drawCentered("Privacy Policy", var4, var17 + 5, 16777215, 0); + var4 = Login.loginBoxX + 180 + 80; + Fonts.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); + var0.drawCentered("Back", var4, var17 + 5, 16777215, 0); + } else if (Login.loginIndex == 12) { + var22 = 201; + String var21 = ""; + var5 = ""; + var19 = ""; + switch(Login.field1212) { + case 0: + var21 = "Your account has been disabled."; + var5 = Strings.field2845; + var19 = ""; + break; + case 1: + var21 = "Account locked as we suspect it has been stolen."; + var5 = Strings.field2856; + var19 = ""; + break; + default: + WorldMapRectangle.Login_promptCredentials(false); + } + + var0.drawCentered(var21, Login.loginBoxX + 180, var22, 16776960, 0); + var23 = var22 + 15; + var2.drawCentered(var5, Login.loginBoxX + 180, var23, 16776960, 0); + var23 += 15; + var2.drawCentered(var19, Login.loginBoxX + 180, var23, 16776960, 0); + var23 += 15; + var7 = Login.loginBoxX + 180; + var20 = 276; + Fonts.titlebuttonSprite.drawAt(var7 - 73, var20 - 20); + var0.drawCentered("Support Page", var7, var20 + 5, 16777215, 0); + var7 = Login.loginBoxX + 180; + var20 = 326; + Fonts.titlebuttonSprite.drawAt(var7 - 73, var20 - 20); + var0.drawCentered("Back", var7, var20 + 5, 16777215, 0); + } else if (Login.loginIndex == 24) { + var22 = 221; + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16777215, 0); + var23 = var22 + 15; + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16777215, 0); + var23 += 15; + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16777215, 0); + var23 += 15; + var4 = Login.loginBoxX + 180; + var17 = 301; + Fonts.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); + var0.drawCentered("Ok", var4, var17 + 5, 16777215, 0); + } + } + } + } + + if (Client.gameState >= 10) { + int[] var18 = new int[4]; + Rasterizer2D.Rasterizer2D_getClipArray(var18); + Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, class52.canvasHeight); + Login.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); + Login.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); + Rasterizer2D.Rasterizer2D_setClipArray(var18); + } + + Decimator.title_muteSprite[NetSocket.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); + if (Client.gameState > 5 && UserComparator9.clientLanguage == Language.Language_EN) { + if (WorldMapIcon_1.field206 != null) { + var23 = Login.xPadding + 5; + var24 = 463; + byte var28 = 100; + byte var25 = 35; + WorldMapIcon_1.field206.drawAt(var23, var24); + var0.drawCentered("World" + " " + Client.worldId, var28 / 2 + var23, var25 / 2 + var24 - 2, 16777215, 0); + if (VertexNormal.World_request != null) { + var1.drawCentered("Loading...", var28 / 2 + var23, var25 / 2 + var24 + 12, 16777215, 0); + } else { + var1.drawCentered("Click to switch", var28 / 2 + var23, var25 / 2 + var24 + 12, 16777215, 0); + } + } else { + WorldMapIcon_1.field206 = class329.SpriteBuffer_getIndexedSpriteByName(GrandExchangeEvent.archive8, "sl_button", ""); + } + } + + } + } } diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index deabc7dd7b..0382434249 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("ml") +@ObfuscatedName("ma") @Implements("WorldMap") public class WorldMap { - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Lka;" + signature = "Lke;" ) @Export("fontNameVerdana11") static final FontName fontNameVerdana11; - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "Lka;" + signature = "Lke;" ) @Export("fontNameVerdana13") static final FontName fontNameVerdana13; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Lka;" + signature = "Lke;" ) @Export("fontNameVerdana15") static final FontName fontNameVerdana15; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "Liy;" + signature = "Lic;" ) @Export("WorldMap_archive") AbstractArchive WorldMap_archive; - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Liy;" + signature = "Lic;" ) @Export("WorldMap_geographyArchive") AbstractArchive WorldMap_geographyArchive; - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Liy;" + signature = "Lic;" ) @Export("WorldMap_groundArchive") AbstractArchive WorldMap_groundArchive; - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lkx;" + signature = "Lko;" ) @Export("font") Font font; - @ObfuscatedName("u") + @ObfuscatedName("h") @Export("fonts") HashMap fonts; - @ObfuscatedName("h") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "[Lle;" + signature = "[Llh;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("g") + @ObfuscatedName("r") @Export("details") HashMap details; - @ObfuscatedName("i") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Las;" + signature = "Lad;" ) @Export("mainMapArea") WorldMapArea mainMapArea; - @ObfuscatedName("a") + @ObfuscatedName("v") @ObfuscatedSignature( - signature = "Las;" + signature = "Lad;" ) @Export("currentMapArea") WorldMapArea currentMapArea; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Las;" + signature = "Lad;" ) WorldMapArea field3984; - @ObfuscatedName("l") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Laj;" + signature = "Laa;" ) @Export("worldMapManager") WorldMapManager worldMapManager; - @ObfuscatedName("r") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "Lmi;" + signature = "Lml;" ) @Export("cacheLoader") WorldMapArchiveLoader cacheLoader; - @ObfuscatedName("o") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1156713059 + intValue = -477044905 ) @Export("centerTileX") int centerTileX; - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1112780801 + intValue = -2103634789 ) @Export("centerTileY") int centerTileY; - @ObfuscatedName("j") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1961416767 + intValue = -1027821819 ) @Export("worldMapTargetX") int worldMapTargetX; - @ObfuscatedName("y") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 291588009 + intValue = -921409869 ) @Export("worldMapTargetY") int worldMapTargetY; @ObfuscatedName("f") @Export("zoom") float zoom; - @ObfuscatedName("ae") + @ObfuscatedName("ah") @Export("zoomTarget") float zoomTarget; - @ObfuscatedName("an") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = 2108230877 + intValue = 356289309 ) @Export("worldMapDisplayWidth") int worldMapDisplayWidth; - @ObfuscatedName("ai") + @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 835636901 + intValue = -733670243 ) @Export("worldMapDisplayHeight") int worldMapDisplayHeight; - @ObfuscatedName("ap") + @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 982152301 + intValue = -1490793911 ) @Export("worldMapDisplayX") int worldMapDisplayX; - @ObfuscatedName("ab") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 2052237249 + intValue = -1155375327 ) @Export("worldMapDisplayY") int worldMapDisplayY; - @ObfuscatedName("ar") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -1593055275 + intValue = 414730673 ) @Export("maxFlashCount") int maxFlashCount; - @ObfuscatedName("af") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 1055110607 + intValue = -1380461053 ) @Export("cyclesPerFlash") int cyclesPerFlash; - @ObfuscatedName("at") + @ObfuscatedName("am") @Export("perpetualFlash") boolean perpetualFlash; - @ObfuscatedName("al") + @ObfuscatedName("ak") @Export("flashingElements") HashSet flashingElements; - @ObfuscatedName("as") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 1658498297 + intValue = 1899094841 ) @Export("flashCount") int flashCount; - @ObfuscatedName("am") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -818253269 + intValue = -2123119613 ) @Export("flashCycle") int flashCycle; - @ObfuscatedName("au") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 2062517591 + intValue = -879818821 ) - int field4003; - @ObfuscatedName("ao") + int field4014; + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -582417353 + intValue = 1109861733 ) - int field4004; - @ObfuscatedName("aq") + int field3975; + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -1399744773 + intValue = -1756719777 ) - int field3970; - @ObfuscatedName("av") + int field4005; + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 1747511571 + intValue = -903365883 ) - int field4022; - @ObfuscatedName("ak") + int field4006; + @ObfuscatedName("ac") @ObfuscatedGetter( - longValue = -7492465693749449203L + longValue = 684510429086866809L ) long field4007; - @ObfuscatedName("aa") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 1948821495 + intValue = 69046583 ) int field4008; - @ObfuscatedName("ax") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 785384757 + intValue = 788734491 ) - int field4023; + int field4009; + @ObfuscatedName("at") + boolean field4017; @ObfuscatedName("az") - boolean field3993; - @ObfuscatedName("ad") @Export("enabledElements") HashSet enabledElements; - @ObfuscatedName("ac") + @ObfuscatedName("aq") @Export("enabledCategories") HashSet enabledCategories; - @ObfuscatedName("ah") + @ObfuscatedName("ay") @Export("enabledElementIds") HashSet enabledElementIds; - @ObfuscatedName("ag") - HashSet field3997; - @ObfuscatedName("aw") + @ObfuscatedName("au") + HashSet field4027; + @ObfuscatedName("aj") @Export("elementsDisabled") boolean elementsDisabled; - @ObfuscatedName("bf") + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = -754982927 + intValue = 668714479 ) int field4016; - @ObfuscatedName("bo") + @ObfuscatedName("bg") @Export("menuOpcodes") final int[] menuOpcodes; - @ObfuscatedName("bd") + @ObfuscatedName("be") List field4018; - @ObfuscatedName("bk") + @ObfuscatedName("bf") @Export("iconIterator") Iterator iconIterator; - @ObfuscatedName("bu") - HashSet field4019; - @ObfuscatedName("be") + @ObfuscatedName("ba") + HashSet field3978; + @ObfuscatedName("bd") @ObfuscatedSignature( - signature = "Lhj;" + signature = "Lhg;" ) @Export("mouseCoord") Coord mouseCoord; - @ObfuscatedName("bg") + @ObfuscatedName("bb") @Export("showCoord") public boolean showCoord; - @ObfuscatedName("bt") + @ObfuscatedName("bw") @ObfuscatedSignature( - signature = "Lla;" + signature = "Llz;" ) @Export("sprite") Sprite sprite; - @ObfuscatedName("bh") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = -1704097389 + intValue = 1633365947 ) @Export("cachedPixelsPerTile") int cachedPixelsPerTile; - @ObfuscatedName("br") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = -1222435813 + intValue = -1616979105 ) @Export("minCachedTileX") int minCachedTileX; - @ObfuscatedName("bq") + @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = 1773937531 + intValue = 780139023 ) @Export("minCachedTileY") int minCachedTileY; - @ObfuscatedName("ba") + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = 1017317495 + intValue = -385601979 ) - int field3999; + int field3988; static { fontNameVerdana11 = FontName.FontName_verdana11; @@ -304,30 +304,30 @@ public class WorldMap { this.flashingElements = null; this.flashCount = -1; this.flashCycle = -1; - this.field4003 = -1; - this.field4004 = -1; - this.field3970 = -1; - this.field4022 = -1; - this.field3993 = true; + this.field4014 = -1; + this.field3975 = -1; + this.field4005 = -1; + this.field4006 = -1; + this.field4017 = true; this.enabledElements = new HashSet(); this.enabledCategories = new HashSet(); this.enabledElementIds = new HashSet(); - this.field3997 = new HashSet(); + this.field4027 = new HashSet(); this.elementsDisabled = false; this.field4016 = 0; this.menuOpcodes = new int[]{1008, 1009, 1010, 1011, 1012}; - this.field4019 = new HashSet(); + this.field3978 = new HashSet(); this.mouseCoord = null; this.showCoord = false; this.minCachedTileX = -1; this.minCachedTileY = -1; - this.field3999 = -1; + this.field3988 = -1; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Liy;Liy;Liy;Lkx;Ljava/util/HashMap;[Lle;I)V", - garbageValue = "-1632082744" + signature = "(Lic;Lic;Lic;Lko;Ljava/util/HashMap;[Llh;I)V", + garbageValue = "-2031713861" ) @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.field339.name); + int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field322.name); int[] var8 = this.WorldMap_archive.getGroupFileIds(var7); this.details = new HashMap(var8.length); @@ -359,19 +359,19 @@ public class WorldMap { this.field3984 = null; } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "902859893" + signature = "(B)V", + garbageValue = "19" ) - public void method6509() { - WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); + public void method6696() { + Players.method2274(); } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(IIZIIIII)V", - garbageValue = "-1392973406" + garbageValue = "2116125643" ) @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.method722(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.method695(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(); GrandExchangeOfferOwnWorldComparator.runScriptEvent(var14)) { + for (var12 = var10.iterator(); var12.hasNext(); InterfaceParent.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.field4019.contains(var13)) { + if (this.field3978.contains(var13)) { var14.setType(17); } else { var14.setType(15); } } - var12 = this.field4019.iterator(); + var12 = this.field3978.iterator(); while (var12.hasNext()) { var13 = (AbstractWorldMapIcon)var12.next(); @@ -410,71 +410,72 @@ public class WorldMap { var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); var14.setArgs(new Object[]{var15, var1, var2}); var14.setType(16); - GrandExchangeOfferOwnWorldComparator.runScriptEvent(var14); + InterfaceParent.runScriptEvent(var14); } } - this.field4019 = var11; + this.field3978 = var11; } } } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IIZZI)V", - garbageValue = "2122785833" + signature = "(IIZZB)V", + garbageValue = "69" ) - public void method6420(int var1, int var2, boolean var3, boolean var4) { - long var5 = class217.currentTimeMillis(); - this.method6487(var1, var2, var4, var5); + public void method6693(int var1, int var2, boolean var3, boolean var4) { + long var5 = MilliClock.currentTimeMillis(); + this.method6525(var1, var2, var4, var5); if (!this.hasTarget() && (var4 || var3)) { if (var4) { - this.field3970 = var1; - this.field4022 = var2; - this.field4003 = this.centerTileX; - this.field4004 = this.centerTileY; + this.field4005 = var1; + this.field4006 = var2; + this.field4014 = this.centerTileX; + this.field3975 = this.centerTileY; } - if (this.field4003 != -1) { - int var7 = var1 - this.field3970; - int var8 = var2 - this.field4022; - this.setWorldMapPosition(this.field4003 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field4004, false); + if (this.field4014 != -1) { + int var7 = var1 - this.field4005; + int var8 = var2 - this.field4006; + this.setWorldMapPosition(this.field4014 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field3975, false); } } else { - this.method6425(); + this.method6529(); } if (var4) { this.field4007 = var5; this.field4008 = var1; - this.field4023 = var2; + this.field4009 = var2; } } - @ObfuscatedName("w") - void method6487(int var1, int var2, boolean var3, long var4) { + @ObfuscatedName("p") + void method6525(int var1, int var2, boolean var3, long var4) { if (this.currentMapArea != null) { int var6 = (int)((float)this.centerTileX + ((float)(var1 - this.worldMapDisplayX) - (float)this.getDisplayWith() * this.zoom / 2.0F) / this.zoom); int var7 = (int)((float)this.centerTileY - ((float)(var2 - this.worldMapDisplayY) - (float)this.getDisplayHeight() * this.zoom / 2.0F) / this.zoom); this.mouseCoord = this.currentMapArea.coord(var6 + this.currentMapArea.getRegionLowX() * 64, var7 + this.currentMapArea.getRegionLowY() * 64); if (this.mouseCoord != null && var3) { - if (FaceNormal.method3379() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { - GrandExchangeOfferWorldComparator.method148(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); + boolean var8 = Client.staffModLevel >= 2; + if (var8 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { + GrandExchangeOffer.method191(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); } else { - boolean var8 = true; - if (this.field3993) { - int var9 = var1 - this.field4008; - int var10 = var2 - this.field4023; - if (var4 - this.field4007 > 500L || var9 < -25 || var9 > 25 || var10 < -25 || var10 > 25) { - var8 = false; + boolean var9 = true; + if (this.field4017) { + int var10 = var1 - this.field4008; + int var11 = var2 - this.field4009; + if (var4 - this.field4007 > 500L || var10 < -25 || var10 > 25 || var11 < -25 || var11 > 25) { + var9 = false; } } - if (var8) { - PacketBufferNode var11 = FaceNormal.getPacketBufferNode(ClientPacket.field2260, Client.packetWriter.isaacCipher); - var11.packetBuffer.writeInt(this.mouseCoord.packed()); - Client.packetWriter.addNode(var11); + if (var9) { + PacketBufferNode var12 = UserComparator4.getPacketBufferNode(ClientPacket.field2333, Client.packetWriter.isaacCipher); + var12.packetBuffer.method5764(this.mouseCoord.packed()); + Client.packetWriter.addNode(var12); this.field4007 = 0L; } } @@ -485,14 +486,14 @@ public class WorldMap { } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "22" + signature = "(I)V", + garbageValue = "422650301" ) @Export("smoothZoom") void smoothZoom() { - if (WorldMapRectangle.field222 != null) { + if (class278.field3585 != null) { this.zoom = this.zoomTarget; } else { if (this.zoom < this.zoomTarget) { @@ -506,10 +507,10 @@ public class WorldMap { } } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "819469805" + garbageValue = "2119991272" ) @Export("scrollToTarget") void scrollToTarget() { @@ -525,7 +526,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.centerTileY == this.worldMapTargetY) { this.worldMapTargetX = -1; this.worldMapTargetY = -1; } @@ -533,48 +534,48 @@ public class WorldMap { } } - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(IIZI)V", - garbageValue = "353769390" + signature = "(IIZB)V", + garbageValue = "83" ) @Export("setWorldMapPosition") final void setWorldMapPosition(int var1, int var2, boolean var3) { this.centerTileX = var1; this.centerTileY = var2; - class217.currentTimeMillis(); + MilliClock.currentTimeMillis(); if (var3) { - this.method6425(); + this.method6529(); } } - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "32" + signature = "(I)V", + garbageValue = "1330915767" ) - final void method6425() { - this.field4022 = -1; - this.field3970 = -1; - this.field4004 = -1; - this.field4003 = -1; + final void method6529() { + this.field4006 = -1; + this.field4005 = -1; + this.field3975 = -1; + this.field4014 = -1; } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "408108894" + garbageValue = "-2089729451" ) @Export("hasTarget") boolean hasTarget() { return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; } - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(IIII)Las;", - garbageValue = "1867716364" + signature = "(IIII)Lad;", + garbageValue = "-342923578" ) @Export("mapAreaAtCoord") public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) { @@ -592,12 +593,12 @@ public class WorldMap { return var5; } - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(IIIZI)V", - garbageValue = "1519014469" + garbageValue = "-1486444716" ) - public void method6524(int var1, int var2, int var3, boolean var4) { + public void method6532(int var1, int var2, int var3, boolean var4) { WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); if (var5 == null) { if (!var4) { @@ -620,10 +621,10 @@ public class WorldMap { } - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "-513513568" + garbageValue = "-1476612822" ) @Export("setCurrentMapAreaId") public void setCurrentMapAreaId(int var1) { @@ -634,30 +635,30 @@ public class WorldMap { } - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "583895693" + signature = "(B)I", + garbageValue = "96" ) @Export("currentMapAreaId") public int currentMapAreaId() { return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); } - @ObfuscatedName("h") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(I)Las;", - garbageValue = "683414686" + signature = "(I)Lad;", + garbageValue = "-434939978" ) @Export("getCurrentMapArea") public WorldMapArea getCurrentMapArea() { return this.currentMapArea; } - @ObfuscatedName("g") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(Las;B)V", - garbageValue = "-18" + signature = "(Lad;I)V", + garbageValue = "1435320921" ) @Export("setCurrentMapArea") void setCurrentMapArea(WorldMapArea var1) { @@ -667,10 +668,10 @@ public class WorldMap { } } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Las;I)V", - garbageValue = "-1810722368" + signature = "(Lad;I)V", + garbageValue = "1169619542" ) @Export("initializeWorldMapManager") void initializeWorldMapManager(WorldMapArea var1) { @@ -679,12 +680,12 @@ public class WorldMap { this.cacheLoader.reset(this.currentMapArea.getInternalName()); } - @ObfuscatedName("a") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(Las;Lhj;Lhj;ZI)V", - garbageValue = "698052085" + signature = "(Lad;Lhg;Lhg;ZB)V", + garbageValue = "-3" ) - public void method6588(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { + public void method6538(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { if (var1 != null) { if (this.currentMapArea == null || var1 != this.currentMapArea) { this.initializeWorldMapManager(var1); @@ -699,10 +700,10 @@ public class WorldMap { } } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(IIIB)V", - garbageValue = "86" + signature = "(IIII)V", + garbageValue = "662676533" ) @Export("jump") void jump(int var1, int var2, int var3) { @@ -723,10 +724,10 @@ public class WorldMap { } } - @ObfuscatedName("c") + @ObfuscatedName("t") @ObfuscatedSignature( signature = "(IIIIIB)V", - garbageValue = "0" + garbageValue = "45" ) @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5) { @@ -760,18 +761,20 @@ 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) { - boolean var10 = false; + var10 = false; if (var5 - this.field4016 > 100) { this.field4016 = 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.field3997, 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.field4027, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); } - this.method6426(var1, var2, var3, var4, var8, var9); - if (FaceNormal.method3379() && this.showCoord && this.mouseCoord != null) { + this.method6603(var1, var2, var3, var4, var8, var9); + var10 = Client.staffModLevel >= 2; + if (var10 && this.showCoord && this.mouseCoord != null) { this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1); } @@ -783,18 +786,18 @@ public class WorldMap { } } - @ObfuscatedName("f") + @ObfuscatedName("x") @ObfuscatedSignature( signature = "(IIIIIII)Z", - garbageValue = "-1422166631" + garbageValue = "1450598957" ) - boolean method6437(int var1, int var2, int var3, int var4, int var5, int var6) { + boolean method6565(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.field3999 != Client.field891) { + } else if (this.field3988 != Client.field942) { return true; } else if (var3 <= 0 && var4 <= 0) { return var3 + var1 < var5 || var2 + var4 < var6; @@ -806,13 +809,13 @@ public class WorldMap { } } - @ObfuscatedName("ae") + @ObfuscatedName("ah") @ObfuscatedSignature( signature = "(IIIIIIB)V", - garbageValue = "8" + garbageValue = "0" ) - void method6426(int var1, int var2, int var3, int var4, int var5, int var6) { - if (WorldMapRectangle.field222 != null) { + void method6603(int var1, int var2, int var3, int var4, int var5, int var6) { + if (class278.field3585 != null) { int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); int var8 = var3 + 512; int var9 = var4 + 512; @@ -823,7 +826,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.method6437(var8, var9, var13, var14, var3, var4)) { + if (this.method6565(var8, var9, var13, var14, var3, var4)) { if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { Arrays.fill(this.sprite.pixels, 0); } else { @@ -833,26 +836,26 @@ public class WorldMap { this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; - WorldMapRectangle.field222.method4407(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); - this.field3999 = Client.field891; + class278.field3585.method4490(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); + this.field3988 = Client.field942; var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); } Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); - if (var10 == 1.0F) { - this.sprite.method6234(var13, var14, 192); + if (1.0F == var10) { + this.sprite.method6337(var13, var14, 192); } else { - this.sprite.method6268(var13, var14, (int)(var10 * (float)var8), (int)(var10 * (float)var9), 192); + this.sprite.method6366(var13, var14, (int)(var10 * (float)var8), (int)(var10 * (float)var9), 192); } } } - @ObfuscatedName("an") + @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(IIIIB)V", - garbageValue = "-54" + signature = "(IIIII)V", + garbageValue = "371539895" ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4) { @@ -868,20 +871,20 @@ public class WorldMap { } } - @ObfuscatedName("ai") + @ObfuscatedName("ao") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "1466740410" + garbageValue = "2046053399" ) @Export("setZoomPercentage") public void setZoomPercentage(int var1) { this.zoomTarget = this.getZoomFromPercentage(var1); } - @ObfuscatedName("ap") + @ObfuscatedName("ae") @ObfuscatedSignature( signature = "(IIIIII)V", - garbageValue = "1603223574" + garbageValue = "-911619085" ) @Export("drawLoading") void drawLoading(int var1, int var2, int var3, int var4, int var5) { @@ -891,13 +894,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, var8 + var6, -1, -1); + this.font.drawCentered("Loading...", var7, var6 + var8, -1, -1); } - @ObfuscatedName("ab") + @ObfuscatedName("ax") @ObfuscatedSignature( signature = "(II)F", - garbageValue = "132963455" + garbageValue = "-101273681" ) @Export("getZoomFromPercentage") float getZoomFromPercentage(int var1) { @@ -914,16 +917,16 @@ public class WorldMap { } } - @ObfuscatedName("ar") + @ObfuscatedName("ag") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "600440321" + garbageValue = "-1432703186" ) @Export("getZoomLevel") public int getZoomLevel() { - if ((double)this.zoomTarget == 1.0D) { + if (1.0D == (double)this.zoomTarget) { return 25; - } else if (1.5D == (double)this.zoomTarget) { + } else if ((double)this.zoomTarget == 1.5D) { return 37; } else if ((double)this.zoomTarget == 2.0D) { return 50; @@ -934,30 +937,30 @@ public class WorldMap { } } - @ObfuscatedName("af") + @ObfuscatedName("ab") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-182915585" + garbageValue = "-344269271" ) @Export("loadCache") public void loadCache() { this.cacheLoader.load(); } - @ObfuscatedName("at") + @ObfuscatedName("am") @ObfuscatedSignature( signature = "(I)Z", - garbageValue = "-1191452508" + garbageValue = "-2083683127" ) @Export("isCacheLoaded") public boolean isCacheLoaded() { return this.cacheLoader.isLoaded(); } - @ObfuscatedName("as") + @ObfuscatedName("ak") @ObfuscatedSignature( - signature = "(II)Las;", - garbageValue = "-982696781" + signature = "(II)Lad;", + garbageValue = "173267923" ) @Export("getMapArea") public WorldMapArea getMapArea(int var1) { @@ -975,10 +978,10 @@ public class WorldMap { return var3; } - @ObfuscatedName("am") + @ObfuscatedName("ad") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "441252120" + garbageValue = "124476569" ) @Export("setWorldMapPositionTarget") public void setWorldMapPositionTarget(int var1, int var2) { @@ -988,10 +991,10 @@ public class WorldMap { } } - @ObfuscatedName("au") + @ObfuscatedName("as") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "103" + signature = "(III)V", + garbageValue = "796383009" ) @Export("setWorldMapPositionTargetInstant") public void setWorldMapPositionTargetInstant(int var1, int var2) { @@ -1002,10 +1005,10 @@ public class WorldMap { } } - @ObfuscatedName("ao") + @ObfuscatedName("ar") @ObfuscatedSignature( - signature = "(IIII)V", - garbageValue = "991204183" + signature = "(IIIB)V", + garbageValue = "-86" ) @Export("jumpToSourceCoord") public void jumpToSourceCoord(int var1, int var2, int var3) { @@ -1018,10 +1021,10 @@ public class WorldMap { } } - @ObfuscatedName("aq") + @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "(IIIB)V", - garbageValue = "0" + signature = "(IIII)V", + garbageValue = "1641941372" ) @Export("jumpToSourceCoordInstant") public void jumpToSourceCoordInstant(int var1, int var2, int var3) { @@ -1034,60 +1037,60 @@ public class WorldMap { } } - @ObfuscatedName("av") + @ObfuscatedName("al") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-12" + signature = "(I)I", + garbageValue = "-2103537124" ) @Export("getDisplayX") public int getDisplayX() { return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; } - @ObfuscatedName("ak") + @ObfuscatedName("an") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1454836009" + garbageValue = "692721192" ) @Export("getDisplayY") public int getDisplayY() { return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; } - @ObfuscatedName("aa") + @ObfuscatedName("ac") @ObfuscatedSignature( - signature = "(B)Lhj;", - garbageValue = "-24" + signature = "(I)Lhg;", + garbageValue = "-1863746595" ) @Export("getDisplayCoord") public Coord getDisplayCoord() { return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); } - @ObfuscatedName("ax") + @ObfuscatedName("av") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-27" + signature = "(I)I", + garbageValue = "-1645904359" ) @Export("getDisplayWith") public int getDisplayWith() { return this.worldMapDisplayWidth; } - @ObfuscatedName("az") + @ObfuscatedName("af") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-165837872" + garbageValue = "1582823724" ) @Export("getDisplayHeight") public int getDisplayHeight() { return this.worldMapDisplayHeight; } - @ObfuscatedName("aj") + @ObfuscatedName("at") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "-4" + signature = "(II)V", + garbageValue = "1740193117" ) @Export("setMaxFlashCount") public void setMaxFlashCount(int var1) { @@ -1097,20 +1100,20 @@ public class WorldMap { } - @ObfuscatedName("ay") + @ObfuscatedName("aa") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1765651870" + garbageValue = "-316454776" ) @Export("resetMaxFlashCount") public void resetMaxFlashCount() { this.maxFlashCount = 3; } - @ObfuscatedName("ad") + @ObfuscatedName("aw") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-544500674" + signature = "(IB)V", + garbageValue = "51" ) @Export("setCyclesPerFlash") public void setCyclesPerFlash(int var1) { @@ -1120,30 +1123,30 @@ public class WorldMap { } - @ObfuscatedName("ac") + @ObfuscatedName("az") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1325127509" + garbageValue = "2071944062" ) @Export("resetCyclesPerFlash") public void resetCyclesPerFlash() { this.cyclesPerFlash = 50; } - @ObfuscatedName("ah") + @ObfuscatedName("aq") @ObfuscatedSignature( signature = "(ZI)V", - garbageValue = "2030274031" + garbageValue = "-999392835" ) @Export("setPerpetualFlash") public void setPerpetualFlash(boolean var1) { this.perpetualFlash = var1; } - @ObfuscatedName("ag") + @ObfuscatedName("ay") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-843738086" + signature = "(IB)V", + garbageValue = "106" ) @Export("flashElement") public void flashElement(int var1) { @@ -1153,10 +1156,10 @@ public class WorldMap { this.flashCycle = 0; } - @ObfuscatedName("aw") + @ObfuscatedName("au") @ObfuscatedSignature( signature = "(II)V", - garbageValue = "2123087925" + garbageValue = "-1070811489" ) @Export("flashCategory") public void flashCategory(int var1) { @@ -1164,38 +1167,38 @@ public class WorldMap { this.flashCount = 0; this.flashCycle = 0; - for (int var2 = 0; var2 < class277.WorldMapElement_count; ++var2) { - if (class25.WorldMapElement_get(var2) != null && class25.WorldMapElement_get(var2).category == var1) { - this.flashingElements.add(class25.WorldMapElement_get(var2).objectId); + for (int var2 = 0; var2 < WorldMapElement.WorldMapElement_count; ++var2) { + if (Client.WorldMapElement_get(var2) != null && Client.WorldMapElement_get(var2).category == var1) { + this.flashingElements.add(Client.WorldMapElement_get(var2).objectId); } } } - @ObfuscatedName("bf") + @ObfuscatedName("aj") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "2104531068" + garbageValue = "8454016" ) @Export("stopCurrentFlashes") public void stopCurrentFlashes() { this.flashingElements = null; } - @ObfuscatedName("bc") + @ObfuscatedName("bk") @ObfuscatedSignature( signature = "(ZI)V", - garbageValue = "560446249" + garbageValue = "-74185669" ) @Export("setElementsDisabled") public void setElementsDisabled(boolean var1) { this.elementsDisabled = !var1; } - @ObfuscatedName("bo") + @ObfuscatedName("bh") @ObfuscatedSignature( signature = "(IZI)V", - garbageValue = "-2066473112" + garbageValue = "1502020559" ) @Export("disableElement") public void disableElement(int var1, boolean var2) { @@ -1205,13 +1208,13 @@ public class WorldMap { this.enabledElements.remove(var1); } - this.method6511(); + this.method6573(); } - @ObfuscatedName("bd") + @ObfuscatedName("bg") @ObfuscatedSignature( signature = "(IZI)V", - garbageValue = "741156816" + garbageValue = "-324596356" ) @Export("setCategoryDisabled") public void setCategoryDisabled(int var1, boolean var2) { @@ -1221,9 +1224,9 @@ public class WorldMap { this.enabledCategories.remove(var1); } - for (int var3 = 0; var3 < class277.WorldMapElement_count; ++var3) { - if (class25.WorldMapElement_get(var3) != null && class25.WorldMapElement_get(var3).category == var1) { - int var4 = class25.WorldMapElement_get(var3).objectId; + for (int var3 = 0; var3 < WorldMapElement.WorldMapElement_count; ++var3) { + if (Client.WorldMapElement_get(var3) != null && Client.WorldMapElement_get(var3).category == var1) { + int var4 = Client.WorldMapElement_get(var3).objectId; if (!var2) { this.enabledElementIds.add(var4); } else { @@ -1232,61 +1235,61 @@ public class WorldMap { } } - this.method6511(); + this.method6573(); } - @ObfuscatedName("bk") + @ObfuscatedName("be") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "149249835" + signature = "(B)Z", + garbageValue = "-45" ) @Export("getElementsDisabled") public boolean getElementsDisabled() { return !this.elementsDisabled; } - @ObfuscatedName("bu") + @ObfuscatedName("bf") @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "1744055471" + signature = "(IS)Z", + garbageValue = "-10758" ) @Export("isElementDisabled") public boolean isElementDisabled(int var1) { return !this.enabledElements.contains(var1); } - @ObfuscatedName("be") + @ObfuscatedName("ba") @ObfuscatedSignature( signature = "(IS)Z", - garbageValue = "-18946" + garbageValue = "24518" ) @Export("isCategoryDisabled") public boolean isCategoryDisabled(int var1) { return !this.enabledCategories.contains(var1); } - @ObfuscatedName("bg") + @ObfuscatedName("bd") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "105577872" + signature = "(B)V", + garbageValue = "32" ) - void method6511() { - this.field3997.clear(); - this.field3997.addAll(this.enabledElements); - this.field3997.addAll(this.enabledElementIds); + void method6573() { + this.field4027.clear(); + this.field4027.addAll(this.enabledElements); + this.field4027.addAll(this.enabledElementIds); } - @ObfuscatedName("bt") + @ObfuscatedName("bb") @ObfuscatedSignature( signature = "(IIIIIIB)V", - garbageValue = "91" + garbageValue = "-102" ) @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.method722(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.method695(this.centerTileX - var7 / 2 - 1, this.centerTileY - var8 / 2 - 1, var7 / 2 + this.centerTileX + 1, var8 / 2 + this.centerTileY + 1, var1, var2, var3, var4, var5, var6); if (!var9.isEmpty()) { Iterator var10 = var9.iterator(); @@ -1297,12 +1300,12 @@ public class WorldMap { } AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); - WorldMapElement var12 = class25.WorldMapElement_get(var11.getElement()); + WorldMapElement var12 = Client.WorldMapElement_get(var11.getElement()); var13 = false; for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { if (var12.menuActions[var14] != null) { - IgnoreList.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); + ScriptEvent.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); var13 = true; } } @@ -1312,12 +1315,12 @@ public class WorldMap { } } - @ObfuscatedName("bh") + @ObfuscatedName("bw") @ObfuscatedSignature( - signature = "(ILhj;B)Lhj;", - garbageValue = "32" + signature = "(ILhg;I)Lhg;", + garbageValue = "-1210676807" ) - public Coord method6470(int var1, Coord var2) { + public Coord method6575(int var1, Coord var2) { if (!this.cacheLoader.isLoaded()) { return null; } else if (!this.worldMapManager.isLoaded()) { @@ -1358,10 +1361,10 @@ public class WorldMap { } } - @ObfuscatedName("br") + @ObfuscatedName("bq") @ObfuscatedSignature( - signature = "(IILhj;Lhj;B)V", - garbageValue = "35" + signature = "(IILhg;Lhg;I)V", + garbageValue = "346883599" ) @Export("worldMapMenuAction") public void worldMapMenuAction(int var1, int var2, Coord var3, Coord var4) { @@ -1385,13 +1388,13 @@ public class WorldMap { var5.setType(14); } - GrandExchangeOfferOwnWorldComparator.runScriptEvent(var5); + InterfaceParent.runScriptEvent(var5); } - @ObfuscatedName("bq") + @ObfuscatedName("bn") @ObfuscatedSignature( - signature = "(I)Lax;", - garbageValue = "-295029476" + signature = "(I)Laf;", + garbageValue = "-1116444098" ) @Export("iconStart") public AbstractWorldMapIcon iconStart() { @@ -1414,10 +1417,10 @@ public class WorldMap { } } - @ObfuscatedName("ba") + @ObfuscatedName("bc") @ObfuscatedSignature( - signature = "(I)Lax;", - garbageValue = "-528069180" + signature = "(B)Laf;", + garbageValue = "-42" ) @Export("iconNext") public AbstractWorldMapIcon iconNext() { diff --git a/runescape-client/src/main/java/WorldMapArchiveLoader.java b/runescape-client/src/main/java/WorldMapArchiveLoader.java index b5717d0e3c..c05cb79825 100644 --- a/runescape-client/src/main/java/WorldMapArchiveLoader.java +++ b/runescape-client/src/main/java/WorldMapArchiveLoader.java @@ -4,35 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mi") +@ObfuscatedName("ml") @Implements("WorldMapArchiveLoader") public class WorldMapArchiveLoader { - @ObfuscatedName("bk") - @ObfuscatedSignature( - signature = "Liv;" - ) - static StudioGame field3965; - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("cacheName") String cacheName; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Liy;" + signature = "Lic;" ) @Export("archive") AbstractArchive archive; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 2095920673 + intValue = 1583552183 ) @Export("percentLoaded") int percentLoaded; - @ObfuscatedName("z") + @ObfuscatedName("u") @Export("loaded") boolean loaded; @ObfuscatedSignature( - signature = "(Liy;)V" + signature = "(Lic;)V" ) WorldMapArchiveLoader(AbstractArchive var1) { this.percentLoaded = 0; @@ -40,10 +35,10 @@ public class WorldMapArchiveLoader { this.archive = var1; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(Ljava/lang/String;I)V", - garbageValue = "-2004873028" + garbageValue = "796588704" ) @Export("reset") void reset(String var1) { @@ -57,15 +52,15 @@ public class WorldMapArchiveLoader { } } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1654768805" + garbageValue = "-1901724660" ) @Export("load") int load() { if (this.percentLoaded < 33) { - if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field340.name, this.cacheName)) { + if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field325.name, this.cacheName)) { return this.percentLoaded; } @@ -73,7 +68,7 @@ public class WorldMapArchiveLoader { } if (this.percentLoaded == 33) { - if (this.archive.isValidFileName(WorldMapCacheName.field341.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field341.name, this.cacheName)) { + if (this.archive.isValidFileName(WorldMapCacheName.field324.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field324.name, this.cacheName)) { return this.percentLoaded; } @@ -81,7 +76,7 @@ public class WorldMapArchiveLoader { } if (this.percentLoaded == 66) { - if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field343.name)) { + if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field326.name)) { return this.percentLoaded; } @@ -92,20 +87,20 @@ public class WorldMapArchiveLoader { return this.percentLoaded; } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "30" + signature = "(I)Z", + garbageValue = "-1377768408" ) @Export("isLoaded") boolean isLoaded() { return this.loaded; } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "16" + signature = "(I)I", + garbageValue = "-1099667221" ) @Export("getPercentLoaded") int getPercentLoaded() { diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java index 4d96e6396a..7802838d48 100644 --- a/runescape-client/src/main/java/WorldMapArea.java +++ b/runescape-client/src/main/java/WorldMapArea.java @@ -1,4 +1,3 @@ -import java.awt.Image; import java.util.Iterator; import java.util.LinkedList; import net.runelite.mapping.Export; @@ -7,72 +6,70 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("as") +@ObfuscatedName("ad") @Implements("WorldMapArea") public class WorldMapArea { - @ObfuscatedName("al") - static Image field265; - @ObfuscatedName("gn") - @Export("regionLandArchiveIds") - static int[] regionLandArchiveIds; - @ObfuscatedName("x") + @ObfuscatedName("aa") + @Export("hasFocus") + protected static boolean hasFocus; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -631635031 + intValue = -102714047 ) @Export("id") int id; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("internalName") String internalName; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("externalName") String externalName; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -46653521 + intValue = 2008440325 ) @Export("backGroundColor") int backGroundColor; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1356940577 + intValue = -776340421 ) @Export("zoom") int zoom; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "Lhj;" + signature = "Lhg;" ) @Export("origin") Coord origin; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 739572021 + intValue = -1184938719 ) @Export("regionLowX") int regionLowX; - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1052240037 + intValue = 1321973801 ) @Export("regionHighX") int regionHighX; - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1837208227 + intValue = 1250553257 ) @Export("regionLowY") int regionLowY; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -884560367 + intValue = 464294365 ) @Export("regionHighY") int regionHighY; - @ObfuscatedName("s") + @ObfuscatedName("w") @Export("isMain") boolean isMain; - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("sections") LinkedList sections; @@ -88,10 +85,10 @@ public class WorldMapArea { this.isMain = false; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkb;IB)V", - garbageValue = "9" + signature = "(Lkn;II)V", + garbageValue = "1711579729" ) @Export("read") public void read(Buffer var1, int var2) { @@ -113,41 +110,42 @@ public class WorldMapArea { this.setBounds(); } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkb;I)Lay;", - garbageValue = "647857344" + signature = "(Lkn;B)Law;", + garbageValue = "-69" ) @Export("readWorldMapSection") WorldMapSection readWorldMapSection(Buffer var1) { int var2 = var1.readUnsignedByte(); - WorldMapSectionType var3 = (WorldMapSectionType)GrandExchangeEvent.findEnumerated(WorldMapSectionType.method345(), var2); - Object var4 = null; - switch(var3.type) { + WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.WORLDMAPSECTIONTYPE2, WorldMapSectionType.WORLDMAPSECTIONTYPE0, WorldMapSectionType.WORLDMAPSECTIONTYPE1, WorldMapSectionType.WORLDMAPSECTIONTYPE3}; + WorldMapSectionType var4 = (WorldMapSectionType)FaceNormal.findEnumerated(var3, var2); + Object var5 = null; + switch(var4.type) { case 0: - var4 = new WorldMapSection0(); + var5 = new WorldMapSection1(); break; case 1: - var4 = new WorldMapSection3(); + var5 = new WorldMapSection3(); break; case 2: - var4 = new WorldMapSection1(); + var5 = new WorldMapSection0(); break; case 3: - var4 = new WorldMapSection2(); + var5 = new WorldMapSection2(); break; default: throw new IllegalStateException(""); } - ((WorldMapSection)var4).read(var1); - return (WorldMapSection)var4; + ((WorldMapSection)var5).read(var1); + return (WorldMapSection)var5; } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IIIB)Z", - garbageValue = "-47" + signature = "(IIII)Z", + garbageValue = "303739781" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -165,10 +163,10 @@ public class WorldMapArea { return true; } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(III)Z", - garbageValue = "-541055130" + signature = "(IIB)Z", + garbageValue = "111" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { @@ -196,10 +194,10 @@ public class WorldMapArea { } } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(IIIB)[I", - garbageValue = "-62" + signature = "(IIII)[I", + garbageValue = "1838178690" ) @Export("position") public int[] position(int var1, int var2, int var3) { @@ -217,10 +215,10 @@ public class WorldMapArea { return var5.getBorderTileLengths(var1, var2, var3); } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(IIB)Lhj;", - garbageValue = "-65" + signature = "(III)Lhg;", + garbageValue = "-1660127351" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -238,10 +236,10 @@ public class WorldMapArea { return var4.coord(var1, var2); } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "969855429" + signature = "(B)V", + garbageValue = "61" ) @Export("setBounds") void setBounds() { @@ -254,221 +252,156 @@ public class WorldMapArea { } - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "39" + signature = "(I)I", + garbageValue = "-659291236" ) @Export("getId") public int getId() { return this.id; } - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "-126" + signature = "(I)Z", + garbageValue = "-2131690602" ) @Export("getIsMain") public boolean getIsMain() { return this.isMain; } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(B)Ljava/lang/String;", - garbageValue = "76" + signature = "(I)Ljava/lang/String;", + garbageValue = "-1380863043" ) @Export("getInternalName") public String getInternalName() { return this.internalName; } - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(I)Ljava/lang/String;", - garbageValue = "1379257785" + garbageValue = "657919972" ) @Export("getExternalName") public String getExternalName() { return this.externalName; } - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "0" + garbageValue = "49" ) @Export("getBackGroundColor") int getBackGroundColor() { return this.backGroundColor; } - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "2036158074" + signature = "(B)I", + garbageValue = "24" ) @Export("getZoom") public int getZoom() { return this.zoom; } - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1003198197" + garbageValue = "-1324174996" ) @Export("getRegionLowX") public int getRegionLowX() { return this.regionLowX; } - @ObfuscatedName("h") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "-1380383839" + signature = "(B)I", + garbageValue = "103" ) @Export("getRegionHighX") public int getRegionHighX() { return this.regionHighX; } - @ObfuscatedName("g") + @ObfuscatedName("r") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1596015720" + garbageValue = "-1253585407" ) @Export("getRegionLowY") public int getRegionLowY() { return this.regionLowY; } - @ObfuscatedName("i") + @ObfuscatedName("d") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "851351546" + garbageValue = "1154975420" ) @Export("getRegionHighY") public int getRegionHighY() { return this.regionHighY; } - @ObfuscatedName("a") + @ObfuscatedName("e") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-2108645613" + garbageValue = "-1645493175" ) @Export("getOriginX") public int getOriginX() { return this.origin.x; } - @ObfuscatedName("o") + @ObfuscatedName("l") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "567530142" + garbageValue = "680709831" ) @Export("getOriginPlane") public int getOriginPlane() { return this.origin.plane; } - @ObfuscatedName("c") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "-86" + signature = "(I)I", + garbageValue = "-734959342" ) @Export("getOriginY") public int getOriginY() { return this.origin.y; } - @ObfuscatedName("f") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(I)Lhj;", - garbageValue = "710873415" + signature = "(I)Lhg;", + garbageValue = "-1903361332" ) @Export("getOrigin") public Coord getOrigin() { return new Coord(this.origin); } - @ObfuscatedName("d") + @ObfuscatedName("hf") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "2135191334" + signature = "(III)V", + garbageValue = "1010580353" ) - @Export("savePreferences") - static void savePreferences() { - AccessFile var0 = null; - - try { - var0 = KeyHandler.getPreferencesFile("", WorldMapArchiveLoader.field3965.name, true); - Buffer var1 = GrandExchangeOfferOwnWorldComparator.clientPreferences.toBuffer(); - var0.write(var1.array, 0, var1.offset); - } catch (Exception var3) { - } - - try { - if (var0 != null) { - var0.closeSync(true); - } - } catch (Exception var2) { - } - - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(ILiy;Ljava/lang/String;Ljava/lang/String;IZI)V", - garbageValue = "350541226" - ) - public static void method461(int var0, AbstractArchive var1, String var2, String var3, int var4, boolean var5) { - int var6 = var1.getGroupId(var2); - int var7 = var1.getFileId(var6, var3); - FaceNormal.playMusicTrack(var0, var1, var6, var7, var4, var5); - } - - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "([BIIB)Ljava/lang/String;", - garbageValue = "-16" - ) - @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 = class297.cp1252AsciiExtension[var6 - 128]; - if (var7 == 0) { - var7 = '?'; - } - - var6 = var7; - } - - var3[var4++] = (char)var6; - } - } - - return new String(var3, 0, var4); - } - - @ObfuscatedName("gw") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "749778877" - ) - static void method508() { - if (GrandExchangeOfferAgeComparator.worldMap != null) { - GrandExchangeOfferAgeComparator.worldMap.method6524(ScriptEvent.Client_plane, (ByteArrayPool.localPlayer.x >> 7) + class69.baseX, (ByteArrayPool.localPlayer.y >> 7) + class89.baseY, false); - GrandExchangeOfferAgeComparator.worldMap.loadCache(); - } - + @Export("resumePauseWidget") + static void resumePauseWidget(int var0, int var1) { + PacketBufferNode var2 = UserComparator4.getPacketBufferNode(ClientPacket.field2288, Client.packetWriter.isaacCipher); + var2.packetBuffer.writeInt(var0); + var2.packetBuffer.method5898(var1); + Client.packetWriter.addNode(var2); } } diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index 8d3df2ba7f..b50bdf8f38 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -6,32 +6,26 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ad") +@ObfuscatedName("az") @Implements("WorldMapAreaData") public class WorldMapAreaData extends WorldMapArea { - @ObfuscatedName("hc") - @ObfuscatedSignature( - signature = "[Lla;" - ) - @Export("mapMarkerSprites") - static Sprite[] mapMarkerSprites; - @ObfuscatedName("n") + @ObfuscatedName("c") @Export("worldMapData0Set") HashSet worldMapData0Set; - @ObfuscatedName("u") + @ObfuscatedName("h") @Export("worldMapData1Set") HashSet worldMapData1Set; - @ObfuscatedName("h") + @ObfuscatedName("k") @Export("iconList") List iconList; WorldMapAreaData() { } - @ObfuscatedName("by") + @ObfuscatedName("bs") @ObfuscatedSignature( - signature = "(Lkb;Lkb;IZI)V", - garbageValue = "-661163942" + signature = "(Lkn;Lkn;IZI)V", + garbageValue = "442767924" ) @Export("init") void init(Buffer var1, Buffer var2, int var3, boolean var4) { @@ -70,10 +64,10 @@ public class WorldMapAreaData extends WorldMapArea { this.initIconsList(var2, var4); } - @ObfuscatedName("bj") + @ObfuscatedName("by") @ObfuscatedSignature( - signature = "(Lkb;ZI)V", - garbageValue = "1078269638" + signature = "(Lkn;ZI)V", + garbageValue = "-380421071" ) @Export("initIconsList") void initIconsList(Buffer var1, boolean var2) { @@ -81,7 +75,7 @@ public class WorldMapAreaData extends WorldMapArea { int var3 = var1.readUnsignedShort(); for (int var4 = 0; var4 < var3; ++var4) { - int var5 = var1.method5591(); + int var5 = var1.method5843(); Coord var6 = new Coord(var1.readInt()); boolean var7 = var1.readUnsignedByte() == 1; if (var2 || !var7) { @@ -91,49 +85,124 @@ public class WorldMapAreaData extends WorldMapArea { } - @ObfuscatedName("is") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Lhe;IIZS)V", - garbageValue = "11869" + signature = "([BI)Lcs;", + garbageValue = "1792640289" ) - @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; + @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); + } + } } - 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; + 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(); + } } - if (var0.widthAlignment == 4) { - var0.width = var0.field2584 * var0.height / var0.field2585; + return var1; + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "(Ljava/lang/CharSequence;B)I", + garbageValue = "47" + ) + public static int method759(CharSequence var0) { + int var1 = var0.length(); + int var2 = 0; + + for (int var3 = 0; var3 < var1; ++var3) { + var2 = (var2 << 5) - var2 + var0.charAt(var3); } - if (var0.heightAlignment == 4) { - var0.height = var0.field2585 * var0.width / var0.field2584; + return var2; + } + + @ObfuscatedName("ic") + @ObfuscatedSignature( + signature = "(II)Ljava/lang/String;", + garbageValue = "803969817" + ) + @Export("formatItemStacks") + static final String formatItemStacks(int var0) { + String var1 = Integer.toString(var0); + + for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { + var1 = var1.substring(0, var2) + "," + var1.substring(var2); } - if (var0.contentType == 1337) { - Client.viewportWidget = var0; + if (var1.length() > 9) { + return " " + ItemContainer.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; + } else { + return var1.length() > 6 ? " " + ItemContainer.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + ItemContainer.colorStartTag(16776960) + var1 + ""; } + } - 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("kk") + @ObfuscatedSignature( + signature = "(Lhd;B)Ljava/lang/String;", + garbageValue = "-51" + ) + static String method762(Widget var0) { + if (WorldMapID.method617(KeyHandler.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/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java index c07c8ed17d..2acccd0942 100644 --- a/runescape-client/src/main/java/WorldMapCacheName.java +++ b/runescape-client/src/main/java/WorldMapCacheName.java @@ -1,139 +1,84 @@ import 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("az") +@ObfuscatedName("at") @Implements("WorldMapCacheName") public class WorldMapCacheName { - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Laz;" + @ObfuscatedName("rq") + @ObfuscatedGetter( + intValue = 1378764689 ) - public static final WorldMapCacheName field339; + static int field329; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Laz;" + signature = "Lat;" ) - public static final WorldMapCacheName field340; - @ObfuscatedName("k") + public static final WorldMapCacheName field322; + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Laz;" + signature = "Lat;" ) - public static final WorldMapCacheName field341; - @ObfuscatedName("d") + public static final WorldMapCacheName field325; + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Laz;" + signature = "Lat;" ) - static final WorldMapCacheName field345; - @ObfuscatedName("w") + public static final WorldMapCacheName field324; + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Laz;" + signature = "Lat;" ) - public static final WorldMapCacheName field343; - @ObfuscatedName("aq") - @Export("null_string") - protected static String null_string; - @ObfuscatedName("v") + static final WorldMapCacheName field323; + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "Lat;" + ) + public static final WorldMapCacheName field326; + @ObfuscatedName("ga") + @ObfuscatedGetter( + intValue = 1520300025 + ) + static int field328; + @ObfuscatedName("g") @Export("name") public final String name; static { - field339 = new WorldMapCacheName("details"); - field340 = new WorldMapCacheName("compositemap"); - field341 = new WorldMapCacheName("compositetexture"); - field345 = new WorldMapCacheName("area"); - field343 = new WorldMapCacheName("labels"); + field322 = new WorldMapCacheName("details"); + field325 = new WorldMapCacheName("compositemap"); + field324 = new WorldMapCacheName("compositetexture"); + field323 = new WorldMapCacheName("area"); + field326 = new WorldMapCacheName("labels"); } WorldMapCacheName(String var1) { this.name = var1; } - @ObfuscatedName("d") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;B)[B", - garbageValue = "-93" + signature = "(ILlp;Lig;I)V", + garbageValue = "-1710341553" ) - public static byte[] method715(CharSequence var0) { - int var1 = var0.length(); - byte[] var2 = new byte[var1]; - - for (int var3 = 0; var3 < var1; ++var3) { - char var4 = var0.charAt(var3); - if (var4 > 0 && var4 < 128 || var4 >= 160 && var4 <= 255) { - var2[var3] = (byte)var4; - } else if (var4 == 8364) { - var2[var3] = -128; - } else if (var4 == 8218) { - var2[var3] = -126; - } else if (var4 == 402) { - var2[var3] = -125; - } else if (var4 == 8222) { - var2[var3] = -124; - } else if (var4 == 8230) { - var2[var3] = -123; - } else if (var4 == 8224) { - var2[var3] = -122; - } else if (var4 == 8225) { - var2[var3] = -121; - } else if (var4 == 710) { - var2[var3] = -120; - } else if (var4 == 8240) { - var2[var3] = -119; - } else if (var4 == 352) { - var2[var3] = -118; - } else if (var4 == 8249) { - var2[var3] = -117; - } else if (var4 == 338) { - var2[var3] = -116; - } else if (var4 == 381) { - var2[var3] = -114; - } else if (var4 == 8216) { - var2[var3] = -111; - } else if (var4 == 8217) { - var2[var3] = -110; - } else if (var4 == 8220) { - var2[var3] = -109; - } else if (var4 == 8221) { - var2[var3] = -108; - } else if (var4 == 8226) { - var2[var3] = -107; - } else if (var4 == 8211) { - var2[var3] = -106; - } else if (var4 == 8212) { - var2[var3] = -105; - } else if (var4 == 732) { - var2[var3] = -104; - } else if (var4 == 8482) { - var2[var3] = -103; - } else if (var4 == 353) { - var2[var3] = -102; - } else if (var4 == 8250) { - var2[var3] = -101; - } else if (var4 == 339) { - var2[var3] = -100; - } else if (var4 == 382) { - var2[var3] = -98; - } else if (var4 == 376) { - var2[var3] = -97; - } else { - var2[var3] = 63; + static void method688(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; + } } } - return var2; - } - - @ObfuscatedName("gh") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-2140521670" - ) - static void method716() { - if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { - class22.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); + if (var3 != null) { + var2.load(var1, var0, var3, true); + } else { + byte[] var4 = var1.read(var0); + var2.load(var1, var0, var4, true); } - } } diff --git a/runescape-client/src/main/java/WorldMapData_0.java b/runescape-client/src/main/java/WorldMapData_0.java index e92760eb3f..a4d83cb42b 100644 --- a/runescape-client/src/main/java/WorldMapData_0.java +++ b/runescape-client/src/main/java/WorldMapData_0.java @@ -3,36 +3,34 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("y") +@ObfuscatedName("i") @Implements("WorldMapData_0") public class WorldMapData_0 extends AbstractWorldMapData { - @ObfuscatedName("y") - @Export("BZip2Decompressor_block") - static int[] BZip2Decompressor_block; - @ObfuscatedName("br") - static String field137; - @ObfuscatedName("fh") + @ObfuscatedName("dq") @ObfuscatedSignature( - signature = "Lkx;" + signature = "Lig;" ) - @Export("fontPlain12") - static Font fontPlain12; - @ObfuscatedName("gh") - @Export("regionLandArchives") - static byte[][] regionLandArchives; + @Export("archive11") + static Archive archive11; + @ObfuscatedName("ej") + @ObfuscatedSignature( + signature = "Lig;" + ) + @Export("archive19") + static Archive archive19; WorldMapData_0() { } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkb;I)V", - garbageValue = "-1716650970" + signature = "(Lkn;I)V", + garbageValue = "-1154990112" ) @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); - if (var2 != WorldMapID.field302.value) { + if (var2 != WorldMapID.field301.value) { throw new IllegalStateException(""); } else { super.minPlane = var1.readUnsignedByte(); @@ -41,26 +39,26 @@ public class WorldMapData_0 extends AbstractWorldMapData { super.regionYLow = var1.readUnsignedShort(); super.regionX = var1.readUnsignedShort(); super.regionY = var1.readUnsignedShort(); - super.groupId = var1.method5591(); - super.fileId = var1.method5591(); + super.groupId = var1.method5843(); + super.fileId = var1.method5843(); } } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkb;B)V", - garbageValue = "-78" + signature = "(Lkn;I)V", + garbageValue = "-1774414997" ) @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.field205 = new byte[super.planes][64][64]; - super.field206 = new byte[super.planes][64][64]; + super.field185 = new byte[super.planes][64][64]; + super.field175 = new byte[super.planes][64][64]; super.decorations = new WorldMapDecoration[super.planes][64][64][]; int var2 = var1.readUnsignedByte(); - if (var2 != class39.field300.value) { + if (var2 != class39.field296.value) { throw new IllegalStateException(""); } else { int var3 = var1.readUnsignedByte(); @@ -91,44 +89,52 @@ public class WorldMapData_0 extends AbstractWorldMapData { return super.regionX | super.regionY << 8; } - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "([BIIII[Lfm;B)V", - garbageValue = "-108" - ) - static final void method275(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; + @ObfuscatedName("o") + @Export("base37DecodeLong") + public static String base37DecodeLong(long var0) { + if (var0 > 0L && var0 < 6582952005840035281L) { + if (var0 % 37L == 0L) { + return null; + } else { + int var2 = 0; + + for (long var3 = var0; var3 != 0L; var3 /= 37L) { + ++var2; + } + + StringBuilder var5; + char var8; + for (var5 = new StringBuilder(var2); var0 != 0L; var5.append(var8)) { + long var6 = var0; + var0 /= 37L; + var8 = class298.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; } - - Buffer var10 = new Buffer(var0); - - for (var7 = 0; var7 < 4; ++var7) { - for (var8 = 0; var8 < 64; ++var8) { - for (int var9 = 0; var9 < 64; ++var9) { - MusicPatchNode2.loadTerrain(var10, var7, var8 + var1, var9 + var2, var3, var4, 0); - } - } - } - } - @ObfuscatedName("ki") + @ObfuscatedName("he") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1448123046" + signature = "(IIIII)V", + garbageValue = "-992239935" ) - static final void method263() { - Client.field874 = Client.cycleCntr; - Timer.ClanChat_inClanChat = true; + static final void method243(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.field879[var4] = true; + } + } + } } diff --git a/runescape-client/src/main/java/WorldMapData_1.java b/runescape-client/src/main/java/WorldMapData_1.java index ce5133ddfb..3f15826d23 100644 --- a/runescape-client/src/main/java/WorldMapData_1.java +++ b/runescape-client/src/main/java/WorldMapData_1.java @@ -1,41 +1,36 @@ -import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ac") +@ObfuscatedName("aq") @Implements("WorldMapData_1") public class WorldMapData_1 extends AbstractWorldMapData { - @ObfuscatedName("lq") + @ObfuscatedName("gx") + @Export("xteaKeys") + static int[][] xteaKeys; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -759112177 - ) - @Export("menuHeight") - static int menuHeight; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 1108561207 + intValue = -941461191 ) @Export("chunkXLow") int chunkXLow; - @ObfuscatedName("i") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1693102949 + intValue = 1539271547 ) @Export("chunkYLow") int chunkYLow; - @ObfuscatedName("a") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1779998121 + intValue = -1911855955 ) @Export("chunkX") int chunkX; - @ObfuscatedName("b") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -468577011 + intValue = 1515866059 ) @Export("chunkY") int chunkY; @@ -43,15 +38,15 @@ public class WorldMapData_1 extends AbstractWorldMapData { WorldMapData_1() { } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkb;B)V", - garbageValue = "1" + signature = "(Lkn;I)V", + garbageValue = "-484373567" ) @Export("init") void init(Buffer var1) { int var2 = var1.readUnsignedByte(); - if (var2 != WorldMapID.field303.value) { + if (var2 != WorldMapID.field299.value) { throw new IllegalStateException(""); } else { super.minPlane = var1.readUnsignedByte(); @@ -64,26 +59,26 @@ public class WorldMapData_1 extends AbstractWorldMapData { super.regionY = var1.readUnsignedShort(); this.chunkX = var1.readUnsignedByte(); this.chunkY = var1.readUnsignedByte(); - super.groupId = var1.method5591(); - super.fileId = var1.method5591(); + super.groupId = var1.method5843(); + super.fileId = var1.method5843(); } } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkb;B)V", - garbageValue = "-78" + signature = "(Lkn;I)V", + garbageValue = "-1774414997" ) @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.field205 = new byte[super.planes][64][64]; - super.field206 = new byte[super.planes][64][64]; + super.field185 = new byte[super.planes][64][64]; + super.field175 = new byte[super.planes][64][64]; super.decorations = new WorldMapDecoration[super.planes][64][64][]; int var2 = var1.readUnsignedByte(); - if (var2 != class39.field297.value) { + if (var2 != class39.field293.value) { throw new IllegalStateException(""); } else { int var3 = var1.readUnsignedByte(); @@ -103,40 +98,40 @@ public class WorldMapData_1 extends AbstractWorldMapData { } } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "3" + garbageValue = "4" ) @Export("getChunkXLow") int getChunkXLow() { return this.chunkXLow; } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1104006476" + garbageValue = "259751183" ) @Export("getChunkYLow") int getChunkYLow() { return this.chunkYLow; } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-2123096151" + garbageValue = "-810164078" ) @Export("getChunkX") int getChunkX() { return this.chunkX; } - @ObfuscatedName("aq") + @ObfuscatedName("as") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-50915018" + garbageValue = "196084572" ) @Export("getChunkY") int getChunkY() { @@ -148,8 +143,8 @@ public class WorldMapData_1 extends AbstractWorldMapData { return false; } else { WorldMapData_1 var2 = (WorldMapData_1)var1; - if (super.regionX == var2.regionX && super.regionY == var2.regionY) { - return var2.chunkX == this.chunkX && var2.chunkY == this.chunkY; + if (var2.regionX == super.regionX && var2.regionY == super.regionY) { + return this.chunkX == var2.chunkX && var2.chunkY == this.chunkY; } else { return false; } @@ -160,386 +155,213 @@ public class WorldMapData_1 extends AbstractWorldMapData { return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; } - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(B)Lcq;", - garbageValue = "-96" + signature = "(II)Z", + garbageValue = "1959951733" ) - static ClientPreferences method813() { - AccessFile var0 = null; - ClientPreferences var1 = new ClientPreferences(); - - try { - var0 = KeyHandler.getPreferencesFile("", WorldMapArchiveLoader.field3965.name, false); - byte[] var2 = new byte[(int)var0.length()]; - - int var4; - for (int var3 = 0; var3 < var2.length; var3 += var4) { - var4 = var0.read(var2, var3, var2.length - var3); - if (var4 == -1) { - throw new IOException(); - } - } - - var1 = new ClientPreferences(new Buffer(var2)); - } catch (Exception var6) { - } - - try { - if (var0 != null) { - var0.close(); - } - } catch (Exception var5) { - } - - return var1; + public static boolean method784(int var0) { + return var0 >= WorldMapDecorationType.field2775.id && var0 <= WorldMapDecorationType.field2778.id; } - @ObfuscatedName("aq") - @ObfuscatedSignature( - signature = "(ILce;ZB)I", - garbageValue = "66" - ) - static int method814(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.LOGOUT) { - Client.logoutTimer = 250; - return 1; - } else { - return 2; - } - } - - @ObfuscatedName("hq") - @ObfuscatedSignature( - signature = "(Lgh;B)V", - garbageValue = "49" - ) - static final void method816(class194 var0) { - PacketBuffer var1 = Client.packetWriter.packetBuffer; - int var3; - int var4; - int var5; - int var6; - int var7; - int var8; - int var37; - if (class194.field2327 == var0) { - var37 = var1.method5604(); - var3 = var37 >> 2; - var4 = var37 & 3; - var5 = Client.field699[var3]; - var6 = var1.readUnsignedByte(); - var7 = (var6 >> 4 & 7) + GrandExchangeOfferTotalQuantityComparator.field91; - var8 = (var6 & 7) + PlatformInfo.field3959; - if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { - Skeleton.updatePendingSpawn(ScriptEvent.Client_plane, var7, var8, var5, -1, var3, var4, 0, -1); - } - - } else { - int var9; - int var11; - int var12; - int var13; - byte var14; - if (class194.field2324 == var0) { - byte var2 = var1.method5608(); - var3 = var1.method5614(); - var4 = var1.readUnsignedShort(); - var5 = var1.method5614(); - var6 = var1.method5604(); - var7 = var6 >> 2; - var8 = var6 & 3; - var9 = Client.field699[var7]; - byte var10 = var1.readByte(); - var11 = var1.method5603(); - var12 = (var11 >> 4 & 7) + GrandExchangeOfferTotalQuantityComparator.field91; - var13 = (var11 & 7) + PlatformInfo.field3959; - var14 = var1.method5606(); - int var15 = var1.method5614(); - byte var16 = var1.method5606(); - Player var17; - if (var4 == Client.localPlayerIndex) { - var17 = ByteArrayPool.localPlayer; - } else { - var17 = Client.players[var4]; - } - - if (var17 != null) { - ObjectDefinition var18 = WorldMapSection2.getObjectDefinition(var5); - int var19; - int var20; - if (var8 != 1 && var8 != 3) { - var19 = var18.sizeX; - var20 = var18.sizeY; - } else { - var19 = var18.sizeY; - var20 = var18.sizeX; - } - - int var21 = var12 + (var19 >> 1); - int var22 = var12 + (var19 + 1 >> 1); - int var23 = var13 + (var20 >> 1); - int var24 = var13 + (var20 + 1 >> 1); - int[][] var25 = Tiles.Tiles_heights[ScriptEvent.Client_plane]; - int var26 = var25[var21][var24] + var25[var21][var23] + var25[var22][var23] + var25[var22][var24] >> 2; - int var27 = (var12 << 7) + (var19 << 6); - int var28 = (var13 << 7) + (var20 << 6); - Model var29 = var18.getModel(var7, var8, var25, var27, var26, var28); - if (var29 != null) { - Skeleton.updatePendingSpawn(ScriptEvent.Client_plane, var12, var13, var9, -1, 0, 0, var15 + 1, var3 + 1); - var17.animationCycleStart = var15 + Client.cycle; - var17.animationCycleEnd = var3 + Client.cycle; - var17.model0 = var29; - var17.field662 = var19 * 64 + var12 * 128; - var17.field657 = var20 * 64 + var13 * 128; - var17.tileHeight2 = var26; - byte var30; - if (var10 > var14) { - var30 = var10; - var10 = var14; - var14 = var30; - } - - if (var2 > var16) { - var30 = var2; - var2 = var16; - var16 = var30; - } - - var17.field659 = var12 + var10; - var17.field661 = var14 + var12; - var17.field660 = var2 + var13; - var17.field664 = var13 + var16; - } - } - } - - TileItem var32; - if (class194.field2331 == var0) { - var37 = var1.method5605(); - var3 = (var37 >> 4 & 7) + GrandExchangeOfferTotalQuantityComparator.field91; - var4 = (var37 & 7) + PlatformInfo.field3959; - var5 = var1.readUnsignedShort(); - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { - NodeDeque var31 = Client.groundItems[ScriptEvent.Client_plane][var3][var4]; - if (var31 != null) { - for (var32 = (TileItem)var31.last(); var32 != null; var32 = (TileItem)var31.previous()) { - if ((var5 & 32767) == var32.id) { - var32.remove(); - break; - } - } - - if (var31.last() == null) { - Client.groundItems[ScriptEvent.Client_plane][var3][var4] = null; - } - - World.updateItemPile(var3, var4); - } - } - - } else if (class194.field2329 == var0) { - var37 = var1.readUnsignedShort(); - var3 = var1.method5614(); - var4 = var1.method5564(); - var5 = var1.readUnsignedByte(); - var6 = (var5 >> 4 & 7) + GrandExchangeOfferTotalQuantityComparator.field91; - var7 = (var5 & 7) + PlatformInfo.field3959; - if (var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) { - NodeDeque var41 = Client.groundItems[ScriptEvent.Client_plane][var6][var7]; - if (var41 != null) { - for (TileItem var34 = (TileItem)var41.last(); var34 != null; var34 = (TileItem)var41.previous()) { - if ((var3 & 32767) == var34.id && var37 == var34.quantity) { - var34.quantity = var4; - break; - } - } - - World.updateItemPile(var6, var7); - } - } - - } else if (class194.field2330 == var0) { - var37 = var1.readUnsignedByte(); - var3 = (var37 >> 4 & 7) + GrandExchangeOfferTotalQuantityComparator.field91; - var4 = (var37 & 7) + PlatformInfo.field3959; - var5 = var1.method5614(); - var6 = var1.method5605(); - var7 = var6 >> 2; - var8 = var6 & 3; - var9 = Client.field699[var7]; - if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { - Skeleton.updatePendingSpawn(ScriptEvent.Client_plane, var3, var4, var9, var5, var7, var8, 0, -1); - } - - } else { - int var39; - if (class194.field2325 == var0) { - var37 = var1.readUnsignedByte(); - var3 = var1.method5605(); - var4 = (var3 >> 4 & 7) + GrandExchangeOfferTotalQuantityComparator.field91; - var5 = (var3 & 7) + PlatformInfo.field3959; - var6 = var1.method5613(); - var7 = var1.method5605(); - var8 = var7 >> 4 & 15; - var9 = var7 & 7; - if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { - var39 = var8 + 1; - if (ByteArrayPool.localPlayer.pathX[0] >= var4 - var39 && ByteArrayPool.localPlayer.pathX[0] <= var4 + var39 && ByteArrayPool.localPlayer.pathY[0] >= var5 - var39 && ByteArrayPool.localPlayer.pathY[0] <= var5 + var39 && Client.areaSoundEffectVolume != 0 && var9 > 0 && Client.soundEffectCount < 50) { - Client.soundEffectIds[Client.soundEffectCount] = var6; - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var9; - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var37; - Client.soundEffects[Client.soundEffectCount] = null; - Client.soundLocations[Client.soundEffectCount] = var8 + (var5 << 8) + (var4 << 16); - ++Client.soundEffectCount; - } - } - } - - if (class194.field2323 == var0) { - var37 = var1.method5613(); - var3 = var1.method5564(); - var4 = var1.readUnsignedByte(); - var5 = (var4 >> 4 & 7) + GrandExchangeOfferTotalQuantityComparator.field91; - var6 = (var4 & 7) + PlatformInfo.field3959; - if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { - var32 = new TileItem(); - var32.id = var37; - var32.quantity = var3; - if (Client.groundItems[ScriptEvent.Client_plane][var5][var6] == null) { - Client.groundItems[ScriptEvent.Client_plane][var5][var6] = new NodeDeque(); - } - - Client.groundItems[ScriptEvent.Client_plane][var5][var6].addFirst(var32); - World.updateItemPile(var5, var6); - } - - } else if (class194.field2332 == var0) { - var37 = var1.method5613(); - var3 = var1.method5605() * 4; - var4 = var1.method5604() * 4; - var5 = var1.method5604(); - byte var38 = var1.method5607(); - var7 = var1.method5614(); - var8 = var1.method5564(); - var9 = var1.readUnsignedByte(); - var39 = (var9 >> 4 & 7) + GrandExchangeOfferTotalQuantityComparator.field91; - var11 = (var9 & 7) + PlatformInfo.field3959; - var12 = var1.readUnsignedByte(); - var13 = var1.readShort(); - var14 = var1.method5607(); - var6 = var38 + var39; - int var40 = var14 + var11; - if (var39 >= 0 && var11 >= 0 && var39 < 104 && var11 < 104 && var6 >= 0 && var40 >= 0 && var6 < 104 && var40 < 104 && var7 != 65535) { - var39 = var39 * 128 + 64; - var11 = var11 * 128 + 64; - var6 = var6 * 128 + 64; - var40 = var40 * 128 + 64; - Projectile var35 = new Projectile(var7, ScriptEvent.Client_plane, var39, var11, class277.getTileHeight(var39, var11, ScriptEvent.Client_plane) - var4, var8 + Client.cycle, var37 + Client.cycle, var5, var12, var13, var3); - var35.setDestination(var6, var40, class277.getTileHeight(var6, var40, ScriptEvent.Client_plane) - var3, var8 + Client.cycle); - Client.projectiles.addFirst(var35); - } - - } else if (class194.field2326 == var0) { - var37 = var1.method5603(); - var3 = var1.readUnsignedShort(); - var4 = var1.method5603(); - var5 = (var4 >> 4 & 7) + GrandExchangeOfferTotalQuantityComparator.field91; - var6 = (var4 & 7) + PlatformInfo.field3959; - var7 = var1.method5613(); - if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { - var5 = var5 * 128 + 64; - var6 = var6 * 128 + 64; - GraphicsObject var33 = new GraphicsObject(var3, ScriptEvent.Client_plane, var5, var6, class277.getTileHeight(var5, var6, ScriptEvent.Client_plane) - var37, var7, Client.cycle); - Client.graphicsObjects.addFirst(var33); - } - - } else if (class194.field2328 == var0) { - var37 = var1.method5605(); - var3 = (var37 >> 4 & 7) + GrandExchangeOfferTotalQuantityComparator.field91; - var4 = (var37 & 7) + PlatformInfo.field3959; - var5 = var1.readUnsignedByte(); - var6 = var5 >> 2; - var7 = var5 & 3; - var8 = Client.field699[var6]; - var9 = var1.method5614(); - if (var3 >= 0 && var4 >= 0 && var3 < 103 && var4 < 103) { - if (var8 == 0) { - BoundaryObject var36 = GrandExchangeOfferWorldComparator.scene.method3199(ScriptEvent.Client_plane, var3, var4); - if (var36 != null) { - var11 = WorldMapRectangle.Entity_unpackID(var36.tag); - if (var6 == 2) { - var36.entity1 = new DynamicObject(var11, 2, var7 + 4, ScriptEvent.Client_plane, var3, var4, var9, false, var36.entity1); - var36.entity2 = new DynamicObject(var11, 2, var7 + 1 & 3, ScriptEvent.Client_plane, var3, var4, var9, false, var36.entity2); - } else { - var36.entity1 = new DynamicObject(var11, var6, var7, ScriptEvent.Client_plane, var3, var4, var9, false, var36.entity1); - } - } - } - - if (var8 == 1) { - WallDecoration var42 = GrandExchangeOfferWorldComparator.scene.method3252(ScriptEvent.Client_plane, var3, var4); - if (var42 != null) { - var11 = WorldMapRectangle.Entity_unpackID(var42.tag); - if (var6 != 4 && var6 != 5) { - if (var6 == 6) { - var42.entity1 = new DynamicObject(var11, 4, var7 + 4, ScriptEvent.Client_plane, var3, var4, var9, false, var42.entity1); - } else if (var6 == 7) { - var42.entity1 = new DynamicObject(var11, 4, (var7 + 2 & 3) + 4, ScriptEvent.Client_plane, var3, var4, var9, false, var42.entity1); - } else if (var6 == 8) { - var42.entity1 = new DynamicObject(var11, 4, var7 + 4, ScriptEvent.Client_plane, var3, var4, var9, false, var42.entity1); - var42.entity2 = new DynamicObject(var11, 4, (var7 + 2 & 3) + 4, ScriptEvent.Client_plane, var3, var4, var9, false, var42.entity2); - } - } else { - var42.entity1 = new DynamicObject(var11, 4, var7, ScriptEvent.Client_plane, var3, var4, var9, false, var42.entity1); - } - } - } - - if (var8 == 2) { - GameObject var43 = GrandExchangeOfferWorldComparator.scene.method3201(ScriptEvent.Client_plane, var3, var4); - if (var6 == 11) { - var6 = 10; - } - - if (var43 != null) { - var43.entity = new DynamicObject(WorldMapRectangle.Entity_unpackID(var43.tag), var6, var7, ScriptEvent.Client_plane, var3, var4, var9, false, var43.entity); - } - } - - if (var8 == 3) { - FloorDecoration var44 = GrandExchangeOfferWorldComparator.scene.getFloorDecoration(ScriptEvent.Client_plane, var3, var4); - if (var44 != null) { - var44.entity = new DynamicObject(WorldMapRectangle.Entity_unpackID(var44.tag), 22, var7, ScriptEvent.Client_plane, var3, var4, var9, false, var44.entity); - } - } - } - - } - } - } - } - - @ObfuscatedName("ic") + @ObfuscatedName("im") @ObfuscatedSignature( signature = "(IIIIB)V", - garbageValue = "85" + garbageValue = "87" ) - @Export("selectSpell") - static void selectSpell(int var0, int var1, int var2, int var3) { - Widget var4 = GrandExchangeOfferUnitPriceComparator.getWidgetChild(var0, var1); - if (var4 != null && var4.onTargetEnter != null) { - ScriptEvent var5 = new ScriptEvent(); - var5.widget = var4; - var5.args = var4.onTargetEnter; - GrandExchangeOfferOwnWorldComparator.runScriptEvent(var5); + @Export("addSceneMenuOptions") + static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { + if (Client.isItemSelected == 0 && !Client.isSpellSelected) { + ScriptEvent.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); + } + + long var4 = -1L; + long var6 = -1L; + + int var8; + for (var8 = 0; var8 < WorldMapSection2.method372(); ++var8) { + long var9 = WorldMapLabel.method482(var8); + if (var9 != var6) { + var6 = var9; + int var24 = SoundSystem.method2628(var8); + long var14 = ViewportMouse.ViewportMouse_entityTags[var8]; + int var13 = (int)(var14 >>> 7 & 127L); + var13 = var13; + int var25 = class171.method3571(ViewportMouse.ViewportMouse_entityTags[var8]); + int var16 = class2.method32(var8); + if (var25 == 2 && UserComparator3.scene.getObjectFlags(TileItemPile.Client_plane, var24, var13, var9) >= 0) { + ObjectDefinition var17 = Canvas.getObjectDefinition(var16); + if (var17.transforms != null) { + var17 = var17.transform(); + } + + if (var17 == null) { + continue; + } + + if (Client.isItemSelected == 1) { + ScriptEvent.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ItemContainer.colorStartTag(65535) + var17.name, 1, var16, var24, var13); + } else if (Client.isSpellSelected) { + if ((WorldMapSprite.selectedSpellFlags & 4) == 4) { + ScriptEvent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ItemContainer.colorStartTag(65535) + var17.name, 2, var16, var24, var13); + } + } else { + String[] var26 = var17.actions; + if (var26 != null) { + for (int var27 = 4; var27 >= 0; --var27) { + if (var26[var27] != null) { + short var20 = 0; + if (var27 == 0) { + var20 = 3; + } + + if (var27 == 1) { + var20 = 4; + } + + if (var27 == 2) { + var20 = 5; + } + + if (var27 == 3) { + var20 = 6; + } + + if (var27 == 4) { + var20 = 1001; + } + + ScriptEvent.insertMenuItemNoShift(var26[var27], ItemContainer.colorStartTag(65535) + var17.name, var20, var16, var24, var13); + } + } + } + + ScriptEvent.insertMenuItemNoShift("Examine", ItemContainer.colorStartTag(65535) + var17.name, 1002, var17.id, var24, var13); + } + } + + int var18; + NPC var19; + Player var21; + int[] var33; + int var35; + if (var25 == 1) { + NPC var30 = Client.npcs[var16]; + if (var30 == null) { + continue; + } + + if (var30.definition.size == 1 && (var30.x & 127) == 64 && (var30.y & 127) == 64) { + for (var18 = 0; var18 < Client.npcCount; ++var18) { + var19 = Client.npcs[Client.npcIndices[var18]]; + if (var19 != null && var30 != var19 && var19.definition.size == 1 && var19.x == var30.x && var19.y == var30.y) { + ApproximateRouteStrategy.addNpcToMenu(var19.definition, Client.npcIndices[var18], var24, var13); + } + } + + var18 = Players.Players_count; + var33 = Players.Players_indices; + + for (var35 = 0; var35 < var18; ++var35) { + var21 = Client.players[var33[var35]]; + if (var21 != null && var30.x == var21.x && var30.y == var21.y) { + Player.addPlayerToMenu(var21, var33[var35], var24, var13); + } + } + } + + ApproximateRouteStrategy.addNpcToMenu(var30.definition, var16, var24, var13); + } + + if (var25 == 0) { + Player var31 = Client.players[var16]; + if (var31 == null) { + continue; + } + + if ((var31.x & 127) == 64 && (var31.y & 127) == 64) { + for (var18 = 0; var18 < Client.npcCount; ++var18) { + var19 = Client.npcs[Client.npcIndices[var18]]; + if (var19 != null && var19.definition.size == 1 && var31.x == var19.x && var31.y == var19.y) { + ApproximateRouteStrategy.addNpcToMenu(var19.definition, Client.npcIndices[var18], var24, var13); + } + } + + var18 = Players.Players_count; + var33 = Players.Players_indices; + + for (var35 = 0; var35 < var18; ++var35) { + var21 = Client.players[var33[var35]]; + if (var21 != null && var21 != var31 && var21.x == var31.x && var31.y == var21.y) { + Player.addPlayerToMenu(var21, var33[var35], var24, var13); + } + } + } + + if (var16 != Client.combatTargetPlayerIndex) { + Player.addPlayerToMenu(var31, var16, var24, var13); + } else { + var4 = var9; + } + } + + if (var25 == 3) { + NodeDeque var32 = Client.groundItems[TileItemPile.Client_plane][var24][var13]; + if (var32 != null) { + for (TileItem var36 = (TileItem)var32.first(); var36 != null; var36 = (TileItem)var32.next()) { + ItemDefinition var34 = KitDefinition.ItemDefinition_get(var36.id); + if (Client.isItemSelected == 1) { + ScriptEvent.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ItemContainer.colorStartTag(16748608) + var34.name, 16, var36.id, var24, var13); + } else if (Client.isSpellSelected) { + if ((WorldMapSprite.selectedSpellFlags & 1) == 1) { + ScriptEvent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ItemContainer.colorStartTag(16748608) + var34.name, 17, var36.id, var24, var13); + } + } else { + String[] var28 = var34.groundActions; + + for (int var29 = 4; var29 >= 0; --var29) { + if (var28 != null && var28[var29] != null) { + byte var22 = 0; + if (var29 == 0) { + var22 = 18; + } + + if (var29 == 1) { + var22 = 19; + } + + if (var29 == 2) { + var22 = 20; + } + + if (var29 == 3) { + var22 = 21; + } + + if (var29 == 4) { + var22 = 22; + } + + ScriptEvent.insertMenuItemNoShift(var28[var29], ItemContainer.colorStartTag(16748608) + var34.name, var22, var36.id, var24, var13); + } else if (var29 == 2) { + ScriptEvent.insertMenuItemNoShift("Take", ItemContainer.colorStartTag(16748608) + var34.name, 20, var36.id, var24, var13); + } + } + + ScriptEvent.insertMenuItemNoShift("Examine", ItemContainer.colorStartTag(16748608) + var34.name, 1004, var36.id, var24, var13); + } + } + } + } + } + } + + if (-1L != var4) { + var8 = class279.method5159(var4); + int var23 = (int)(var4 >>> 7 & 127L); + Player var11 = Client.players[Client.combatTargetPlayerIndex]; + Player.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var23); } - Client.field837 = var3; - Client.isSpellSelected = true; - class7.selectedSpellWidget = var0; - Client.selectedSpellChildIndex = var1; - AbstractWorldMapIcon.selectedSpellFlags = var2; - ItemContainer.invalidateWidget(var4); } } diff --git a/runescape-client/src/main/java/WorldMapDecoration.java b/runescape-client/src/main/java/WorldMapDecoration.java index f3b791e35d..3c6d665972 100644 --- a/runescape-client/src/main/java/WorldMapDecoration.java +++ b/runescape-client/src/main/java/WorldMapDecoration.java @@ -4,41 +4,40 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("al") +@ObfuscatedName("ak") @Implements("WorldMapDecoration") public class WorldMapDecoration { - @ObfuscatedName("no") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1289499225 + intValue = -399317437 ) - static int field245; - @ObfuscatedName("bh") - @ObfuscatedSignature( - signature = "[Lle;" - ) - @Export("worldSelectArrows") - static IndexedSprite[] worldSelectArrows; - @ObfuscatedName("lt") + @Export("idxCount") + static int idxCount; + @ObfuscatedName("eg") @ObfuscatedGetter( - intValue = 620715937 + intValue = 1871379013 ) - @Export("menuX") - static int menuX; - @ObfuscatedName("x") + static int field238; + @ObfuscatedName("id") @ObfuscatedGetter( - intValue = -727730927 + intValue = -169776853 + ) + static int field234; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -1201238261 ) @Export("objectDefinitionId") final int objectDefinitionId; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1283555483 + intValue = -2100994551 ) @Export("decoration") final int decoration; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 983246099 + intValue = -1800056501 ) @Export("rotation") final int rotation; @@ -49,39 +48,91 @@ public class WorldMapDecoration { this.rotation = var3; } + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "([Ljava/lang/String;[SI)V", + garbageValue = "478567291" + ) + public static void method400(String[] var0, short[] var1) { + class4.sortItemsByName(var0, var1, 0, var0.length - 1); + } + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)Lch;", - garbageValue = "-1617483479" + signature = "(II)I", + garbageValue = "1441437585" ) - @Export("worldListStart") - static World worldListStart() { - World.World_listCount = 0; - return MouseHandler.getNextWorldListWorld(); + public static int method402(int var0) { + return var0 >> 17 & 7; } - @ObfuscatedName("he") + @ObfuscatedName("jl") @ObfuscatedSignature( - signature = "(IIB)Lgx;", - garbageValue = "123" + signature = "([Lhd;IB)V", + garbageValue = "-69" ) - static RouteStrategy method438(int var0, int var1) { - Client.field954.approxDestinationX = var0; - Client.field954.approxDestinationY = var1; - Client.field954.approxDestinationSizeX = 1; - Client.field954.approxDestinationSizeY = 1; - return Client.field954; - } + @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 || !Entity.isComponentHidden(var3))) { + int var5; + if (var3.type == 0) { + if (!var3.isIf3 && Entity.isComponentHidden(var3) && var3 != WorldMapSection1.mousedOverWidgetIf1) { + continue; + } + + drawModelComponents(var0, var3.id); + if (var3.children != null) { + drawModelComponents(var3.children, var3.id); + } + + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); + if (var4 != null) { + var5 = var4.group; + if (UserComparator4.loadInterface(var5)) { + drawModelComponents(Widget.Widget_interfaceComponents[var5], -1); + } + } + } + + if (var3.type == 6) { + if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { + boolean var7 = DevicePcmPlayerProvider.runCs1(var3); + if (var7) { + var5 = var3.sequenceId2; + } else { + var5 = var3.sequenceId; + } + + if (var5 != -1) { + SequenceDefinition var6 = NetSocket.SequenceDefinition_get(var5); + + for (var3.modelFrameCycle += Client.field747; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; class234.invalidateWidget(var3)) { + var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; + ++var3.modelFrame; + if (var3.modelFrame >= var6.frameIds.length) { + var3.modelFrame -= var6.frameCount; + if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { + var3.modelFrame = 0; + } + } + } + } + } + + if (var3.field2658 != 0 && !var3.isIf3) { + int var8 = var3.field2658 >> 16; + var5 = var3.field2658 << 16 >> 16; + var8 *= Client.field747; + var5 *= Client.field747; + var3.modelAngleX = var8 + var3.modelAngleX & 2047; + var3.modelAngleY = var5 + var3.modelAngleY & 2047; + class234.invalidateWidget(var3); + } + } + } + } - @ObfuscatedName("kq") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "2146125679" - ) - @Export("Clan_leaveChat") - static final void Clan_leaveChat() { - PacketBufferNode var0 = FaceNormal.getPacketBufferNode(ClientPacket.field2236, Client.packetWriter.isaacCipher); - var0.packetBuffer.writeByte(0); - Client.packetWriter.addNode(var0); } } diff --git a/runescape-client/src/main/java/WorldMapDecorationType.java b/runescape-client/src/main/java/WorldMapDecorationType.java index 3baed403f7..658a88d65a 100644 --- a/runescape-client/src/main/java/WorldMapDecorationType.java +++ b/runescape-client/src/main/java/WorldMapDecorationType.java @@ -1,133 +1,131 @@ -import java.io.DataInputStream; -import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ha") +@ObfuscatedName("hp") @Implements("WorldMapDecorationType") public enum WorldMapDecorationType implements Enumerated { - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2732(0, 0), @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lha;" + signature = "Lhp;" ) - field2718(1, 0), - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2728(2, 0), - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2742(3, 0), - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2722(9, 2), - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2723(4, 1), - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2724(5, 1), - @ObfuscatedName("z") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2721(6, 1), - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2726(7, 1), - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2730(8, 1), - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2734(12, 2), - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2729(13, 2), - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2720(14, 2), - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2731(15, 2), - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2725(16, 2), - @ObfuscatedName("g") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2738(17, 2), - @ObfuscatedName("i") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2737(18, 2), - @ObfuscatedName("a") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2735(19, 2), - @ObfuscatedName("b") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2736(20, 2), - @ObfuscatedName("l") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2733(21, 2), - @ObfuscatedName("r") - @ObfuscatedSignature( - signature = "Lha;" - ) - field2719(10, 2), + field2756(0, 0), @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lha;" + signature = "Lhp;" ) - field2739(11, 2), + field2757(1, 0), + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "Lhp;" + ) + field2755(2, 0), + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "Lhp;" + ) + field2758(3, 0), + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "Lhp;" + ) + field2759(9, 2), + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "Lhp;" + ) + field2760(4, 1), + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "Lhp;" + ) + field2761(5, 1), + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Lhp;" + ) + field2762(6, 1), + @ObfuscatedName("a") + @ObfuscatedSignature( + signature = "Lhp;" + ) + field2776(7, 1), + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "Lhp;" + ) + field2764(8, 1), + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "Lhp;" + ) + field2765(12, 2), + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "Lhp;" + ) + field2763(13, 2), @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lha;" + signature = "Lhp;" ) - field2740(22, 3); + field2769(14, 2), + @ObfuscatedName("h") + @ObfuscatedSignature( + signature = "Lhp;" + ) + field2768(15, 2), + @ObfuscatedName("k") + @ObfuscatedSignature( + signature = "Lhp;" + ) + field2766(16, 2), + @ObfuscatedName("r") + @ObfuscatedSignature( + signature = "Lhp;" + ) + field2770(17, 2), + @ObfuscatedName("s") + @ObfuscatedSignature( + signature = "Lhp;" + ) + field2771(18, 2), + @ObfuscatedName("v") + @ObfuscatedSignature( + signature = "Lhp;" + ) + field2772(19, 2), + @ObfuscatedName("d") + @ObfuscatedSignature( + signature = "Lhp;" + ) + field2767(20, 2), + @ObfuscatedName("e") + @ObfuscatedSignature( + signature = "Lhp;" + ) + field2774(21, 2), + @ObfuscatedName("l") + @ObfuscatedSignature( + signature = "Lhp;" + ) + field2775(10, 2), + @ObfuscatedName("t") + @ObfuscatedSignature( + signature = "Lhp;" + ) + field2778(11, 2), + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "Lhp;" + ) + field2777(22, 3); - @ObfuscatedName("j") + @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1867992849 + intValue = -992967721 ) @Export("id") public final int id; @@ -140,612 +138,13 @@ public enum WorldMapDecorationType implements Enumerated { this.id = var3; } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "56" + signature = "(I)I", + garbageValue = "-995092303" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", - garbageValue = "-1131770525" - ) - @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 = NetCache.method4393(var1); - } - - if (var0 != null) { - if (var1 != null) { - var2 = var2 + " | "; - } - - var2 = var2 + var0; - } - - System.out.println("Error: " + var2); - var2 = var2.replace(':', '.'); - var2 = var2.replace('@', '_'); - var2 = var2.replace('&', '_'); - var2 = var2.replace('#', '_'); - if (RunException.RunException_applet == null) { - return; - } - - URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + RunException.clientType + "&e=" + var2); - DataInputStream var4 = new DataInputStream(var3.openStream()); - var4.read(); - var4.close(); - } catch (Exception var5) { - } - - } - } - - @ObfuscatedName("z") - static boolean method4212(long var0) { - return (int)(var0 >>> 16 & 1L) == 1; - } - - @ObfuscatedName("jm") - @ObfuscatedSignature( - signature = "([Lhe;IIIIIIII)V", - garbageValue = "635809234" - ) - @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 || ScriptEvent.getWidgetClickMask(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { - if (var9.isIf3) { - if (AbstractWorldMapData.isComponentHidden(var9)) { - continue; - } - } else if (var9.type == 0 && var9 != class9.mousedOverWidgetIf1 && AbstractWorldMapData.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.field861 = true; - Client.field834 = var10; - Client.field863 = var11; - } - - boolean var32 = false; - if (var9.field2641) { - switch(Client.field842) { - case 0: - var32 = true; - case 1: - default: - break; - case 2: - if (Client.field843 == var9.id >>> 16) { - var32 = true; - } - break; - case 3: - if (var9.id == Client.field843) { - 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 (MilliClock.widgetDragDuration == 0) { - Client.clickedWidget = null; - Client.clickedWidgetParent = null; - } - - if (!Client.isMenuOpen) { - Tile.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) { - WorldMapRectangle.addSceneMenuOptions(var17, var18, var12, var13); - } - } else if (var9.contentType == 1338) { - class3.checkIfMinimapClicked(var9, var10, var11); - } else { - if (var9.contentType == 1400) { - GrandExchangeOfferAgeComparator.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var33, var10, var11, var9.width, var9.height); - } - - if (!Client.isMenuOpen && var33) { - if (var9.contentType == 1400) { - GrandExchangeOfferAgeComparator.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18); - } else { - WorldMapLabelSize.method288(var9, var17 - var10, var18 - var11); - } - } - - boolean var21; - int var23; - if (var32) { - for (int var20 = 0; var20 < var9.field2555.length; ++var20) { - var21 = false; - boolean var22 = false; - if (!var21 && var9.field2555[var20] != null) { - for (var23 = 0; var23 < var9.field2555[var20].length; ++var23) { - boolean var24 = false; - if (var9.field2706 != null) { - var24 = KeyHandler.KeyHandler_pressedKeys[var9.field2555[var20][var23]]; - } - - if (Messages.method2322(var9.field2555[var20][var23]) || var24) { - var21 = true; - if (var9.field2706 != null && var9.field2706[var20] > Client.cycle) { - break; - } - - byte var25 = var9.field2643[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) { - ClientPacket.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); - } else if (var20 == 10) { - GrandExchangeOffer.Widget_runOnTargetLeave(); - WorldMapData_1.selectSpell(var9.id, var9.childIndex, WorldMapRectangle.method388(ScriptEvent.getWidgetClickMask(var9)), var9.itemId); - Client.selectedSpellActionName = PrivateChatMode.method5965(var9); - if (Client.selectedSpellActionName == null) { - Client.selectedSpellActionName = "null"; - } - - Client.selectedSpellName = var9.dataText + class297.colorStartTag(16777215); - } - - var23 = var9.field2644[var20]; - if (var9.field2706 == null) { - var9.field2706 = new int[var9.field2555.length]; - } - - if (var9.field2695 == null) { - var9.field2695 = new int[var9.field2555.length]; - } - - if (var23 != 0) { - if (var9.field2706[var20] == 0) { - var9.field2706[var20] = var23 + Client.cycle + var9.field2695[var20]; - } else { - var9.field2706[var20] = var23 + Client.cycle; - } - } else { - var9.field2706[var20] = Integer.MAX_VALUE; - } - } - - if (!var21 && var9.field2706 != null) { - var9.field2706[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 || !class217.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var33) { - var34 = true; - } - - var21 = false; - if ((MouseHandler.MouseHandler_lastButton == 1 || !class217.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) { - Player.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11); - } - - if (var9.contentType == 1400) { - GrandExchangeOfferAgeComparator.worldMap.method6420(var17, var18, var33 & var34, var33 & var21); - } - - if (Client.clickedWidget != null && var9 != Client.clickedWidget && var33 && GrandExchangeOfferUnitPriceComparator.method218(ScriptEvent.getWidgetClickMask(var9))) { - Client.draggedOnWidget = var9; - } - - if (var9 == Client.clickedWidgetParent) { - Client.field732 = true; - Client.field859 = var10; - Client.field881 = 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 || class236.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.field919.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.field919.addFirst(var27); - } - } - - if (var9.onTimer != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onTimer; - Client.field727.addFirst(var27); - } - - ScriptEvent var30; - int var35; - int var36; - if (var9.onVarTransmit != null && Client.field772 > var9.field2701) { - if (var9.varTransmitTriggers != null && Client.field772 - var9.field2701 <= 32) { - label887: - for (var35 = var9.field2701; var35 < Client.field772; ++var35) { - var23 = Client.field866[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 label887; - } - } - } - } else { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onVarTransmit; - Client.scriptEvents.addFirst(var27); - } - - var9.field2701 = Client.field772; - } - - if (var9.onInvTransmit != null && Client.field869 > var9.field2620) { - if (var9.invTransmitTriggers != null && Client.field869 - var9.field2620 <= 32) { - label863: - for (var35 = var9.field2620; var35 < Client.field869; ++var35) { - var23 = Client.changedItemContainers[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 label863; - } - } - } - } else { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onInvTransmit; - Client.scriptEvents.addFirst(var27); - } - - var9.field2620 = Client.field869; - } - - if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field2588) { - if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field2588 <= 32) { - label839: - for (var35 = var9.field2588; 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 label839; - } - } - } - } else { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onStatTransmit; - Client.scriptEvents.addFirst(var27); - } - - var9.field2588 = Client.changedSkillsCount; - } - - if (Client.chatCycle > var9.field2700 && var9.onChatTransmit != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onChatTransmit; - Client.scriptEvents.addFirst(var27); - } - - if (Client.field873 > var9.field2700 && var9.onFriendTransmit != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onFriendTransmit; - Client.scriptEvents.addFirst(var27); - } - - if (Client.field874 > var9.field2700 && var9.onClanTransmit != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onClanTransmit; - Client.scriptEvents.addFirst(var27); - } - - if (Client.field774 > var9.field2700 && var9.onStockTransmit != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onStockTransmit; - Client.scriptEvents.addFirst(var27); - } - - if (Client.field726 > var9.field2700 && var9.field2691 != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.field2691; - Client.scriptEvents.addFirst(var27); - } - - if (Client.field877 > var9.field2700 && var9.onMiscTransmit != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onMiscTransmit; - Client.scriptEvents.addFirst(var27); - } - - var9.field2700 = Client.cycleCntr; - if (var9.onKey != null) { - for (var35 = 0; var35 < Client.field901; ++var35) { - ScriptEvent var31 = new ScriptEvent(); - var31.widget = var9; - var31.keyTyped = Client.field872[var35]; - var31.keyPressed = Client.field902[var35]; - var31.args = var9.onKey; - Client.scriptEvents.addFirst(var31); - } - } - } - } - - if (!var9.isIf3) { - if (Client.clickedWidget != null || class236.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) { - class9.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; - } else { - class9.mousedOverWidgetIf1 = var9; - } - } - - if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - Language.field2368 = var9; - } - - if (var9.scrollHeight > var9.height) { - ViewportMouse.method3092(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 (MilliClock.widgetDragDuration == 0) { - Client.clickedWidget = null; - Client.clickedWidgetParent = null; - } - - if (!Client.isMenuOpen) { - Tile.addCancelMenuEntry(); - } - } - - class2.updateRootInterface(var28.group, var12, var13, var14, var15, var10, var11); - } - } - } - } - } - } - - } } diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index f5febd7675..95951452c4 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -4,106 +4,112 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("io") +@ObfuscatedName("ih") @Implements("WorldMapElement") public class WorldMapElement extends DualNode { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Liy;" + signature = "Lic;" ) @Export("WorldMapElement_archive") public static AbstractArchive WorldMapElement_archive; - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "[Lio;" + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -1135374529 ) - @Export("WorldMapElement_cached") - public static WorldMapElement[] WorldMapElement_cached; - @ObfuscatedName("d") + @Export("WorldMapElement_count") + public static int WorldMapElement_count; + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Leg;" + signature = "Lec;" ) @Export("WorldMapElement_cachedSprites") - static EvictingDualNodeHashTable WorldMapElement_cachedSprites; - @ObfuscatedName("w") + public static EvictingDualNodeHashTable WorldMapElement_cachedSprites; + @ObfuscatedName("hz") + @ObfuscatedSignature( + signature = "[Llh;" + ) + @Export("scrollBarSprites") + static IndexedSprite[] scrollBarSprites; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1778455375 + intValue = 712564113 ) @Export("objectId") public final int objectId; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1839539911 + intValue = 211021913 ) @Export("sprite1") public int sprite1; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1328409781 + intValue = 492639717 ) @Export("sprite2") int sprite2; - @ObfuscatedName("z") + @ObfuscatedName("u") @Export("name") public String name; - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -66498181 + intValue = -1414394937 ) - public int field3216; - @ObfuscatedName("e") + public int field3251; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1404661325 + intValue = -1395285175 ) @Export("textSize") public int textSize; - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("menuActions") public String[] menuActions; - @ObfuscatedName("n") + @ObfuscatedName("c") @Export("menuTargetName") public String menuTargetName; - @ObfuscatedName("u") - int[] field3220; @ObfuscatedName("h") + int[] field3243; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 244845295 + intValue = 234759337 ) - int field3221; - @ObfuscatedName("g") + int field3252; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1082888487 + intValue = -1681954435 ) - int field3222; - @ObfuscatedName("i") + int field3242; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 677837161 + intValue = 407708591 ) - int field3223; - @ObfuscatedName("a") + int field3254; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 639685945 + intValue = 345147075 ) - int field3210; - @ObfuscatedName("b") + int field3255; + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "Lje;" + signature = "Ljc;" ) @Export("horizontalAlignment") public HorizontalAlignment horizontalAlignment; - @ObfuscatedName("l") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "Lie;" + signature = "Lif;" ) @Export("verticalAlignment") public VerticalAlignment verticalAlignment; - @ObfuscatedName("r") - int[] field3229; - @ObfuscatedName("o") - byte[] field3218; - @ObfuscatedName("c") + @ObfuscatedName("l") + int[] field3258; + @ObfuscatedName("t") + byte[] field3259; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1088538707 + intValue = -524595041 ) @Export("category") public int category; @@ -117,20 +123,20 @@ public class WorldMapElement extends DualNode { this.sprite2 = -1; this.textSize = 0; this.menuActions = new String[5]; - this.field3221 = Integer.MAX_VALUE; - this.field3222 = Integer.MAX_VALUE; - this.field3223 = Integer.MIN_VALUE; - this.field3210 = Integer.MIN_VALUE; + this.field3252 = Integer.MAX_VALUE; + this.field3242 = Integer.MAX_VALUE; + this.field3254 = Integer.MIN_VALUE; + this.field3255 = Integer.MIN_VALUE; this.horizontalAlignment = HorizontalAlignment.HorizontalAlignment_centered; this.verticalAlignment = VerticalAlignment.VerticalAlignment_centered; this.category = -1; this.objectId = var1; } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkb;B)V", - garbageValue = "-115" + signature = "(Lkn;B)V", + garbageValue = "106" ) @Export("decode") public void decode(Buffer var1) { @@ -144,21 +150,21 @@ public class WorldMapElement extends DualNode { } } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lkb;II)V", - garbageValue = "2055926497" + signature = "(Lkn;II)V", + garbageValue = "1696894212" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 1) { - this.sprite1 = var1.method5591(); + this.sprite1 = var1.method5843(); } else if (var2 == 2) { - this.sprite2 = var1.method5591(); + this.sprite2 = var1.method5843(); } else if (var2 == 3) { this.name = var1.readStringCp1252NullTerminated(); } else if (var2 == 4) { - this.field3216 = var1.readMedium(); + this.field3251 = var1.readMedium(); } else if (var2 == 5) { var1.readMedium(); } else if (var2 == 6) { @@ -178,32 +184,32 @@ public class WorldMapElement extends DualNode { this.menuActions[var2 - 10] = var1.readStringCp1252NullTerminated(); } else if (var2 == 15) { var3 = var1.readUnsignedByte(); - this.field3220 = new int[var3 * 2]; + this.field3243 = new int[var3 * 2]; int var4; for (var4 = 0; var4 < var3 * 2; ++var4) { - this.field3220[var4] = var1.readShort(); + this.field3243[var4] = var1.readShort(); } var1.readInt(); var4 = var1.readUnsignedByte(); - this.field3229 = new int[var4]; + this.field3258 = new int[var4]; int var5; - for (var5 = 0; var5 < this.field3229.length; ++var5) { - this.field3229[var5] = var1.readInt(); + for (var5 = 0; var5 < this.field3258.length; ++var5) { + this.field3258[var5] = var1.readInt(); } - this.field3218 = new byte[var3]; + this.field3259 = new byte[var3]; for (var5 = 0; var5 < var3; ++var5) { - this.field3218[var5] = var1.readByte(); + this.field3259[var5] = var1.readByte(); } } else if (var2 != 16) { if (var2 == 17) { this.menuTargetName = var1.readStringCp1252NullTerminated(); } else if (var2 == 18) { - var1.method5591(); + var1.method5843(); } else if (var2 == 19) { this.category = var1.readUnsignedShort(); } else if (var2 == 21) { @@ -218,47 +224,47 @@ public class WorldMapElement extends DualNode { var1.readShort(); var1.readShort(); } else if (var2 == 25) { - var1.method5591(); + var1.method5843(); } else if (var2 == 28) { var1.readUnsignedByte(); } else if (var2 == 29) { - this.horizontalAlignment = (HorizontalAlignment)GrandExchangeEvent.findEnumerated(NetFileRequest.method4244(), var1.readUnsignedByte()); + this.horizontalAlignment = (HorizontalAlignment)FaceNormal.findEnumerated(GrandExchangeOfferNameComparator.method207(), var1.readUnsignedByte()); } else if (var2 == 30) { - this.verticalAlignment = (VerticalAlignment)GrandExchangeEvent.findEnumerated(Coord.method4084(), var1.readUnsignedByte()); + this.verticalAlignment = (VerticalAlignment)FaceNormal.findEnumerated(class219.method4106(), var1.readUnsignedByte()); } } } } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1026224709" + signature = "(B)V", + garbageValue = "116" ) - public void method4466() { - if (this.field3220 != null) { - for (int var1 = 0; var1 < this.field3220.length; var1 += 2) { - if (this.field3220[var1] < this.field3221) { - this.field3221 = this.field3220[var1]; - } else if (this.field3220[var1] > this.field3223) { - this.field3223 = this.field3220[var1]; + public void method4548() { + if (this.field3243 != null) { + for (int var1 = 0; var1 < this.field3243.length; var1 += 2) { + if (this.field3243[var1] < this.field3252) { + this.field3252 = this.field3243[var1]; + } else if (this.field3243[var1] > this.field3254) { + this.field3254 = this.field3243[var1]; } - if (this.field3220[var1 + 1] < this.field3222) { - this.field3222 = this.field3220[var1 + 1]; - } else if (this.field3220[var1 + 1] > this.field3210) { - this.field3210 = this.field3220[var1 + 1]; + if (this.field3243[var1 + 1] < this.field3242) { + this.field3242 = this.field3243[var1 + 1]; + } else if (this.field3243[var1 + 1] > this.field3255) { + this.field3255 = this.field3243[var1 + 1]; } } } } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(ZI)Lla;", - garbageValue = "2050095285" + signature = "(ZI)Llz;", + garbageValue = "-314713437" ) @Export("getSpriteBool") public Sprite getSpriteBool(boolean var1) { @@ -266,10 +272,10 @@ public class WorldMapElement extends DualNode { return this.getSprite(var2); } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(II)Lla;", - garbageValue = "122291326" + signature = "(II)Llz;", + garbageValue = "1760825025" ) @Export("getSprite") Sprite getSprite(int var1) { @@ -280,7 +286,7 @@ public class WorldMapElement extends DualNode { if (var2 != null) { return var2; } else { - var2 = MusicPatchNode2.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); + var2 = GameShell.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); if (var2 != null) { WorldMapElement_cachedSprites.put(var2, (long)var1); } @@ -290,10 +296,10 @@ public class WorldMapElement extends DualNode { } } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "1436204675" + garbageValue = "-1240109519" ) @Export("getObjectId") public int getObjectId() { @@ -302,23 +308,51 @@ public class WorldMapElement extends DualNode { @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II)Lib;", - garbageValue = "-973838819" + signature = "(Lkn;Llf;I)Llf;", + garbageValue = "1394866461" ) - @Export("KitDefinition_get") - public static KitDefinition KitDefinition_get(int var0) { - KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); - var1 = new KitDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); + @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()); } - KitDefinition.KitDefinition_cached.put(var1, (long)var0); - return var1; + var1.put((Node)var6, (long)var5); } + + return var1; + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + signature = "(ILhg;ZI)V", + garbageValue = "284772848" + ) + static void method4566(int var0, Coord var1, boolean var2) { + WorldMapArea var3 = ClanChat.getWorldMap().getMapArea(var0); + int var4 = class60.localPlayer.plane; + int var5 = (class60.localPlayer.x >> 7) + class182.baseX; + int var6 = (class60.localPlayer.y >> 7) + SecureRandomFuture.baseY; + Coord var7 = new Coord(var4, var5, var6); + ClanChat.getWorldMap().method6538(var3, var7, var1, var2); } } diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java index 3ec560fa7c..d42f222f8a 100644 --- a/runescape-client/src/main/java/WorldMapEvent.java +++ b/runescape-client/src/main/java/WorldMapEvent.java @@ -1,9 +1,7 @@ import java.io.InputStream; import java.io.OutputStreamWriter; -import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; -import java.util.Random; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; @@ -11,33 +9,36 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ag") +@ObfuscatedName("au") @Implements("WorldMapEvent") public class WorldMapEvent { - @ObfuscatedName("sr") - @Export("foundItemIds") - static short[] foundItemIds; - @ObfuscatedName("x") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 46773257 + intValue = 1506774655 + ) + @Export("Interpreter_stringStackSize") + static int Interpreter_stringStackSize; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 1403861851 ) @Export("mapElement") public int mapElement; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lhj;" + signature = "Lhg;" ) @Export("coord1") public Coord coord1; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lhj;" + signature = "Lhg;" ) @Export("coord2") public Coord coord2; @ObfuscatedSignature( - signature = "(ILhj;Lhj;)V" + signature = "(ILhg;Lhg;)V" ) public WorldMapEvent(int var1, Coord var2, Coord var3) { this.mapElement = var1; @@ -45,382 +46,523 @@ public class WorldMapEvent { this.coord2 = var3; } - @ObfuscatedName("k") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II)J", - garbageValue = "984846325" + signature = "(I)J", + garbageValue = "-33276510" ) - public static long method868(int var0) { - return ViewportMouse.ViewportMouse_entityTags[var0]; + static long method839() { + try { + URL var0 = new URL(HealthBarDefinition.method4669("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; + } + + var4.offset += var5; + } while(var4.offset < 1000); + + return 0L; + } catch (Exception var9) { + return 0L; + } } - @ObfuscatedName("e") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-5" + signature = "(II)Lir;", + garbageValue = "-2114458170" ) - static void method864() { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - HealthBarUpdate.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); + @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 { - long var1; - try { - URL var3 = new URL(class41.method654("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 var22 = var7.readLong(); - var1 = var22; - break; - } - - var7.offset += var8; - if (var7.offset >= 1000) { - var1 = 0L; - break; - } - } - } catch (Exception var32) { - var1 = 0L; + byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); + var1 = new KitDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); } - byte var0; - if (0L == var1) { - var0 = 5; - } else { - String var33 = Login.Login_username; - Random var34 = new Random(); - Buffer var26 = new Buffer(128); - Buffer var9 = new Buffer(128); - int[] var10 = new int[]{var34.nextInt(), var34.nextInt(), (int)(var1 >> 32), (int)var1}; - var26.writeByte(10); + KitDefinition.KitDefinition_cached.put(var1, (long)var0); + return var1; + } + } - int var11; - for (var11 = 0; var11 < 4; ++var11) { - var26.writeInt(var34.nextInt()); - } + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(Lig;IIIBZI)V", + garbageValue = "-966731754" + ) + @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; + } - var26.writeInt(var10[0]); - var26.writeInt(var10[1]); - var26.writeLong(var1); - var26.writeLong(0L); - - for (var11 = 0; var11 < 4; ++var11) { - var26.writeInt(var34.nextInt()); - } - - var26.encryptRsa(class89.field1158, class89.field1155); - var9.writeByte(10); - - for (var11 = 0; var11 < 3; ++var11) { - var9.writeInt(var34.nextInt()); - } - - var9.writeLong(var34.nextLong()); - var9.writeLongMedium(var34.nextLong()); - if (Client.randomDatData != null) { - var9.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); } else { - byte[] var27 = GraphicsObject.method2120(); - var9.writeBytes(var27, 0, var27.length); - } - - var9.writeLong(var34.nextLong()); - var9.encryptRsa(class89.field1158, class89.field1155); - var11 = class234.stringCp1252NullTerminatedByteSize(var33); - if (var11 % 8 != 0) { - var11 += 8 - var11 % 8; - } - - Buffer var12 = new Buffer(var11); - var12.writeStringCp1252NullTerminated(var33); - var12.offset = var11; - var12.xteaEncryptAll(var10); - Buffer var13 = new Buffer(var12.offset + var26.offset + var9.offset + 5); - var13.writeByte(2); - var13.writeByte(var26.offset); - var13.writeBytes(var26.array, 0, var26.offset); - var13.writeByte(var9.offset); - var13.writeBytes(var9.array, 0, var9.offset); - var13.writeShort(var12.offset); - var13.writeBytes(var12.array, 0, var12.offset); - String var14 = StudioGame.method4242(var13.array); - - byte var28; - try { - URL var15 = new URL(class41.method654("services", false) + "m=accountappeal/login.ws"); - URLConnection var16 = var15.openConnection(); - var16.setDoInput(true); - var16.setDoOutput(true); - var16.setConnectTimeout(5000); - OutputStreamWriter var17 = new OutputStreamWriter(var16.getOutputStream()); - var17.write("data2=" + MouseHandler.method1187(var14) + "&dest=" + MouseHandler.method1187("passwordchoice.ws")); - var17.flush(); - InputStream var18 = var16.getInputStream(); - var13 = new Buffer(new byte[1000]); - - while (true) { - int var19 = var18.read(var13.array, var13.offset, 1000 - var13.offset); - if (var19 == -1) { - var17.close(); - var18.close(); - String var29 = new String(var13.array); - if (var29.startsWith("OFFLINE")) { - var28 = 4; - } else if (var29.startsWith("WRONG")) { - var28 = 7; - } else if (var29.startsWith("RELOAD")) { - var28 = 3; - } else if (var29.startsWith("Not permitted for social network accounts.")) { - var28 = 6; - } else { - var13.xteaDecryptAll(var10); - - while (var13.offset > 0 && var13.array[var13.offset - 1] == 0) { - --var13.offset; - } - - var29 = new String(var13.array, 0, var13.offset); - boolean var20; - if (var29 == null) { - var20 = false; - } else { - label120: { - try { - new URL(var29); - } catch (MalformedURLException var30) { - var20 = false; - break label120; - } - - var20 = true; - } - } - - if (var20) { - Script.openURL(var29, true, false); - var28 = 2; - } else { - var28 = 5; - } - } - break; - } - - var13.offset += var19; - if (var13.offset >= 1000) { - var28 = 5; - break; + if (!var5) { + var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); + if (var8 != null) { + return; } } - } catch (Throwable var31) { - var31.printStackTrace(); - var28 = 5; - } - var0 = var28; - } + 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; + } - switch(var0) { - case 2: - HealthBarUpdate.setLoginResponseString(Strings.field3026, Strings.field2898, Strings.field2807); - Login.loginIndex = 6; - break; - case 3: - HealthBarUpdate.setLoginResponseString("", "Error connecting to server.", ""); - break; - case 4: - HealthBarUpdate.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); - break; - case 5: - HealthBarUpdate.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); - break; - case 6: - HealthBarUpdate.setLoginResponseString("", "Error connecting to server.", ""); - break; - case 7: - HealthBarUpdate.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("p") - @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "-1379247234" - ) - static int method866(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var3 = MusicPatchNode.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - } else { - var3 = var2 ? GrandExchangeOfferNameComparator.field115 : Interpreter.field1130; - } - - 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]; - } else { - var8[var7] = new Integer(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - } - } - - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var7 != -1) { - var8[0] = new Integer(var7); - } else { - var8 = null; - } - - if (var0 == ScriptOpcodes.CC_SETONCLICK) { - var3.onClick = var8; - } else if (var0 == ScriptOpcodes.CC_SETONHOLD) { - var3.onHold = var8; - } else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { - var3.onRelease = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { - var3.onMouseOver = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { - var3.onMouseLeave = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDRAG) { - var3.onDrag = var8; - } else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { - var3.onTargetLeave = var8; - } else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { - var3.onVarTransmit = var8; - var3.varTransmitTriggers = var5; - } else if (var0 == ScriptOpcodes.CC_SETONTIMER) { - var3.onTimer = var8; - } else if (var0 == ScriptOpcodes.CC_SETONOP) { - var3.onOp = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { - var3.onDragComplete = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { - var3.onClickRepeat = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { - var3.onMouseRepeat = var8; - } else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { - var3.onInvTransmit = var8; - var3.invTransmitTriggers = var5; - } else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { - var3.onStatTransmit = var8; - var3.statTransmitTriggers = var5; - } else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { - var3.onTargetEnter = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { - var3.onScroll = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { - var3.onChatTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONKEY) { - var3.onKey = var8; - } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { - var3.onFriendTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { - var3.onClanTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { - var3.onMiscTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { - var3.onDialogAbort = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { - var3.onSubChange = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { - var3.onStockTransmit = var8; - } else if (var0 == 1426) { - var3.field2691 = var8; - } else { - if (var0 != ScriptOpcodes.CC_SETONRESIZE) { - return 2; - } - - var3.onResize = var8; - } - - var3.hasListener = true; - return 1; - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - signature = "(IZII)V", - garbageValue = "826643868" - ) - public static final void method867(int var0, boolean var1, int var2) { - if (var0 >= 8000 && var0 <= 48000) { - PcmPlayer.field1421 = var0; - PcmPlayer.PcmPlayer_stereo = var1; - PcmPlayer.field1423 = var2; - } else { - throw new IllegalArgumentException(); } } - @ObfuscatedName("au") + @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "1831250087" + signature = "(ILcs;ZI)I", + garbageValue = "-1652034071" ) - static int method865(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.GETWINDOWMODE) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ApproximateRouteStrategy.getWindowedMode(); + static int method836(int var0, Script var1, boolean var2) { + String var3; + if (var0 == ScriptOpcodes.MES) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter_stringStackSize]; + ObjectSound.addGameMessage(0, "", var3); + return 1; + } else if (var0 == ScriptOpcodes.ANIM) { + UrlRequester.Interpreter_intStackSize -= 2; + SecureRandomCallable.performPlayerAnimation(class60.localPlayer, Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize], Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]); + return 1; + } else if (var0 == ScriptOpcodes.IF_CLOSE) { + if (!Interpreter.field1118) { + Interpreter.field1125 = true; + } + return 1; } else { - int var3; - if (var0 == ScriptOpcodes.SETWINDOWMODE) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var3 == 1 || var3 == 2) { - WorldMapIcon_1.setWindowedMode(var3); + int var10; + if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter_stringStackSize]; + var10 = 0; + if (UserComparator7.isNumber(var3)) { + var10 = Tiles.parseInt(var3); } + PacketBufferNode var12 = UserComparator4.getPacketBufferNode(ClientPacket.field2298, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeInt(var10); + Client.packetWriter.addNode(var12); return 1; - } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferOwnWorldComparator.clientPreferences.windowMode; - return 1; - } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { - if (var0 == 5310) { - --Interpreter.Interpreter_intStackSize; + } else { + PacketBufferNode var14; + if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter_stringStackSize]; + var14 = UserComparator4.getPacketBufferNode(ClientPacket.field2270, 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_stringStackSize]; + var14 = UserComparator4.getPacketBufferNode(ClientPacket.field2312, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeByte(var3.length() + 1); + var14.packetBuffer.writeStringCp1252NullTerminated(var3); + Client.packetWriter.addNode(var14); return 1; } else { - return 2; - } - } else { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (var3 == 1 || var3 == 2) { - GrandExchangeOfferOwnWorldComparator.clientPreferences.windowMode = var3; - WorldMapArea.savePreferences(); - } + String var7; + int var15; + if (var0 == ScriptOpcodes.OPPLAYER) { + var15 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_stringStack[--Interpreter_stringStackSize]; + SoundCache.method2647(var15, var7); + return 1; + } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { + UrlRequester.Interpreter_intStackSize -= 3; + var15 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var10 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + int var9 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2]; + Widget var13 = WorldMapSprite.getWidget(var9); + class60.clickWidget(var13, var15, var10); + return 1; + } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { + UrlRequester.Interpreter_intStackSize -= 2; + var15 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var10 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + Widget var11 = var2 ? KeyHandler.field407 : SecureRandomCallable.field544; + class60.clickWidget(var11, var15, var10); + return 1; + } else if (var0 == ScriptOpcodes.MOUSECAM) { + ArchiveLoader.mouseCam = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = NetSocket.clientPreferences.roofsHidden ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { + NetSocket.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + SpriteMask.savePreferences(); + return 1; + } else if (var0 == ScriptOpcodes.OPENURL) { + var3 = Interpreter.Interpreter_stringStack[--Interpreter_stringStackSize]; + boolean var4 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + WorldMapSectionType.openURL(var3, var4, false); + return 1; + } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { + var15 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + var14 = UserComparator4.getPacketBufferNode(ClientPacket.field2269, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeShort(var15); + Client.packetWriter.addNode(var14); + return 1; + } else if (var0 == ScriptOpcodes.BUG_REPORT) { + var15 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + Interpreter_stringStackSize -= 2; + var7 = Interpreter.Interpreter_stringStack[Interpreter_stringStackSize]; + String var5 = Interpreter.Interpreter_stringStack[Interpreter_stringStackSize + 1]; + if (var7.length() > 500) { + return 1; + } else if (var5.length() > 500) { + return 1; + } else { + PacketBufferNode var6 = UserComparator4.getPacketBufferNode(ClientPacket.field2304, Client.packetWriter.isaacCipher); + var6.packetBuffer.writeShort(1 + DynamicObject.stringCp1252NullTerminatedByteSize(var7) + DynamicObject.stringCp1252NullTerminatedByteSize(var5)); + var6.packetBuffer.writeStringCp1252NullTerminated(var7); + var6.packetBuffer.method5837(var15); + var6.packetBuffer.writeStringCp1252NullTerminated(var5); + Client.packetWriter.addNode(var6); + return 1; + } + } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { + Client.shiftClickDrop = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { + Client.showMouseOverText = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.RENDERSELF) { + Client.renderSelf = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == 3120) { + if (Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 1; + } else { + Client.drawPlayerNames &= -2; + } - return 1; + return 1; + } else if (var0 == 3121) { + if (Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 2; + } else { + Client.drawPlayerNames &= -3; + } + + return 1; + } else if (var0 == 3122) { + if (Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1) { + Client.drawPlayerNames |= 4; + } else { + Client.drawPlayerNames &= -5; + } + + return 1; + } else if (var0 == 3123) { + if (Interpreter.Interpreter_intStack[--UrlRequester.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[--UrlRequester.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { + Client.showLoadingMessages = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + return 1; + } else if (var0 == ScriptOpcodes.SETTAPTODROP) { + Skeleton.setTapToDrop(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1); + return 1; + } else if (var0 == ScriptOpcodes.GETTAPTODROP) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Player.getTapToDrop() ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.SETOCULUSORBSPEED) { + UrlRequester.Interpreter_intStackSize -= 2; + Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + return 1; + } else if (var0 == 3130) { + UrlRequester.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 3131) { + --UrlRequester.Interpreter_intStackSize; + return 1; + } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Varcs.canvasWidth; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = class52.canvasHeight; + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) { + --UrlRequester.Interpreter_intStackSize; + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { + return 1; + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { + UrlRequester.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 3136) { + Client.field835 = 3; + Client.field671 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + return 1; + } else if (var0 == 3137) { + Client.field835 = 2; + Client.field671 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + return 1; + } else if (var0 == 3138) { + Client.field835 = 0; + return 1; + } else if (var0 == 3139) { + Client.field835 = 1; + return 1; + } else if (var0 == 3140) { + Client.field835 = 3; + Client.field671 = var2 ? KeyHandler.field407.id * 40459347 * 1532053467 : SecureRandomCallable.field544.id * 40459347 * 1532053467; + return 1; + } else { + boolean var8; + if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { + var8 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + NetSocket.clientPreferences.hideUsername = var8; + SpriteMask.savePreferences(); + return 1; + } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = NetSocket.clientPreferences.hideUsername ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { + var8 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + Client.Login_isUsernameRemembered = var8; + if (!var8) { + NetSocket.clientPreferences.rememberedUsername = ""; + SpriteMask.savePreferences(); + } + + return 1; + } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { + Interpreter.Interpreter_intStack[++UrlRequester.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[--UrlRequester.Interpreter_intStackSize] == 1; + if (var8 == NetSocket.clientPreferences.titleMusicDisabled) { + NetSocket.clientPreferences.titleMusicDisabled = !var8; + SpriteMask.savePreferences(); + } + + return 1; + } else if (var0 == ScriptOpcodes.GETTITLEMUSICENABLED) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = NetSocket.clientPreferences.titleMusicDisabled ? 0 : 1; + return 1; + } else if (var0 == 3148) { + return 1; + } else if (var0 == 3149) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3150) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3151) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3152) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3153) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; + return 1; + } else if (var0 == 3154) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = MusicPatchNode2.method3820(); + return 1; + } else if (var0 == 3155) { + --Interpreter_stringStackSize; + return 1; + } else if (var0 == 3156) { + return 1; + } else if (var0 == 3157) { + UrlRequester.Interpreter_intStackSize -= 2; + return 1; + } else if (var0 == 3158) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3159) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3160) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3161) { + --UrlRequester.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3162) { + --UrlRequester.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3163) { + --Interpreter_stringStackSize; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3164) { + --UrlRequester.Interpreter_intStackSize; + Interpreter.Interpreter_stringStack[++Interpreter_stringStackSize - 1] = ""; + return 1; + } else if (var0 == 3165) { + --UrlRequester.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3166) { + UrlRequester.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3167) { + UrlRequester.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3168) { + UrlRequester.Interpreter_intStackSize -= 2; + Interpreter.Interpreter_stringStack[++Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Interpreter_stringStackSize - 1] = ""; + return 1; + } else if (var0 == 3169) { + return 1; + } else if (var0 == 3170) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3171) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3172) { + --UrlRequester.Interpreter_intStackSize; + return 1; + } else if (var0 == 3173) { + --UrlRequester.Interpreter_intStackSize; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3174) { + --UrlRequester.Interpreter_intStackSize; + return 1; + } else if (var0 == 3175) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + return 1; + } else if (var0 == 3176) { + return 1; + } else if (var0 == 3177) { + return 1; + } else if (var0 == 3178) { + --Interpreter_stringStackSize; + return 1; + } else if (var0 == 3179) { + return 1; + } else if (var0 == 3180) { + --Interpreter_stringStackSize; + return 1; + } else { + return 2; + } + } + } } } } + + @ObfuscatedName("hg") + @ObfuscatedSignature( + signature = "(III)V", + garbageValue = "823242837" + ) + static void method840(int var0, int var1) { + int var2 = GrandExchangeOfferNameComparator.fontBold12.stringWidth("Choose Option"); + + int var3; + for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { + Font var4 = GrandExchangeOfferNameComparator.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; + } + } + + var2 += 8; + var3 = Client.menuOptionsCount * 15 + 22; + int var7 = var0 - var2 / 2; + if (var2 + var7 > Varcs.canvasWidth) { + var7 = Varcs.canvasWidth - var2; + } + + if (var7 < 0) { + var7 = 0; + } + + int var8 = var1; + if (var3 + var1 > class52.canvasHeight) { + var8 = class52.canvasHeight - var3; + } + + if (var8 < 0) { + var8 = 0; + } + + WorldMapRectangle.menuX = var7; + Frames.menuY = var8; + class69.menuWidth = var2; + ApproximateRouteStrategy.menuHeight = Client.menuOptionsCount * 15 + 22; + } } diff --git a/runescape-client/src/main/java/WorldMapID.java b/runescape-client/src/main/java/WorldMapID.java index b12e25a7e7..63540a61fa 100644 --- a/runescape-client/src/main/java/WorldMapID.java +++ b/runescape-client/src/main/java/WorldMapID.java @@ -4,180 +4,136 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("av") +@ObfuscatedName("an") @Implements("WorldMapID") public class WorldMapID { - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lav;" - ) - static final WorldMapID field302; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lav;" + signature = "Lan;" ) - static final WorldMapID field303; - @ObfuscatedName("hf") + static final WorldMapID field301; + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "[Lle;" + signature = "Lan;" ) - @Export("modIconSprites") - static IndexedSprite[] modIconSprites; - @ObfuscatedName("jh") - @ObfuscatedSignature( - signature = "Lhe;" - ) - static Widget field307; - @ObfuscatedName("k") + static final WorldMapID field299; + @ObfuscatedName("am") + static String field300; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -96015239 + intValue = -2051394385 ) @Export("value") final int value; static { - field302 = new WorldMapID(0); - field303 = new WorldMapID(1); + field301 = new WorldMapID(0); + field299 = new WorldMapID(1); } WorldMapID(int var1) { this.value = var1; } - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkj;B)V", - garbageValue = "30" + signature = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-452075122" ) - static final void method648(PacketBuffer var0) { - int var1 = 0; - var0.importIndex(); - - byte[] var10000; - int var2; - int var3; - int var4; - for (var2 = 0; var2 < Players.Players_count; ++var2) { - var3 = Players.Players_indices[var2]; - if ((Players.field1267[var3] & 1) == 0) { - if (var1 > 0) { - --var1; - var10000 = Players.field1267; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - var4 = var0.readBits(1); - if (var4 == 0) { - var1 = MouseHandler.method1200(var0); - var10000 = Players.field1267; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - class25.readPlayerUpdate(var0, var3); - } - } - } + @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); } - var0.exportIndex(); - if (var1 != 0) { - throw new RuntimeException(); + 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("o") + @ObfuscatedSignature( + signature = "(II)I", + garbageValue = "-211582550" + ) + public static int method617(int var0) { + return var0 >> 11 & 63; + } + + @ObfuscatedName("gv") + @ObfuscatedSignature( + signature = "(IIIIZI)V", + garbageValue = "-1973135066" + ) + @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.field727; + } else if (var5 >= 100) { + var6 = Client.field924; } else { - var0.importIndex(); + var6 = (Client.field924 - Client.field727) * var5 / 100 + Client.field727; + } - for (var2 = 0; var2 < Players.Players_count; ++var2) { - var3 = Players.Players_indices[var2]; - if ((Players.field1267[var3] & 1) != 0) { - if (var1 > 0) { - --var1; - var10000 = Players.field1267; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - var4 = var0.readBits(1); - if (var4 == 0) { - var1 = MouseHandler.method1200(var0); - var10000 = Players.field1267; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - class25.readPlayerUpdate(var0, var3); - } - } + int var7 = var3 * var6 * 512 / (var2 * 334); + int var8; + int var9; + short var10; + if (var7 < Client.field685) { + var10 = Client.field685; + var6 = var10 * var2 * 334 / (var3 * 512); + if (var6 > Client.field928) { + var6 = Client.field928; + 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; } - - 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.field1267[var3] & 1) != 0) { - if (var1 > 0) { - --var1; - var10000 = Players.field1267; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - var4 = var0.readBits(1); - if (var4 == 0) { - var1 = MouseHandler.method1200(var0); - var10000 = Players.field1267; - var10000[var3] = (byte)(var10000[var3] | 2); - } else if (class22.updateExternalPlayer(var0, var3)) { - var10000 = Players.field1267; - var10000[var3] = (byte)(var10000[var3] | 2); - } - } - } + } else if (var7 > Client.field861) { + var10 = Client.field861; + var6 = var10 * var2 * 334 / (var3 * 512); + if (var6 < Client.field927) { + var6 = Client.field927; + 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); } - 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.field1267[var3] & 1) == 0) { - if (var1 > 0) { - --var1; - var10000 = Players.field1267; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - var4 = var0.readBits(1); - if (var4 == 0) { - var1 = MouseHandler.method1200(var0); - var10000 = Players.field1267; - var10000[var3] = (byte)(var10000[var3] | 2); - } else if (class22.updateExternalPlayer(var0, var3)) { - var10000 = Players.field1267; - 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.field1267; - 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; - } - } - - } - } + var1 += var9; + var3 -= var9 * 2; } } + + Client.viewportZoom = var3 * var6 / 334; + if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { + class23.method230(var2, var3); + } + + Client.viewportOffsetX = var0; + Client.viewportOffsetY = var1; + Client.viewportWidth = var2; + Client.viewportHeight = var3; } } diff --git a/runescape-client/src/main/java/WorldMapIcon_0.java b/runescape-client/src/main/java/WorldMapIcon_0.java index 07b0a71990..dfb9100550 100644 --- a/runescape-client/src/main/java/WorldMapIcon_0.java +++ b/runescape-client/src/main/java/WorldMapIcon_0.java @@ -3,55 +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("an") +@ObfuscatedName("ai") @Implements("WorldMapIcon_0") public class WorldMapIcon_0 extends AbstractWorldMapIcon { - @ObfuscatedName("bu") + @ObfuscatedName("sq") @ObfuscatedSignature( - signature = "Lmx;" + signature = "Lr;" ) - @Export("loginType") - static LoginType loginType; - @ObfuscatedName("dr") - @ObfuscatedSignature( - signature = "Lih;" - ) - @Export("archive5") - static Archive archive5; - @ObfuscatedName("x") + @Export("grandExchangeEvents") + static GrandExchangeEvents grandExchangeEvents; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -602879945 + intValue = -2054953485 ) @Export("element") final int element; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lau;" + signature = "Lar;" ) @Export("label") final WorldMapLabel label; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1634028725 + intValue = 841547123 ) @Export("subWidth") final int subWidth; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 497212545 + intValue = -826275661 ) @Export("subHeight") final int subHeight; @ObfuscatedSignature( - signature = "(Lhj;Lhj;ILau;)V" + signature = "(Lhg;Lhg;ILar;)V" ) WorldMapIcon_0(Coord var1, Coord var2, int var3, WorldMapLabel var4) { super(var1, var2); this.element = var3; this.label = var4; - WorldMapElement var5 = class25.WorldMapElement_get(this.getElement()); + WorldMapElement var5 = Client.WorldMapElement_get(this.getElement()); Sprite var6 = var5.getSpriteBool(false); if (var6 != null) { this.subWidth = var6.subWidth; @@ -63,119 +58,467 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "16" + garbageValue = "0" ) @Export("getElement") public int getElement() { return this.element; } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)Lau;", - garbageValue = "2077771117" + signature = "(B)Lar;", + garbageValue = "35" ) @Export("getLabel") WorldMapLabel getLabel() { return this.label; } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "650401890" + garbageValue = "1804331962" ) @Export("getSubWidth") int getSubWidth() { return this.subWidth; } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1828864081" + garbageValue = "-1265869629" ) @Export("getSubHeight") int getSubHeight() { return this.subHeight; } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Ljava/lang/String;II)Z", - garbageValue = "-1457680622" + signature = "(II)[B", + garbageValue = "-116765930" ) - static boolean method306(String var0, int var1) { - return ItemContainer.method1274(var0, var1, "openjs"); + @Export("ByteArrayPool_getArray") + public static synchronized byte[] ByteArrayPool_getArray(int var0) { + return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); } - @ObfuscatedName("hk") + @ObfuscatedName("af") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1081049793" + signature = "(ILcs;ZI)I", + garbageValue = "1354105347" ) - static final void method304() { - 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.field918[++Client.field801 - 1] = Client.npcIndices[var2]; - } - } - - if (var1 > Client.npcCount) { - throw new RuntimeException(""); + static int method265(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 6600) { + var3 = TileItemPile.Client_plane; + int var9 = (class60.localPlayer.x >> 7) + class182.baseX; + int var5 = (class60.localPlayer.y >> 7) + SecureRandomFuture.baseY; + ClanChat.getWorldMap().method6532(var3, var9, var5, true); + return 1; } else { - Client.npcCount = 0; + WorldMapArea var11; + if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + String var16 = ""; + var11 = ClanChat.getWorldMap().getMapArea(var3); + if (var11 != null) { + var16 = var11.getExternalName(); + } - 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; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var16; + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + ClanChat.getWorldMap().setCurrentMapAreaId(var3); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ClanChat.getWorldMap().getZoomLevel(); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + ClanChat.getWorldMap().setZoomPercentage(var3); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ClanChat.getWorldMap().isCacheLoaded() ? 1 : 0; + return 1; + } else { + Coord var15; + if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { + var15 = new Coord(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); + ClanChat.getWorldMap().setWorldMapPositionTarget(var15.x, var15.y); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { + var15 = new Coord(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); + ClanChat.getWorldMap().setWorldMapPositionTargetInstant(var15.x, var15.y); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { + var15 = new Coord(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); + ClanChat.getWorldMap().jumpToSourceCoord(var15.plane, var15.x, var15.y); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { + var15 = new Coord(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); + ClanChat.getWorldMap().jumpToSourceCoordInstant(var15.plane, var15.x, var15.y); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ClanChat.getWorldMap().getDisplayX(); + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ClanChat.getWorldMap().getDisplayY(); + return 1; } else { - int var6 = var0.readBits(2); - if (var6 == 0) { - Client.npcIndices[++Client.npcCount - 1] = var3; - var4.npcCycle = Client.cycle; - Client.field725[++Client.field851 - 1] = var3; + WorldMapArea var13; + if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + var13 = ClanChat.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var13.getOrigin().packed(); + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + var13 = ClanChat.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = (var13.getRegionHighX() - var13.getRegionLowX() + 1) * 64; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = (var13.getRegionHighY() - var13.getRegionLowY() + 1) * 64; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + var13 = ClanChat.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var13.getRegionLowX() * 64; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var13.getRegionLowY() * 64; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var13.getRegionHighX() * 64 + 64 - 1; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var13.getRegionHighY() * 64 + 64 - 1; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + var13 = ClanChat.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var13.getZoom(); + } + + return 1; + } else if (var0 == 6615) { + var15 = ClanChat.getWorldMap().getDisplayCoord(); + if (var15 == null) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var15.x; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var15.y; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ClanChat.getWorldMap().currentMapAreaId(); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { + var15 = new Coord(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); + var13 = ClanChat.getWorldMap().getCurrentMapArea(); + if (var13 == null) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; + return 1; + } else { + int[] var14 = var13.position(var15.plane, var15.x, var15.y); + if (var14 == null) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var14[0]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var14[1]; + } + + return 1; + } } else { - int var7; - int var8; - if (var6 == 1) { - Client.npcIndices[++Client.npcCount - 1] = var3; - var4.npcCycle = Client.cycle; - var7 = var0.readBits(3); - var4.method2133(var7, (byte)1); - var8 = var0.readBits(1); - if (var8 == 1) { - Client.field725[++Client.field851 - 1] = var3; + Coord var7; + if (var0 == 6618) { + var15 = new Coord(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); + var13 = ClanChat.getWorldMap().getCurrentMapArea(); + if (var13 == null) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; + return 1; + } else { + var7 = var13.coord(var15.x, var15.y); + if (var7 == null) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var7.packed(); + } + + return 1; } - } else if (var6 == 2) { - Client.npcIndices[++Client.npcCount - 1] = var3; - var4.npcCycle = Client.cycle; - var7 = var0.readBits(3); - var4.method2133(var7, (byte)2); - var8 = var0.readBits(3); - var4.method2133(var8, (byte)2); - int var9 = var0.readBits(1); - if (var9 == 1) { - Client.field725[++Client.field851 - 1] = var3; + } else { + Coord var12; + if (var0 == 6619) { + UrlRequester.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var12 = new Coord(Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]); + WorldMapElement.method4566(var3, var12, false); + return 1; + } else if (var0 == 6620) { + UrlRequester.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var12 = new Coord(Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]); + WorldMapElement.method4566(var3, var12, true); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { + UrlRequester.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var12 = new Coord(Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]); + var11 = ClanChat.getWorldMap().getMapArea(var3); + if (var11 == null) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + return 1; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var11.containsCoord(var12.plane, var12.x, var12.y) ? 1 : 0; + return 1; + } + } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ClanChat.getWorldMap().getDisplayWith(); + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ClanChat.getWorldMap().getDisplayHeight(); + return 1; + } else if (var0 == 6623) { + var15 = new Coord(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); + var13 = ClanChat.getWorldMap().mapAreaAtCoord(var15.plane, var15.x, var15.y); + if (var13 == null) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var13.getId(); + } + + return 1; + } else if (var0 == 6624) { + ClanChat.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); + return 1; + } else if (var0 == 6625) { + ClanChat.getWorldMap().resetMaxFlashCount(); + return 1; + } else if (var0 == 6626) { + ClanChat.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); + return 1; + } else if (var0 == 6627) { + ClanChat.getWorldMap().resetCyclesPerFlash(); + return 1; + } else { + boolean var10; + if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { + var10 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + ClanChat.getWorldMap().setPerpetualFlash(var10); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + ClanChat.getWorldMap().flashElement(var3); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + ClanChat.getWorldMap().flashCategory(var3); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { + ClanChat.getWorldMap().stopCurrentFlashes(); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { + var10 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + ClanChat.getWorldMap().setElementsDisabled(var10); + return 1; + } else { + boolean var4; + if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { + UrlRequester.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1] == 1; + ClanChat.getWorldMap().disableElement(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { + UrlRequester.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1] == 1; + ClanChat.getWorldMap().setCategoryDisabled(var3, var4); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ClanChat.getWorldMap().getElementsDisabled() ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ClanChat.getWorldMap().isElementDisabled(var3) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ClanChat.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; + return 1; + } else if (var0 == 6638) { + UrlRequester.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + var12 = new Coord(Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]); + var7 = ClanChat.getWorldMap().method6575(var3, var12); + if (var7 == null) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var7.packed(); + } + + return 1; + } else { + AbstractWorldMapIcon var8; + if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { + var8 = ClanChat.getWorldMap().iconStart(); + if (var8 == null) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var8.getElement(); + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var8.coord2.packed(); + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { + var8 = ClanChat.getWorldMap().iconNext(); + if (var8 == null) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var8.getElement(); + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var8.coord2.packed(); + } + + return 1; + } else { + WorldMapElement var6; + if (var0 == ScriptOpcodes.MEC_TEXT) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + var6 = Client.WorldMapElement_get(var3); + if (var6.name == null) { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var6.name; + } + + return 1; + } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + var6 = Client.WorldMapElement_get(var3); + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var6.textSize; + return 1; + } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + var6 = Client.WorldMapElement_get(var3); + if (var6 == null) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var6.category; + } + + return 1; + } else if (var0 == ScriptOpcodes.MEC_SPRITE) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + var6 = Client.WorldMapElement_get(var3); + if (var6 == null) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var6.sprite1; + } + + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = WorldMapSection3.worldMapEvent.mapElement; + return 1; + } else if (var0 == 6698) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = WorldMapSection3.worldMapEvent.coord1.packed(); + return 1; + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = WorldMapSection3.worldMapEvent.coord2.packed(); + return 1; + } else { + return 2; + } + } + } + } } - } else if (var6 == 3) { - Client.field918[++Client.field801 - 1] = var3; } } } } - } } + + @ObfuscatedName("gc") + @ObfuscatedSignature( + signature = "(ZI)V", + garbageValue = "-63078339" + ) + @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.field967 == 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 = class206.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); + var2.playerCycle = Client.cycle; + UserComparator3.scene.drawEntity(TileItemPile.Client_plane, var2.x, var2.y, Language.getTileHeight(var2.field967 * 64 - 64 + var2.x, var2.field967 * 64 - 64 + var2.y, TileItemPile.Client_plane), var2.field967 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); + } + } + } + + } + + @ObfuscatedName("it") + @ObfuscatedSignature( + signature = "([Lhd;Lhd;ZS)V", + garbageValue = "-3141" + ) + @Export("revalidateWidgetScroll") + static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { + int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * 1772823043 * -897574741 : var1.width * 1667004247 * -75340697; + int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * -519746393 * -962880745 : var1.height * -2125257181 * 1991883147; + GrandExchangeOfferUnitPriceComparator.resizeInterface(var0, var1.id, var3, var4, var2); + if (var1.children != null) { + GrandExchangeOfferUnitPriceComparator.resizeInterface(var1.children, var1.id, var3, var4, var2); + } + + InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); + if (var5 != null) { + int var6 = var5.group; + if (UserComparator4.loadInterface(var6)) { + GrandExchangeOfferUnitPriceComparator.resizeInterface(Widget.Widget_interfaceComponents[var6], -1, var3, var4, var2); + } + } + + if (var1.contentType == 1337) { + } + + } } diff --git a/runescape-client/src/main/java/WorldMapIcon_1.java b/runescape-client/src/main/java/WorldMapIcon_1.java index cce5eac7cb..460dbaab2f 100644 --- a/runescape-client/src/main/java/WorldMapIcon_1.java +++ b/runescape-client/src/main/java/WorldMapIcon_1.java @@ -1,57 +1,63 @@ +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("af") +@ObfuscatedName("ab") @Implements("WorldMapIcon_1") public class WorldMapIcon_1 extends AbstractWorldMapIcon { - @ObfuscatedName("he") - @ObfuscatedGetter( - intValue = -395695129 + @ObfuscatedName("bc") + @ObfuscatedSignature( + signature = "Llh;" ) - @Export("cameraYaw") - static int cameraYaw; - @ObfuscatedName("x") + static IndexedSprite field206; + @ObfuscatedName("dj") + @ObfuscatedSignature( + signature = "Lig;" + ) + @Export("archive14") + static Archive archive14; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1547579339 + intValue = 1169931065 ) @Export("objectDefId") final int objectDefId; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lao;" + signature = "Lap;" ) @Export("region") final WorldMapRegion region; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1354598699 + intValue = -278806663 ) @Export("element") int element; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lau;" + signature = "Lar;" ) @Export("label") WorldMapLabel label; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 152564965 + intValue = -475422811 ) @Export("subWidth") int subWidth; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1072450563 + intValue = -463998497 ) @Export("subHeight") int subHeight; @ObfuscatedSignature( - signature = "(Lhj;Lhj;ILao;)V" + signature = "(Lhg;Lhg;ILap;)V" ) WorldMapIcon_1(Coord var1, Coord var2, int var3, WorldMapRegion var4) { super(var1, var2); @@ -60,56 +66,56 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { this.init(); } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(B)I", - garbageValue = "16" + garbageValue = "0" ) @Export("getElement") public int getElement() { return this.element; } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)Lau;", - garbageValue = "2077771117" + signature = "(B)Lar;", + garbageValue = "35" ) @Export("getLabel") WorldMapLabel getLabel() { return this.label; } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "650401890" + garbageValue = "1804331962" ) @Export("getSubWidth") int getSubWidth() { return this.subWidth; } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-1828864081" + garbageValue = "-1265869629" ) @Export("getSubHeight") int getSubHeight() { return this.subHeight; } - @ObfuscatedName("u") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "10774" + signature = "(I)V", + garbageValue = "19136800" ) @Export("init") void init() { - this.element = WorldMapSection2.getObjectDefinition(this.objectDefId).transform().mapIconId; - this.label = this.region.createMapLabel(class25.WorldMapElement_get(this.element)); - WorldMapElement var1 = class25.WorldMapElement_get(this.getElement()); + this.element = Canvas.getObjectDefinition(this.objectDefId).transform().mapIconId; + this.label = this.region.createMapLabel(Client.WorldMapElement_get(this.element)); + WorldMapElement var1 = Client.WorldMapElement_get(this.getElement()); Sprite var2 = var1.getSpriteBool(false); if (var2 != null) { this.subWidth = var2.subWidth; @@ -121,42 +127,113 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { } - @ObfuscatedName("t") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "39" + signature = "(I)Ljava/security/SecureRandom;", + garbageValue = "1486718795" ) - public static int method407(int var0) { - return WorldMapRectangle.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var0]); + static SecureRandom method348() { + SecureRandom var0 = new SecureRandom(); + var0.nextInt(); + return var0; } - @ObfuscatedName("gz") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "265635085" + signature = "([BIIIIIIILem;[Lfz;I)V", + garbageValue = "1704898412" ) - @Export("setWindowedMode") - static void setWindowedMode(int var0) { - Client.field893 = 0L; - if (var0 >= 2) { - Client.isResizable = true; - } else { - Client.isResizable = false; - } + static final void method365(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, Scene var8, CollisionMap[] var9) { + Buffer var10 = new Buffer(var0); + int var11 = -1; - if (ApproximateRouteStrategy.getWindowedMode() == 1) { - WorldMapSection1.client.setMaxCanvasSize(765, 503); - } else { - WorldMapSection1.client.setMaxCanvasSize(7680, 2160); - } + while (true) { + int var12 = var10.method5732(); + if (var12 == 0) { + return; + } - if (Client.gameState >= 25) { - PacketBufferNode var1 = FaceNormal.getPacketBufferNode(ClientPacket.field2257, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(ApproximateRouteStrategy.getWindowedMode()); - var1.packetBuffer.writeShort(WorldMapLabel.canvasWidth); - var1.packetBuffer.writeShort(Varps.canvasHeight); - Client.packetWriter.addNode(var1); - } + var11 += var12; + int var13 = 0; + while (true) { + int var14 = var10.readUShortSmart(); + if (var14 == 0) { + break; + } + + var13 += var14 - 1; + int var15 = var13 & 63; + int var16 = var13 >> 6 & 63; + int var17 = var13 >> 12; + int var18 = var10.readUnsignedByte(); + int var19 = var18 >> 2; + int var20 = var18 & 3; + if (var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) { + ObjectDefinition var21 = Canvas.getObjectDefinition(var11); + int var24 = var16 & 7; + int var25 = var15 & 7; + int var27 = var21.sizeX; + int var28 = var21.sizeY; + int var29; + if ((var20 & 1) == 1) { + var29 = var27; + var27 = var28; + var28 = var29; + } + + int var26 = var7 & 3; + int var23; + if (var26 == 0) { + var23 = var24; + } else if (var26 == 1) { + var23 = var25; + } else if (var26 == 2) { + var23 = 7 - var24 - (var27 - 1); + } else { + var23 = 7 - var25 - (var28 - 1); + } + + var29 = var23 + var2; + int var32 = var16 & 7; + int var33 = var15 & 7; + int var35 = var21.sizeX; + int var36 = var21.sizeY; + int var37; + if ((var20 & 1) == 1) { + var37 = var35; + var35 = var36; + var36 = var37; + } + + int var34 = var7 & 3; + int var31; + if (var34 == 0) { + var31 = var33; + } else if (var34 == 1) { + var31 = 7 - var32 - (var35 - 1); + } else if (var34 == 2) { + var31 = 7 - var33 - (var36 - 1); + } else { + var31 = var32; + } + + var37 = var31 + var3; + if (var29 > 0 && var37 > 0 && var29 < 103 && var37 < 103) { + int var38 = var1; + if ((Tiles.Tiles_renderFlags[1][var29][var37] & 2) == 2) { + var38 = var1 - 1; + } + + CollisionMap var39 = null; + if (var38 >= 0) { + var39 = var9[var38]; + } + + class41.method623(var1, var29, var37, var11, var20 + var7 & 3, var19, var8, var39); + } + } + } + } } } diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java index a55027a88b..095a2aacfe 100644 --- a/runescape-client/src/main/java/WorldMapLabel.java +++ b/runescape-client/src/main/java/WorldMapLabel.java @@ -5,47 +5,64 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("au") +@ObfuscatedName("ar") @Implements("WorldMapLabel") public class WorldMapLabel { - @ObfuscatedName("q") - public static short[] field278; - @ObfuscatedName("c") + @ObfuscatedName("re") @ObfuscatedGetter( - intValue = 710663083 + intValue = 1522349817 ) - @Export("canvasWidth") - public static int canvasWidth; - @ObfuscatedName("fz") + static int field275; + @ObfuscatedName("n") + static byte[][][] field269; + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "Ley;" + signature = "Lic;" ) - @Export("urlRequester") - static UrlRequester urlRequester; - @ObfuscatedName("x") + @Export("Widget_fontsArchive") + static AbstractArchive Widget_fontsArchive; + @ObfuscatedName("ek") + @ObfuscatedSignature( + signature = "Lig;" + ) + @Export("archive15") + static Archive archive15; + @ObfuscatedName("ez") + @ObfuscatedGetter( + intValue = -1537954811 + ) + @Export("port3") + static int port3; + @ObfuscatedName("fm") + @ObfuscatedSignature( + signature = "Lko;" + ) + @Export("fontPlain11") + static Font fontPlain11; + @ObfuscatedName("m") @Export("text") String text; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 622921631 + intValue = -1110407141 ) @Export("width") int width; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 939857441 + intValue = 1740933995 ) @Export("height") int height; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lae;" + signature = "Lah;" ) @Export("size") WorldMapLabelSize size; @ObfuscatedSignature( - signature = "(Ljava/lang/String;IILae;)V" + signature = "(Ljava/lang/String;IILah;)V" ) WorldMapLabel(String var1, int var2, int var3, WorldMapLabelSize var4) { this.text = var1; @@ -54,105 +71,555 @@ public class WorldMapLabel { this.size = var4; } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "-461076613" + signature = "(II)Z", + garbageValue = "578317705" ) - static int method517(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 = MusicPatchNode.getWidget(var3); - if (var6.children == null) { - var6.children = new Widget[var5 + 1]; - } + public static boolean method487(int var0) { + return (var0 & 1) != 0; + } - 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) { - GrandExchangeOfferNameComparator.field115 = var12; - } else { - Interpreter.field1130 = var12; - } - - ItemContainer.invalidateWidget(var6); - return 1; - } - } + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(Lbu;II)V", + garbageValue = "1472646677" + ) + @Export("runScript") + static void runScript(ScriptEvent var0, int var1) { + Object[] var2 = var0.args; + Script var3; + int var17; + if (ArchiveDiskActionHandler.isWorldMapEvent(var0.type)) { + WorldMapSection3.worldMapEvent = (WorldMapEvent)var2[0]; + WorldMapElement var4 = Client.WorldMapElement_get(WorldMapSection3.worldMapEvent.mapElement); + var3 = class4.getWorldMapScript(var0.type, var4.objectId, var4.category); } else { - Widget var9; - if (var0 == ScriptOpcodes.CC_DELETE) { - var9 = var2 ? GrandExchangeOfferNameComparator.field115 : Interpreter.field1130; - Widget var10 = MusicPatchNode.getWidget(var9.id); - var10.children[var9.childIndex] = null; - ItemContainer.invalidateWidget(var10); - return 1; - } else if (var0 == ScriptOpcodes.CC_DELETEALL) { - var9 = MusicPatchNode.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - var9.children = null; - ItemContainer.invalidateWidget(var9); - return 1; - } else if (var0 != ScriptOpcodes.CC_FIND) { - if (var0 == ScriptOpcodes.IF_FIND) { - var9 = MusicPatchNode.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - if (var9 != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - if (var2) { - GrandExchangeOfferNameComparator.field115 = var9; - } else { - Interpreter.field1130 = var9; + var17 = (Integer)var2[0]; + var3 = WorldMapSection0.getScript(var17); + } + + if (var3 != null) { + UrlRequester.Interpreter_intStackSize = 0; + WorldMapEvent.Interpreter_stringStackSize = 0; + var17 = -1; + int[] var5 = var3.opcodes; + int[] var6 = var3.intOperands; + byte var7 = -1; + Interpreter.Interpreter_frameDepth = 0; + Interpreter.field1125 = false; + + try { + int var10; + try { + Interpreter.Interpreter_intLocals = new int[var3.localIntCount]; + int var8 = 0; + Interpreter.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 * 40459347 * 1532053467 : -1; + } + + if (var11 == -2147483644) { + var11 = var0.opIndex; + } + + if (var11 == -2147483643) { + var11 = var0.widget != null ? var0.widget.childIndex * 1593342751 * 94060767 : -1; + } + + if (var11 == -2147483642) { + var11 = var0.dragTarget != null ? var0.dragTarget.id * 40459347 * 1532053467 : -1; + } + + if (var11 == -2147483641) { + var11 = var0.dragTarget != null ? var0.dragTarget.childIndex * 1593342751 * 94060767 : -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; + } + + Interpreter.Interpreter_stringLocals[var9++] = var18; } - } 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 = GrandExchangeOfferUnitPriceComparator.getWidgetChild(var3, var4); - if (var11 != null && var4 != -1) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - if (var2) { - GrandExchangeOfferNameComparator.field115 = var11; - } else { - Interpreter.field1130 = var11; + var10 = 0; + Interpreter.field1132 = var0.field600; + + 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 = class307.method5650(var29, var3, var32); + switch(var20) { + case 0: + return; + case 1: + default: + break; + case 2: + throw new IllegalStateException(); + } + } else if (var29 == 0) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var6[var17]; + } else if (var29 == ScriptOpcodes.GET_VARP) { + var11 = var6[var17]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Varps.Varps_main[var11]; + } else if (var29 == ScriptOpcodes.SET_VARP) { + var11 = var6[var17]; + Varps.Varps_main[var11] = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + WorldMapSection0.changeGameOptions(var11); + } else if (var29 == ScriptOpcodes.SCONST) { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3.stringOperands[var17]; + } else if (var29 == ScriptOpcodes.JUMP) { + var17 += var6[var17]; + } else if (var29 == ScriptOpcodes.IF_ICMPNE) { + UrlRequester.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]) { + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.IF_ICMPEQ) { + UrlRequester.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]) { + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.IF_ICMPLT) { + UrlRequester.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]) { + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.IF_ICMPGT) { + UrlRequester.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[UrlRequester.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; + Interpreter.Interpreter_stringLocals = var34.stringLocals; + } else if (var29 == ScriptOpcodes.GET_VARBIT) { + var11 = var6[var17]; + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Widget.getVarbit(var11); + } else if (var29 == ScriptOpcodes.SET_VARBIT) { + var11 = var6[var17]; + class257.method4679(var11, Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); + } else if (var29 == ScriptOpcodes.IF_ICMPLE) { + UrlRequester.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]) { + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.IF_ICMPGE) { + UrlRequester.Interpreter_intStackSize -= 2; + if (Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]) { + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.ILOAD) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Interpreter.Interpreter_intLocals[var6[var17]]; + } else if (var29 == ScriptOpcodes.ISTORE) { + Interpreter.Interpreter_intLocals[var6[var17]] = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + } else if (var29 == ScriptOpcodes.SLOAD) { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = Interpreter.Interpreter_stringLocals[var6[var17]]; + } else if (var29 == ScriptOpcodes.SSTORE) { + Interpreter.Interpreter_stringLocals[var6[var17]] = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; + } else if (var29 == ScriptOpcodes.JOIN_STRING) { + var11 = var6[var17]; + WorldMapEvent.Interpreter_stringStackSize -= var11; + String var31 = StructDefinition.method4718(Interpreter.Interpreter_stringStack, WorldMapEvent.Interpreter_stringStackSize, var11); + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var31; + } else if (var29 == ScriptOpcodes.POP_INT) { + --UrlRequester.Interpreter_intStackSize; + } else if (var29 == ScriptOpcodes.POP_STRING) { + --WorldMapEvent.Interpreter_stringStackSize; + } else { + int var15; + if (var29 != ScriptOpcodes.INVOKE) { + if (var29 == ScriptOpcodes.GET_VARC_INT) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = AttackOption.varcs.getInt(var6[var17]); + } else if (var29 == ScriptOpcodes.SET_VARC_INT) { + AttackOption.varcs.setInt(var6[var17], Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); + } else if (var29 == ScriptOpcodes.DEFINE_ARRAY) { + var11 = var6[var17] >> 16; + var20 = var6[var17] & 65535; + int var21 = Interpreter.Interpreter_intStack[--UrlRequester.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[--UrlRequester.Interpreter_intStackSize]; + if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { + throw new RuntimeException(); + } + + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var11][var20]; + } else if (var29 == ScriptOpcodes.SET_ARRAY_INT) { + var11 = var6[var17]; + UrlRequester.Interpreter_intStackSize -= 2; + var20 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { + throw new RuntimeException(); + } + + Interpreter.Interpreter_arrays[var11][var20] = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + } else if (var29 == ScriptOpcodes.GET_VARC_STRING_OLD) { + var18 = AttackOption.varcs.getStringOld(var6[var17]); + if (var18 == null) { + var18 = "null"; + } + + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var18; + } else if (var29 == ScriptOpcodes.SET_VARC_STRING_OLD) { + AttackOption.varcs.setStringOld(var6[var17], Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]); + } else if (var29 == ScriptOpcodes.GET_VARC_STRING) { + var18 = AttackOption.varcs.getString(var6[var17]); + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var18; + } else if (var29 == ScriptOpcodes.SET_VARC_STRING) { + AttackOption.varcs.setString(var6[var17], Interpreter.Interpreter_stringStack[--WorldMapEvent.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[--UrlRequester.Interpreter_intStackSize]); + if (var30 != null) { + var17 += var30.integer; + } + } + } else { + var11 = var6[var17]; + Script var12 = WorldMapSection0.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 + (UrlRequester.Interpreter_intStackSize - var12.intArgumentCount)]; + } + + for (var15 = 0; var15 < var12.stringArgumentCount; ++var15) { + var14[var15] = Interpreter.Interpreter_stringStack[var15 + (WorldMapEvent.Interpreter_stringStackSize - var12.stringArgumentCount)]; + } + + UrlRequester.Interpreter_intStackSize -= var12.intArgumentCount; + WorldMapEvent.Interpreter_stringStackSize -= var12.stringArgumentCount; + ScriptFrame var19 = new ScriptFrame(); + var19.script = var3; + var19.pc = var17; + var19.intLocals = Interpreter.Interpreter_intLocals; + var19.stringLocals = Interpreter.Interpreter_stringLocals; + Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var19; + var3 = var12; + var5 = var12.opcodes; + var6 = var12.intOperands; + var17 = -1; + Interpreter.Interpreter_intLocals = var13; + Interpreter.Interpreter_stringLocals = var14; + } + } } - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } 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); + class197.RunException_sendStackTrace(var24.toString(), var27); + } + } finally { + if (Interpreter.field1125) { + Interpreter.field1118 = true; + class217.method4092(); + Interpreter.field1118 = false; + Interpreter.field1125 = false; } - return 1; } } } + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(IB)J", + garbageValue = "88" + ) + public static long method482(int var0) { + return ViewportMouse.ViewportMouse_entityTags[var0]; + } + + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "(II)I", + garbageValue = "807704553" + ) + @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("ff") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1944038316" + ) + static final void method488() { + int var0 = class204.field2420 * 128 + 64; + int var1 = WorldMapManager.field348 * 128 + 64; + int var2 = Language.getTileHeight(var0, var1, TileItemPile.Client_plane) - field275; + if (MouseHandler.cameraX < var0) { + MouseHandler.cameraX = (var0 - MouseHandler.cameraX) * ScriptEvent.field604 / 1000 + MouseHandler.cameraX + class25.field122; + if (MouseHandler.cameraX > var0) { + MouseHandler.cameraX = var0; + } + } + + if (MouseHandler.cameraX > var0) { + MouseHandler.cameraX -= ScriptEvent.field604 * (MouseHandler.cameraX - var0) / 1000 + class25.field122; + if (MouseHandler.cameraX < var0) { + MouseHandler.cameraX = var0; + } + } + + if (WorldMapSection3.cameraY < var2) { + WorldMapSection3.cameraY = (var2 - WorldMapSection3.cameraY) * ScriptEvent.field604 / 1000 + WorldMapSection3.cameraY + class25.field122; + if (WorldMapSection3.cameraY > var2) { + WorldMapSection3.cameraY = var2; + } + } + + if (WorldMapSection3.cameraY > var2) { + WorldMapSection3.cameraY -= ScriptEvent.field604 * (WorldMapSection3.cameraY - var2) / 1000 + class25.field122; + if (WorldMapSection3.cameraY < var2) { + WorldMapSection3.cameraY = var2; + } + } + + if (ObjectSound.cameraZ < var1) { + ObjectSound.cameraZ = (var1 - ObjectSound.cameraZ) * ScriptEvent.field604 / 1000 + ObjectSound.cameraZ + class25.field122; + if (ObjectSound.cameraZ > var1) { + ObjectSound.cameraZ = var1; + } + } + + if (ObjectSound.cameraZ > var1) { + ObjectSound.cameraZ -= ScriptEvent.field604 * (ObjectSound.cameraZ - var1) / 1000 + class25.field122; + if (ObjectSound.cameraZ < var1) { + ObjectSound.cameraZ = var1; + } + } + + var0 = DevicePcmPlayerProvider.field435 * 128 + 64; + var1 = class9.field42 * 128 + 64; + var2 = Language.getTileHeight(var0, var1, TileItemPile.Client_plane) - class206.field2446; + int var3 = var0 - MouseHandler.cameraX; + int var4 = var2 - WorldMapSection3.cameraY; + int var5 = var1 - ObjectSound.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 (TilePaint.cameraPitch < var7) { + TilePaint.cameraPitch = (var7 - TilePaint.cameraPitch) * WorldMapCacheName.field329 / 1000 + TilePaint.cameraPitch + class329.field3867; + if (TilePaint.cameraPitch > var7) { + TilePaint.cameraPitch = var7; + } + } + + if (TilePaint.cameraPitch > var7) { + TilePaint.cameraPitch -= WorldMapCacheName.field329 * (TilePaint.cameraPitch - var7) / 1000 + class329.field3867; + if (TilePaint.cameraPitch < var7) { + TilePaint.cameraPitch = var7; + } + } + + int var9 = var8 - Canvas.cameraYaw; + if (var9 > 1024) { + var9 -= 2048; + } + + if (var9 < -1024) { + var9 += 2048; + } + + if (var9 > 0) { + Canvas.cameraYaw = Canvas.cameraYaw + class329.field3867 + var9 * WorldMapCacheName.field329 / 1000; + Canvas.cameraYaw &= 2047; + } + + if (var9 < 0) { + Canvas.cameraYaw -= class329.field3867 + -var9 * WorldMapCacheName.field329 / 1000; + Canvas.cameraYaw &= 2047; + } + + int var10 = var8 - Canvas.cameraYaw; + if (var10 > 1024) { + var10 -= 2048; + } + + if (var10 < -1024) { + var10 += 2048; + } + + if (var10 < 0 && var9 > 0 || var10 > 0 && var9 < 0) { + Canvas.cameraYaw = var8; + } + + } + + @ObfuscatedName("il") + @ObfuscatedSignature( + signature = "(Lhd;III)V", + garbageValue = "-488696963" + ) + @Export("alignWidgetPosition") + static void alignWidgetPosition(Widget var0, int var1, int var2) { + if (var0.xAlignment == 0) { + var0.x = var0.rawX; + } else if (var0.xAlignment == 1) { + var0.x = var0.rawX + (var1 - var0.width) / 2; + } else if (var0.xAlignment == 2) { + var0.x = var1 - var0.width - var0.rawX; + } else if (var0.xAlignment == 3) { + var0.x = var0.rawX * var1 >> 14; + } else if (var0.xAlignment == 4) { + var0.x = (var1 - var0.width) / 2 + (var0.rawX * var1 >> 14); + } else { + var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); + } + + if (var0.yAlignment == 0) { + var0.y = var0.rawY; + } else if (var0.yAlignment == 1) { + var0.y = (var2 - var0.height) / 2 + var0.rawY; + } else if (var0.yAlignment == 2) { + var0.y = var2 - var0.height - var0.rawY; + } else if (var0.yAlignment == 3) { + var0.y = var2 * var0.rawY >> 14; + } else if (var0.yAlignment == 4) { + var0.y = (var2 - var0.height) / 2 + (var2 * var0.rawY >> 14); + } else { + var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); + } + + } + + @ObfuscatedName("jv") + @ObfuscatedSignature( + signature = "(IIII)Lbz;", + garbageValue = "1553809797" + ) + static final InterfaceParent method486(int var0, int var1, int var2) { + InterfaceParent var3 = new InterfaceParent(); + var3.group = var1; + var3.type = var2; + Client.interfaceParents.put(var3, (long)var0); + WorldMapSection3.Widget_resetModelFrames(var1); + Widget var4 = WorldMapSprite.getWidget(var0); + class234.invalidateWidget(var4); + if (Client.meslayerContinueWidget != null) { + class234.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; + } + } + + WorldMapEvent.method840(class69.menuWidth / 2 + WorldMapRectangle.menuX, Frames.menuY); + WorldMapIcon_0.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var0 >> 16], var4, false); + UserComparator4.runWidgetOnLoadListener(var1); + if (Client.rootInterface != -1) { + Language.runIntfCloseListeners(Client.rootInterface, 1); + } + + return var3; + } } diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java index dc0b0c8909..9356fd0246 100644 --- a/runescape-client/src/main/java/WorldMapLabelSize.java +++ b/runescape-client/src/main/java/WorldMapLabelSize.java @@ -4,58 +4,53 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ae") +@ObfuscatedName("ah") @Implements("WorldMapLabelSize") public class WorldMapLabelSize { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lae;" + signature = "Lah;" ) @Export("WorldMapLabelSize_small") public static final WorldMapLabelSize WorldMapLabelSize_small; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lae;" + signature = "Lah;" ) @Export("WorldMapLabelSize_medium") public static final WorldMapLabelSize WorldMapLabelSize_medium; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lae;" + signature = "Lah;" ) @Export("WorldMapLabelSize_large") public static final WorldMapLabelSize WorldMapLabelSize_large; - @ObfuscatedName("p") + @ObfuscatedName("ey") + @ObfuscatedGetter( + intValue = 1573352615 + ) + static int field134; + @ObfuscatedName("fw") @ObfuscatedSignature( - signature = "Lle;" + signature = "Leh;" ) - static IndexedSprite field160; - @ObfuscatedName("ad") + @Export("urlRequester") + static UrlRequester urlRequester; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1219677423 + intValue = 20574645 ) - static int field158; - @ObfuscatedName("ed") + final int field130; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1644127547 + intValue = 1754805069 ) - @Export("port1") - static int port1; - @ObfuscatedName("d") + final int field132; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 17541419 + intValue = 629937619 ) - final int field153; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 1519176047 - ) - final int field155; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 2055310893 - ) - final int field152; + final int field133; static { WorldMapLabelSize_small = new WorldMapLabelSize(1, 0, 4); @@ -64,285 +59,63 @@ public class WorldMapLabelSize { } WorldMapLabelSize(int var1, int var2, int var3) { - this.field153 = var1; - this.field155 = var2; - this.field152 = var3; + this.field130 = var1; + this.field132 = var2; + this.field133 = var3; } @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(FB)Z", - garbageValue = "-55" + signature = "(FI)Z", + garbageValue = "-645861568" ) - boolean method289(float var1) { - return var1 >= (float)this.field152; + boolean method246(float var1) { + return var1 >= (float)this.field133; } - @ObfuscatedName("x") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)[Lae;", - garbageValue = "-1367790562" + signature = "(III)Lhd;", + garbageValue = "-756668004" ) - static WorldMapLabelSize[] method284() { - return new WorldMapLabelSize[]{WorldMapLabelSize_large, WorldMapLabelSize_medium, WorldMapLabelSize_small}; - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(Liy;Liy;ZI)V", - garbageValue = "-1100564340" - ) - public static void method290(AbstractArchive var0, AbstractArchive var1, boolean var2) { - ObjectDefinition.ObjectDefinition_archive = var0; - ObjectDefinition.ObjectDefinition_modelsArchive = var1; - ObjectDefinition.ObjectDefinition_isLowDetail = var2; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(ZZB)I", - garbageValue = "98" - ) - public static int method292(boolean var0, boolean var1) { - byte var2 = 0; - int var3 = var2 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount; - return var3; - } - - @ObfuscatedName("ia") - @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "723862906" - ) - static boolean method282(int var0) { - return var0 == 57 || var0 == 58 || var0 == 1007 || var0 == 25 || var0 == 30; - } - - @ObfuscatedName("jq") - @ObfuscatedSignature( - signature = "(Lhe;III)V", - garbageValue = "255772747" - ) - @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; + @Export("getWidgetChild") + public static Widget getWidgetChild(int var0, int var1) { + Widget var2 = WorldMapSprite.getWidget(var0); + if (var1 == -1) { + return var2; } else { - var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); + return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; } - - 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); - } - } - @ObfuscatedName("jj") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lhe;III)V", - garbageValue = "-1189563111" + signature = "(I)Z", + garbageValue = "1950669116" ) - static final void method288(Widget var0, int var1, int var2) { - if (var0.buttonType == 1) { - IgnoreList.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); - } + public static boolean method251() { + return class206.field2439 != 0 ? true : WorldMapSprite.midiPcmStream.isReady(); + } - String var3; - if (var0.buttonType == 2 && !Client.isSpellSelected) { - var3 = PrivateChatMode.method5965(var0); - if (var3 != null) { - IgnoreList.insertMenuItemNoShift(var3, class297.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); - } - } + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1407102588" + ) + static final void method249() { + Object var10000 = null; + String var0 = "You can't add yourself to your own friend list"; + ObjectSound.addGameMessage(30, "", var0); + } - if (var0.buttonType == 3) { - IgnoreList.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); - } - - if (var0.buttonType == 4) { - IgnoreList.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); - } - - if (var0.buttonType == 5) { - IgnoreList.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); - } - - if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { - IgnoreList.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); - } - - int var4; - int var19; - if (var0.type == 2) { - var19 = 0; - - for (var4 = 0; var4 < var0.height; ++var4) { - for (int var5 = 0; var5 < var0.width; ++var5) { - int var6 = (var0.paddingX + 32) * var5; - int var7 = (var0.paddingY + 32) * var4; - if (var19 < 20) { - var6 += var0.inventoryXOffsets[var19]; - var7 += var0.inventoryYOffsets[var19]; - } - - if (var1 >= var6 && var2 >= var7 && var1 < var6 + 32 && var2 < var7 + 32) { - Client.dragItemSlotDestination = var19; - RouteStrategy.field2106 = var0; - if (var0.itemIds[var19] > 0) { - label336: { - ItemDefinition var8 = AbstractWorldMapData.ItemDefinition_get(var0.itemIds[var19] - 1); - boolean var9; - int var10; - if (Client.isItemSelected == 1) { - var10 = ScriptEvent.getWidgetClickMask(var0); - var9 = (var10 >> 30 & 1) != 0; - if (var9) { - if (var0.id != WorldMapSection2.selectedItemWidget || var19 != Client.selectedItemSlot) { - IgnoreList.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class297.colorStartTag(16748608) + var8.name, 31, var8.id, var19, var0.id); - } - break label336; - } - } - - if (Client.isSpellSelected) { - var10 = ScriptEvent.getWidgetClickMask(var0); - var9 = (var10 >> 30 & 1) != 0; - if (var9) { - if ((AbstractWorldMapIcon.selectedSpellFlags & 16) == 16) { - IgnoreList.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class297.colorStartTag(16748608) + var8.name, 32, var8.id, var19, var0.id); - } - break label336; - } - } - - String[] var20 = var8.inventoryActions; - var10 = -1; - boolean var11; - if (Client.shiftClickDrop) { - var11 = Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; - if (var11) { - var10 = var8.getShiftClickIndex(); - } - } - - int var12 = ScriptEvent.getWidgetClickMask(var0); - var11 = (var12 >> 30 & 1) != 0; - if (var11) { - for (int var13 = 4; var13 >= 3; --var13) { - if (var13 != var10) { - ItemContainer.addWidgetItemMenuItem(var0, var8, var19, var13, false); - } - } - } - - int var14 = ScriptEvent.getWidgetClickMask(var0); - boolean var23 = (var14 >> 31 & 1) != 0; - if (var23) { - IgnoreList.insertMenuItemNoShift("Use", class297.colorStartTag(16748608) + var8.name, 38, var8.id, var19, var0.id); - } - - int var16 = ScriptEvent.getWidgetClickMask(var0); - boolean var15 = (var16 >> 30 & 1) != 0; - int var17; - if (var15) { - for (var17 = 2; var17 >= 0; --var17) { - if (var17 != var10) { - ItemContainer.addWidgetItemMenuItem(var0, var8, var19, var17, false); - } - } - - if (var10 >= 0) { - ItemContainer.addWidgetItemMenuItem(var0, var8, var19, var10, true); - } - } - - var20 = var0.itemActions; - if (var20 != null) { - for (var17 = 4; var17 >= 0; --var17) { - if (var20[var17] != null) { - byte var18 = 0; - if (var17 == 0) { - var18 = 39; - } - - if (var17 == 1) { - var18 = 40; - } - - if (var17 == 2) { - var18 = 41; - } - - if (var17 == 3) { - var18 = 42; - } - - if (var17 == 4) { - var18 = 43; - } - - IgnoreList.insertMenuItemNoShift(var20[var17], class297.colorStartTag(16748608) + var8.name, var18, var8.id, var19, var0.id); - } - } - } - - IgnoreList.insertMenuItemNoShift("Examine", class297.colorStartTag(16748608) + var8.name, 1005, var8.id, var19, var0.id); - } - } - } - - ++var19; - } - } - } - - if (var0.isIf3) { - if (Client.isSpellSelected) { - if (class194.method3694(ScriptEvent.getWidgetClickMask(var0)) && (AbstractWorldMapIcon.selectedSpellFlags & 32) == 32) { - IgnoreList.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); - } - } else { - for (var19 = 9; var19 >= 5; --var19) { - String var21 = class217.method4036(var0, var19); - if (var21 != null) { - IgnoreList.insertMenuItemNoShift(var21, var0.dataText, 1007, var19 + 1, var0.childIndex, var0.id); - } - } - - var3 = PrivateChatMode.method5965(var0); - if (var3 != null) { - IgnoreList.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); - } - - for (var4 = 4; var4 >= 0; --var4) { - String var22 = class217.method4036(var0, var4); - if (var22 != null) { - ScriptFrame.insertMenuItem(var22, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.field2658); - } - } - - if (LoginScreenAnimation.method1939(ScriptEvent.getWidgetClickMask(var0))) { - IgnoreList.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); - } - } + @ObfuscatedName("kw") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "2140827250" + ) + static void method247() { + if (Client.oculusOrbState == 1) { + Client.field756 = true; } } diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java index 7ac5c2b62c..08a5f4ee6d 100644 --- a/runescape-client/src/main/java/WorldMapManager.java +++ b/runescape-client/src/main/java/WorldMapManager.java @@ -10,105 +10,98 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("aj") +@ObfuscatedName("aa") @Implements("WorldMapManager") public final class WorldMapManager { - @ObfuscatedName("qd") - @ObfuscatedSignature( - signature = "Ldw;" + @ObfuscatedName("rn") + @ObfuscatedGetter( + intValue = -1416304591 ) - @Export("pcmPlayer0") - static PcmPlayer pcmPlayer0; - @ObfuscatedName("dj") - @ObfuscatedSignature( - signature = "Lfr;" - ) - @Export("js5SocketTask") - static Task js5SocketTask; - @ObfuscatedName("x") + static int field348; + @ObfuscatedName("m") @Export("loaded") boolean loaded; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("loadStarted") boolean loadStarted; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lad;" + signature = "Laz;" ) @Export("mapAreaData") WorldMapAreaData mapAreaData; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lla;" + signature = "Llz;" ) @Export("compositeTextureSprite") Sprite compositeTextureSprite; - @ObfuscatedName("w") + @ObfuscatedName("p") @Export("icons") HashMap icons; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "[[Lao;" + signature = "[[Lap;" ) @Export("regions") WorldMapRegion[][] regions; - @ObfuscatedName("q") + @ObfuscatedName("n") @Export("scaleHandlers") HashMap scaleHandlers; - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "[Lle;" + signature = "[Llh;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "Liy;" + signature = "Lic;" ) @Export("geographyArchive") final AbstractArchive geographyArchive; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Liy;" + signature = "Lic;" ) @Export("groundArchive") final AbstractArchive groundArchive; - @ObfuscatedName("s") + @ObfuscatedName("w") @Export("fonts") final HashMap fonts; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1440050247 + intValue = 1626550247 ) @Export("tileX") int tileX; - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 2084338799 + intValue = -265170969 ) @Export("tileY") int tileY; - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1804049707 + intValue = 2094787343 ) @Export("tileWidth") int tileWidth; - @ObfuscatedName("h") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 793863639 + intValue = -750399835 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("g") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1333710855 + intValue = -963594831 ) @Export("pixelsPerTile") public int pixelsPerTile; @ObfuscatedSignature( - signature = "([Lle;Ljava/util/HashMap;Liy;Liy;)V" + signature = "([Llh;Ljava/util/HashMap;Lic;Lic;)V" ) public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, AbstractArchive var4) { this.loaded = false; @@ -121,10 +114,10 @@ public final class WorldMapManager { this.groundArchive = var4; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Liy;Ljava/lang/String;ZI)V", - garbageValue = "1660505626" + signature = "(Lic;Ljava/lang/String;ZI)V", + garbageValue = "2141843540" ) @Export("load") public void load(AbstractArchive var1, String var2, boolean var3) { @@ -132,10 +125,10 @@ public final class WorldMapManager { this.loaded = false; this.loadStarted = true; System.nanoTime(); - int var4 = var1.getGroupId(WorldMapCacheName.field339.name); + int var4 = var1.getGroupId(WorldMapCacheName.field322.name); int var5 = var1.getFileId(var4, var2); - Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field339.name, var2)); - Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field340.name, var2)); + Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field322.name, var2)); + Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field325.name, var2)); System.nanoTime(); System.nanoTime(); this.mapAreaData = new WorldMapAreaData(); @@ -157,7 +150,7 @@ public final class WorldMapManager { int var9 = this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1; System.nanoTime(); System.nanoTime(); - PendingSpawn.method1840(); + WorldMapRegion.WorldMapRegion_cachedSprites.clear(); this.regions = new WorldMapRegion[var16][var9]; Iterator var10 = this.mapAreaData.worldMapData0Set.iterator(); @@ -182,9 +175,9 @@ public final class WorldMapManager { System.nanoTime(); System.nanoTime(); - if (var1.isValidFileName(WorldMapCacheName.field341.name, var2)) { - byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field341.name, var2); - this.compositeTextureSprite = class200.convertJpgToSprite(var20); + if (var1.isValidFileName(WorldMapCacheName.field324.name, var2)) { + byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field324.name, var2); + this.compositeTextureSprite = FloorUnderlayDefinition.convertJpgToSprite(var20); } System.nanoTime(); @@ -194,20 +187,20 @@ public final class WorldMapManager { } } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "2062651870" + garbageValue = "1532053467" ) @Export("clearIcons") public final void clearIcons() { this.icons = null; } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IIIIIIIIB)V", - garbageValue = "8" + signature = "(IIIIIIIII)V", + garbageValue = "-2041483003" ) @Export("drawTiles") public final void drawTiles(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { @@ -227,7 +220,7 @@ public final class WorldMapManager { } int var23 = var13.width + var13.x - 1; - int var17 = var13.height + var13.y - 1; + int var17 = var13.y + var13.height - 1; int var18; int var19; @@ -244,17 +237,17 @@ public final class WorldMapManager { int var20 = var2 + this.tileY; 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].method519(var5 + (this.regions[var21][var22].regionX * 64 - var19) * var18 / 64, var8 - (this.regions[var21][var22].regionY * 64 - var20 + 64) * var18 / 64, var18); + for (int var22 = var13.y; var22 < var13.y + var13.height; ++var22) { + this.regions[var21][var22].method490(var5 + (this.regions[var21][var22].regionX * 64 - var19) * var18 / 64, var8 - (this.regions[var21][var22].regionY * 64 - var20 + 64) * var18 / 64, var18); } } } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZB)V", - garbageValue = "18" + signature = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZI)V", + garbageValue = "531249052" ) @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) { @@ -272,13 +265,13 @@ public final class WorldMapManager { this.regions[var19][var20].initWorldMapIcon1s(); } - this.regions[var19][var20].method529(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); + this.regions[var19][var20].method514(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); } } if (var10 != null && var11 > 0) { for (var19 = var14.x; var19 < var14.width + var14.x; ++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); } } @@ -286,10 +279,10 @@ public final class WorldMapManager { } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(IIIILjava/util/HashSet;IIB)V", - garbageValue = "73" + garbageValue = "-52" ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4, HashSet var5, int var6, int var7) { @@ -326,12 +319,12 @@ public final class WorldMapManager { } } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(IIIIIIIIIII)Ljava/util/List;", - garbageValue = "1400578411" + signature = "(IIIIIIIIIIB)Ljava/util/List;", + garbageValue = "7" ) - public List method722(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { + public List method695(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; @@ -343,8 +336,8 @@ public final class WorldMapManager { int var16 = var2 + this.tileY; for (int var17 = var12.x; var17 < var12.width + var12.x; ++var17) { - for (int var18 = var12.y; var18 < var12.height + var12.y; ++var18) { - List var19 = this.regions[var17][var18].method606(var5 + (this.regions[var17][var18].regionX * 64 - var15) * var14 / 64, var8 + var6 - (this.regions[var17][var18].regionY * 64 - var16 + 64) * var14 / 64, var14, var9, var10); + for (int var18 = var12.y; var18 < var12.y + var12.height; ++var18) { + List var19 = this.regions[var17][var18].method544(var5 + (this.regions[var17][var18].regionX * 64 - var15) * var14 / 64, var8 + var6 - (this.regions[var17][var18].regionY * 64 - var16 + 64) * var14 / 64, var14, var9, var10); if (!var19.isEmpty()) { var11.addAll(var19); } @@ -355,10 +348,10 @@ public final class WorldMapManager { } } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(IIIII)Lar;", - garbageValue = "-1850062895" + signature = "(IIIII)Lag;", + garbageValue = "-1190093558" ) @Export("createWorldMapRectangle") WorldMapRectangle createWorldMapRectangle(int var1, int var2, int var3, int var4) { @@ -398,20 +391,20 @@ public final class WorldMapManager { return var5; } - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(B)Z", - garbageValue = "8" + garbageValue = "0" ) @Export("isLoaded") public boolean isLoaded() { return this.loaded; } - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(B)Ljava/util/HashMap;", - garbageValue = "-55" + signature = "(I)Ljava/util/HashMap;", + garbageValue = "-518296380" ) @Export("buildIcons") public HashMap buildIcons() { @@ -419,10 +412,10 @@ public final class WorldMapManager { return this.icons; } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1203186095" + signature = "(B)V", + garbageValue = "-84" ) @Export("buildIcons0") void buildIcons0() { @@ -456,10 +449,10 @@ public final class WorldMapManager { } - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(III)F", - garbageValue = "-1899828753" + signature = "(IIB)F", + garbageValue = "-11" ) @Export("getPixelsPerTile") float getPixelsPerTile(int var1, int var2) { @@ -474,33 +467,57 @@ public final class WorldMapManager { } } - @ObfuscatedName("a") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "345752229" + signature = "(I)Z", + garbageValue = "1960710050" ) - static int method750(int var0, Script var1, boolean var2) { - Widget var3 = MusicPatchNode.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; + @Export("isKeyDown") + public static final boolean isKeyDown() { + synchronized(KeyHandler.KeyHandler_instance) { + if (KeyHandler.field416 == KeyHandler.field421) { + return false; + } else { + SecureRandomCallable.field546 = KeyHandler.field413[KeyHandler.field416]; + class58.field442 = KeyHandler.field415[KeyHandler.field416]; + KeyHandler.field416 = KeyHandler.field416 + 1 & 127; + return true; + } + } + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + signature = "(ILcs;ZB)I", + garbageValue = "-25" + ) + static int method717(int var0, Script var1, boolean var2) { + Widget var3 = WorldMapSprite.getWidget(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); + if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = WorldMapID.method617(KeyHandler.getWidgetClickMask(var3)); return 1; + } else if (var0 != ScriptOpcodes.IF_GETOP) { + if (var0 == ScriptOpcodes.IF_GETOPBASE) { + if (var3.dataText == null) { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3.dataText; + } + + return 1; + } else { + return 2; + } } else { - return 2; + int var4 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + --var4; + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3.actions[var4]; + } else { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; + } + + return 1; } } } diff --git a/runescape-client/src/main/java/WorldMapRectangle.java b/runescape-client/src/main/java/WorldMapRectangle.java index d976283114..2062f1da14 100644 --- a/runescape-client/src/main/java/WorldMapRectangle.java +++ b/runescape-client/src/main/java/WorldMapRectangle.java @@ -4,281 +4,134 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ar") +@ObfuscatedName("ag") @Implements("WorldMapRectangle") public final class WorldMapRectangle { - @ObfuscatedName("sw") + @ObfuscatedName("h") + static int[] field198; + @ObfuscatedName("de") @ObfuscatedSignature( - signature = "Lin;" + signature = "Lig;" ) - public static class247 field222; - @ObfuscatedName("rt") + @Export("archive5") + static Archive archive5; + @ObfuscatedName("lj") @ObfuscatedGetter( - intValue = 396400765 + intValue = 677341381 ) - static int field217; - @ObfuscatedName("hj") + @Export("menuX") + static int menuX; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1285501421 - ) - @Export("cameraX") - static int cameraX; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 2118227677 + intValue = 2128861857 ) @Export("width") int width; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -245816907 + intValue = -1397318075 ) @Export("height") int height; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1773088179 + intValue = -2033449825 ) @Export("x") int x; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -409358263 + intValue = 2045769543 ) @Export("y") int y; // $FF: synthetic field @ObfuscatedSignature( - signature = "Laj;" + signature = "Laa;" ) final WorldMapManager this$0; @ObfuscatedSignature( - signature = "(Laj;)V" + signature = "(Laa;)V" ) WorldMapRectangle(WorldMapManager var1) { this.this$0 = var1; } - @ObfuscatedName("m") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-1866970355" + signature = "(III)I", + garbageValue = "-429068240" ) - public static int method388(int var0) { - return var0 >> 11 & 63; + public static int method347(int var0, int var1) { + int var2 = var0 >>> 31; + return (var0 + var2) / var1 - var2; } - @ObfuscatedName("e") - @Export("Entity_unpackID") - public static int Entity_unpackID(long var0) { - return (int)(var0 >>> 17 & 4294967295L); - } - - @ObfuscatedName("gd") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "767205713" + signature = "(ZI)V", + garbageValue = "-349989095" ) - static boolean method386() { - return (Client.drawPlayerNames & 1) != 0; - } - - @ObfuscatedName("in") - @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "-1807339500" - ) - @Export("addSceneMenuOptions") - static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { - if (Client.isItemSelected == 0 && !Client.isSpellSelected) { - IgnoreList.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); + @Export("Login_promptCredentials") + static void Login_promptCredentials(boolean var0) { + Login.Login_response1 = ""; + Login.Login_response2 = "Enter your username/email & password."; + Login.Login_response3 = ""; + Login.loginIndex = 2; + if (var0) { + Login.Login_password = ""; } - long var4 = -1L; - long var6 = -1L; - - int var8; - for (var8 = 0; var8 < SecureRandomCallable.method1250(); ++var8) { - long var9 = WorldMapEvent.method868(var8); - if (var9 != var6) { - var6 = var9; - int var22 = PacketWriter.method2376(var8); - int var12 = WorldMapSectionType.method347(var8); - int var13 = class276.method5036(var8); - int var14 = WorldMapIcon_1.method407(var8); - if (var13 == 2 && GrandExchangeOfferWorldComparator.scene.getObjectFlags(ScriptEvent.Client_plane, var22, var12, var9) >= 0) { - ObjectDefinition var15 = WorldMapSection2.getObjectDefinition(var14); - if (var15.transforms != null) { - var15 = var15.transform(); - } - - if (var15 == null) { - continue; - } - - if (Client.isItemSelected == 1) { - IgnoreList.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class297.colorStartTag(65535) + var15.name, 1, var14, var22, var12); - } else if (Client.isSpellSelected) { - if ((AbstractWorldMapIcon.selectedSpellFlags & 4) == 4) { - IgnoreList.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class297.colorStartTag(65535) + var15.name, 2, var14, var22, var12); - } - } else { - String[] var23 = var15.actions; - if (var23 != null) { - for (int var24 = 4; var24 >= 0; --var24) { - if (var23[var24] != null) { - short var18 = 0; - if (var24 == 0) { - var18 = 3; - } - - if (var24 == 1) { - var18 = 4; - } - - if (var24 == 2) { - var18 = 5; - } - - if (var24 == 3) { - var18 = 6; - } - - if (var24 == 4) { - var18 = 1001; - } - - IgnoreList.insertMenuItemNoShift(var23[var24], class297.colorStartTag(65535) + var15.name, var18, var14, var22, var12); - } - } - } - - IgnoreList.insertMenuItemNoShift("Examine", class297.colorStartTag(65535) + var15.name, 1002, var15.id, var22, var12); - } - } - - int var16; - NPC var17; - Player var19; - int[] var30; - int var32; - if (var13 == 1) { - NPC var27 = Client.npcs[var14]; - if (var27 == null) { - continue; - } - - if (var27.definition.size == 1 && (var27.x & 127) == 64 && (var27.y & 127) == 64) { - for (var16 = 0; var16 < Client.npcCount; ++var16) { - var17 = Client.npcs[Client.npcIndices[var16]]; - if (var17 != null && var17 != var27 && var17.definition.size == 1 && var17.x == var27.x && var27.y == var17.y) { - WorldMapRegion.addNpcToMenu(var17.definition, Client.npcIndices[var16], var22, var12); - } - } - - var16 = Players.Players_count; - var30 = Players.Players_indices; - - for (var32 = 0; var32 < var16; ++var32) { - var19 = Client.players[var30[var32]]; - if (var19 != null && var19.x == var27.x && var27.y == var19.y) { - InterfaceParent.addPlayerToMenu(var19, var30[var32], var22, var12); - } - } - } - - WorldMapRegion.addNpcToMenu(var27.definition, var14, var22, var12); - } - - if (var13 == 0) { - Player var28 = Client.players[var14]; - if (var28 == null) { - continue; - } - - if ((var28.x & 127) == 64 && (var28.y & 127) == 64) { - for (var16 = 0; var16 < Client.npcCount; ++var16) { - var17 = Client.npcs[Client.npcIndices[var16]]; - if (var17 != null && var17.definition.size == 1 && var17.x == var28.x && var28.y == var17.y) { - WorldMapRegion.addNpcToMenu(var17.definition, Client.npcIndices[var16], var22, var12); - } - } - - var16 = Players.Players_count; - var30 = Players.Players_indices; - - for (var32 = 0; var32 < var16; ++var32) { - var19 = Client.players[var30[var32]]; - if (var19 != null && var28 != var19 && var19.x == var28.x && var19.y == var28.y) { - InterfaceParent.addPlayerToMenu(var19, var30[var32], var22, var12); - } - } - } - - if (var14 != Client.combatTargetPlayerIndex) { - InterfaceParent.addPlayerToMenu(var28, var14, var22, var12); - } else { - var4 = var9; - } - } - - if (var13 == 3) { - NodeDeque var29 = Client.groundItems[ScriptEvent.Client_plane][var22][var12]; - if (var29 != null) { - for (TileItem var33 = (TileItem)var29.first(); var33 != null; var33 = (TileItem)var29.next()) { - ItemDefinition var31 = AbstractWorldMapData.ItemDefinition_get(var33.id); - if (Client.isItemSelected == 1) { - IgnoreList.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class297.colorStartTag(16748608) + var31.name, 16, var33.id, var22, var12); - } else if (Client.isSpellSelected) { - if ((AbstractWorldMapIcon.selectedSpellFlags & 1) == 1) { - IgnoreList.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class297.colorStartTag(16748608) + var31.name, 17, var33.id, var22, var12); - } - } else { - String[] var25 = var31.groundActions; - - for (int var26 = 4; var26 >= 0; --var26) { - if (var25 != null && var25[var26] != null) { - byte var20 = 0; - if (var26 == 0) { - var20 = 18; - } - - if (var26 == 1) { - var20 = 19; - } - - if (var26 == 2) { - var20 = 20; - } - - if (var26 == 3) { - var20 = 21; - } - - if (var26 == 4) { - var20 = 22; - } - - IgnoreList.insertMenuItemNoShift(var25[var26], class297.colorStartTag(16748608) + var31.name, var20, var33.id, var22, var12); - } else if (var26 == 2) { - IgnoreList.insertMenuItemNoShift("Take", class297.colorStartTag(16748608) + var31.name, 20, var33.id, var22, var12); - } - } - - IgnoreList.insertMenuItemNoShift("Examine", class297.colorStartTag(16748608) + var31.name, 1004, var33.id, var22, var12); - } - } - } - } + if (Login.Login_username == null || Login.Login_username.length() <= 0) { + if (NetSocket.clientPreferences.rememberedUsername != null) { + Login.Login_username = NetSocket.clientPreferences.rememberedUsername; + Client.Login_isUsernameRemembered = true; + } else { + Client.Login_isUsernameRemembered = false; } } - if (var4 != -1L) { - var8 = (int)(var4 >>> 0 & 127L); - int var10 = UserComparator9.method3500(var4); - Player var11 = Client.players[Client.combatTargetPlayerIndex]; - InterfaceParent.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var10); + class22.method225(); + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "(Lhd;IIII)V", + garbageValue = "-127200615" + ) + @Export("Widget_setKeyRate") + static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { + if (var0.field2679 == null) { + throw new RuntimeException(); + } else { + var0.field2679[var1] = var2; + var0.field2680[var1] = var3; + } + } + + @ObfuscatedName("ji") + @ObfuscatedSignature( + signature = "(IIIILlz;Lhh;I)V", + garbageValue = "866321883" + ) + @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; + UrlRequester.redHintArrowSprite.method6435(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); + } else { + GrandExchangeOffer.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); } } diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index 3037fb001a..36809a32dd 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -10,67 +10,55 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ao") +@ObfuscatedName("ap") @Implements("WorldMapRegion") public class WorldMapRegion { - @ObfuscatedName("ss") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "Llq;" - ) - @Export("masterDisk") - static ArchiveDisk masterDisk; - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lfl;" + signature = "Lfr;" ) @Export("WorldMapRegion_cachedSprites") - public static DemotingHashTable WorldMapRegion_cachedSprites; - @ObfuscatedName("dp") - @ObfuscatedSignature( - signature = "Lih;" - ) - @Export("archive11") - static Archive archive11; - @ObfuscatedName("v") + static DemotingHashTable WorldMapRegion_cachedSprites; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1197836781 + intValue = 224644345 ) @Export("regionX") int regionX; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1627893231 + intValue = -2039655483 ) @Export("regionY") int regionY; - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "Ly;" + signature = "Li;" ) @Export("worldMapData_0") WorldMapData_0 worldMapData_0; - @ObfuscatedName("t") + @ObfuscatedName("a") @Export("worldMapData1List") LinkedList worldMapData1List; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 594891015 + intValue = -1539368261 ) @Export("backgroundColor") int backgroundColor; - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -411328267 + intValue = -484140581 ) @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("p") + @ObfuscatedName("y") @Export("icon0List") List icon0List; - @ObfuscatedName("n") + @ObfuscatedName("c") @Export("iconMap") HashMap iconMap; - @ObfuscatedName("u") + @ObfuscatedName("h") @Export("fonts") final HashMap fonts; @@ -88,16 +76,13 @@ public class WorldMapRegion { this.fonts = var4; } - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(IIII)V", - garbageValue = "800782831" + garbageValue = "-323473463" ) - void method519(int var1, int var2, int var3) { - int var5 = this.regionX; - int var6 = this.regionY; - int var7 = this.pixelsPerTile; - Sprite var4 = (Sprite)WorldMapRegion_cachedSprites.get(HorizontalAlignment.method4777(var5, var6, var7)); + void method490(int var1, int var2, int var3) { + Sprite var4 = InterfaceParent.method1233(this.regionX, this.regionY, this.pixelsPerTile); if (var4 != null) { if (var3 == this.pixelsPerTile * 64) { var4.drawAt(var1, var2); @@ -108,10 +93,10 @@ public class WorldMapRegion { } } - @ObfuscatedName("d") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(Ly;Ljava/util/List;I)V", - garbageValue = "1320723450" + signature = "(Li;Ljava/util/List;I)V", + garbageValue = "-1392873276" ) @Export("initWorldMapData0") void initWorldMapData0(WorldMapData_0 var1, List var2) { @@ -120,10 +105,10 @@ public class WorldMapRegion { this.addAllToIconList(var2); } - @ObfuscatedName("w") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Ljava/util/HashSet;Ljava/util/List;I)V", - garbageValue = "-1524913173" + signature = "(Ljava/util/HashSet;Ljava/util/List;B)V", + garbageValue = "114" ) @Export("initWorldMapData1") void initWorldMapData1(HashSet var1, List var2) { @@ -140,15 +125,15 @@ public class WorldMapRegion { this.addAllToIconList(var2); } - @ObfuscatedName("v") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(IIIILab;S)V", - garbageValue = "-7361" + signature = "(IIIILax;I)V", + garbageValue = "513799457" ) @Export("getIconsForTiles") void getIconsForTiles(int var1, int var2, int var3, int var4, AbstractWorldMapData var5) { for (int var6 = var1; var6 < var3 + var1; ++var6) { - label50: + label48: for (int var7 = var2; var7 < var2 + var4; ++var7) { for (int var8 = 0; var8 < var5.planes; ++var8) { WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; @@ -157,10 +142,10 @@ public class WorldMapRegion { for (int var11 = 0; var11 < var10.length; ++var11) { WorldMapDecoration var12 = var10[var11]; - ObjectDefinition var13 = WorldMapSection2.getObjectDefinition(var12.objectDefinitionId); - if (Tiles.method1239(var13)) { + ObjectDefinition var13 = Canvas.getObjectDefinition(var12.objectDefinitionId); + if (GrandExchangeOfferUnitPriceComparator.method202(var13)) { this.getIcon(var13, var8, var6, var7, var5); - continue label50; + continue label48; } } } @@ -170,10 +155,10 @@ public class WorldMapRegion { } - @ObfuscatedName("q") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Ljw;IIILab;I)V", - garbageValue = "-332727967" + signature = "(Ljg;IIILax;I)V", + garbageValue = "1752488167" ) @Export("getIcon") void getIcon(ObjectDefinition var1, int var2, int var3, int var4, AbstractWorldMapData var5) { @@ -183,24 +168,24 @@ public class WorldMapRegion { var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, var4 + this.worldMapData_0.regionYLow * 64); } else { WorldMapData_1 var8 = (WorldMapData_1)var5; - var7 = new Coord(var2 + var8.minPlane, var3 + var8.regionXLow * 64 + var8.getChunkXLow() * 8, var8.regionYLow * 64 + var4 + var8.getChunkYLow() * 8); + var7 = new Coord(var2 + var8.minPlane, var8.regionXLow * 64 + var3 + var8.getChunkXLow() * 8, var8.regionYLow * 64 + var4 + var8.getChunkYLow() * 8); } Object var10; if (var1.transforms != null) { var10 = new WorldMapIcon_1(var7, var6, var1.id, this); } else { - WorldMapElement var9 = class25.WorldMapElement_get(var1.mapIconId); + WorldMapElement var9 = Client.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("z") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "128" + signature = "(I)V", + garbageValue = "1939037740" ) @Export("initWorldMapIcon1s") void initWorldMapIcon1s() { @@ -215,10 +200,10 @@ public class WorldMapRegion { } - @ObfuscatedName("t") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(Ljava/util/List;I)V", - garbageValue = "-2024138363" + garbageValue = "-1366696532" ) @Export("addAllToIconList") void addAllToIconList(List var1) { @@ -227,19 +212,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.method548(var3.element)); + WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method518(var3.element)); this.icon0List.add(var4); } } } - @ObfuscatedName("e") + @ObfuscatedName("w") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-949994571" + garbageValue = "1391400259" ) - void method526() { + void method580() { if (this.worldMapData_0 != null) { this.worldMapData_0.reset(); } else { @@ -253,10 +238,10 @@ public class WorldMapRegion { } - @ObfuscatedName("s") + @ObfuscatedName("y") @ObfuscatedSignature( - signature = "(Liy;I)Z", - garbageValue = "155508897" + signature = "(Lic;I)Z", + garbageValue = "-1165934913" ) @Export("loadGeography") boolean loadGeography(AbstractArchive var1) { @@ -292,62 +277,56 @@ public class WorldMapRegion { } } - @ObfuscatedName("p") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "(ILah;[Lle;Liy;Liy;I)V", - garbageValue = "828020907" + signature = "(ILay;[Llh;Lic;Lic;I)V", + garbageValue = "-799383237" ) @Export("drawTile") void drawTile(int var1, WorldMapScaleHandler var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) { this.pixelsPerTile = var1; if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { - int var7 = this.regionX; - int var8 = this.regionY; - Sprite var6 = (Sprite)WorldMapRegion_cachedSprites.get(HorizontalAlignment.method4777(var7, var8, var1)); - if (var6 == null) { - boolean var9 = true; - var9 &= this.loadGeography(var4); - int var11; + if (InterfaceParent.method1233(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(class200.convertJpgToSprite(var10).pixels); + var9 = new WorldMapSprite(FloorUnderlayDefinition.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.method531(var2, var3, var12); + this.method501(var2, var3, var9); } else { - this.method532(var2, var3, var12); + this.method502(var2, var3, var9); } - int var15 = this.regionX; - int var16 = this.regionY; - int var17 = this.pixelsPerTile; - WorldMapRegion_cachedSprites.put(var14, HorizontalAlignment.method4777(var15, var16, var17), var14.pixels.length * 4); - this.method526(); + class90.method2166(var11, this.regionX, this.regionY, this.pixelsPerTile); + this.method580(); } } } } - @ObfuscatedName("n") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(IIILjava/util/HashSet;B)V", - garbageValue = "-19" + signature = "(IIILjava/util/HashSet;I)V", + garbageValue = "830003997" ) - void method529(int var1, int var2, int var3, HashSet var4) { + void method514(int var1, int var2, int var3, HashSet var4) { if (var4 == null) { var4 = new HashSet(); } @@ -356,10 +335,10 @@ public class WorldMapRegion { this.drawMapLinks(var1, var2, var4, var3); } - @ObfuscatedName("u") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Ljava/util/HashSet;IIB)V", - garbageValue = "-1" + signature = "(Ljava/util/HashSet;III)V", + garbageValue = "-850649722" ) @Export("flashElements") void flashElements(HashSet var1, int var2, int var3) { @@ -370,44 +349,44 @@ public class WorldMapRegion { if (var5.hasValidElement()) { int var6 = var5.getElement(); if (var1.contains(var6)) { - WorldMapElement var7 = class25.WorldMapElement_get(var6); + WorldMapElement var7 = Client.WorldMapElement_get(var6); this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); } } } - this.method540(var1, var2, var3); + this.method497(var1, var2, var3); } - @ObfuscatedName("h") + @ObfuscatedName("r") @ObfuscatedSignature( - signature = "(Lah;[Lle;Lam;I)V", - garbageValue = "-1199825986" + signature = "(Lay;[Llh;Las;B)V", + garbageValue = "-41" ) - void method531(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { + void method501(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { int var4; int var5; for (var4 = 0; var4 < 64; ++var4) { for (var5 = 0; var5 < 64; ++var5) { this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); - this.method535(var4, var5, this.worldMapData_0, var1); + this.method511(var4, var5, this.worldMapData_0, var1); } } for (var4 = 0; var4 < 64; ++var4) { for (var5 = 0; var5 < 64; ++var5) { - this.method533(var4, var5, this.worldMapData_0, var1, var2); + this.method503(var4, var5, this.worldMapData_0, var1, var2); } } } - @ObfuscatedName("g") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(Lah;[Lle;Lam;B)V", - garbageValue = "-33" + signature = "(Lay;[Llh;Las;B)V", + garbageValue = "-26" ) - void method532(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { + void method502(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { Iterator var4 = this.worldMapData1List.iterator(); WorldMapData_1 var5; @@ -419,7 +398,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.method535(var6, var7, var5, var1); + this.method511(var6, var7, var5, var1); } } } @@ -431,27 +410,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.method533(var6, var7, var5, var1, var2); + this.method503(var6, var7, var5, var1, var2); } } } } - @ObfuscatedName("i") + @ObfuscatedName("e") @ObfuscatedSignature( - signature = "(IILab;Lah;[Lle;I)V", - garbageValue = "642220126" + signature = "(IILax;Lay;[Llh;I)V", + garbageValue = "-248826960" ) - void method533(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { + void method503(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { this.method527(var1, var2, var3); - this.method518(var1, var2, var3, var5); + this.method507(var1, var2, var3, var5); } - @ObfuscatedName("a") + @ObfuscatedName("l") @ObfuscatedSignature( - signature = "(IILab;Lah;Lam;I)V", - garbageValue = "700550528" + signature = "(IILax;Lay;Las;I)V", + garbageValue = "1979978658" ) @Export("drawTileGround") void drawTileGround(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, WorldMapSprite var5) { @@ -463,56 +442,56 @@ public class WorldMapRegion { int var8 = 16711935; if (var7 != -1) { - var8 = class169.method3545(var7, this.backgroundColor); + var8 = Buddy.method5363(var7, this.backgroundColor); } - if (var7 > -1 && var3.field205[0][var1][var2] == 0) { + if (var7 > -1 && var3.field185[0][var1][var2] == 0) { Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); } else { - int var9 = this.method536(var1, var2, var3, var5); + int var9 = this.method506(var1, var2, var3, var5); if (var7 == -1) { Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); } else { - var4.method818(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field205[0][var1][var2], var3.field206[0][var1][var2]); + var4.method798(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field185[0][var1][var2], var3.field175[0][var1][var2]); } } } - @ObfuscatedName("o") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(IILab;Lah;B)V", - garbageValue = "7" + signature = "(IILax;Lay;I)V", + garbageValue = "-946989025" ) - void method535(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) { + void method511(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) { for (int var5 = 1; var5 < var3.planes; ++var5) { int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; if (var6 > -1) { - int var7 = class169.method3545(var6, this.backgroundColor); - if (var3.field205[var5][var1][var2] == 0) { + int var7 = Buddy.method5363(var6, this.backgroundColor); + if (var3.field185[var5][var1][var2] == 0) { Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); } else { - var4.method818(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field205[var5][var1][var2], var3.field206[var5][var1][var2]); + var4.method798(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field185[var5][var1][var2], var3.field175[var5][var1][var2]); } } } } - @ObfuscatedName("c") + @ObfuscatedName("x") @ObfuscatedSignature( - signature = "(IILab;Lam;I)I", - garbageValue = "1185225383" + signature = "(IILax;Las;B)I", + garbageValue = "76" ) - int method536(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { + int method506(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); } - @ObfuscatedName("f") + @ObfuscatedName("ah") @ObfuscatedSignature( - signature = "(IILab;[Lle;I)V", - garbageValue = "-2109478496" + signature = "(IILax;[Llh;I)V", + garbageValue = "-388606552" ) - void method518(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { + void method507(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) { @@ -520,20 +499,20 @@ public class WorldMapRegion { for (int var8 = 0; var8 < var7.length; ++var8) { WorldMapDecoration var9 = var7[var8]; - if (!Entity.method3374(var9.decoration)) { + if (!WorldMapData_1.method784(var9.decoration)) { int var11 = var9.decoration; - boolean var10 = var11 == WorldMapDecorationType.field2740.id; + boolean var10 = var11 == WorldMapDecorationType.field2777.id; if (!var10) { continue; } } - ObjectDefinition var12 = WorldMapSection2.getObjectDefinition(var9.objectDefinitionId); + ObjectDefinition var12 = Canvas.getObjectDefinition(var9.objectDefinitionId); if (var12.mapSceneId != -1) { if (var12.mapSceneId != 46 && var12.mapSceneId != 52) { - var4[var12.mapSceneId].method6211(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); + var4[var12.mapSceneId].method6322(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); } else { - var4[var12.mapSceneId].method6211(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); + var4[var12.mapSceneId].method6322(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); } } } @@ -542,10 +521,10 @@ public class WorldMapRegion { } - @ObfuscatedName("ae") + @ObfuscatedName("ai") @ObfuscatedSignature( - signature = "(IILab;B)V", - garbageValue = "-16" + signature = "(IILax;B)V", + garbageValue = "101" ) void method527(int var1, int var2, AbstractWorldMapData var3) { for (int var4 = 0; var4 < var3.planes; ++var4) { @@ -556,20 +535,20 @@ public class WorldMapRegion { for (int var7 = 0; var7 < var6.length; ++var7) { WorldMapDecoration var8 = var6[var7]; int var10 = var8.decoration; - boolean var9 = var10 >= WorldMapDecorationType.field2732.id && var10 <= WorldMapDecorationType.field2742.id || var10 == WorldMapDecorationType.field2722.id; + boolean var9 = var10 >= WorldMapDecorationType.field2756.id && var10 <= WorldMapDecorationType.field2758.id || var10 == WorldMapDecorationType.field2759.id; if (var9) { - ObjectDefinition var11 = WorldMapSection2.getObjectDefinition(var8.objectDefinitionId); + ObjectDefinition var11 = Canvas.getObjectDefinition(var8.objectDefinitionId); int var12 = var11.int1 != 0 ? -3407872 : -3355444; - if (var8.decoration == WorldMapDecorationType.field2732.id) { - this.method552(var1, var2, var8.rotation, var12); + if (var8.decoration == WorldMapDecorationType.field2756.id) { + this.method522(var1, var2, var8.rotation, var12); } - if (var8.decoration == WorldMapDecorationType.field2728.id) { - this.method552(var1, var2, var8.rotation, -3355444); - this.method552(var1, var2, var8.rotation + 1, var12); + if (var8.decoration == WorldMapDecorationType.field2755.id) { + this.method522(var1, var2, var8.rotation, -3355444); + this.method522(var1, var2, var8.rotation + 1, var12); } - if (var8.decoration == WorldMapDecorationType.field2742.id) { + if (var8.decoration == WorldMapDecorationType.field2758.id) { if (var8.rotation == 0) { Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var12); } @@ -579,7 +558,7 @@ public class WorldMapRegion { } if (var8.rotation == 2) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 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, var12); } if (var8.rotation == 3) { @@ -587,7 +566,7 @@ public class WorldMapRegion { } } - if (var8.decoration == WorldMapDecorationType.field2722.id) { + if (var8.decoration == WorldMapDecorationType.field2759.id) { int var13 = var8.rotation % 2; int var14; if (var13 == 0) { @@ -607,10 +586,10 @@ public class WorldMapRegion { } - @ObfuscatedName("an") + @ObfuscatedName("ao") @ObfuscatedSignature( signature = "(IILjava/util/HashSet;II)V", - garbageValue = "-1793934594" + garbageValue = "-1066971556" ) @Export("drawNonLinkMapIcons") void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) { @@ -622,32 +601,32 @@ public class WorldMapRegion { Entry var8 = (Entry)var7.next(); Coord var9 = (Coord)var8.getKey(); int var10 = (int)((float)var1 + var5 * (float)var9.x - var6); - int var11 = (int)((float)(var2 + var4) - (float)var9.y * var5 - var6); + int var11 = (int)((float)(var2 + var4) - var5 * (float)var9.y - var6); AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); if (var12 != null && var12.hasValidElement()) { var12.screenX = var10; var12.screenY = var11; - WorldMapElement var13 = class25.WorldMapElement_get(var12.getElement()); + WorldMapElement var13 = Client.WorldMapElement_get(var12.getElement()); if (!var3.contains(var13.getObjectId())) { - this.method542(var12, var10, var11, var5); + this.method512(var12, var10, var11, var5); } } } } - @ObfuscatedName("ai") + @ObfuscatedName("ae") @ObfuscatedSignature( signature = "(Ljava/util/HashSet;III)V", - garbageValue = "1080849523" + garbageValue = "-545046717" ) - void method540(HashSet var1, int var2, int var3) { + void method497(HashSet var1, int var2, int var3) { Iterator var4 = this.icon0List.iterator(); while (var4.hasNext()) { AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); if (var5.hasValidElement()) { - WorldMapElement var6 = class25.WorldMapElement_get(var5.getElement()); + WorldMapElement var6 = Client.WorldMapElement_get(var5.getElement()); if (var6 != null && var1.contains(var6.getObjectId())) { this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); } @@ -656,10 +635,10 @@ public class WorldMapRegion { } - @ObfuscatedName("ap") + @ObfuscatedName("ax") @ObfuscatedSignature( - signature = "(Lio;IIIIS)V", - garbageValue = "4032" + signature = "(Lih;IIIII)V", + garbageValue = "1074456567" ) @Export("drawBackgroundCircle") void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) { @@ -674,51 +653,51 @@ public class WorldMapRegion { } } - @ObfuscatedName("ab") + @ObfuscatedName("ag") @ObfuscatedSignature( - signature = "(Lax;IIFI)V", - garbageValue = "1195952860" + signature = "(Laf;IIFI)V", + garbageValue = "-591534558" ) - void method542(AbstractWorldMapIcon var1, int var2, int var3, float var4) { - WorldMapElement var5 = class25.WorldMapElement_get(var1.getElement()); - this.method543(var5, var2, var3); - this.method544(var1, var5, var2, var3, var4); + void method512(AbstractWorldMapIcon var1, int var2, int var3, float var4) { + WorldMapElement var5 = Client.WorldMapElement_get(var1.getElement()); + this.method494(var5, var2, var3); + this.method604(var1, var5, var2, var3, var4); } - @ObfuscatedName("ar") + @ObfuscatedName("ab") @ObfuscatedSignature( - signature = "(Lio;IIB)V", - garbageValue = "15" + signature = "(Lih;IIB)V", + garbageValue = "34" ) - void method543(WorldMapElement var1, int var2, int var3) { + void method494(WorldMapElement var1, int var2, int var3) { Sprite var4 = var1.getSpriteBool(false); if (var4 != null) { - int var5 = this.method546(var4, var1.horizontalAlignment); - int var6 = this.method547(var4, var1.verticalAlignment); + int var5 = this.method516(var4, var1.horizontalAlignment); + int var6 = this.method517(var4, var1.verticalAlignment); var4.drawTransBgAt(var5 + var2, var3 + var6); } } - @ObfuscatedName("af") + @ObfuscatedName("am") @ObfuscatedSignature( - signature = "(Lax;Lio;IIFI)V", - garbageValue = "630638914" + signature = "(Laf;Lih;IIFB)V", + garbageValue = "81" ) - void method544(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { + void method604(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { WorldMapLabel var6 = var1.getLabel(); if (var6 != null) { - if (var6.size.method289(var5)) { + if (var6.size.method246(var5)) { Font var7 = (Font)this.fonts.get(var6.size); - var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field3216, 0, 1, 0, var7.ascent / 2); + var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field3251, 0, 1, 0, var7.ascent / 2); } } } - @ObfuscatedName("at") + @ObfuscatedName("ak") @ObfuscatedSignature( signature = "(IILjava/util/HashSet;II)V", - garbageValue = "-1206739508" + garbageValue = "-109418068" ) @Export("drawMapLinks") void drawMapLinks(int var1, int var2, HashSet var3, int var4) { @@ -730,24 +709,24 @@ public class WorldMapRegion { if (var7.hasValidElement()) { int var8 = var7.coord2.x % 64; int var9 = var7.coord2.y % 64; - var7.screenX = (int)((float)var8 * var5 + (float)var1); - var7.screenY = (int)((float)var2 + (float)(63 - var9) * var5); + var7.screenX = (int)(var5 * (float)var8 + (float)var1); + var7.screenY = (int)((float)var2 + var5 * (float)(63 - var9)); if (!var3.contains(var7.getElement())) { - this.method542(var7, var7.screenX, var7.screenY, var5); + this.method512(var7, var7.screenX, var7.screenY, var5); } } } } - @ObfuscatedName("as") + @ObfuscatedName("ad") @ObfuscatedSignature( - signature = "(Lla;Lje;B)I", - garbageValue = "1" + signature = "(Llz;Ljc;I)I", + garbageValue = "-1624159662" ) - int method546(Sprite var1, HorizontalAlignment var2) { + int method516(Sprite var1, HorizontalAlignment var2) { switch(var2.value) { - case 0: + case 1: return -var1.subWidth / 2; case 2: return 0; @@ -756,58 +735,59 @@ public class WorldMapRegion { } } - @ObfuscatedName("am") + @ObfuscatedName("as") @ObfuscatedSignature( - signature = "(Lla;Lie;B)I", - garbageValue = "-110" + signature = "(Llz;Lif;I)I", + garbageValue = "1330408949" ) - int method547(Sprite var1, VerticalAlignment var2) { + int method517(Sprite var1, VerticalAlignment var2) { switch(var2.value) { - case 0: - return 0; case 1: return -var1.subHeight / 2; + case 2: + return 0; default: return -var1.subHeight; } } - @ObfuscatedName("ao") + @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "(II)Lau;", - garbageValue = "1415397741" + signature = "(IB)Lar;", + garbageValue = "15" ) - WorldMapLabel method548(int var1) { - WorldMapElement var2 = class25.WorldMapElement_get(var1); + WorldMapLabel method518(int var1) { + WorldMapElement var2 = Client.WorldMapElement_get(var1); return this.createMapLabel(var2); } - @ObfuscatedName("aq") + @ObfuscatedName("al") @ObfuscatedSignature( - signature = "(Lio;B)Lau;", - garbageValue = "93" + signature = "(Lih;I)Lar;", + garbageValue = "-1165001445" ) @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.method284(); - int var5 = 0; + WorldMapLabelSize[] var4 = new WorldMapLabelSize[]{WorldMapLabelSize.WorldMapLabelSize_medium, WorldMapLabelSize.WorldMapLabelSize_large, 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.field155) { - var2 = var6; + WorldMapLabelSize var7 = var5[var6]; + if (var3 == var7.field132) { + var2 = var7; break; } - ++var5; + ++var6; } if (var2 == null) { @@ -817,12 +797,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]; @@ -840,12 +820,12 @@ public class WorldMapRegion { } } - @ObfuscatedName("av") + @ObfuscatedName("an") @ObfuscatedSignature( signature = "(IIIIII)Ljava/util/List;", - garbageValue = "-1740751209" + garbageValue = "1872285307" ) - List method606(int var1, int var2, int var3, int var4, int var5) { + List method544(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) { @@ -877,10 +857,10 @@ public class WorldMapRegion { } } - @ObfuscatedName("ak") + @ObfuscatedName("ac") @ObfuscatedSignature( signature = "(I)Ljava/util/List;", - garbageValue = "-1911332956" + garbageValue = "-2023703181" ) @Export("icons") List icons() { @@ -890,12 +870,12 @@ public class WorldMapRegion { return var1; } - @ObfuscatedName("aa") + @ObfuscatedName("av") @ObfuscatedSignature( - signature = "(IIIIB)V", - garbageValue = "-23" + signature = "(IIIII)V", + garbageValue = "-637196231" ) - void method552(int var1, int var2, int var3, int var4) { + void method522(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); @@ -915,182 +895,160 @@ public class WorldMapRegion { } - @ObfuscatedName("fa") + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(IB)Ljava/lang/String;", + garbageValue = "0" + ) + static String method611(int var0) { + return ""; + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(Lic;Lic;ZIB)V", + garbageValue = "73" + ) + static void method541(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { + if (GrandExchangeOfferAgeComparator.clearLoginScreen) { + if (var3 == 4) { + Login.loginIndex = 4; + } + + } else { + Login.loginIndex = var3; + Rasterizer2D.Rasterizer2D_clear(); + byte[] var4 = var0.takeFileByNames("title.jpg", ""); + Login.leftTitleSprite = FloorUnderlayDefinition.convertJpgToSprite(var4); + ItemContainer.rightTitleSprite = Login.leftTitleSprite.mirrorHorizontally(); + if ((Client.worldProperties & 536870912) != 0) { + Login.logoSprite = class329.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); + } else if ((Client.worldProperties & 1073741824) != 0) { + Login.logoSprite = class329.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); + } else { + Login.logoSprite = class329.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); + } + + HealthBar.titleboxSprite = class329.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); + Fonts.titlebuttonSprite = class329.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); + Login.runesSprite = PendingSpawn.method1806(var1, "runes", ""); + Decimator.title_muteSprite = PendingSpawn.method1806(var1, "title_mute", ""); + Login.options_buttons_0Sprite = class329.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); + class336.field3912 = class329.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); + GameShell.options_buttons_2Sprite = class329.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); + ScriptEvent.field597 = class329.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); + ScriptEvent.field606 = Login.options_buttons_0Sprite.subWidth; + Skeleton.field1826 = Login.options_buttons_0Sprite.subHeight; + Login.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite); + if (var2) { + Login.Login_username = ""; + Login.Login_password = ""; + } + + WorldMapSprite.field264 = 0; + ClanMate.otp = ""; + Login.field1223 = true; + Login.worldSelectOpen = false; + if (!NetSocket.clientPreferences.titleMusicDisabled) { + WorldMapSectionType.method306(2, UserComparator7.archive6, "scape main", "", 255, false); + } else { + class206.field2439 = 1; + Huffman.musicTrackArchive = null; + class206.musicTrackGroupId = -1; + MilliClock.musicTrackFileId = -1; + class206.musicTrackVolume = 0; + class336.musicTrackBoolean = false; + class206.field2442 = 2; + } + + class41.method624(false); + GrandExchangeOfferAgeComparator.clearLoginScreen = true; + Login.xPadding = (Varcs.canvasWidth - 765) / 2; + Login.loginBoxX = Login.xPadding + 202; + Login.loginBoxCenter = Login.loginBoxX + 180; + Login.leftTitleSprite.drawAt(Login.xPadding, 0); + ItemContainer.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); + } + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "([BIILem;[Lfz;I)V", + garbageValue = "2110608618" + ) + static final void method520(byte[] var0, int var1, int var2, Scene var3, CollisionMap[] var4) { + Buffer var5 = new Buffer(var0); + int var6 = -1; + + while (true) { + int var7 = var5.method5732(); + if (var7 == 0) { + return; + } + + var6 += var7; + int var8 = 0; + + while (true) { + int var9 = var5.readUShortSmart(); + if (var9 == 0) { + break; + } + + var8 += var9 - 1; + int var10 = var8 & 63; + int var11 = var8 >> 6 & 63; + int var12 = var8 >> 12; + int var13 = var5.readUnsignedByte(); + int var14 = var13 >> 2; + int var15 = var13 & 3; + int var16 = var11 + var1; + int var17 = var10 + var2; + if (var16 > 0 && var17 > 0 && var16 < 103 && var17 < 103) { + int var18 = var12; + if ((Tiles.Tiles_renderFlags[1][var16][var17] & 2) == 2) { + var18 = var12 - 1; + } + + CollisionMap var19 = null; + if (var18 >= 0) { + var19 = var4[var18]; + } + + class41.method623(var12, var16, var17, var6, var15, var14, var3, var19); + } + } + } + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + signature = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", + garbageValue = "1188982051" + ) + public static String method613(CharSequence var0) { + int var2 = var0.length(); + char[] var3 = new char[var2]; + + for (int var4 = 0; var4 < var2; ++var4) { + var3[var4] = '*'; + } + + String var1 = new String(var3); + return var1; + } + + @ObfuscatedName("r") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "294809885" + garbageValue = "1729353044" ) - static final void method630() { - 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; - } - } - } - - } - - @ObfuscatedName("ie") - @ObfuscatedSignature( - signature = "(Ljj;IIII)V", - garbageValue = "-283435223" - ) - @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 = ByteArrayPool.localPlayer.combatLevel; - int var9 = var8 - var7; - String var6; - if (var9 < -9) { - var6 = class297.colorStartTag(16711680); - } else if (var9 < -6) { - var6 = class297.colorStartTag(16723968); - } else if (var9 < -3) { - var6 = class297.colorStartTag(16740352); - } else if (var9 < 0) { - var6 = class297.colorStartTag(16756736); - } else if (var9 > 9) { - var6 = class297.colorStartTag(65280); - } else if (var9 > 6) { - var6 = class297.colorStartTag(4259584); - } else if (var9 > 3) { - var6 = class297.colorStartTag(8453888); - } else if (var9 > 0) { - var6 = class297.colorStartTag(12648192); - } else { - var6 = class297.colorStartTag(16776960); - } - - var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")"; - } - - if (var0.isFollower && Client.followerOpsLowPriority) { - IgnoreList.insertMenuItemNoShift("Examine", class297.colorStartTag(16776960) + var4, 1003, var1, var2, var3); - } - - if (Client.isItemSelected == 1) { - IgnoreList.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + class297.colorStartTag(16776960) + var4, 7, var1, var2, var3); - } else if (Client.isSpellSelected) { - if ((AbstractWorldMapIcon.selectedSpellFlags & 2) == 2) { - IgnoreList.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + class297.colorStartTag(16776960) + var4, 8, var1, var2, var3); - } - } else { - int var10 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 0; - String[] var11 = var0.actions; - if (var11 != null) { - for (var7 = 4; var7 >= 0; --var7) { - if (var11[var7] != null && !var11[var7].equalsIgnoreCase("Attack")) { - var8 = 0; - if (var7 == 0) { - var8 = var10 + 9; - } - - if (var7 == 1) { - var8 = var10 + 10; - } - - if (var7 == 2) { - var8 = var10 + 11; - } - - if (var7 == 3) { - var8 = var10 + 12; - } - - if (var7 == 4) { - var8 = var10 + 13; - } - - IgnoreList.insertMenuItemNoShift(var11[var7], class297.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 (Client.npcAttackOption != AttackOption.AttackOption_hidden) { - if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > ByteArrayPool.localPlayer.combatLevel) { - var12 = 2000; - } - - var8 = 0; - if (var7 == 0) { - var8 = var12 + 9; - } - - if (var7 == 1) { - var8 = var12 + 10; - } - - if (var7 == 2) { - var8 = var12 + 11; - } - - if (var7 == 3) { - var8 = var12 + 12; - } - - if (var7 == 4) { - var8 = var12 + 13; - } - - IgnoreList.insertMenuItemNoShift(var11[var7], class297.colorStartTag(16776960) + var4, var8, var1, var2, var3); - } - } - } - } - - if (!var0.isFollower || !Client.followerOpsLowPriority) { - IgnoreList.insertMenuItemNoShift("Examine", class297.colorStartTag(16776960) + var4, 1003, var1, var2, var3); - } - } - - } - } - } - } - } - - @ObfuscatedName("ky") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-59" - ) - static final void method537() { - for (int var0 = 0; var0 < Players.Players_count; ++var0) { - Player var1 = Client.players[Players.Players_indices[var0]]; - var1.clearIsInClanChat(); + static void method591() { + if (WorldMapSection3.loadWorlds()) { + Login.worldSelectOpen = true; + Login.worldSelectPage = 0; + Login.worldSelectPagesCount = 0; } } diff --git a/runescape-client/src/main/java/WorldMapScaleHandler.java b/runescape-client/src/main/java/WorldMapScaleHandler.java index f3878f6db8..22fbbdcbad 100644 --- a/runescape-client/src/main/java/WorldMapScaleHandler.java +++ b/runescape-client/src/main/java/WorldMapScaleHandler.java @@ -4,22 +4,19 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ah") +@ObfuscatedName("ay") @Implements("WorldMapScaleHandler") public class WorldMapScaleHandler { - @ObfuscatedName("lo") + @ObfuscatedName("sy") + @Export("foundItemIds") + static short[] foundItemIds; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 863785417 - ) - @Export("menuWidth") - static int menuWidth; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -182915585 + intValue = 941345051 ) @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("tileTemplates") byte[][][] tileTemplates; @@ -27,25 +24,25 @@ public class WorldMapScaleHandler { this.pixelsPerTile = var1; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IIIIIIIIB)V", - garbageValue = "-32" + signature = "(IIIIIIIII)V", + garbageValue = "1923645128" ) - void method818(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + void method798(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.method819(var8, var7); - var7 = this.method837(var7); + var8 = this.method794(var8, var7); + var7 = this.method795(var7); Rasterizer2D.Rasterizer2D_drawGradientPixels(var1, var2, var5, var6, var3, var4, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); } } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( signature = "(III)I", - garbageValue = "-108715988" + garbageValue = "-1887787405" ) - int method819(int var1, int var2) { + int method794(int var1, int var2) { if (var2 == 9) { var1 = var1 + 1 & 3; } @@ -61,12 +58,12 @@ public class WorldMapScaleHandler { return var1; } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "-51" + signature = "(II)I", + garbageValue = "-1636996123" ) - int method837(int var1) { + int method795(int var1) { if (var1 != 9 && var1 != 10) { return var1 == 11 ? 8 : var1; } else { @@ -74,10 +71,10 @@ public class WorldMapScaleHandler { } } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-118" + signature = "(I)V", + garbageValue = "1385757357" ) @Export("init") void init() { @@ -94,10 +91,10 @@ public class WorldMapScaleHandler { } } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1433352887" + garbageValue = "1289637080" ) @Export("init0") void init0() { @@ -161,10 +158,10 @@ public class WorldMapScaleHandler { this.tileTemplates[0][3] = var1; } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1487501517" + signature = "(B)V", + garbageValue = "-112" ) @Export("init1") void init1() { @@ -232,10 +229,10 @@ public class WorldMapScaleHandler { this.tileTemplates[1][3] = var1; } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-611900971" + garbageValue = "-1821713225" ) @Export("init2") void init2() { @@ -299,10 +296,10 @@ public class WorldMapScaleHandler { this.tileTemplates[2][3] = var1; } - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1800334374" + garbageValue = "-294529084" ) @Export("init3") void init3() { @@ -366,10 +363,10 @@ public class WorldMapScaleHandler { this.tileTemplates[3][3] = var1; } - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "107" + signature = "(I)V", + garbageValue = "-1871993011" ) @Export("init4") void init4() { @@ -433,10 +430,10 @@ public class WorldMapScaleHandler { this.tileTemplates[4][3] = var1; } - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedSignature( signature = "(B)V", - garbageValue = "-68" + garbageValue = "13" ) @Export("init5") void init5() { @@ -502,10 +499,10 @@ public class WorldMapScaleHandler { this.tileTemplates[5][3] = var1; } - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "44" + signature = "(I)V", + garbageValue = "-437355569" ) @Export("init6") void init6() { @@ -571,10 +568,10 @@ public class WorldMapScaleHandler { this.tileTemplates[6][3] = var1; } - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1415108138" + garbageValue = "959686276" ) @Export("init7") void init7() { @@ -640,16 +637,23 @@ public class WorldMapScaleHandler { this.tileTemplates[7][3] = var1; } - @ObfuscatedName("ha") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(IIIII)V", - garbageValue = "-2108955904" + signature = "(IS)Z", + garbageValue = "180" ) - static final void method848(int var0, int var1, int var2, int var3) { - for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { - if (Client.rootWidgetWidths[var4] + Client.rootWidgetXs[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetYs[var4] + Client.rootWidgetHeights[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { - Client.field886[var4] = true; - } + public static boolean method819(int var0) { + return (var0 >> 20 & 1) != 0; + } + + @ObfuscatedName("gq") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1963467605" + ) + static void method812() { + if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { + class9.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); } } diff --git a/runescape-client/src/main/java/WorldMapSection.java b/runescape-client/src/main/java/WorldMapSection.java index a587e4cf34..567a46271a 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("ay") +@ObfuscatedName("aw") @Implements("WorldMapSection") public interface WorldMapSection { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Las;I)V", - garbageValue = "1890497148" + signature = "(Lad;I)V", + garbageValue = "411670415" ) @Export("expandBounds") void expandBounds(WorldMapArea var1); - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIII)Z", - garbageValue = "-65934716" + signature = "(IIIB)Z", + garbageValue = "2" ) @Export("containsCoord") boolean containsCoord(int var1, int var2, int var3); - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(III)Z", - garbageValue = "-240937232" + signature = "(IIB)Z", + garbageValue = "48" ) @Export("containsPosition") boolean containsPosition(int var1, int var2); - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(IIII)[I", - garbageValue = "1656767825" + garbageValue = "459340529" ) @Export("getBorderTileLengths") int[] getBorderTileLengths(int var1, int var2, int var3); - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(III)Lhj;", - garbageValue = "-226825052" + signature = "(III)Lhg;", + garbageValue = "1240901536" ) @Export("coord") Coord coord(int var1, int var2); - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lkb;I)V", - garbageValue = "-1393433755" + signature = "(Lkn;B)V", + garbageValue = "0" ) @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 d254dfc64e..ecdbfae0f5 100644 --- a/runescape-client/src/main/java/WorldMapSection0.java +++ b/runescape-client/src/main/java/WorldMapSection0.java @@ -4,90 +4,96 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ai") +@ObfuscatedName("ao") @Implements("WorldMapSection0") public class WorldMapSection0 implements WorldMapSection { - @ObfuscatedName("x") + @ObfuscatedName("fa") + @ObfuscatedSignature( + signature = "Lkv;" + ) + @Export("WorldMapElement_fonts") + static Fonts WorldMapElement_fonts; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 713824535 + intValue = -1853202427 ) @Export("oldZ") int oldZ; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1876975141 + intValue = 1923822575 ) @Export("newZ") int newZ; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1131302305 + intValue = -34233439 ) @Export("oldX") int oldX; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -676651519 + intValue = -847595737 ) @Export("oldY") int oldY; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1875954061 + intValue = 1218395603 ) @Export("newX") int newX; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -391734637 + intValue = -1280825293 ) @Export("newY") int newY; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 858906315 + intValue = -695848013 ) @Export("oldChunkXLow") int oldChunkXLow; - @ObfuscatedName("z") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 2112793997 + intValue = 233992023 ) @Export("oldChunkYLow") int oldChunkYLow; - @ObfuscatedName("t") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -902525679 + intValue = -1605249157 ) @Export("oldChunkXHigh") int oldChunkXHigh; - @ObfuscatedName("e") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 519445535 + intValue = 103883527 ) @Export("oldChunkYHigh") int oldChunkYHigh; - @ObfuscatedName("s") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -2051517669 + intValue = 1800743497 ) @Export("newChunkXLow") int newChunkXLow; - @ObfuscatedName("p") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 878808507 + intValue = -1992325701 ) @Export("newChunkYLow") int newChunkYLow; - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 671796187 + intValue = 731618977 ) @Export("newChunkXHigh") int newChunkXHigh; - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -362726853 + intValue = -1689147705 ) @Export("newChunkYHigh") int newChunkYHigh; @@ -95,10 +101,10 @@ public class WorldMapSection0 implements WorldMapSection { WorldMapSection0() { } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Las;I)V", - garbageValue = "1890497148" + signature = "(Lad;I)V", + garbageValue = "411670415" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { @@ -120,10 +126,10 @@ public class WorldMapSection0 implements WorldMapSection { } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIII)Z", - garbageValue = "-65934716" + signature = "(IIIB)Z", + garbageValue = "2" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -134,20 +140,20 @@ public class WorldMapSection0 implements WorldMapSection { } } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(III)Z", - garbageValue = "-240937232" + signature = "(IIB)Z", + garbageValue = "48" ) @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("d") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(IIII)[I", - garbageValue = "1656767825" + garbageValue = "459340529" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { @@ -159,10 +165,10 @@ public class WorldMapSection0 implements WorldMapSection { } } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(III)Lhj;", - garbageValue = "-226825052" + signature = "(III)Lhg;", + garbageValue = "1240901536" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -175,10 +181,10 @@ public class WorldMapSection0 implements WorldMapSection { } } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lkb;I)V", - garbageValue = "-1393433755" + signature = "(Lkn;B)V", + garbageValue = "0" ) @Export("read") public void read(Buffer var1) { @@ -199,204 +205,995 @@ public class WorldMapSection0 implements WorldMapSection { this.postRead(); } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-1832298319" + garbageValue = "-1040528661" ) @Export("postRead") void postRead() { } - @ObfuscatedName("gi") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IIII)V", - garbageValue = "-1632092038" + signature = "(II)Lcs;", + garbageValue = "1805062826" ) - @Export("worldToScreen") - static final void worldToScreen(int var0, int var1, int var2) { - if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { - int var3 = class277.getTileHeight(var0, var1, ScriptEvent.Client_plane) - var2; - var0 -= WorldMapRectangle.cameraX; - var3 -= GrandExchangeOfferWorldComparator.cameraY; - var1 -= class200.cameraZ; - int var4 = Rasterizer3D.Rasterizer3D_sine[ApproximateRouteStrategy.cameraPitch]; - int var5 = Rasterizer3D.Rasterizer3D_cosine[ApproximateRouteStrategy.cameraPitch]; - int var6 = Rasterizer3D.Rasterizer3D_sine[WorldMapIcon_1.cameraYaw]; - int var7 = Rasterizer3D.Rasterizer3D_cosine[WorldMapIcon_1.cameraYaw]; - int var8 = var0 * var7 + var6 * var1 >> 16; - var1 = var7 * var1 - var0 * var6 >> 16; - var0 = var8; - var8 = var5 * var3 - 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 { - Client.viewportTempX = -1; - Client.viewportTempY = -1; - } - + @Export("getScript") + static Script getScript(int var0) { + Script var1 = (Script)Script.Script_cached.get((long)var0); + if (var1 != null) { + return var1; } else { - Client.viewportTempX = -1; - Client.viewportTempY = -1; + byte[] var2 = Message.archive12.takeFile(var0, 0); + if (var2 == null) { + return null; + } else { + var1 = WorldMapAreaData.newScript(var2); + Script.Script_cached.put(var1, (long)var0); + return var1; + } } } - @ObfuscatedName("hm") + @ObfuscatedName("z") @ObfuscatedSignature( - signature = "(Lkj;I)V", - garbageValue = "1398134743" + signature = "(I)V", + garbageValue = "1742384999" ) - static final void method335(PacketBuffer var0) { - for (int var1 = 0; var1 < Client.field851; ++var1) { - int var2 = Client.field725[var1]; - NPC var3 = Client.npcs[var2]; - int var4 = var0.readUnsignedByte(); - int var5; - int var6; - int var7; - if ((var4 & 128) != 0) { - var5 = var0.method5614(); - if (var5 == 65535) { - var5 = -1; - } + public static final void method299() { + ViewportMouse.ViewportMouse_isInViewport = false; + ViewportMouse.ViewportMouse_entityCount = 0; + } - var6 = var0.readUnsignedByte(); - if (var5 == var3.sequence && var5 != -1) { - var7 = SpotAnimationDefinition.SequenceDefinition_get(var5).field3525; - if (var7 == 1) { - var3.sequenceFrame = 0; - var3.sequenceFrameCycle = 0; - var3.sequenceDelay = var6; - var3.field1011 = 0; + @ObfuscatedName("an") + @ObfuscatedSignature( + signature = "(IB)I", + garbageValue = "50" + ) + static int method295(int var0) { + return (int)((Math.log((double)var0) / Interpreter.field1126 - 7.0D) * 256.0D); + } + + @ObfuscatedName("hd") + @ObfuscatedSignature( + signature = "(IIIILjava/lang/String;Ljava/lang/String;IIB)V", + garbageValue = "89" + ) + @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 = UserComparator4.getPacketBufferNode(ClientPacket.field2294, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5752(var0 + class182.baseX); + var8.packetBuffer.method5837(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeShortLE(AbstractUserComparator.selectedItemWidget); + var8.packetBuffer.method5752(SecureRandomFuture.baseY + var1); + var8.packetBuffer.writeShort(LoginScreenAnimation.selectedItemSlot); + var8.packetBuffer.writeShort(WorldMapSectionType.selectedItemId); + var8.packetBuffer.method5753(var3); + 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 = UserComparator4.getPacketBufferNode(ClientPacket.field2259, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShort(var0 + class182.baseX); + var8.packetBuffer.method5764(ItemContainer.selectedSpellWidget); + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method5753(var3); + var8.packetBuffer.writeShort(SecureRandomFuture.baseY + var1); + var8.packetBuffer.method5753(Client.selectedSpellChildIndex); + Client.packetWriter.addNode(var8); + } else if (var2 == 3) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2307, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5753(SecureRandomFuture.baseY + var1); + var8.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeShort(var0 + class182.baseX); + var8.packetBuffer.method5898(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 = UserComparator4.getPacketBufferNode(ClientPacket.field2282, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5837(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method5898(SecureRandomFuture.baseY + var1); + var8.packetBuffer.method5753(var3); + var8.packetBuffer.method5898(var0 + class182.baseX); + 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 = UserComparator4.getPacketBufferNode(ClientPacket.field2313, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5752(var0 + class182.baseX); + var8.packetBuffer.method5752(SecureRandomFuture.baseY + var1); + var8.packetBuffer.writeShort(var3); + var8.packetBuffer.writeIntME(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 = UserComparator4.getPacketBufferNode(ClientPacket.field2262, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5753(var0 + class182.baseX); + var8.packetBuffer.method5837(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method5898(var3); + var8.packetBuffer.method5752(SecureRandomFuture.baseY + var1); + Client.packetWriter.addNode(var8); + } else { + PacketBufferNode var9; + NPC var13; + if (var2 == 7) { + var13 = Client.npcs[var3]; + if (var13 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = UserComparator4.getPacketBufferNode(ClientPacket.field2322, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5837(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method5764(AbstractUserComparator.selectedItemWidget); + var9.packetBuffer.method5752(var3); + var9.packetBuffer.method5753(LoginScreenAnimation.selectedItemSlot); + var9.packetBuffer.method5753(WorldMapSectionType.selectedItemId); + 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 = UserComparator4.getPacketBufferNode(ClientPacket.field2295, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.writeInt(ItemContainer.selectedSpellWidget); + var9.packetBuffer.method5898(var3); + var9.packetBuffer.method5752(Client.selectedSpellChildIndex); + 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 = UserComparator4.getPacketBufferNode(ClientPacket.field2274, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5837(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method5752(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 = UserComparator4.getPacketBufferNode(ClientPacket.field2251, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5744(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 = UserComparator4.getPacketBufferNode(ClientPacket.field2260, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5837(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method5753(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 = UserComparator4.getPacketBufferNode(ClientPacket.field2317, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5898(var3); + var9.packetBuffer.writeByte(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 = UserComparator4.getPacketBufferNode(ClientPacket.field2278, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5753(var3); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + 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 = UserComparator4.getPacketBufferNode(ClientPacket.field2257, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method5752(var3); + var9.packetBuffer.method5753(WorldMapSectionType.selectedItemId); + var9.packetBuffer.method5762(AbstractUserComparator.selectedItemWidget); + var9.packetBuffer.method5753(LoginScreenAnimation.selectedItemSlot); + Client.packetWriter.addNode(var9); } - - if (var7 == 2) { - var3.field1011 = 0; + } 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 = UserComparator4.getPacketBufferNode(ClientPacket.field2327, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5753(Client.selectedSpellChildIndex); + var9.packetBuffer.method5764(ItemContainer.selectedSpellWidget); + var9.packetBuffer.method5898(var3); + var9.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var9); } - } else if (var5 == -1 || var3.sequence == -1 || SpotAnimationDefinition.SequenceDefinition_get(var5).field3519 >= SpotAnimationDefinition.SequenceDefinition_get(var3.sequence).field3519) { - var3.sequence = var5; - var3.sequenceFrame = 0; - var3.sequenceFrameCycle = 0; - var3.sequenceDelay = var6; - var3.field1011 = 0; - var3.field1032 = var3.pathLength; - } - } - - int var8; - if ((var4 & 16) != 0) { - var5 = var0.method5613(); - var6 = var0.method5614(); - var7 = var3.x - (var5 - class69.baseX - class69.baseX) * 64; - var8 = var3.y - (var6 - class89.baseY - class89.baseY) * 64; - if (var7 != 0 || var8 != 0) { - var3.field1015 = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047; - } - } - - if ((var4 & 32) != 0) { - var3.definition = class237.getNpcDefinition(var0.method5614()); - var3.field976 = var3.definition.size; - var3.field1026 = var3.definition.rotation; - var3.walkSequence = var3.definition.walkSequence; - var3.walkBackSequence = var3.definition.walkBackSequence; - var3.walkLeftSequence = var3.definition.walkLeftSequence; - var3.walkRightSequence = var3.definition.walkRightSequence; - var3.idleSequence = var3.definition.idleSequence; - var3.turnLeftSequence = var3.definition.turnLeftSequence; - var3.turnRightSequence = var3.definition.turnRightSequence; - } - - if ((var4 & 8) != 0) { - var3.targetIndex = var0.readUnsignedShort(); - if (var3.targetIndex == 65535) { - var3.targetIndex = -1; - } - } - - if ((var4 & 2) != 0) { - var3.spotAnimation = var0.method5614(); - var5 = var0.method5621(); - var3.field1033 = var5 >> 16; - var3.field1013 = (var5 & 65535) + Client.cycle; - var3.spotAnimationFrame = 0; - var3.spotAnimationFrameCycle = 0; - if (var3.field1013 > Client.cycle) { - var3.spotAnimationFrame = -1; - } - - if (var3.spotAnimation == 65535) { - var3.spotAnimation = -1; - } - } - - if ((var4 & 64) != 0) { - var3.overheadText = var0.readStringCp1252NullTerminated(); - var3.overheadTextCyclesRemaining = 100; - } - - if ((var4 & 1) != 0) { - var5 = var0.method5605(); - 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; + } else if (var2 == 16) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2241, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5898(WorldMapSectionType.selectedItemId); + var8.packetBuffer.method5753(var3); + var8.packetBuffer.method5753(var0 + class182.baseX); + var8.packetBuffer.method5744(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeShort(SecureRandomFuture.baseY + var1); + var8.packetBuffer.method5762(AbstractUserComparator.selectedItemWidget); + var8.packetBuffer.writeShort(LoginScreenAnimation.selectedItemSlot); + 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 = UserComparator4.getPacketBufferNode(ClientPacket.field2276, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5753(var0 + class182.baseX); + var8.packetBuffer.method5752(Client.selectedSpellChildIndex); + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method5898(var3); + var8.packetBuffer.writeShortLE(ItemContainer.selectedSpellWidget); + var8.packetBuffer.writeShort(SecureRandomFuture.baseY + var1); + 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 = UserComparator4.getPacketBufferNode(ClientPacket.field2284, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5753(var0 + class182.baseX); + var8.packetBuffer.writeShort(SecureRandomFuture.baseY + var1); + var8.packetBuffer.method5744(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var8); + } else if (var2 == 19) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2280, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5898(var0 + class182.baseX); + var8.packetBuffer.method5744(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method5752(SecureRandomFuture.baseY + var1); + var8.packetBuffer.method5752(var3); + Client.packetWriter.addNode(var8); + } else if (var2 == 20) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2300, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5752(var3); + var8.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.writeShort(SecureRandomFuture.baseY + var1); + var8.packetBuffer.method5898(var0 + class182.baseX); + Client.packetWriter.addNode(var8); + } else if (var2 == 21) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2296, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5898(var0 + class182.baseX); + var8.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method5898(SecureRandomFuture.baseY + var1); + var8.packetBuffer.method5753(var3); + 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 = UserComparator4.getPacketBufferNode(ClientPacket.field2242, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5837(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var8.packetBuffer.method5752(var0 + class182.baseX); + var8.packetBuffer.method5752(SecureRandomFuture.baseY + var1); + var8.packetBuffer.method5898(var3); + Client.packetWriter.addNode(var8); + } else if (var2 == 23) { + if (Client.isMenuOpen) { + UserComparator3.scene.setViewportWalking(); + } else { + UserComparator3.scene.menuOpen(TileItemPile.Client_plane, var0, var1, true); + } + } else { + PacketBufferNode var10; + Widget var16; + if (var2 == 24) { + var16 = WorldMapSprite.getWidget(var1); + boolean var11 = true; + if (var16.contentType > 0) { + var11 = MilliClock.method3586(var16); } - var11 = var0.readUShortSmart(); - var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11); - } - } + if (var11) { + var10 = UserComparator4.getPacketBufferNode(ClientPacket.field2263, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var10); + } + } else { + if (var2 == 25) { + var16 = WorldMapLabelSize.getWidgetChild(var1, var0); + if (var16 != null) { + GrandExchangeOffer.Widget_runOnTargetLeave(); + AttackOption.selectSpell(var1, var0, WorldMapID.method617(KeyHandler.getWidgetClickMask(var16)), var16.itemId); + Client.isItemSelected = 0; + Client.selectedSpellActionName = WorldMapAreaData.method762(var16); + if (Client.selectedSpellActionName == null) { + Client.selectedSpellActionName = "null"; + } - var6 = var0.method5604(); - if (var6 > 0) { - for (var7 = 0; var7 < var6; ++var7) { - var8 = var0.readUShortSmart(); - var9 = var0.readUShortSmart(); - if (var9 != 32767) { - var10 = var0.readUShortSmart(); - var11 = var0.method5604(); - int var12 = var9 > 0 ? var0.method5605() : var11; - var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12); + if (var16.isIf3) { + Client.selectedSpellName = var16.dataText + ItemContainer.colorStartTag(16777215); + } else { + Client.selectedSpellName = ItemContainer.colorStartTag(65280) + var16.spellName + ItemContainer.colorStartTag(16777215); + } + } + + return; + } + + if (var2 == 26) { + class217.method4092(); } else { - var3.removeHealthBar(var8); + int var12; + Widget var14; + if (var2 == 28) { + var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2263, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var8); + var14 = WorldMapSprite.getWidget(var1); + if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { + var12 = var14.cs1Instructions[0][1]; + Varps.Varps_main[var12] = 1 - Varps.Varps_main[var12]; + changeGameOptions(var12); + } + } else if (var2 == 29) { + var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2263, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var8); + var14 = WorldMapSprite.getWidget(var1); + if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { + var12 = var14.cs1Instructions[0][1]; + if (Varps.Varps_main[var12] != var14.cs1ComparisonValues[0]) { + Varps.Varps_main[var12] = var14.cs1ComparisonValues[0]; + changeGameOptions(var12); + } + } + } else if (var2 == 30) { + if (Client.meslayerContinueWidget == null) { + WorldMapArea.resumePauseWidget(var1, var0); + Client.meslayerContinueWidget = WorldMapLabelSize.getWidgetChild(var1, var0); + class234.invalidateWidget(Client.meslayerContinueWidget); + } + } else if (var2 == 31) { + var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2335, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeInt(var1); + var8.packetBuffer.method5753(var3); + var8.packetBuffer.writeInt(AbstractUserComparator.selectedItemWidget); + var8.packetBuffer.writeShort(var0); + var8.packetBuffer.method5753(LoginScreenAnimation.selectedItemSlot); + var8.packetBuffer.method5753(WorldMapSectionType.selectedItemId); + Client.packetWriter.addNode(var8); + Client.field808 = 0; + class194.field2356 = WorldMapSprite.getWidget(var1); + Client.field668 = var0; + } else if (var2 == 32) { + var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2266, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShort(var0); + var8.packetBuffer.method5764(ItemContainer.selectedSpellWidget); + var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); + var8.packetBuffer.method5752(var3); + var8.packetBuffer.method5764(var1); + Client.packetWriter.addNode(var8); + Client.field808 = 0; + class194.field2356 = WorldMapSprite.getWidget(var1); + Client.field668 = var0; + } else if (var2 == 33) { + var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2248, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5753(var3); + var8.packetBuffer.method5764(var1); + var8.packetBuffer.writeShort(var0); + Client.packetWriter.addNode(var8); + Client.field808 = 0; + class194.field2356 = WorldMapSprite.getWidget(var1); + Client.field668 = var0; + } else if (var2 == 34) { + var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2315, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShortLE(var1); + var8.packetBuffer.method5898(var0); + var8.packetBuffer.method5752(var3); + Client.packetWriter.addNode(var8); + Client.field808 = 0; + class194.field2356 = WorldMapSprite.getWidget(var1); + Client.field668 = var0; + } else if (var2 == 35) { + var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2319, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5762(var1); + var8.packetBuffer.writeShort(var0); + var8.packetBuffer.method5898(var3); + Client.packetWriter.addNode(var8); + Client.field808 = 0; + class194.field2356 = WorldMapSprite.getWidget(var1); + Client.field668 = var0; + } else if (var2 == 36) { + var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2334, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShort(var3); + var8.packetBuffer.writeShortLE(var1); + var8.packetBuffer.method5752(var0); + Client.packetWriter.addNode(var8); + Client.field808 = 0; + class194.field2356 = WorldMapSprite.getWidget(var1); + Client.field668 = var0; + } else if (var2 == 37) { + var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2328, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5753(var3); + var8.packetBuffer.writeShort(var0); + var8.packetBuffer.writeInt(var1); + Client.packetWriter.addNode(var8); + Client.field808 = 0; + class194.field2356 = WorldMapSprite.getWidget(var1); + Client.field668 = var0; + } else { + if (var2 == 38) { + GrandExchangeOffer.Widget_runOnTargetLeave(); + var16 = WorldMapSprite.getWidget(var1); + Client.isItemSelected = 1; + LoginScreenAnimation.selectedItemSlot = var0; + AbstractUserComparator.selectedItemWidget = var1; + WorldMapSectionType.selectedItemId = var3; + class234.invalidateWidget(var16); + Client.selectedItemName = ItemContainer.colorStartTag(16748608) + KitDefinition.ItemDefinition_get(var3).name + ItemContainer.colorStartTag(16777215); + if (Client.selectedItemName == null) { + Client.selectedItemName = "null"; + } + + return; + } + + if (var2 == 39) { + var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2305, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShortLE(var1); + var8.packetBuffer.method5753(var3); + var8.packetBuffer.writeShort(var0); + Client.packetWriter.addNode(var8); + Client.field808 = 0; + class194.field2356 = WorldMapSprite.getWidget(var1); + Client.field668 = var0; + } else if (var2 == 40) { + var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2344, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeShort(var3); + var8.packetBuffer.writeInt(var1); + var8.packetBuffer.method5898(var0); + Client.packetWriter.addNode(var8); + Client.field808 = 0; + class194.field2356 = WorldMapSprite.getWidget(var1); + Client.field668 = var0; + } else if (var2 == 41) { + var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2293, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeInt(var1); + var8.packetBuffer.method5898(var3); + var8.packetBuffer.method5753(var0); + Client.packetWriter.addNode(var8); + Client.field808 = 0; + class194.field2356 = WorldMapSprite.getWidget(var1); + Client.field668 = var0; + } else if (var2 == 42) { + var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2308, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeInt(var1); + var8.packetBuffer.method5753(var3); + var8.packetBuffer.writeShort(var0); + Client.packetWriter.addNode(var8); + Client.field808 = 0; + class194.field2356 = WorldMapSprite.getWidget(var1); + Client.field668 = var0; + } else if (var2 == 43) { + var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2252, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5752(var3); + var8.packetBuffer.writeInt(var1); + var8.packetBuffer.method5898(var0); + Client.packetWriter.addNode(var8); + Client.field808 = 0; + class194.field2356 = WorldMapSprite.getWidget(var1); + Client.field668 = 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 = UserComparator4.getPacketBufferNode(ClientPacket.field2271, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 45) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = UserComparator4.getPacketBufferNode(ClientPacket.field2338, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method5752(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 = UserComparator4.getPacketBufferNode(ClientPacket.field2250, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method5752(var3); + Client.packetWriter.addNode(var9); + } + } else if (var2 == 47) { + var15 = Client.players[var3]; + if (var15 != null) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var9 = UserComparator4.getPacketBufferNode(ClientPacket.field2261, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShort(var3); + var9.packetBuffer.method5744(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 = UserComparator4.getPacketBufferNode(ClientPacket.field2272, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.writeShort(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 = UserComparator4.getPacketBufferNode(ClientPacket.field2301, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5752(var3); + var9.packetBuffer.method5744(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 = UserComparator4.getPacketBufferNode(ClientPacket.field2337, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.method5753(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 = UserComparator4.getPacketBufferNode(ClientPacket.field2287, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5744(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + var9.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var9); + } + } else { + label788: { + if (var2 != 57) { + if (var2 == 58) { + var16 = WorldMapLabelSize.getWidgetChild(var1, var0); + if (var16 != null) { + var9 = UserComparator4.getPacketBufferNode(ClientPacket.field2281, Client.packetWriter.isaacCipher); + var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); + var9.packetBuffer.method5752(var0); + var9.packetBuffer.method5764(var1); + var9.packetBuffer.writeShortLE(ItemContainer.selectedSpellWidget); + var9.packetBuffer.method5753(var16.itemId); + var9.packetBuffer.method5752(Client.field830); + Client.packetWriter.addNode(var9); + } + break label788; + } + + if (var2 == 1001) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + Client.destinationX = var0; + Client.destinationY = var1; + var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2340, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5752(var3); + var8.packetBuffer.method5753(SecureRandomFuture.baseY + var1); + var8.packetBuffer.writeShort(var0 + class182.baseX); + var8.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); + Client.packetWriter.addNode(var8); + break label788; + } + + if (var2 == 1002) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2302, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5753(var3); + Client.packetWriter.addNode(var8); + break label788; + } + + 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 = UserComparator4.getPacketBufferNode(ClientPacket.field2267, Client.packetWriter.isaacCipher); + var10.packetBuffer.method5753(var17.id); + Client.packetWriter.addNode(var10); + } + } + break label788; + } + + if (var2 == 1004) { + Client.mouseCrossX = var6; + Client.mouseCrossY = var7; + Client.mouseCrossColor = 2; + Client.mouseCrossState = 0; + var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2249, Client.packetWriter.isaacCipher); + var8.packetBuffer.method5753(var3); + Client.packetWriter.addNode(var8); + break label788; + } + + if (var2 == 1005) { + var16 = WorldMapSprite.getWidget(var1); + if (var16 != null && var16.itemQuantities[var0] >= 100000) { + ObjectSound.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + KitDefinition.ItemDefinition_get(var3).name); + } else { + var9 = UserComparator4.getPacketBufferNode(ClientPacket.field2249, Client.packetWriter.isaacCipher); + var9.packetBuffer.method5753(var3); + Client.packetWriter.addNode(var9); + } + + Client.field808 = 0; + class194.field2356 = WorldMapSprite.getWidget(var1); + Client.field668 = var0; + break label788; + } + + if (var2 != 1007) { + if (var2 == 1008 || var2 == 1010 || var2 == 1009 || var2 == 1011 || var2 == 1012) { + class228.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); + } + break label788; + } + } + + var16 = WorldMapLabelSize.getWidgetChild(var1, var0); + if (var16 != null) { + class247.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); + } + } + } + } } } } } - - if ((var4 & 4) != 0) { - var3.field990 = var0.method5607(); - var3.field1017 = var0.method5608(); - var3.field972 = var0.method5606(); - var3.field1018 = var0.readByte(); - var3.field1019 = var0.method5564() + Client.cycle; - var3.field1020 = var0.method5613() + Client.cycle; - var3.field1021 = var0.readUnsignedShort(); - var3.pathLength = 1; - var3.field1032 = 0; - var3.field990 += var3.pathX[0]; - var3.field1017 += var3.pathY[0]; - var3.field972 += var3.pathX[0]; - var3.field1018 += var3.pathY[0]; - } } + if (Client.isItemSelected != 0) { + Client.isItemSelected = 0; + class234.invalidateWidget(WorldMapSprite.getWidget(AbstractUserComparator.selectedItemWidget)); + } + + if (Client.isSpellSelected) { + GrandExchangeOffer.Widget_runOnTargetLeave(); + } + + if (class194.field2356 != null && Client.field808 == 0) { + class234.invalidateWidget(class194.field2356); + } + + } + + @ObfuscatedName("ju") + @ObfuscatedSignature( + signature = "(II)V", + garbageValue = "-2103133941" + ) + @Export("changeGameOptions") + static final void changeGameOptions(int var0) { + Buffer.method5950(); + Projectile.method2247(); + int var1 = class219.VarpDefinition_get(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); + } + + MouseRecorder.method1251(); + } + + 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.musicVolume) { + if (Client.musicVolume == 0 && Client.currentTrackGroupId != -1) { + UserComparator9.method3513(UserComparator7.archive6, Client.currentTrackGroupId, 0, var3, false); + Client.field743 = false; + } else if (var3 == 0) { + class89.method2161(); + Client.field743 = false; + } else if (class206.field2439 != 0) { + class206.musicTrackVolume = var3; + } else { + WorldMapSprite.midiPcmStream.setPcmStreamVolume(var3); + } + + Client.musicVolume = 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.field838 = var2; + } + + if (var1 == 10) { + if (var2 == 0) { + Client.areaSoundEffectVolume = 127; + } + + if (var2 == 1) { + Client.areaSoundEffectVolume = 96; + } + + if (var2 == 2) { + Client.areaSoundEffectVolume = 64; + } + + if (var2 == 3) { + Client.areaSoundEffectVolume = 32; + } + + if (var2 == 4) { + Client.areaSoundEffectVolume = 0; + } + } + + if (var1 == 17) { + Client.followerIndex = var2 & 65535; + } + + AttackOption[] var4; + if (var1 == 18) { + var4 = new AttackOption[]{AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_hidden, AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_dependsOnCombatLevels}; + Client.playerAttackOption = (AttackOption)FaceNormal.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_hidden, AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_dependsOnCombatLevels}; + Client.npcAttackOption = (AttackOption)FaceNormal.findEnumerated(var4, var2); + if (Client.npcAttackOption == null) { + Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + + } } } diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index e021130e9a..aa1dc581ee 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -3,50 +3,49 @@ 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("aa") +@ObfuscatedName("av") @Implements("WorldMapSection1") public class WorldMapSection1 implements WorldMapSection { - @ObfuscatedName("ag") - @Export("client") + @ObfuscatedName("lg") @ObfuscatedSignature( - signature = "Lclient;" + signature = "Lhd;" ) - static Client client; - @ObfuscatedName("x") + @Export("mousedOverWidgetIf1") + static Widget mousedOverWidgetIf1; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1637377849 + intValue = 421699515 ) @Export("minPlane") int minPlane; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1999475083 + intValue = -758111591 ) @Export("planes") int planes; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1574888169 + intValue = -796724619 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1761506511 + intValue = 843613977 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -2112462573 + intValue = 670440885 ) @Export("regionEndX") int regionEndX; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 731154353 + intValue = 374420035 ) @Export("regionEndY") int regionEndY; @@ -54,10 +53,10 @@ public class WorldMapSection1 implements WorldMapSection { WorldMapSection1() { } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Las;I)V", - garbageValue = "1890497148" + signature = "(Lad;I)V", + garbageValue = "411670415" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { @@ -79,34 +78,34 @@ public class WorldMapSection1 implements WorldMapSection { } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIII)Z", - garbageValue = "-65934716" + signature = "(IIIB)Z", + garbageValue = "2" ) @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 && var3 >> 6 == this.regionStartY; } else { return false; } } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(III)Z", - garbageValue = "-240937232" + signature = "(IIB)Z", + garbageValue = "48" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY; } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(IIII)[I", - garbageValue = "1656767825" + garbageValue = "459340529" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { @@ -118,10 +117,10 @@ public class WorldMapSection1 implements WorldMapSection { } } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(III)Lhj;", - garbageValue = "-226825052" + signature = "(III)Lhg;", + garbageValue = "1240901536" ) @Export("coord") public Coord coord(int var1, int var2) { @@ -134,10 +133,10 @@ public class WorldMapSection1 implements WorldMapSection { } } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lkb;I)V", - garbageValue = "-1393433755" + signature = "(Lkn;B)V", + garbageValue = "0" ) @Export("read") public void read(Buffer var1) { @@ -150,683 +149,62 @@ public class WorldMapSection1 implements WorldMapSection { this.postRead(); } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1986942295" + signature = "(B)V", + garbageValue = "-123" ) @Export("postRead") void postRead() { } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(IIIB)I", - garbageValue = "-1" + signature = "(Lic;Ljava/lang/String;Ljava/lang/String;IZI)V", + garbageValue = "-1968156146" ) - public static int method663(int var0, int var1, int var2) { - var2 &= 3; - if (var2 == 0) { - return var0; - } else if (var2 == 1) { - return var1; - } else { - return var2 == 2 ? 7 - var0 : 7 - var1; - } + public static void method656(AbstractArchive var0, String var1, String var2, int var3, boolean var4) { + int var5 = var0.getGroupId(var1); + int var6 = var0.getFileId(var5, var2); + UserComparator9.method3513(var0, var5, var6, var3, var4); } - @ObfuscatedName("g") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(ILce;ZB)I", - garbageValue = "-116" + signature = "(IZIZI)V", + garbageValue = "1727413002" ) - static int method683(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? GrandExchangeOfferNameComparator.field115 : Interpreter.field1130; - if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapRectangle.method388(ScriptEvent.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; - } - } 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; + @Export("sortWorldList") + static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { + if (class13.World_worlds != null) { + Tiles.doWorldSorting(0, class13.World_worlds.length - 1, var0, var1, var2, var3); } + } - @ObfuscatedName("gj") + @ObfuscatedName("k") @ObfuscatedSignature( - signature = "(Lcw;IIIIII)V", - garbageValue = "-1464461419" + signature = "(Ljava/lang/String;I)V", + garbageValue = "-1443767280" ) - @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 var77; - if (var10 != ByteArrayPool.localPlayer) { - var77 = (Client.drawPlayerNames & 4) != 0; - boolean var78 = var77 || WorldMapRectangle.method386() && var10.isFriend(); - if (!var78) { - boolean var13 = (Client.drawPlayerNames & 2) != 0; - var78 = var13 && var10.isClanMember(); - } - - var9 = var78; - } else { - var77 = (Client.drawPlayerNames & 8) != 0; - var9 = var77; - } - } - - if (var9) { - Player var11 = (Player)var0; - if (var1 < var75) { - KeyHandler.method939(var0, var0.defaultHeight + 15); - AbstractFont var12 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); - byte var92 = 9; - var12.drawCentered(var11.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var92, 16777215, 0); - var8 = 18; - } - } - } - - int var87 = -2; - int var15; - int var22; - int var23; - if (!var0.healthBars.method4891()) { - KeyHandler.method939(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 var76 = var91.getBackSprite(); - Sprite var14 = var91.getFrontSprite(); - int var16 = 0; - if (var76 != 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 var93; - if (var89.cycleOffset > var19) { - var21 = var91.field3272 == 0 ? 0 : var91.field3272 * (var19 / var91.field3272); - var22 = var15 * var89.health / var91.width; - var93 = var21 * (var20 - var22) / var89.cycleOffset + var22; - } else { - var93 = var20; - var21 = var91.int5 + var89.cycleOffset - var19; - if (var91.int3 >= 0) { - var17 = (var21 << 8) / (var91.int5 - var91.int3); - } - } - - if (var89.health2 > 0 && var93 < 1) { - var93 = 1; - } - - if (var76 != null && var14 != null) { - if (var15 == var93) { - var93 += var16 * 2; - } else { - var93 += var16; - } - - var21 = var76.subHeight; - var87 += var21; - var22 = var2 + Client.viewportTempX - (var15 >> 1); - var23 = var3 + Client.viewportTempY - var87; - var22 -= var16; - if (var17 >= 0 && var17 < 255) { - var76.drawTransAt(var22, var23, var17); - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var93, var23 + var21); - var14.drawTransAt(var22, var23, var17); - } else { - var76.drawTransBgAt(var22, var23); - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var93, 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, var93, 5, 65280); - Rasterizer2D.Rasterizer2D_fillRectangle(var93 + var21, var22, var15 - var93, 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) { - KeyHandler.method939(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - if (var10.headIconPk != -1) { - var87 += 25; - class52.headIconPkSprites[var10.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); - } - - if (var10.headIconPrayer != -1) { - var87 += 25; - ReflectionCheck.headIconPrayerSprites[var10.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); - } - } - } - - if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { - KeyHandler.method939(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - var87 += class4.headIconHintSprites[1].subHeight; - class4.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87); - } - } - } else { - NPCDefinition var90 = ((NPC)var0).definition; - if (var90.transforms != null) { - var90 = var90.transform(); - } - - if (var90.headIconPrayer >= 0 && var90.headIconPrayer < ReflectionCheck.headIconPrayerSprites.length) { - KeyHandler.method939(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - ReflectionCheck.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) { - KeyHandler.method939(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - class4.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); - } - } - } - - if (var0.overheadText != null && (var1 >= var75 || !var0.field988 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { - KeyHandler.method939(var0, var0.defaultHeight); - if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { - Client.overheadTextXOffsets[Client.overheadTextCount] = TaskHandler.fontBold12.stringWidth(var0.overheadText) / 2; - Client.overheadTextAscents[Client.overheadTextCount] = TaskHandler.fontBold12.ascent; - Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; - Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; - Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; - Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; - Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; - Client.overheadText[Client.overheadTextCount] = var0.overheadText; - ++Client.overheadTextCount; - } - } - - for (int var79 = 0; var79 < 4; ++var79) { - int var96 = var0.hitSplatCycles[var79]; - int var97 = var0.hitSplatTypes[var79]; - HitSplatDefinition var95 = null; - int var80 = 0; - if (var97 >= 0) { - if (var96 <= Client.cycle) { - continue; - } - - var95 = GrandExchangeOfferUnitPriceComparator.method213(var0.hitSplatTypes[var79]); - var80 = var95.field3329; - if (var95 != null && var95.transforms != null) { - var95 = var95.transform(); - if (var95 == null) { - var0.hitSplatCycles[var79] = -1; - continue; - } - } - } else if (var96 < 0) { - continue; - } - - var15 = var0.hitSplatTypes2[var79]; - HitSplatDefinition var81 = null; - if (var15 >= 0) { - var81 = GrandExchangeOfferUnitPriceComparator.method213(var15); - if (var81 != null && var81.transforms != null) { - var81 = var81.transform(); - } - } - - if (var96 - var80 <= Client.cycle) { - if (var95 == null) { - var0.hitSplatCycles[var79] = -1; - } else { - KeyHandler.method939(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 = var95.method4642(); - int var43; - if (var82 != null) { - var22 = var82.subWidth; - var43 = var82.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var26 = var82.xOffset; - } - - var83 = var95.method4631(); - if (var83 != null) { - var23 = var83.subWidth; - var43 = var83.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var27 = var83.xOffset; - } - - var84 = var95.method4632(); - if (var84 != null) { - var24 = var84.subWidth; - var43 = var84.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var28 = var84.xOffset; - } - - var85 = var95.method4633(); - if (var85 != null) { - var25 = var85.subWidth; - var43 = var85.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var29 = var85.xOffset; - } - - if (var81 != null) { - var30 = var81.method4642(); - if (var30 != null) { - var34 = var30.subWidth; - var43 = var30.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var38 = var30.xOffset; - } - - var31 = var81.method4631(); - if (var31 != null) { - var35 = var31.subWidth; - var43 = var31.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var39 = var31.xOffset; - } - - var32 = var81.method4632(); - if (var32 != null) { - var36 = var32.subWidth; - var43 = var32.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var40 = var32.xOffset; - } - - var33 = var81.method4633(); - if (var33 != null) { - var37 = var33.subWidth; - var43 = var33.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var41 = var33.xOffset; - } - } - - Font var86 = var95.getFont(); - if (var86 == null) { - var86 = Script.fontPlain11; - } - - Font var44; - if (var81 != null) { - var44 = var81.getFont(); - if (var44 == null) { - var44 = Script.fontPlain11; - } - } else { - var44 = Script.fontPlain11; - } - - String var45 = null; - String var46 = null; - boolean var47 = false; - int var48 = 0; - var45 = var95.getString(var0.hitSplatValues[var79]); - int var94 = 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; - } else { - var49 = var94 / 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 = var49 * var23; - var51 += var56; - var55 += (var56 - var94) / 2; - } else { - var51 += var94; - } - - 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 = var50 * var35; - var51 += var62; - var61 += (var62 - var48) / 2; - } else { - var51 += var48; - } - - var60 = var51; - if (var37 > 0) { - var51 += var37; - } - } - - var62 = var0.hitSplatCycles[var79] - Client.cycle; - int var63 = var95.field3338 - var62 * var95.field3338 / var95.field3329; - int var64 = var62 * var95.field3341 / var95.field3329 + -var95.field3341; - 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 + var95.field3339 + 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.field3339 + 15; - var73 = var72 - var44.maxAscent; - var74 = var72 + var44.maxDescent; - if (var73 < var67) { - ; - } - - if (var74 > var68) { - ; - } - } - - var73 = 255; - if (var95.field3334 >= 0) { - var73 = (var62 << 8) / (var95.field3329 - var95.field3334); - } - - 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(var23 * var74 + (var65 + var54 - var27), var66, var73); - } - } - - if (var85 != null) { - var85.drawTransAt(var65 + var56 - var29, var66, var73); - } - - var86.drawAlpha(var45, var55 + var65, var69, var95.textColor, 0, var73); - if (var81 != null) { - if (var30 != null) { - var30.drawTransAt(var65 + var57 - var38, var66, var73); - } - - if (var32 != null) { - var32.drawTransAt(var65 + var58 - var40, var66, var73); - } - - if (var31 != null) { - for (var74 = 0; var74 < var50; ++var74) { - var31.drawTransAt(var74 * var35 + (var65 + var59 - var39), var66, var73); - } - } - - if (var33 != null) { - var33.drawTransAt(var60 + var65 - var41, var66, var73); - } - - var44.drawAlpha(var46, var61 + var65, var72, var81.textColor, 0, var73); - } - } else { - if (var82 != null) { - var82.drawTransBgAt(var52 + var65 - var26, var66); - } - - if (var84 != null) { - var84.drawTransBgAt(var53 + var65 - var28, var66); - } - - if (var83 != null) { - for (var74 = 0; var74 < var49; ++var74) { - var83.drawTransBgAt(var74 * var23 + (var65 + var54 - var27), var66); - } - } - - if (var85 != null) { - var85.drawTransBgAt(var56 + var65 - var29, var66); - } - - var86.draw(var45, var55 + var65, var69, var95.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, var61 + var65, var72, var81.textColor | -16777216, 0); - } - } - } - } - } - } - - } + static final void method655(String var0) { + StringBuilder var10000 = (new StringBuilder()).append(var0); + Object var10001 = null; + String var1 = var10000.append(" is already on your ignore list").toString(); + ObjectSound.addGameMessage(30, "", var1); + } + + @ObfuscatedName("jt") + @ObfuscatedSignature( + signature = "(IB)V", + garbageValue = "23" + ) + static void method648(int var0) { + class169.tempMenuAction = new MenuAction(); + class169.tempMenuAction.param0 = Client.menuArguments1[var0]; + class169.tempMenuAction.param1 = Client.menuArguments2[var0]; + class169.tempMenuAction.opcode = Client.menuOpcodes[var0]; + class169.tempMenuAction.identifier = Client.menuIdentifiers[var0]; + class169.tempMenuAction.action = Client.menuActions[var0]; } } diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index 1c62830f9f..37a8d7fa78 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -4,159 +4,153 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("at") +@ObfuscatedName("am") @Implements("WorldMapSection2") public class WorldMapSection2 implements WorldMapSection { - @ObfuscatedName("ix") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1088959325 - ) - @Export("selectedItemWidget") - static int selectedItemWidget; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = 108027763 + intValue = 2038842267 ) @Export("minPlane") int minPlane; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -970262457 + intValue = -469390903 ) @Export("planes") int planes; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1813632253 + intValue = -1406202611 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 460883399 + intValue = 1926246543 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -2027857729 + intValue = -950715137 ) @Export("regionEndX") int regionEndX; - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -848152655 + intValue = 1777420965 ) @Export("regionEndY") int regionEndY; - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -2043506095 + intValue = 1453055839 ) - int field232; + int field221; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = 83876345 + ) + int field215; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -798390703 + ) + int field223; @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1803971443 + intValue = -69028415 ) - int field239; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = 1772744581 - ) - int field234; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -1804974207 - ) - int field241; + int field224; WorldMapSection2() { } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Las;I)V", - garbageValue = "1890497148" + signature = "(Lad;I)V", + garbageValue = "411670415" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field232) { - var1.regionLowX = this.field232; + if (var1.regionLowX > this.field221) { + var1.regionLowX = this.field221; } - if (var1.regionHighX < this.field234) { - var1.regionHighX = this.field234; + if (var1.regionHighX < this.field223) { + var1.regionHighX = this.field223; } - if (var1.regionLowY > this.field239) { - var1.regionLowY = this.field239; + if (var1.regionLowY > this.field215) { + var1.regionLowY = this.field215; } - if (var1.regionHighY < this.field241) { - var1.regionHighY = this.field241; + if (var1.regionHighY < this.field224) { + var1.regionHighY = this.field224; } } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIII)Z", - garbageValue = "-65934716" + signature = "(IIIB)Z", + garbageValue = "2" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.minPlane && var1 < this.minPlane + this.planes) { + if (var1 >= this.minPlane && var1 < this.planes + this.minPlane) { return var2 >> 6 >= this.regionStartX && var2 >> 6 <= this.regionEndX && var3 >> 6 >= this.regionStartY && var3 >> 6 <= this.regionEndY; } else { return false; } } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(III)Z", - garbageValue = "-240937232" + signature = "(IIB)Z", + garbageValue = "48" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >> 6 >= this.field232 && var1 >> 6 <= this.field234 && var2 >> 6 >= this.field239 && var2 >> 6 <= this.field241; + return var1 >> 6 >= this.field221 && var1 >> 6 <= this.field223 && var2 >> 6 >= this.field215 && var2 >> 6 <= this.field224; } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(IIII)[I", - garbageValue = "1656767825" + garbageValue = "459340529" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { if (!this.containsCoord(var1, var2, var3)) { return null; } else { - int[] var4 = new int[]{var2 + (this.field232 * 64 - this.regionStartX * 64), var3 + (this.field239 * 64 - this.regionStartY * 64)}; + int[] var4 = new int[]{var2 + (this.field221 * 64 - this.regionStartX * 64), var3 + (this.field215 * 64 - this.regionStartY * 64)}; return var4; } } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(III)Lhj;", - garbageValue = "-226825052" + signature = "(III)Lhg;", + garbageValue = "1240901536" ) @Export("coord") public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { return null; } else { - int var3 = this.regionStartX * 64 - this.field232 * 64 + var1; - int var4 = var2 + (this.regionStartY * 64 - this.field239 * 64); + int var3 = this.regionStartX * 64 - this.field221 * 64 + var1; + int var4 = var2 + (this.regionStartY * 64 - this.field215 * 64); return new Coord(this.minPlane, var3, var4); } } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lkb;I)V", - garbageValue = "-1393433755" + signature = "(Lkn;B)V", + garbageValue = "0" ) @Export("read") public void read(Buffer var1) { @@ -166,66 +160,40 @@ public class WorldMapSection2 implements WorldMapSection { this.regionStartY = var1.readUnsignedShort(); this.regionEndX = var1.readUnsignedShort(); this.regionEndY = var1.readUnsignedShort(); - this.field232 = var1.readUnsignedShort(); - this.field239 = var1.readUnsignedShort(); - this.field234 = var1.readUnsignedShort(); - this.field241 = var1.readUnsignedShort(); + this.field221 = var1.readUnsignedShort(); + this.field215 = var1.readUnsignedShort(); + this.field223 = var1.readUnsignedShort(); + this.field224 = var1.readUnsignedShort(); this.postRead(); } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1585844448" + signature = "(S)V", + garbageValue = "4206" ) @Export("postRead") void postRead() { } - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(I)[Lgh;", - garbageValue = "-615033295" - ) - public static class194[] method434() { - return new class194[]{class194.field2324, class194.field2325, class194.field2327, class194.field2326, class194.field2332, class194.field2328, class194.field2329, class194.field2330, class194.field2331, class194.field2323}; - } - @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(II)Ljw;", - garbageValue = "1650295452" + signature = "(I)I", + garbageValue = "-2012901203" ) - @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; - } + public static int method372() { + return ViewportMouse.ViewportMouse_entityCount; } - @ObfuscatedName("z") + @ObfuscatedName("d") @ObfuscatedSignature( - signature = "(CI)Z", - garbageValue = "65280" + signature = "(I)V", + garbageValue = "926990190" ) - static boolean method433(char var0) { - return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var0) != -1; + static void method398() { + Login.worldSelectOpen = false; + Login.leftTitleSprite.drawAt(Login.xPadding, 0); + ItemContainer.rightTitleSprite.drawAt(Login.xPadding + 382, 0); + Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); } } diff --git a/runescape-client/src/main/java/WorldMapSection3.java b/runescape-client/src/main/java/WorldMapSection3.java index a7368dacd5..1c6fe5c0e1 100644 --- a/runescape-client/src/main/java/WorldMapSection3.java +++ b/runescape-client/src/main/java/WorldMapSection3.java @@ -1,241 +1,337 @@ +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("aw") +@ObfuscatedName("aj") @Implements("WorldMapSection3") public class WorldMapSection3 implements WorldMapSection { - @ObfuscatedName("n") + @ObfuscatedName("s") @ObfuscatedSignature( - signature = "Lkx;" + signature = "Lau;" ) - @Export("ItemDefinition_fontPlain11") - public static Font ItemDefinition_fontPlain11; - @ObfuscatedName("h") - static int[][][] field404; - @ObfuscatedName("x") + @Export("worldMapEvent") + static WorldMapEvent worldMapEvent; + @ObfuscatedName("hv") @ObfuscatedGetter( - intValue = 575472127 + intValue = -862489875 ) - int field398; + @Export("cameraY") + static int cameraY; @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1833803509 + intValue = 1213021705 ) - int field393; - @ObfuscatedName("k") + int field391; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1774846813 + intValue = -54957495 ) - int field394; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 1983880403 - ) - int field397; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -821206197 - ) - int field396; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 1047570917 - ) - int field401; + int field379; @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -347542775 + intValue = -1592783569 ) - int field402; + int field383; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 370580043 + ) + int field381; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -461171823 + ) + int field382; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -238437965 + ) + int field380; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -344073573 + ) + int field384; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -290440995 + ) + int field385; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = -1800160845 + ) + int field386; @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -311502303 + intValue = 1694202633 ) - int field399; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -912860035 - ) - int field400; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -1883208611 - ) - int field395; + int field387; WorldMapSection3() { } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Las;I)V", - garbageValue = "1890497148" + signature = "(Lad;I)V", + garbageValue = "411670415" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field396) { - var1.regionLowX = this.field396; + if (var1.regionLowX > this.field382) { + var1.regionLowX = this.field382; } - if (var1.regionHighX < this.field396) { - var1.regionHighX = this.field396; + if (var1.regionHighX < this.field382) { + var1.regionHighX = this.field382; } - if (var1.regionLowY > this.field401) { - var1.regionLowY = this.field401; + if (var1.regionLowY > this.field380) { + var1.regionLowY = this.field380; } - if (var1.regionHighY < this.field401) { - var1.regionHighY = this.field401; + if (var1.regionHighY < this.field380) { + var1.regionHighY = this.field380; } } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIII)Z", - garbageValue = "-65934716" + signature = "(IIIB)Z", + garbageValue = "2" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.field398 && var1 < this.field398 + this.field393) { - return var2 >= (this.field394 << 6) + (this.field402 << 3) && var2 <= (this.field394 << 6) + (this.field402 << 3) + 7 && var3 >= (this.field397 << 6) + (this.field399 << 3) && var3 <= (this.field397 << 6) + (this.field399 << 3) + 7; + if (var1 >= this.field391 && var1 < this.field379 + this.field391) { + return var2 >= (this.field383 << 6) + (this.field384 << 3) && var2 <= (this.field383 << 6) + (this.field384 << 3) + 7 && var3 >= (this.field381 << 6) + (this.field385 << 3) && var3 <= (this.field381 << 6) + (this.field385 << 3) + 7; } else { return false; } } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(III)Z", - garbageValue = "-240937232" + signature = "(IIB)Z", + garbageValue = "48" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >= (this.field396 << 6) + (this.field400 << 3) && var1 <= (this.field396 << 6) + (this.field400 << 3) + 7 && var2 >= (this.field401 << 6) + (this.field395 << 3) && var2 <= (this.field401 << 6) + (this.field395 << 3) + 7; + return var1 >= (this.field382 << 6) + (this.field386 << 3) && var1 <= (this.field382 << 6) + (this.field386 << 3) + 7 && var2 >= (this.field380 << 6) + (this.field387 << 3) && var2 <= (this.field380 << 6) + (this.field387 << 3) + 7; } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(IIII)[I", - garbageValue = "1656767825" + garbageValue = "459340529" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { if (!this.containsCoord(var1, var2, var3)) { return null; } else { - int[] var4 = new int[]{var2 + (this.field396 * 64 - this.field394 * 64) + (this.field400 * 8 - this.field402 * 8), var3 + (this.field401 * 64 - this.field397 * 64) + (this.field395 * 8 - this.field399 * 8)}; + int[] var4 = new int[]{var2 + (this.field382 * 64 - this.field383 * 64) + (this.field386 * 8 - this.field384 * 8), var3 + (this.field380 * 64 - this.field381 * 64) + (this.field387 * 8 - this.field385 * 8)}; return var4; } } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(III)Lhj;", - garbageValue = "-226825052" + signature = "(III)Lhg;", + garbageValue = "1240901536" ) @Export("coord") public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { return null; } else { - int var3 = this.field394 * 64 - this.field396 * 64 + (this.field402 * 8 - this.field400 * 8) + var1; - int var4 = var2 + (this.field397 * 64 - this.field401 * 64) + (this.field399 * 8 - this.field395 * 8); - return new Coord(this.field398, var3, var4); + int var3 = this.field383 * 64 - this.field382 * 64 + (this.field384 * 8 - this.field386 * 8) + var1; + int var4 = var2 + (this.field381 * 64 - this.field380 * 64) + (this.field385 * 8 - this.field387 * 8); + return new Coord(this.field391, var3, var4); } } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Lkb;I)V", - garbageValue = "-1393433755" + signature = "(Lkn;B)V", + garbageValue = "0" ) @Export("read") public void read(Buffer var1) { - this.field398 = var1.readUnsignedByte(); - this.field393 = var1.readUnsignedByte(); - this.field394 = var1.readUnsignedShort(); - this.field402 = var1.readUnsignedByte(); - this.field397 = var1.readUnsignedShort(); - this.field399 = var1.readUnsignedByte(); - this.field396 = var1.readUnsignedShort(); - this.field400 = var1.readUnsignedByte(); - this.field401 = var1.readUnsignedShort(); - this.field395 = var1.readUnsignedByte(); - this.method876(); + this.field391 = var1.readUnsignedByte(); + this.field379 = var1.readUnsignedByte(); + this.field383 = var1.readUnsignedShort(); + this.field384 = var1.readUnsignedByte(); + this.field381 = var1.readUnsignedShort(); + this.field385 = var1.readUnsignedByte(); + this.field382 = var1.readUnsignedShort(); + this.field386 = var1.readUnsignedByte(); + this.field380 = var1.readUnsignedShort(); + this.field387 = var1.readUnsignedByte(); + this.method842(); } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "211103794" + garbageValue = "1212353754" ) - void method876() { - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(I)[Lgb;", - garbageValue = "-1687776366" - ) - static LoginPacket[] method895() { - return new LoginPacket[]{LoginPacket.field2315, LoginPacket.field2313, LoginPacket.field2317, LoginPacket.field2319, LoginPacket.field2314, LoginPacket.field2311}; + void method842() { } @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljava/lang/Throwable;Ljava/lang/String;)Lmf;" + signature = "(B)Z", + garbageValue = "26" ) - @Export("newRunException") - public static RunException newRunException(Throwable var0, String var1) { - RunException var2; - if (var0 instanceof RunException) { - var2 = (RunException)var0; - var2.message = var2.message + ' ' + var1; - } else { - var2 = new RunException(var0, var1); + @Export("loadWorlds") + static boolean loadWorlds() { + try { + if (VertexNormal.World_request == null) { + VertexNormal.World_request = WorldMapLabelSize.urlRequester.request(new URL(HorizontalAlignment.worldListURL)); + } else if (VertexNormal.World_request.isDone()) { + byte[] var0 = VertexNormal.World_request.getResponse(); + Buffer var1 = new Buffer(var0); + var1.readInt(); + World.World_count = var1.readUnsignedShort(); + class13.World_worlds = new World[World.World_count]; + + World var3; + for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { + var3 = class13.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(); + } + + GrandExchangeOffer.sortWorlds(class13.World_worlds, 0, class13.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); + VertexNormal.World_request = null; + return true; + } + } catch (Exception var4) { + var4.printStackTrace(); + VertexNormal.World_request = null; } - return var2; + return false; } - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "([BI)V", - garbageValue = "1515618060" + signature = "(II)I", + garbageValue = "-672116026" ) - @Export("ByteArrayPool_release") - public static synchronized void ByteArrayPool_release(byte[] var0) { - if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < 1000) { - ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; - } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < 250) { - ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; - } else if (var0.length == 30000 && ByteArrayPool.ByteArrayPool_largeCount < 50) { - ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; - } else { - if (ByteArrayPool.ByteArrayPool_arrays != null) { - for (int var1 = 0; var1 < RunException.ByteArrayPool_alternativeSizes.length; ++var1) { - if (var0.length == RunException.ByteArrayPool_alternativeSizes[var1] && ByteArrayPool.ByteArrayPool_altSizeArrayCounts[var1] < ByteArrayPool.ByteArrayPool_arrays[var1].length) { - ByteArrayPool.ByteArrayPool_arrays[var1][ByteArrayPool.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; - return; - } + @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("ec") + @ObfuscatedSignature( + signature = "(IZZZB)Lig;", + garbageValue = "34" + ) + @Export("newArchive") + static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) { + ArchiveDisk var4 = null; + if (JagexCache.JagexCache_dat2File != null) { + var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idxFiles[var0], 1000000); + } + + return new Archive(var4, FloorUnderlayDefinition.masterDisk, var0, var1, var2, var3); + } + + @ObfuscatedName("hy") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "-32" + ) + static final void method841() { + int var0 = WorldMapRectangle.menuX; + int var1 = Frames.menuY; + int var2 = class69.menuWidth; + int var3 = ApproximateRouteStrategy.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); + GrandExchangeOfferNameComparator.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 = (Client.menuOptionsCount - 1 - var7) * 15 + var1 + 31; + int var9 = 16777215; + if (var5 > var0 && var5 < var0 + var2 && var6 > var8 - 13 && var6 < var8 + 3) { + var9 = 16776960; + } + + Font var10 = GrandExchangeOfferNameComparator.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); + } + + WorldMapData_0.method243(WorldMapRectangle.menuX, Frames.menuY, class69.menuWidth, ApproximateRouteStrategy.menuHeight); + } + + @ObfuscatedName("jn") + @ObfuscatedSignature( + signature = "(IB)V", + garbageValue = "32" + ) + @Export("Widget_resetModelFrames") + static final void Widget_resetModelFrames(int var0) { + if (UserComparator4.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; } } } } - - @ObfuscatedName("jc") - @ObfuscatedSignature( - signature = "(B)Z", - garbageValue = "-24" - ) - @Export("getTapToDrop") - static boolean getTapToDrop() { - return Client.tapToDrop; - } } diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java index 2e1ffe148f..6b8d08f66c 100644 --- a/runescape-client/src/main/java/WorldMapSectionType.java +++ b/runescape-client/src/main/java/WorldMapSectionType.java @@ -4,41 +4,58 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ap") +@ObfuscatedName("ae") @Implements("WorldMapSectionType") public enum WorldMapSectionType implements Enumerated { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lap;" + signature = "Lae;" ) @Export("WORLDMAPSECTIONTYPE0") WORLDMAPSECTIONTYPE0(3, (byte)0), - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lap;" + signature = "Lae;" ) @Export("WORLDMAPSECTIONTYPE1") - WORLDMAPSECTIONTYPE1(2, (byte)1), - @ObfuscatedName("k") + WORLDMAPSECTIONTYPE1(0, (byte)1), + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lap;" + signature = "Lae;" ) @Export("WORLDMAPSECTIONTYPE2") - WORLDMAPSECTIONTYPE2(0, (byte)2), - @ObfuscatedName("d") + WORLDMAPSECTIONTYPE2(2, (byte)2), + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lap;" + signature = "Lae;" ) @Export("WORLDMAPSECTIONTYPE3") WORLDMAPSECTIONTYPE3(1, (byte)3); - @ObfuscatedName("w") + @ObfuscatedName("au") + @Export("client") + @ObfuscatedSignature( + signature = "Lclient;" + ) + static Client client; + @ObfuscatedName("ew") @ObfuscatedGetter( - intValue = -27254411 + intValue = 2013764495 + ) + static int field174; + @ObfuscatedName("iz") + @ObfuscatedGetter( + intValue = -870801305 + ) + @Export("selectedItemId") + static int selectedItemId; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -159728419 ) @Export("type") final int type; - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("id") final byte id; @@ -47,164 +64,46 @@ public enum WorldMapSectionType implements Enumerated { this.id = var4; } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "56" + signature = "(I)I", + garbageValue = "-995092303" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)[Lap;", - garbageValue = "-1086432793" + signature = "(Ljava/lang/String;ZZI)V", + garbageValue = "267980652" ) - static WorldMapSectionType[] method345() { - return new WorldMapSectionType[]{WORLDMAPSECTIONTYPE0, WORLDMAPSECTIONTYPE1, WORLDMAPSECTIONTYPE2, WORLDMAPSECTIONTYPE3}; + @Export("openURL") + public static void openURL(String var0, boolean var1, boolean var2) { + UrlRequest.method3426(var0, var1, "openjs", var2); } - @ObfuscatedName("m") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "1841927686" + signature = "(ILic;Ljava/lang/String;Ljava/lang/String;IZI)V", + garbageValue = "-2120164920" ) - @Export("changeWorldSelectSorting") - static void changeWorldSelectSorting(int var0, int var1) { - int[] var2 = new int[4]; - int[] var3 = new int[4]; - var2[0] = var0; - var3[0] = var1; - int var4 = 1; - - for (int var5 = 0; var5 < 4; ++var5) { - if (World.World_sortOption1[var5] != var0) { - var2[var4] = World.World_sortOption1[var5]; - var3[var4] = World.World_sortOption2[var5]; - ++var4; - } - } - - World.World_sortOption1 = var2; - World.World_sortOption2 = var3; - UserComparator9.sortWorlds(UserComparator2.World_worlds, 0, UserComparator2.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); + public static void method306(int var0, AbstractArchive var1, String var2, String var3, int var4, boolean var5) { + int var6 = var1.getGroupId(var2); + int var7 = var1.getFileId(var6, var3); + MenuAction.playMusicTrack(var0, var1, var6, var7, var4, var5); } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-1148353199" + signature = "(I)V", + garbageValue = "-230874976" ) - public static int method347(int var0) { - return UserComparator9.method3500(ViewportMouse.ViewportMouse_entityTags[var0]); - } - - @ObfuscatedName("aj") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1668286639" - ) - @Export("runWidgetOnLoadListener") - static void runWidgetOnLoadListener(int var0) { - if (var0 != -1) { - if (LoginScreenAnimation.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; - PlayerAppearance.runScript(var4, 5000000); - } - } - - } - } - } - - @ObfuscatedName("hd") - @ObfuscatedSignature( - signature = "(Lbw;B)V", - garbageValue = "80" - ) - static final void method348(PendingSpawn var0) { - long var1 = 0L; - int var3 = -1; - int var4 = 0; - int var5 = 0; - if (var0.type == 0) { - var1 = GrandExchangeOfferWorldComparator.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); + public static void method312() { + if (NetCache.NetCache_socket != null) { + NetCache.NetCache_socket.close(); } - if (var0.type == 1) { - var1 = GrandExchangeOfferWorldComparator.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 2) { - var1 = GrandExchangeOfferWorldComparator.scene.getGameObjectTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 3) { - var1 = GrandExchangeOfferWorldComparator.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); - } - - if (var1 != 0L) { - int var6 = GrandExchangeOfferWorldComparator.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); - var3 = WorldMapRectangle.Entity_unpackID(var1); - var4 = var6 & 31; - var5 = var6 >> 6 & 3; - } - - var0.objectId = var3; - var0.field963 = var4; - var0.field968 = var5; - } - - @ObfuscatedName("kw") - @ObfuscatedSignature( - signature = "(Lhe;B)Z", - garbageValue = "47" - ) - static final boolean method344(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.method4089(var2, var3 == 1); - } - - if (var1 == 324) { - Client.playerAppearance.changeSex(false); - } - - if (var1 == 325) { - Client.playerAppearance.changeSex(true); - } - - if (var1 == 326) { - PacketBufferNode var4 = FaceNormal.getPacketBufferNode(ClientPacket.field2239, 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/WorldMapSprite.java b/runescape-client/src/main/java/WorldMapSprite.java index 4151c8de35..9e4e09698c 100644 --- a/runescape-client/src/main/java/WorldMapSprite.java +++ b/runescape-client/src/main/java/WorldMapSprite.java @@ -1,18 +1,40 @@ import 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("as") @Implements("WorldMapSprite") public final class WorldMapSprite { - @ObfuscatedName("da") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Lih;" + signature = "Lgw;" ) - @Export("archive3") - static Archive archive3; - @ObfuscatedName("m") + @Export("midiPcmStream") + public static MidiPcmStream midiPcmStream; + @ObfuscatedName("aj") + @ObfuscatedGetter( + intValue = -1383908263 + ) + static int field264; + @ObfuscatedName("dt") + @ObfuscatedGetter( + longValue = -1209502997974573813L + ) + static long field261; + @ObfuscatedName("ed") + @ObfuscatedGetter( + intValue = -1316808169 + ) + static int field254; + @ObfuscatedName("mb") + @ObfuscatedGetter( + intValue = 2099345905 + ) + @Export("selectedSpellFlags") + static int selectedSpellFlags; + @ObfuscatedName("o") @Export("tileColors") final int[] tileColors; @@ -24,116 +46,93 @@ public final class WorldMapSprite { this.tileColors = var1; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( signature = "(III)I", - garbageValue = "1469556779" + garbageValue = "2081761027" ) @Export("getTileColor") final int getTileColor(int var1, int var2) { - return this.tileColors[var1 + var2 * 64]; + return this.tileColors[var2 * 64 + var1]; } - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)Lce;", - garbageValue = "1891668899" + signature = "(IB)Lhd;", + garbageValue = "115" ) - @Export("getScript") - static Script getScript(int var0) { - Script var1 = (Script)Script.Script_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = class41.archive12.takeFile(var0, 0); - if (var2 == null) { + @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 = UserComparator4.loadInterface(var1); + if (!var3) { return null; - } else { - var1 = SecureRandomCallable.newScript(var2); - Script.Script_cached.put(var1, (long)var0); - return var1; } } + + return Widget.Widget_interfaceComponents[var1][var2]; } - @ObfuscatedName("m") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(IIIII)V", - garbageValue = "-173221436" + garbageValue = "2146534283" ) - static final void method514(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) { - SoundCache.field1462[0][var5][var4] = 127; - if (var0 == var5 && var5 > 0) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; - } - - if (var0 + var2 == var5 && var5 < 103) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; - } - - if (var4 == var1 && var4 > 0) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1]; - } - - if (var3 + var1 == var4 && var4 < 103) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; - } - } - } + @Export("itemContainerSetItem") + static void itemContainerSetItem(int var0, int var1, int var2, int var3) { + ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); + if (var4 == null) { + var4 = new ItemContainer(); + ItemContainer.itemContainers.put(var4, (long)var0); } + 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; } - @ObfuscatedName("w") + @ObfuscatedName("ep") @ObfuscatedSignature( - signature = "(Lkb;II)V", - garbageValue = "-1583850141" + signature = "(Lig;Ljava/lang/String;I)V", + garbageValue = "2099603799" ) - public static void method510(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) { - } - } - + static void method481(Archive var0, String var1) { + ArchiveLoader var2 = new ArchiveLoader(var0, var1); + Client.archiveLoaders.add(var2); + Client.field945 += var2.groupCount; } - @ObfuscatedName("e") + @ObfuscatedName("jk") @ObfuscatedSignature( - signature = "(B)[Lla;", - garbageValue = "10" + signature = "(I)V", + garbageValue = "1835863543" ) - static Sprite[] method516() { - Sprite[] var0 = new Sprite[class335.SpriteBuffer_spriteCount]; - - for (int var1 = 0; var1 < class335.SpriteBuffer_spriteCount; ++var1) { - Sprite var2 = var0[var1] = new Sprite(); - var2.width = class335.SpriteBuffer_spriteWidth; - var2.height = class335.SpriteBuffer_spriteHeight; - var2.xOffset = class335.SpriteBuffer_xOffsets[var1]; - var2.yOffset = StructDefinition.SpriteBuffer_yOffsets[var1]; - var2.subWidth = class335.SpriteBuffer_spriteWidths[var1]; - var2.subHeight = class335.SpriteBuffer_spriteHeights[var1]; - int var3 = var2.subHeight * var2.subWidth; - byte[] var4 = class4.SpriteBuffer_pixels[var1]; - var2.pixels = new int[var3]; - - for (int var5 = 0; var5 < var3; ++var5) { - var2.pixels[var5] = DefaultsGroup.SpriteBuffer_spritePalette[var4[var5] & 255]; - } + @Export("FriendSystem_invalidateIgnoreds") + static final void FriendSystem_invalidateIgnoreds() { + TilePaint.method3188(); + if (ClientPreferences.clanChat != null) { + ClientPreferences.clanChat.invalidateIgnoreds(); } - class335.SpriteBuffer_xOffsets = null; - StructDefinition.SpriteBuffer_yOffsets = null; - class335.SpriteBuffer_spriteWidths = null; - class335.SpriteBuffer_spriteHeights = null; - DefaultsGroup.SpriteBuffer_spritePalette = null; - class4.SpriteBuffer_pixels = null; - return var0; } } diff --git a/runescape-client/src/main/java/Wrapper.java b/runescape-client/src/main/java/Wrapper.java index d9d07e965b..bb740ac4fb 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("fw") +@ObfuscatedName("fi") @Implements("Wrapper") public abstract class Wrapper extends DualNode { - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("size") final int size; @@ -13,11 +13,11 @@ public abstract class Wrapper extends DualNode { this.size = var1; } - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("get") abstract Object get(); - @ObfuscatedName("m") + @ObfuscatedName("o") @Export("isSoft") abstract boolean isSoft(); } diff --git a/runescape-client/src/main/java/class0.java b/runescape-client/src/main/java/class0.java index d5dd7a2d4d..ce37fa0c33 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("x") +@ObfuscatedName("m") public interface class0 { - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(Ljava/lang/Object;Lkb;B)V", - garbageValue = "3" - ) - void vmethod64(Object var1, Buffer var2); - @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkb;I)Ljava/lang/Object;", - garbageValue = "-1146837249" + signature = "(Ljava/lang/Object;Lkn;B)V", + garbageValue = "0" ) - Object vmethod74(Buffer var1); + void vmethod59(Object var1, Buffer var2); + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(Lkn;B)Ljava/lang/Object;", + garbageValue = "114" + ) + Object vmethod47(Buffer var1); } diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index f6969271bf..6146089834 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -2,77 +2,519 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("m") +@ObfuscatedName("o") final class class1 implements class0 { - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(Ljava/lang/Object;Lkb;B)V", - garbageValue = "3" - ) - public void vmethod64(Object var1, Buffer var2) { - this.method8((Integer)var1, var2); - } + @ObfuscatedName("go") + @Export("regionMapArchives") + static byte[][] regionMapArchives; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkb;I)Ljava/lang/Object;", - garbageValue = "-1146837249" + signature = "(Ljava/lang/Object;Lkn;B)V", + garbageValue = "0" ) - public Object vmethod74(Buffer var1) { + public void vmethod59(Object var1, Buffer var2) { + this.method8((Integer)var1, var2); + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(Lkn;B)Ljava/lang/Object;", + garbageValue = "114" + ) + public Object vmethod47(Buffer var1) { return var1.readInt(); } - @ObfuscatedName("t") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Ljava/lang/Integer;Lkb;B)V", - garbageValue = "-6" + signature = "(Ljava/lang/Integer;Lkn;I)V", + garbageValue = "554078910" ) void method8(Integer var1, Buffer var2) { var2.writeInt(var1); } - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)Ljava/lang/String;", - garbageValue = "1095307790" + signature = "(Ljava/lang/Throwable;Ljava/lang/String;)Lmr;" ) - static String method21(int var0) { - return ""; - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "(IIB)Lby;", - garbageValue = "72" - ) - @Export("Messages_getByChannelAndID") - static Message Messages_getByChannelAndID(int var0, int var1) { - ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); - return var2.getMessage(var1); - } - - @ObfuscatedName("kt") - @ObfuscatedSignature( - signature = "(IIIILla;Lhg;B)V", - garbageValue = "-12" - ) - @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; - GrandExchangeOfferNameComparator.redHintArrowSprite.method6242(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); + @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 { - ScriptEvent.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); + var2 = new RunException(var0, var1); + } + + return var2; + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(IIIII)V", + garbageValue = "-345681310" + ) + static void method16(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.field1103) { + var5 += var1 - var4.field1103; + } else if (var1 < var4.x) { + var5 += var4.x - var1; + } + + if (var2 > var4.field1104) { + var5 += var2 - var4.field1104; + } else if (var2 < var4.y) { + var5 += var4.y - var2; + } + + if (var5 - 64 <= var4.field1105 && Client.areaSoundEffectVolume != 0 && var0 == var4.plane) { + var5 -= 64; + if (var5 < 0) { + var5 = 0; + } + + int var6 = (var4.field1105 - var5) * Client.areaSoundEffectVolume / var4.field1105; + if (var4.stream1 == null) { + if (var4.soundEffectId >= 0) { + SoundEffect var7 = SoundEffect.readSoundEffect(GrandExchangeOffer.archive4, var4.soundEffectId, 0); + if (var7 != null) { + RawSound var8 = var7.toRawSound().resample(class197.decimator); + RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6); + var9.setNumLoops(-1); + class60.pcmStreamMixer.addSubStream(var9); + var4.stream1 = var9; + } + } + } else { + var4.stream1.method2677(var6); + } + + if (var4.stream2 == null) { + if (var4.soundEffectIds != null && (var4.field1111 -= var3) <= 0) { + int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length); + SoundEffect var12 = SoundEffect.readSoundEffect(GrandExchangeOffer.archive4, var4.soundEffectIds[var11], 0); + if (var12 != null) { + RawSound var13 = var12.toRawSound().resample(class197.decimator); + RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6); + var10.setNumLoops(0); + class60.pcmStreamMixer.addSubStream(var10); + var4.stream2 = var10; + var4.field1111 = var4.field1108 + (int)(Math.random() * (double)(var4.field1115 - var4.field1108)); + } + } + } else { + var4.stream2.method2677(var6); + if (!var4.stream2.hasNext()) { + var4.stream2 = null; + } + } + } else { + if (var4.stream1 != null) { + class60.pcmStreamMixer.removeSubStream(var4.stream1); + var4.stream1 = null; + } + + if (var4.stream2 != null) { + class60.pcmStreamMixer.removeSubStream(var4.stream2); + var4.stream2 = null; + } + } + } + } + + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(CLgz;I)I", + garbageValue = "393583355" + ) + @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("y") + @ObfuscatedSignature( + signature = "(B)I", + garbageValue = "25" + ) + static final int method17() { + return ViewportMouse.ViewportMouse_x; + } + + @ObfuscatedName("fo") + @ObfuscatedSignature( + signature = "(Lhd;III)V", + garbageValue = "45098661" + ) + @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 || !ArchiveLoader.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 = var8 * var4 + var7 * var5 >> 11; + int var10 = var8 * var5 - var7 * var4 >> 11; + int var11 = var9 + class60.localPlayer.x >> 7; + int var12 = class60.localPlayer.y - var10 >> 7; + PacketBufferNode var13 = UserComparator4.getPacketBufferNode(ClientPacket.field2289, Client.packetWriter.isaacCipher); + var13.packetBuffer.writeByte(18); + var13.packetBuffer.writeShort(var12 + SecureRandomFuture.baseY); + var13.packetBuffer.writeShort(var11 + class182.baseX); + var13.packetBuffer.method5744(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(class60.localPlayer.x); + var13.packetBuffer.writeShort(class60.localPlayer.y); + var13.packetBuffer.writeByte(63); + Client.packetWriter.addNode(var13); + Client.destinationX = var11; + Client.destinationY = var12; + } + } + + } + } + + @ObfuscatedName("hm") + @ObfuscatedSignature( + signature = "(IIIIIIII)V", + garbageValue = "1438850851" + ) + @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 != TileItemPile.Client_plane) { + return; + } + + long var7 = 0L; + boolean var9 = true; + boolean var10 = false; + boolean var11 = false; + if (var1 == 0) { + var7 = UserComparator3.scene.getBoundaryObjectTag(var0, var2, var3); + } + + if (var1 == 1) { + var7 = UserComparator3.scene.getWallDecorationTag(var0, var2, var3); + } + + if (var1 == 2) { + var7 = UserComparator3.scene.getGameObjectTag(var0, var2, var3); + } + + if (var1 == 3) { + var7 = UserComparator3.scene.getFloorDecorationTag(var0, var2, var3); + } + + int var12; + if (var7 != 0L) { + var12 = UserComparator3.scene.getObjectFlags(var0, var2, var3, var7); + int var39 = Language.Entity_unpackID(var7); + int var40 = var12 & 31; + int var41 = var12 >> 6 & 3; + ObjectDefinition var13; + if (var1 == 0) { + UserComparator3.scene.removeBoundaryObject(var0, var2, var3); + var13 = Canvas.getObjectDefinition(var39); + if (var13.interactType != 0) { + Client.collisionMaps[var0].method3702(var2, var3, var40, var41, var13.boolean1); + } + } + + if (var1 == 1) { + UserComparator3.scene.removeWallDecoration(var0, var2, var3); + } + + if (var1 == 2) { + UserComparator3.scene.removeGameObject(var0, var2, var3); + var13 = Canvas.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) { + UserComparator3.scene.removeFloorDecoration(var0, var2, var3); + var13 = Canvas.getObjectDefinition(var39); + if (var13.interactType == 1) { + Client.collisionMaps[var0].method3689(var2, var3); + } + } + } + + if (var4 >= 0) { + var12 = var0; + if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { + var12 = var0 + 1; + } + + Scene var42 = UserComparator3.scene; + CollisionMap var14 = Client.collisionMaps[var0]; + ObjectDefinition var15 = Canvas.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 = class206.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 { + var29 = new DynamicObject(var4, 22, var5, var12, var2, var3, var15.animationId, true, (Entity)null); + } + + 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 { + var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, true, (Entity)null); + } + + var42.method3356(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.field527[var5], 0, var26, var28); + if (var15.interactType != 0) { + var14.method3680(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.field528[var5], 0, var26, var28); + if (var15.interactType != 0) { + var14.method3680(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.field527[var5], Tiles.field527[var35], var26, var28); + if (var15.interactType != 0) { + var14.method3680(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.field528[var5], 0, var26, var28); + if (var15.interactType != 0) { + var14.method3680(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.method3356(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.field527[var5], 0, 0, 0, var26, var28); + } else { + Object var32; + long var36; + if (var6 == 5) { + var35 = 16; + var36 = var42.getBoundaryObjectTag(var0, var2, var3); + if (var36 != 0L) { + var35 = Canvas.getObjectDefinition(Language.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.field527[var5], 0, var35 * Tiles.field523[var5], var35 * Tiles.field529[var5], var26, var28); + } else if (var6 == 6) { + var35 = 8; + var36 = var42.getBoundaryObjectTag(var0, var2, var3); + if (var36 != 0L) { + var35 = Canvas.getObjectDefinition(Language.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.field531[var5], var35 * Tiles.field533[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 (var36 != 0L) { + var35 = Canvas.getObjectDefinition(Language.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.field531[var5], var35 * Tiles.field533[var5], var26, var28); + } + } + } + } else { + if (var15.animationId == -1 && var15.transforms == null) { + var29 = var15.getModel(10, var5, var22, var24, var23, var25); + } else { + var29 = new DynamicObject(var4, 10, var5, var12, var2, var3, var15.animationId, true, (Entity)null); + } + + if (var29 != null) { + var42.method3356(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("hn") + @ObfuscatedSignature( + signature = "(IIIII)V", + garbageValue = "-569208973" + ) + static final void method7(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.field813[var4] = true; + } } } diff --git a/runescape-client/src/main/java/class10.java b/runescape-client/src/main/java/class10.java index d01475516a..a545b65925 100644 --- a/runescape-client/src/main/java/class10.java +++ b/runescape-client/src/main/java/class10.java @@ -1,35 +1,35 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("s") +@ObfuscatedName("w") public class class10 { - @ObfuscatedName("x") - final int field53; @ObfuscatedName("m") - final int field54; - @ObfuscatedName("k") - final String field55; + final int field48; + @ObfuscatedName("o") + final int field47; + @ObfuscatedName("q") + final String field46; @ObfuscatedSignature( - signature = "(Lkb;)V" + signature = "(Lkn;)V" ) class10(Buffer var1) { this(var1.readUnsignedByte(), var1.readUnsignedByte(), var1.readStringCp1252NullTerminated()); } class10(int var1, int var2, String var3) { - this.field53 = var1; - this.field54 = var2; - this.field55 = var3; - } - - @ObfuscatedName("x") - String method125() { - return Integer.toHexString(this.field53) + Integer.toHexString(this.field54) + this.field55; + this.field48 = var1; + this.field47 = var2; + this.field46 = var3; } @ObfuscatedName("m") - int method127() { - return this.field54; + String method126() { + return Integer.toHexString(this.field48) + Integer.toHexString(this.field47) + this.field46; + } + + @ObfuscatedName("o") + int method123() { + return this.field47; } } diff --git a/runescape-client/src/main/java/class105.java b/runescape-client/src/main/java/class105.java index 807069bc62..9aebd6bb74 100644 --- a/runescape-client/src/main/java/class105.java +++ b/runescape-client/src/main/java/class105.java @@ -2,113 +2,50 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dd") +@ObfuscatedName("dw") public class class105 { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Ljm;" + signature = "Ljx;" ) @Export("reflectionChecks") - public static IterableNodeDeque reflectionChecks; - @ObfuscatedName("ew") - static int[] field1345; + static IterableNodeDeque reflectionChecks; + @ObfuscatedName("dn") + @ObfuscatedSignature( + signature = "Lig;" + ) + @Export("archive3") + static Archive archive3; static { reflectionChecks = new IterableNodeDeque(); } - @ObfuscatedName("x") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(Liy;Ljava/lang/String;Ljava/lang/String;IZI)V", - garbageValue = "895690551" + signature = "(III)I", + garbageValue = "1577025565" ) - public static void method2394(AbstractArchive var0, String var1, String var2, int var3, boolean var4) { - int var5 = var0.getGroupId(var1); - int var6 = var0.getFileId(var5, var2); - ApproximateRouteStrategy.method1321(var0, var5, var6, var3, var4); - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "(DDIB)[D", - garbageValue = "54" - ) - public static double[] method2395(double var0, double var2, int var4) { - int var5 = var4 * 2 + 1; - double[] var6 = new double[var5]; - int var7 = -var4; - - for (int var8 = 0; var7 <= var4; ++var8) { - var6[var8] = GraphicsDefaults.method5968((double)var7, var0, var2); - ++var7; - } - - return var6; - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;IZB)I", - garbageValue = "26" - ) - @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 = var5 * var1 + var10; - if (var9 / var1 != var5) { - throw new NumberFormatException(); - } - - var5 = var9; - var4 = true; + static final int method2414(int var0, int var1) { + if (var0 == -2) { + return 12345678; + } else if (var0 == -1) { + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; } - if (!var4) { - throw new NumberFormatException(); - } else { - return var5; - } + return var1; } else { - throw new IllegalArgumentException("" + var1); + var1 = (var0 & 127) * var1 / 128; + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; + } + + return (var0 & 65408) + var1; } } } diff --git a/runescape-client/src/main/java/class11.java b/runescape-client/src/main/java/class11.java index fdd0a48d63..3b5bc75710 100644 --- a/runescape-client/src/main/java/class11.java +++ b/runescape-client/src/main/java/class11.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("p") +@ObfuscatedName("y") public interface class11 { } diff --git a/runescape-client/src/main/java/class12.java b/runescape-client/src/main/java/class12.java index 6025d3b3a2..3ee970c576 100644 --- a/runescape-client/src/main/java/class12.java +++ b/runescape-client/src/main/java/class12.java @@ -1,11 +1,11 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("n") +@ObfuscatedName("c") public interface class12 { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkb;)Lkb;" + signature = "(Lkn;)Lkn;" ) - Buffer vmethod131(Buffer var1); + Buffer vmethod133(Buffer var1); } diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java index a435d44bba..9a40159619 100644 --- a/runescape-client/src/main/java/class13.java +++ b/runescape-client/src/main/java/class13.java @@ -1,385 +1,25 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("u") +@ObfuscatedName("h") public final class class13 { - @ObfuscatedName("l") + @ObfuscatedName("sz") @ObfuscatedSignature( - signature = "Lkb;" + signature = "Lmc;" ) - @Export("NetCache_reference") - public static Buffer NetCache_reference; - - @ObfuscatedName("ab") + @Export("platformInfo") + static PlatformInfo platformInfo; + @ObfuscatedName("p") @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "1707746438" + signature = "[Lch;" ) - static int method132(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.FRIEND_COUNT) { - if (Projectile.friendSystem.field1092 == 0) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -2; - } else if (Projectile.friendSystem.field1092 == 1) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Projectile.friendSystem.friendsList.getSize(); - } - - return 1; - } else { - int var3; - if (var0 == ScriptOpcodes.FRIEND_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (Projectile.friendSystem.method1952() && var3 >= 0 && var3 < Projectile.friendSystem.friendsList.getSize()) { - Friend var8 = (Friend)Projectile.friendSystem.friendsList.get(var3); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.getName(); - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.getPreviousName(); - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (Projectile.friendSystem.method1952() && var3 >= 0 && var3 < Projectile.friendSystem.friendsList.getSize()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Projectile.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 (Projectile.friendSystem.method1952() && var3 >= 0 && var3 < Projectile.friendSystem.friendsList.getSize()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Projectile.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]; - class52.method902(var5, var6); - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_ADD) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - Projectile.friendSystem.addFriend(var5); - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_DEL) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - Projectile.friendSystem.removeFriend(var5); - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_ADD) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - Projectile.friendSystem.addIgnore(var5); - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_DEL) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - Projectile.friendSystem.removeIgnore(var5); - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_TEST) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - var5 = Occluder.method3400(var5); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Projectile.friendSystem.isFriended(new Username(var5, WorldMapIcon_0.loginType), false) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { - if (InterfaceParent.clanChat != null) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = InterfaceParent.clanChat.name; - } else { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { - if (InterfaceParent.clanChat != null) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = InterfaceParent.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 (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize()) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = InterfaceParent.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 (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)InterfaceParent.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 (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)InterfaceParent.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] = InterfaceParent.clanChat != null ? InterfaceParent.clanChat.minKick : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - PlayerAppearance.clanKickUser(var5); - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = InterfaceParent.clanChat != null ? InterfaceParent.clanChat.rank * 1347537209 * -1076865783 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { - var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; - GrandExchangeEvent.Clan_joinChat(var5); - return 1; - } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { - WorldMapDecoration.Clan_leaveChat(); - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { - if (!Projectile.friendSystem.method1952()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Projectile.friendSystem.ignoreList.getSize(); - } - - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (Projectile.friendSystem.method1952() && var3 >= 0 && var3 < Projectile.friendSystem.ignoreList.getSize()) { - Ignored var4 = (Ignored)Projectile.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 = Occluder.method3400(var5); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Projectile.friendSystem.isIgnored(new Username(var5, WorldMapIcon_0.loginType)) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize() && InterfaceParent.clanChat.get(var3).getUsername().equals(ByteArrayPool.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 (InterfaceParent.clanChat != null && InterfaceParent.clanChat.owner != null) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = InterfaceParent.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 (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize() && ((ClanMate)InterfaceParent.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) { - Projectile.friendSystem.friendsList.removeComparator(); - return 1; - } else { - boolean var7; - if (var0 == 3629) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Projectile.friendSystem.friendsList.addComparator(new UserComparator1(var7)); - return 1; - } else if (var0 == 3630) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Projectile.friendSystem.friendsList.addComparator(new UserComparator2(var7)); - return 1; - } else if (var0 == 3631) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Projectile.friendSystem.friendsList.addComparator(new UserComparator3(var7)); - return 1; - } else if (var0 == 3632) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Projectile.friendSystem.friendsList.addComparator(new UserComparator4(var7)); - return 1; - } else if (var0 == 3633) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Projectile.friendSystem.friendsList.addComparator(new UserComparator5(var7)); - return 1; - } else if (var0 == 3634) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Projectile.friendSystem.friendsList.addComparator(new UserComparator6(var7)); - return 1; - } else if (var0 == 3635) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Projectile.friendSystem.friendsList.addComparator(new UserComparator7(var7)); - return 1; - } else if (var0 == 3636) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Projectile.friendSystem.friendsList.addComparator(new UserComparator8(var7)); - return 1; - } else if (var0 == 3637) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Projectile.friendSystem.friendsList.addComparator(new UserComparator9(var7)); - return 1; - } else if (var0 == 3638) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Projectile.friendSystem.friendsList.addComparator(new UserComparator10(var7)); - return 1; - } else if (var0 == 3639) { - Projectile.friendSystem.friendsList.sort(); - return 1; - } else if (var0 == 3640) { - Projectile.friendSystem.ignoreList.removeComparator(); - return 1; - } else if (var0 == 3641) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Projectile.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); - return 1; - } else if (var0 == 3642) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Projectile.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); - return 1; - } else if (var0 == 3643) { - Projectile.friendSystem.ignoreList.sort(); - return 1; - } else if (var0 == 3644) { - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.removeComparator(); - } - - return 1; - } else if (var0 == 3645) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.addComparator(new UserComparator1(var7)); - } - - return 1; - } else if (var0 == 3646) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.addComparator(new UserComparator2(var7)); - } - - return 1; - } else if (var0 == 3647) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.addComparator(new UserComparator3(var7)); - } - - return 1; - } else if (var0 == 3648) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.addComparator(new UserComparator4(var7)); - } - - return 1; - } else if (var0 == 3649) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.addComparator(new UserComparator5(var7)); - } - - return 1; - } else if (var0 == 3650) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.addComparator(new UserComparator6(var7)); - } - - return 1; - } else if (var0 == 3651) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.addComparator(new UserComparator7(var7)); - } - - return 1; - } else if (var0 == 3652) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.addComparator(new UserComparator8(var7)); - } - - return 1; - } else if (var0 == 3653) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.addComparator(new UserComparator9(var7)); - } - - return 1; - } else if (var0 == 3654) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.addComparator(new UserComparator10(var7)); - } - - return 1; - } else if (var0 == 3655) { - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.sort(); - } - - return 1; - } else if (var0 == 3656) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - Projectile.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); - return 1; - } else if (var0 == 3657) { - var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.addComparator(new BuddyRankComparator(var7)); - } - - return 1; - } else { - return 2; - } - } - } else { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - if (InterfaceParent.clanChat != null && var3 < InterfaceParent.clanChat.getSize() && ((ClanMate)InterfaceParent.clanChat.get(var3)).isIgnored()) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } - } - } - } - - @ObfuscatedName("ek") + @Export("World_worlds") + static World[] World_worlds; + @ObfuscatedName("bo") @ObfuscatedSignature( - signature = "(I)Lml;", - garbageValue = "637526899" + signature = "Llh;" ) - @Export("getWorldMap") - static WorldMap getWorldMap() { - return GrandExchangeOfferAgeComparator.worldMap; - } + @Export("worldSelectLeftSprite") + static IndexedSprite worldSelectLeftSprite; } diff --git a/runescape-client/src/main/java/class155.java b/runescape-client/src/main/java/class155.java index 0f8680f2f2..9fc5644a38 100644 --- a/runescape-client/src/main/java/class155.java +++ b/runescape-client/src/main/java/class155.java @@ -1,7 +1,7 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("es") +@ObfuscatedName("ee") public interface class155 { - @ObfuscatedName("x") - void method3442(Object var1); + @ObfuscatedName("m") + void method3449(Object var1); } diff --git a/runescape-client/src/main/java/class169.java b/runescape-client/src/main/java/class169.java index 184f59f11b..4eca7656c3 100644 --- a/runescape-client/src/main/java/class169.java +++ b/runescape-client/src/main/java/class169.java @@ -3,184 +3,62 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fu") +@ObfuscatedName("fg") public enum class169 implements Enumerated { - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lfu;" - ) - field2012(0, 0), @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lfu;" + signature = "Lfg;" ) - field2007(1, 1), - @ObfuscatedName("k") + field2028(0, 0), + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lfu;" + signature = "Lfg;" ) - field2008(3, 2), - @ObfuscatedName("d") + field2023(1, 1), + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lfu;" + signature = "Lfg;" ) - field2006(2, 3); + field2024(2, 2), + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "Lfg;" + ) + field2025(3, 3); - @ObfuscatedName("z") - @Export("ItemDefinition_inMembersWorld") - public static boolean ItemDefinition_inMembersWorld; - @ObfuscatedName("gf") + @ObfuscatedName("em") + @Export("worldHost") + static String worldHost; + @ObfuscatedName("lz") @ObfuscatedSignature( - signature = "[Lle;" + signature = "Lcu;" ) - @Export("mapSceneSprites") - static IndexedSprite[] mapSceneSprites; - @ObfuscatedName("w") + @Export("tempMenuAction") + static MenuAction tempMenuAction; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1763845437 + intValue = 1619029739 ) - public final int field2014; - @ObfuscatedName("v") + public final int field2026; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1800480151 + intValue = 1641384221 ) @Export("id") final int id; class169(int var3, int var4) { - this.field2014 = var3; + this.field2026 = var3; this.id = var4; } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "56" + signature = "(I)I", + garbageValue = "-995092303" ) @Export("rsOrdinal") public int rsOrdinal() { return this.id; } - - @ObfuscatedName("x") - @Export("sleepExact") - public static final void sleepExact(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) { - } - } - - } - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "2060432902" - ) - static int method3545(int var0, int var1) { - FloorOverlayDefinition var2 = UserComparator9.FloorUnderlayDefinition_get(var0); - if (var2 == null) { - return var1; - } else if (var2.secondaryRgb >= 0) { - return var2.secondaryRgb | -16777216; - } else { - int var4; - int var5; - if (var2.texture >= 0) { - var4 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var2.texture); - byte var11 = 96; - int var3; - if (var4 == -2) { - var3 = 12345678; - } else if (var4 == -1) { - if (var11 < 0) { - var11 = 0; - } else if (var11 > 127) { - var11 = 127; - } - - var5 = 127 - var11; - var3 = var5; - } else { - var5 = var11 * (var4 & 127) / 128; - if (var5 < 2) { - var5 = 2; - } else if (var5 > 126) { - var5 = 126; - } - - var3 = var5 + (var4 & 65408); - } - - return Rasterizer3D.Rasterizer3D_colorPalette[var3] | -16777216; - } else if (var2.primaryRgb == 16711935) { - return var1; - } else { - var4 = var2.hue; - var5 = var2.saturation; - int var6 = var2.lightness; - if (var6 > 179) { - var5 /= 2; - } - - if (var6 > 192) { - var5 /= 2; - } - - if (var6 > 217) { - var5 /= 2; - } - - if (var6 > 243) { - var5 /= 2; - } - - int var7 = (var5 / 32 << 7) + var6 / 2 + (var4 / 4 << 10); - byte var9 = 96; - int var8; - if (var7 == -2) { - var8 = 12345678; - } else { - int var12; - if (var7 == -1) { - if (var9 < 0) { - var9 = 0; - } else if (var9 > 127) { - var9 = 127; - } - - var12 = 127 - var9; - var8 = var12; - } else { - var12 = var9 * (var7 & 127) / 128; - if (var12 < 2) { - var12 = 2; - } else if (var12 > 126) { - var12 = 126; - } - - var8 = var12 + (var7 & 65408); - } - } - - return Rasterizer3D.Rasterizer3D_colorPalette[var8] | -16777216; - } - } - } } diff --git a/runescape-client/src/main/java/class170.java b/runescape-client/src/main/java/class170.java index c80fb31e67..a53387b377 100644 --- a/runescape-client/src/main/java/class170.java +++ b/runescape-client/src/main/java/class170.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ft") +@ObfuscatedName("fu") public interface class170 { } diff --git a/runescape-client/src/main/java/class171.java b/runescape-client/src/main/java/class171.java index e85562e9d8..72aed82be1 100644 --- a/runescape-client/src/main/java/class171.java +++ b/runescape-client/src/main/java/class171.java @@ -1,7 +1,29 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fj") +@ObfuscatedName("ff") public class class171 implements class170 { - @ObfuscatedName("r") - public static String field2016; + @ObfuscatedName("u") + static byte[][][] field2036; + + @ObfuscatedName("g") + public static int method3571(long var0) { + return (int)(var0 >>> 14 & 3L); + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + signature = "(II)I", + garbageValue = "-316130396" + ) + @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/class182.java b/runescape-client/src/main/java/class182.java index 5c646e4b43..6f60635302 100644 --- a/runescape-client/src/main/java/class182.java +++ b/runescape-client/src/main/java/class182.java @@ -1,27 +1,32 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gg") +@ObfuscatedName("gv") public class class182 { - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("directions") - public static int[][] directions; - @ObfuscatedName("d") + static int[][] directions; + @ObfuscatedName("j") @Export("distances") - public static int[][] distances; - @ObfuscatedName("v") + static int[][] distances; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1538364035 + intValue = 773651675 ) - public static int field2097; - @ObfuscatedName("z") + static int field2132; + @ObfuscatedName("u") @Export("bufferX") - public static int[] bufferX; - @ObfuscatedName("t") + static int[] bufferX; + @ObfuscatedName("a") @Export("bufferY") - public static int[] bufferY; + static int[] bufferY; + @ObfuscatedName("fz") + @ObfuscatedGetter( + intValue = 525602501 + ) + @Export("baseX") + static int baseX; static { directions = new int[128][128]; @@ -29,14 +34,4 @@ public class class182 { bufferX = new int[4096]; bufferY = new int[4096]; } - - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "(II)[B", - garbageValue = "130729022" - ) - @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/class190.java b/runescape-client/src/main/java/class190.java index 6fa0fef623..f21b1ae7c8 100644 --- a/runescape-client/src/main/java/class190.java +++ b/runescape-client/src/main/java/class190.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("gc") +@ObfuscatedName("gm") public interface class190 { } diff --git a/runescape-client/src/main/java/class194.java b/runescape-client/src/main/java/class194.java index caa08889e5..9bb2daf6ac 100644 --- a/runescape-client/src/main/java/class194.java +++ b/runescape-client/src/main/java/class194.java @@ -1,85 +1,81 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gh") +@ObfuscatedName("gl") public class class194 { - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lgh;" - ) - public static final class194 field2324; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lgh;" + signature = "Lgl;" ) - public static final class194 field2325; - @ObfuscatedName("k") + public static final class194 field2357; + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgh;" + signature = "Lgl;" ) - public static final class194 field2327; - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "Lgh;" - ) - public static final class194 field2326; - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lgh;" - ) - public static final class194 field2332; - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "Lgh;" - ) - public static final class194 field2328; + public static final class194 field2354; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lgh;" + signature = "Lgl;" ) - public static final class194 field2329; + public static final class194 field2355; + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "Lgl;" + ) + public static final class194 field2358; + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "Lgl;" + ) + public static final class194 field2353; + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "Lgl;" + ) + public static final class194 field2360; + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "Lgl;" + ) + public static final class194 field2359; + @ObfuscatedName("u") + @ObfuscatedSignature( + signature = "Lgl;" + ) + public static final class194 field2363; + @ObfuscatedName("a") + @ObfuscatedSignature( + signature = "Lgl;" + ) + public static final class194 field2361; @ObfuscatedName("z") @ObfuscatedSignature( - signature = "Lgh;" + signature = "Lgl;" ) - public static final class194 field2330; - @ObfuscatedName("t") + public static final class194 field2362; + @ObfuscatedName("jp") @ObfuscatedSignature( - signature = "Lgh;" + signature = "Lhd;" ) - public static final class194 field2331; - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Lgh;" - ) - public static final class194 field2323; + static Widget field2356; static { - field2324 = new class194(14); - field2325 = new class194(5); - field2327 = new class194(2); - field2326 = new class194(6); - field2332 = new class194(15); - field2328 = new class194(4); - field2329 = new class194(7); - field2330 = new class194(4); - field2331 = new class194(3); - field2323 = new class194(5); + field2357 = new class194(6); + field2354 = new class194(7); + field2355 = new class194(4); + field2358 = new class194(14); + field2353 = new class194(2); + field2360 = new class194(15); + field2359 = new class194(5); + field2363 = new class194(3); + field2361 = new class194(4); + field2362 = new class194(5); } @ObfuscatedSignature( signature = "(I)V", - garbageValue = "14" + garbageValue = "6" ) class194(int var1) { } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(IB)Z", - garbageValue = "-67" - ) - public static boolean method3694(int var0) { - return (var0 >> 21 & 1) != 0; - } } diff --git a/runescape-client/src/main/java/class195.java b/runescape-client/src/main/java/class195.java index 42f00749b4..f34175eeb7 100644 --- a/runescape-client/src/main/java/class195.java +++ b/runescape-client/src/main/java/class195.java @@ -2,42 +2,80 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gm") +@ObfuscatedName("go") public class class195 { - @ObfuscatedName("t") + @ObfuscatedName("ba") @ObfuscatedSignature( - signature = "(IIIIB)I", - garbageValue = "90" + signature = "Lmo;" ) - static final int method3695(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); + @Export("loginType") + static LoginType loginType; + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "([BI)[B", + garbageValue = "-92628097" + ) + static byte[] method3748(byte[] var0) { + int var1 = var0.length; + byte[] var2 = new byte[var1]; + System.arraycopy(var0, 0, var2, 0, var1); + return var2; } - @ObfuscatedName("s") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(Lhe;IS)V", - garbageValue = "-23676" + signature = "(IIILjg;IB)V", + garbageValue = "-24" ) - @Export("Widget_setKeyIgnoreHeld") - static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { - if (var0.field2555 == null) { - throw new RuntimeException(); - } else { - if (var0.field2706 == null) { - var0.field2706 = new int[var0.field2555.length]; + static void method3747(int var0, int var1, int var2, ObjectDefinition var3, int var4) { + ObjectSound var5 = new ObjectSound(); + var5.plane = var0; + var5.x = var1 * 128; + var5.y = var2 * 128; + int var6 = var3.sizeX; + int var7 = var3.sizeY; + if (var4 == 1 || var4 == 3) { + var6 = var3.sizeY; + var7 = var3.sizeX; + } + + var5.field1103 = (var6 + var1) * 128; + var5.field1104 = (var7 + var2) * 128; + var5.soundEffectId = var3.ambientSoundId; + var5.field1105 = var3.int4 * 128; + var5.field1108 = var3.int5; + var5.field1115 = var3.int6; + var5.soundEffectIds = var3.soundEffectIds; + if (var3.transforms != null) { + var5.obj = var3; + var5.set(); + } + + ObjectSound.objectSounds.addFirst(var5); + if (var5.soundEffectIds != null) { + var5.field1111 = var5.field1108 + (int)(Math.random() * (double)(var5.field1115 - var5.field1108)); + } + + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1529350789" + ) + public static void method3749() { + while (true) { + ArchiveDiskAction var0; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { + var0 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); } - var0.field2706[var1] = Integer.MAX_VALUE; + if (var0 == null) { + return; + } + + var0.archive.load(var0.archiveDisk, (int)var0.key, var0.data, false); } } - - @ObfuscatedName("h") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;I)V", - garbageValue = "2095745244" - ) - static final void method3696(String var0) { - GrandExchangeEvent.method165("Please remove " + var0 + " from your friend list first"); - } } diff --git a/runescape-client/src/main/java/class197.java b/runescape-client/src/main/java/class197.java index 045dd7574d..d8a09e15f3 100644 --- a/runescape-client/src/main/java/class197.java +++ b/runescape-client/src/main/java/class197.java @@ -1,24 +1,82 @@ +import java.io.DataInputStream; +import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gs") +@ObfuscatedName("gg") public class class197 { - @ObfuscatedName("x") - static int[] field2350; - @ObfuscatedName("w") - @Export("ArchiveDiskActionHandler_thread") - static Thread ArchiveDiskActionHandler_thread; + @ObfuscatedName("qy") + @ObfuscatedSignature( + signature = "Ldv;" + ) + @Export("decimator") + static Decimator decimator; + @ObfuscatedName("m") + static int[] field2379; static { new Object(); - field2350 = new int[33]; - field2350[0] = 0; + field2379 = new int[33]; + field2379[0] = 0; int var0 = 2; for (int var1 = 1; var1 < 33; ++var1) { - field2350[var1] = var0 - 1; + field2379[var1] = var0 - 1; var0 += var0; } } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", + garbageValue = "-1357689499" + ) + @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 = class332.method6316(var1); + } + + if (var0 != null) { + if (var1 != null) { + var2 = var2 + " | "; + } + + var2 = var2 + var0; + } + + System.out.println("Error: " + var2); + var2 = var2.replace(':', '.'); + var2 = var2.replace('@', '_'); + var2 = var2.replace('&', '_'); + var2 = var2.replace('#', '_'); + if (RunException.RunException_applet == null) { + return; + } + + URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + RunException.clientType + "&e=" + var2); + DataInputStream var4 = new DataInputStream(var3.openStream()); + var4.read(); + var4.close(); + } catch (Exception var5) { + } + + } + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(Lic;I)V", + garbageValue = "-1399485116" + ) + public static void method3771(AbstractArchive var0) { + StructDefinition.StructDefinition_archive = var0; + } } diff --git a/runescape-client/src/main/java/class198.java b/runescape-client/src/main/java/class198.java index bc53377969..2faff3ce0e 100644 --- a/runescape-client/src/main/java/class198.java +++ b/runescape-client/src/main/java/class198.java @@ -2,23 +2,21 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gk") +@ObfuscatedName("gh") public class class198 { - @ObfuscatedName("bo") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lii;" + signature = "Lic;" ) - static GameBuild field2353; + @Export("ParamDefinition_archive") + static AbstractArchive ParamDefinition_archive; - @ObfuscatedName("jk") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(IIB)V", - garbageValue = "1" + signature = "(IB)Z", + garbageValue = "-100" ) - @Export("runIntfCloseListeners") - static final void runIntfCloseListeners(int var0, int var1) { - if (LoginScreenAnimation.loadInterface(var0)) { - SecureRandomCallable.runComponentCloseListeners(Widget.Widget_interfaceComponents[var0], var1); - } + public static boolean method3774(int var0) { + return (var0 >> 31 & 1) != 0; } } diff --git a/runescape-client/src/main/java/class2.java b/runescape-client/src/main/java/class2.java index 73ea9b8da0..d4882636a6 100644 --- a/runescape-client/src/main/java/class2.java +++ b/runescape-client/src/main/java/class2.java @@ -1,143 +1,153 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("k") +@ObfuscatedName("q") final class class2 implements class0 { - @ObfuscatedName("x") + @ObfuscatedName("qo") @ObfuscatedSignature( - signature = "(Ljava/lang/Object;Lkb;B)V", - garbageValue = "3" + signature = "Ldt;" ) - public void vmethod64(Object var1, Buffer var2) { - this.method36((Long)var1, var2); - } + @Export("pcmPlayer0") + static PcmPlayer pcmPlayer0; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkb;I)Ljava/lang/Object;", - garbageValue = "-1146837249" + signature = "(Ljava/lang/Object;Lkn;B)V", + garbageValue = "0" ) - public Object vmethod74(Buffer var1) { + public void vmethod59(Object var1, Buffer var2) { + this.method23((Long)var1, var2); + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(Lkn;B)Ljava/lang/Object;", + garbageValue = "114" + ) + public Object vmethod47(Buffer var1) { return var1.readLong(); } - @ObfuscatedName("t") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Ljava/lang/Long;Lkb;I)V", - garbageValue = "1997729156" + signature = "(Ljava/lang/Long;Lkn;I)V", + garbageValue = "2145124737" ) - void method36(Long var1, Buffer var2) { + void method23(Long var1, Buffer var2) { var2.writeLong(var1); } - @ObfuscatedName("d") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)Ljava/lang/Class;", - garbageValue = "15" + signature = "(IS)I", + garbageValue = "-12961" ) - @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 static int method32(int var0) { + return Language.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var0]); } - @ObfuscatedName("q") + @ObfuscatedName("hi") @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "-453717228" + signature = "(ZLkb;I)V", + garbageValue = "1542604247" ) - static int method28(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var3 = MusicPatchNode.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); - } else { - var3 = var2 ? GrandExchangeOfferNameComparator.field115 : Interpreter.field1130; - } + @Export("updateNpcs") + static final void updateNpcs(boolean var0, PacketBuffer var1) { + Client.field687 = 0; + Client.field718 = 0; + UserList.method5333(); - ItemContainer.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 = ByteArrayPool.localPlayer.appearance.getChatHeadId(); - return 1; + int var2; + while (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { + var2 = var1.readBits(15); + if (var2 == 32767) { + break; + } + + 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 = Client.defaultRotations[var1.readBits(3)]; + if (var3) { + var4.orientation = var4.rotation = var5; + } + + int var6 = var1.readBits(1); + int var7 = var1.readBits(1); + if (var7 == 1) { + Client.field719[++Client.field718 - 1] = var2; + } + + var4.definition = StudioGame.getNpcDefinition(var1.readBits(14)); + int var8; + if (var0) { + var8 = var1.readBits(8); + if (var8 > 127) { + var8 -= 256; + } } else { - return 2; + var8 = var1.readBits(5); + if (var8 > 15) { + var8 -= 32; + } } - } 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 = AbstractWorldMapData.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; + + int var9; + if (var0) { + var9 = var1.readBits(8); + if (var9 > 127) { + var9 -= 256; + } } else { - var3.itemQuantityMode = 2; + var9 = var1.readBits(5); + if (var9 > 15) { + var9 -= 32; + } } - if (var3.field2622 > 0) { - var3.modelZoom = var3.modelZoom * 32 / var3.field2622; - } else if (var3.rawWidth > 0) { - var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; + var4.field967 = var4.definition.size; + var4.field1017 = var4.definition.rotation; + if (var4.field1017 == 0) { + var4.rotation = 0; } - return 1; + var4.walkSequence = var4.definition.walkSequence; + var4.walkBackSequence = var4.definition.walkBackSequence; + var4.walkLeftSequence = var4.definition.walkLeftSequence; + var4.walkRightSequence = var4.definition.walkRightSequence; + var4.idleSequence = var4.definition.idleSequence; + var4.turnLeftSequence = var4.definition.turnLeftSequence; + var4.turnRightSequence = var4.definition.turnRightSequence; + var4.method2142(class60.localPlayer.pathX[0] + var9, class60.localPlayer.pathY[0] + var8, var6 == 1); } - } - @ObfuscatedName("jn") - @ObfuscatedSignature( - signature = "(ZB)V", - garbageValue = "1" - ) - @Export("setTapToDrop") - static void setTapToDrop(boolean var0) { - Client.tapToDrop = var0; - } + var1.exportIndex(); + BoundaryObject.method3389(var1); + + for (var2 = 0; var2 < Client.field687; ++var2) { + int var10 = Client.field907[var2]; + if (Client.npcs[var10].npcCycle != Client.cycle) { + Client.npcs[var10].definition = null; + Client.npcs[var10] = 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("jl") - @ObfuscatedSignature( - signature = "(IIIIIIIB)V", - garbageValue = "16" - ) - @Export("updateRootInterface") - static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (LoginScreenAnimation.loadInterface(var0)) { - WorldMapDecorationType.updateInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); } } } diff --git a/runescape-client/src/main/java/class200.java b/runescape-client/src/main/java/class200.java index 16080c6700..4fe61b0973 100644 --- a/runescape-client/src/main/java/class200.java +++ b/runescape-client/src/main/java/class200.java @@ -1,67 +1,45 @@ -import java.awt.image.BufferedImage; -import java.awt.image.PixelGrabber; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import javax.imageio.ImageIO; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gy") +@ObfuscatedName("gi") public class class200 { - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lgy;" - ) - static final class200 field2369; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lgy;" + signature = "Lgi;" ) - static final class200 field2371; - @ObfuscatedName("k") + static final class200 field2400; + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lgy;" + signature = "Lgi;" ) - static final class200 field2370; - @ObfuscatedName("hm") - @ObfuscatedGetter( - intValue = 319009619 + static final class200 field2398; + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "Lgi;" ) - @Export("cameraZ") - static int cameraZ; + static final class200 field2399; static { - field2369 = new class200(); - field2371 = new class200(); - field2370 = new class200(); + field2400 = new class200(); + field2398 = new class200(); + field2399 = new class200(); } class200() { } - @ObfuscatedName("x") + @ObfuscatedName("ao") @ObfuscatedSignature( - signature = "([BI)Lla;", - garbageValue = "1925772237" + signature = "(IZII)V", + garbageValue = "405257362" ) - @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 final void method3803(int var0, boolean var1, int var2) { + if (var0 >= 8000 && var0 <= 48000) { + class237.field3113 = var0; + Messages.PcmPlayer_stereo = var1; + UserComparator3.field2009 = var2; + } else { + throw new IllegalArgumentException(); } - - return new Sprite(0, 0); } } diff --git a/runescape-client/src/main/java/class204.java b/runescape-client/src/main/java/class204.java index eac7c4a05a..0307b9525f 100644 --- a/runescape-client/src/main/java/class204.java +++ b/runescape-client/src/main/java/class204.java @@ -1,85 +1,48 @@ 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("gp") +@ObfuscatedName("gk") public class class204 { + @ObfuscatedName("rd") + @ObfuscatedGetter( + intValue = -815040413 + ) + static int field2420; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = 1826574669 + ) + static int field2422; + @ObfuscatedName("ae") + @Export("fontHelvetica13") + static java.awt.Font fontHelvetica13; + static { new HashMap(); } - @ObfuscatedName("gb") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIIIZI)V", - garbageValue = "-1868229835" + signature = "(III)I", + garbageValue = "1343176092" ) - @Export("setViewportShape") - static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { - if (var2 < 1) { - var2 = 1; + public static int method3818(int var0, int var1) { + int var2; + if (var1 > var0) { + var2 = var0; + var0 = var1; + var1 = var2; } - if (var3 < 1) { - var3 = 1; + while (var1 != 0) { + var2 = var0 % var1; + var0 = var1; + var1 = var2; } - int var5 = var3 - 334; - int var6; - if (var5 < 0) { - var6 = Client.field931; - } else if (var5 >= 100) { - var6 = Client.field932; - } else { - var6 = (Client.field932 - Client.field931) * var5 / 100 + Client.field931; - } - - int var7 = var3 * var6 * 512 / (var2 * 334); - int var8; - int var9; - short var10; - if (var7 < Client.field937) { - var10 = Client.field937; - var6 = var10 * var2 * 334 / (var3 * 512); - if (var6 > Client.field748) { - var6 = Client.field748; - 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.field938) { - var10 = Client.field938; - var6 = var10 * var2 * 334 / (var3 * 512); - if (var6 < Client.field935) { - var6 = Client.field935; - 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) { - GrandExchangeOfferOwnWorldComparator.method1396(var2, var3); - } - - Client.viewportOffsetX = var0; - Client.viewportOffsetY = var1; - Client.viewportWidth = var2; - Client.viewportHeight = var3; + return var0; } } diff --git a/runescape-client/src/main/java/class206.java b/runescape-client/src/main/java/class206.java index 28394d2a23..3e8d3f9956 100644 --- a/runescape-client/src/main/java/class206.java +++ b/runescape-client/src/main/java/class206.java @@ -3,63 +3,70 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gr") +@ObfuscatedName("gs") public class class206 { + @ObfuscatedName("rz") + @ObfuscatedGetter( + intValue = 271631865 + ) + static int field2446; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Liy;" + signature = "Lic;" + ) + @Export("musicPatchesArchive") + public static AbstractArchive musicPatchesArchive; + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "Lic;" ) @Export("musicSamplesArchive") public static AbstractArchive musicSamplesArchive; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Liy;" + signature = "Lic;" ) @Export("soundEffectsArchive") public static AbstractArchive soundEffectsArchive; - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "Lgi;" - ) - @Export("midiPcmStream") - public static MidiPcmStream midiPcmStream; - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -972786961 + intValue = -164621127 ) - public static int field2406; - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "Liy;" - ) - @Export("musicTrackArchive") - public static AbstractArchive musicTrackArchive; - @ObfuscatedName("q") + public static int field2439; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 11413497 + intValue = -897953079 ) @Export("musicTrackGroupId") public static int musicTrackGroupId; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 1138068073 + ) + @Export("musicTrackVolume") + public static int musicTrackVolume; @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1578862753 + intValue = 2058854379 ) - @Export("musicTrackFileId") - public static int musicTrackFileId; - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "Lhh;" - ) - @Export("musicTrack") - public static MusicTrack musicTrack; - @ObfuscatedName("av") - @ObfuscatedSignature( - signature = "Llj;" - ) - @Export("rasterProvider") - public static AbstractRasterProvider rasterProvider; + public static int field2442; static { - field2406 = 0; + field2439 = 0; + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + signature = "(IIIZIB)J", + garbageValue = "1" + ) + @Export("calculateTag") + public static long calculateTag(int var0, int var1, int var2, boolean var3, int var4) { + long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17; + if (var3) { + var5 |= 65536L; + } + + return var5; } } diff --git a/runescape-client/src/main/java/class217.java b/runescape-client/src/main/java/class217.java index ea73c9b7be..498f99cad2 100644 --- a/runescape-client/src/main/java/class217.java +++ b/runescape-client/src/main/java/class217.java @@ -1,74 +1,69 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hw") +@ObfuscatedName("hn") public class class217 { - @ObfuscatedName("dd") - @Export("mouseCam") - static boolean mouseCam; - - @ObfuscatedName("x") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(I)J", - garbageValue = "717184533" + signature = "(Lic;IIB)[Llz;", + garbageValue = "-104" ) - @Export("currentTimeMillis") - public static final synchronized long currentTimeMillis() { - long var0 = System.currentTimeMillis(); - if (var0 < class306.field3698) { - class306.field3699 += class306.field3698 - var0; - } - - class306.field3698 = var0; - return var0 + class306.field3699; - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - signature = "([BI)[B", - garbageValue = "-1231201215" - ) - @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.field3143 != 0 && var3 > AbstractArchive.field3143) { - throw new RuntimeException(); - } else if (var2 == 0) { - byte[] var4 = new byte[var3]; - var1.readBytes(var4, 0, var3); - return var4; + public static Sprite[] method4091(AbstractArchive var0, int var1, int var2) { + byte[] var4 = var0.takeFile(var1, var2); + boolean var3; + if (var4 == null) { + var3 = false; } else { - int var6 = var1.readInt(); - if (var6 < 0 || AbstractArchive.field3143 != 0 && var6 > AbstractArchive.field3143) { - throw new RuntimeException(); - } else { - byte[] var5 = new byte[var6]; - if (var2 == 1) { - BZip2Decompressor.BZip2Decompressor_decompress(var5, var6, var0, var3, 9); - } else { - AbstractArchive.gzipDecompressor.decompress(var1, var5); - } - - return var5; - } + class3.SpriteBuffer_decode(var4); + var3 = true; } - } - @ObfuscatedName("kg") - @ObfuscatedSignature( - signature = "(Lhe;II)Ljava/lang/String;", - garbageValue = "1493859077" - ) - static String method4036(Widget var0, int var1) { - int var3 = ScriptEvent.getWidgetClickMask(var0); - boolean var2 = (var3 >> var1 + 1 & 1) != 0; - if (!var2 && var0.onOp == null) { + if (!var3) { 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; + Sprite[] var5 = new Sprite[class335.SpriteBuffer_spriteCount]; + + for (int var6 = 0; var6 < class335.SpriteBuffer_spriteCount; ++var6) { + Sprite var7 = var5[var6] = new Sprite(); + var7.width = class335.SpriteBuffer_spriteWidth; + var7.height = UserComparator8.SpriteBuffer_spriteHeight; + var7.xOffset = class335.SpriteBuffer_xOffsets[var6]; + var7.yOffset = NPC.SpriteBuffer_yOffsets[var6]; + var7.subWidth = class335.SpriteBuffer_spriteWidths[var6]; + var7.subHeight = class335.SpriteBuffer_spriteHeights[var6]; + int var8 = var7.subHeight * var7.subWidth; + byte[] var9 = ItemDefinition.SpriteBuffer_pixels[var6]; + var7.pixels = new int[var8]; + + for (int var10 = 0; var10 < var8; ++var10) { + var7.pixels[var10] = class335.SpriteBuffer_spritePalette[var9[var10] & 255]; + } + } + + GrandExchangeEvent.method158(); + return var5; } } + + @ObfuscatedName("ja") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-1394672948" + ) + static final void method4092() { + PacketBufferNode var0 = UserComparator4.getPacketBufferNode(ClientPacket.field2265, 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) { + class41.closeInterface(var1, true); + } + } + + if (Client.meslayerContinueWidget != null) { + class234.invalidateWidget(Client.meslayerContinueWidget); + Client.meslayerContinueWidget = null; + } + + } } diff --git a/runescape-client/src/main/java/class219.java b/runescape-client/src/main/java/class219.java index f80c722b9c..7c5c08ff40 100644 --- a/runescape-client/src/main/java/class219.java +++ b/runescape-client/src/main/java/class219.java @@ -1,57 +1,67 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hd") +@ObfuscatedName("hr") public class class219 { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lhb;" + signature = "Lhe;" ) @Export("huffman") public static Huffman huffman; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -2118207893 - ) - @Export("musicTrackVolume") - public static int musicTrackVolume; - @ObfuscatedName("ac") - @ObfuscatedGetter( - intValue = 1086176429 - ) - static int field2515; - - @ObfuscatedName("m") + @ObfuscatedName("ci") @ObfuscatedSignature( - signature = "(II)Llg;", - garbageValue = "1957450330" + signature = "Lbx;" ) - public static PrivateChatMode method4052(int var0) { - PrivateChatMode[] var1 = class300.method5368(); + @Export("mouseRecorder") + static MouseRecorder mouseRecorder; - for (int var2 = 0; var2 < var1.length; ++var2) { - PrivateChatMode var3 = var1[var2]; - if (var0 == var3.field3804) { - return var3; - } - } - - return null; + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(B)[Lif;", + garbageValue = "0" + ) + static VerticalAlignment[] method4106() { + return new VerticalAlignment[]{VerticalAlignment.field3230, VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field3226}; } - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "1658769285" + signature = "(II)Liy;", + garbageValue = "1818836653" ) - public static void method4057(int var0) { - if (class206.field2406 != 0) { - musicTrackVolume = var0; + @Export("VarpDefinition_get") + public static VarpDefinition VarpDefinition_get(int var0) { + VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; } else { - class206.midiPcmStream.setPcmStreamVolume(var0); + byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); + var1 = new VarpDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "(Ljava/lang/CharSequence;I)I", + garbageValue = "527461459" + ) + @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 + UserComparator3.charToByteCp1252(var0.charAt(var3)); } + return var2; } } diff --git a/runescape-client/src/main/java/class22.java b/runescape-client/src/main/java/class22.java index b51fdc94d8..51f648f941 100644 --- a/runescape-client/src/main/java/class22.java +++ b/runescape-client/src/main/java/class22.java @@ -1,571 +1,143 @@ 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("c") +@ObfuscatedName("x") public class class22 { + @ObfuscatedName("gf") + @ObfuscatedGetter( + intValue = -1318000387 + ) + static int field104; + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "32517854" + signature = "(III)I", + garbageValue = "4320081" ) - @Export("isKeyDown") - public static final boolean isKeyDown() { - synchronized(KeyHandler.KeyHandler_instance) { - if (KeyHandler.field434 == KeyHandler.field436) { - return false; - } else { - class3.field16 = KeyHandler.field414[KeyHandler.field434]; - Coord.field2531 = KeyHandler.field424[KeyHandler.field434]; - KeyHandler.field434 = KeyHandler.field434 + 1 & 127; - return true; + public static int method227(int var0, int var1) { + int var2; + for (var2 = 1; var1 > 1; var1 >>= 1) { + if ((var1 & 1) != 0) { + var2 = var0 * var2; } + + var0 *= var0; } - } - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "(Lkj;IB)Z", - garbageValue = "127" - ) - @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.field1269[var1] != null) { - var6.read(Players.field1269[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.field1273[var1]; - var6.plane = (byte)var8; - var6.resetPath((var9 << 13) + var3 - class69.baseX, (var10 << 13) + var4 - class89.baseY); - var6.field670 = 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; + if (var1 == 1) { + return var0 * var2; } 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; - } + return var2; } } - @ObfuscatedName("as") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "257352924" + signature = "(I)V", + garbageValue = "1618940930" ) - static int method258(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] = AbstractWorldMapData.ItemDefinition_get(var3).name; - return 1; + static void method225() { + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { + Login.currentLoginField = 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 = AbstractWorldMapData.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 = AbstractWorldMapData.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] = AbstractWorldMapData.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] = AbstractWorldMapData.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 = AbstractWorldMapData.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 = AbstractWorldMapData.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] = AbstractWorldMapData.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var6 = AbstractWorldMapData.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 = AbstractWorldMapData.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]; - class69.findItemDefinitions(var7, var4 == 1); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = TextureProvider.foundItemIdCount; - return 1; - } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { - if (var0 == ScriptOpcodes.OC_FINDRESET) { - AbstractWorldMapIcon.foundItemIndex = 0; - return 1; - } else { - return 2; - } - } else { - if (WorldMapEvent.foundItemIds != null && AbstractWorldMapIcon.foundItemIndex < TextureProvider.foundItemIdCount) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapEvent.foundItemIds[++AbstractWorldMapIcon.foundItemIndex - 1] & '\uffff'; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; - } - - return 1; - } - } - } - } - - @ObfuscatedName("fz") - @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "16256" - ) - static final void method252() { - 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(FontName.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 - ByteArrayPool.localPlayer.x; - if (var5 < 0) { - var5 = -var5; - } - - int var6 = Client.soundLocations[var0] >> 8 & 255; - int var7 = var6 * 128 + 64 - ByteArrayPool.localPlayer.y; - if (var7 < 0) { - var7 = -var7; - } - - int var8 = var7 + var5 - 128; - if (var8 > var3) { - Client.queuedSoundEffectDelays[var0] = -100; - continue; - } - - if (var8 < 0) { - var8 = 0; - } - - var2 = (var3 - var8) * Client.areaSoundEffectVolume / var3; - } else { - var2 = Client.soundEffectVolume; - } - - if (var2 > 0) { - RawSound var10 = var9.toRawSound().resample(class25.decimator); - RawPcmStream var11 = RawPcmStream.createRawPcmStream(var10, 100, var2); - var11.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1); - Tiles.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.field915) { - boolean var12; - if (class206.field2406 != 0) { - var12 = true; - } else { - var12 = class206.midiPcmStream.isReady(); - } - - if (!var12) { - if (Client.musicVolume != 0 && Client.currentTrackGroupId != -1) { - ApproximateRouteStrategy - .method1321(AbstractWorldMapIcon.archive6, Client.currentTrackGroupId, 0, Client.musicVolume, false); - } - - Client.field915 = false; - } + Login.currentLoginField = 0; } } - @ObfuscatedName("gm") - @ObfuscatedSignature( - signature = "(Lbi;ZI)V", - garbageValue = "-591154231" - ) - @Export("addPlayerToScene") - static void addPlayerToScene(Player var0, boolean var1) { - if (var0 != null && var0.isVisible() && !var0.isHidden) { - var0.isUnanimated = false; - if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.movementSequence == var0.idleSequence) { - var0.isUnanimated = true; - } - - int var2 = var0.x >> 7; - int var3 = var0.y >> 7; - if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { - long var4 = IsaacCipher.calculateTag(0, 0, 0, false, var0.index); - if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { - var0.isUnanimated = false; - var0.tileHeight = class277.getTileHeight(var0.x, var0.y, ScriptEvent.Client_plane); - var0.playerCycle = Client.cycle; - GrandExchangeOfferWorldComparator.scene.addNullableObject(ScriptEvent.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.field659, var0.field660, var0.field661, var0.field664); - } else { - if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { - if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { - return; - } - - Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; - } - - var0.tileHeight = class277.getTileHeight(var0.x, var0.y, ScriptEvent.Client_plane); - var0.playerCycle = Client.cycle; - GrandExchangeOfferWorldComparator.scene.drawEntity(ScriptEvent.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); - } - } - } - - } - - @ObfuscatedName("jr") + @ObfuscatedName("fe") @ObfuscatedSignature( signature = "(IB)V", - garbageValue = "-116" + garbageValue = "1" ) - @Export("changeGameOptions") - static final void changeGameOptions(int var0) { - class58.method966(); + @Export("getLoginError") + static void getLoginError(int var0) { + if (var0 == -3) { + MusicPatchPcmStream.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); + } else if (var0 == -2) { + MusicPatchPcmStream.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); + } else if (var0 == -1) { + MusicPatchPcmStream.setLoginResponseString("No response from server.", "Please try using a different world.", ""); + } else if (var0 == 3) { + Login.loginIndex = 3; + Login.field1213 = 1; + } else if (var0 == 4) { + Buddy.method5349(0); + } else if (var0 == 5) { + Login.field1213 = 2; + MusicPatchPcmStream.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) { + MusicPatchPcmStream.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); + } else if (var0 == 7) { + MusicPatchPcmStream.setLoginResponseString("This world is full.", "Please use a different world.", ""); + } else if (var0 == 8) { + MusicPatchPcmStream.setLoginResponseString("Unable to connect.", "Login server offline.", ""); + } else if (var0 == 9) { + MusicPatchPcmStream.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); + } else if (var0 == 10) { + MusicPatchPcmStream.setLoginResponseString("Unable to connect.", "Bad session id.", ""); + } else if (var0 == 11) { + MusicPatchPcmStream.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); + } else if (var0 == 12) { + MusicPatchPcmStream.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); + } else if (var0 == 13) { + MusicPatchPcmStream.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); + } else if (var0 == 14) { + MusicPatchPcmStream.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 16) { + MusicPatchPcmStream.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); + } else if (var0 == 17) { + MusicPatchPcmStream.setLoginResponseString("You are standing in a members-only area.", "To play on this world move to a free area first", ""); + } else if (var0 == 18) { + Buddy.method5349(1); + } else if (var0 == 19) { + MusicPatchPcmStream.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); + } else if (var0 == 20) { + MusicPatchPcmStream.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); + } else if (var0 == 22) { + MusicPatchPcmStream.setLoginResponseString("Malformed login packet.", "Please try again.", ""); + } else if (var0 == 23) { + MusicPatchPcmStream.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 24) { + MusicPatchPcmStream.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); + } else if (var0 == 25) { + MusicPatchPcmStream.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); + } else if (var0 == 26) { + MusicPatchPcmStream.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); + } else if (var0 == 27) { + MusicPatchPcmStream.setLoginResponseString("", "Service unavailable.", ""); + } else if (var0 == 31) { + MusicPatchPcmStream.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) { + MusicPatchPcmStream.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) { + MusicPatchPcmStream.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); + } else if (var0 == 38) { + MusicPatchPcmStream.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) { + MusicPatchPcmStream.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); + ClientPreferences.updateGameState(11); + return; + } - for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var1.obj != null) { - var1.set(); + if (var0 == 57) { + MusicPatchPcmStream.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); + ClientPreferences.updateGameState(11); + return; + } + + if (var0 == 61) { + Login.loginIndex = 7; + } else { + MusicPatchPcmStream.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); } } - int var4 = class228.VarpDefinition_get(var0).type; - if (var4 != 0) { - int var2 = Varps.Varps_main[var0]; - if (var4 == 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 (var4 == 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.musicVolume) { - if (Client.musicVolume == 0 && Client.currentTrackGroupId != -1) { - ApproximateRouteStrategy - .method1321(AbstractWorldMapIcon.archive6, Client.currentTrackGroupId, 0, var3, false); - Client.field915 = false; - } else if (var3 == 0) { - Client.method1496(); - Client.field915 = false; - } else { - class219.method4057(var3); - } - - Client.musicVolume = var3; - } - } - - if (var4 == 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 == 5) { - Client.leftClickOpensMenu = var2; - } - - if (var4 == 6) { - Client.chatEffects = var2; - } - - if (var4 == 9) { - Client.field845 = var2; - } - - if (var4 == 10) { - if (var2 == 0) { - Client.areaSoundEffectVolume = 127; - } - - if (var2 == 1) { - Client.areaSoundEffectVolume = 96; - } - - if (var2 == 2) { - Client.areaSoundEffectVolume = 64; - } - - if (var2 == 3) { - Client.areaSoundEffectVolume = 32; - } - - if (var2 == 4) { - Client.areaSoundEffectVolume = 0; - } - } - - if (var4 == 17) { - Client.followerIndex = var2 & 65535; - } - - if (var4 == 18) { - Client.playerAttackOption = (AttackOption)GrandExchangeEvent.findEnumerated(class39.method643(), var2); - if (Client.playerAttackOption == null) { - Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } - } - - if (var4 == 19) { - if (var2 == -1) { - Client.combatTargetPlayerIndex = -1; - } else { - Client.combatTargetPlayerIndex = var2 & 2047; - } - } - - if (var4 == 22) { - Client.npcAttackOption = (AttackOption)GrandExchangeEvent.findEnumerated(class39.method643(), var2); - if (Client.npcAttackOption == null) { - Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } - } - - } - } - - @ObfuscatedName("lb") - @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "2" - ) - static void method256(int var0) { - Client.oculusOrbState = var0; + ClientPreferences.updateGameState(10); } } diff --git a/runescape-client/src/main/java/class224.java b/runescape-client/src/main/java/class224.java index 622615c8b4..8e0d9242f1 100644 --- a/runescape-client/src/main/java/class224.java +++ b/runescape-client/src/main/java/class224.java @@ -1,210 +1,45 @@ -import java.awt.Desktop; -import java.awt.Desktop.Action; -import java.net.URI; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("hm") +@ObfuscatedName("hx") public class class224 { - @ObfuscatedName("x") - public static final short[] field2544; @ObfuscatedName("m") - public static final short[][] field2547; - @ObfuscatedName("k") - public static final short[] field2546; - @ObfuscatedName("d") - public static final short[][] field2545; - @ObfuscatedName("dn") - @ObfuscatedSignature( - signature = "Lih;" - ) - @Export("archive14") - static Archive archive14; + public static final short[] field2579; + @ObfuscatedName("o") + public static final short[][] field2580; + @ObfuscatedName("q") + public static final short[] field2584; + @ObfuscatedName("j") + public static final short[][] field2582; static { - field2544 = new short[]{6798, 8741, 25238, 4626, 4550}; - field2547 = 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}}; - field2546 = new short[]{-10304, 9104, -1, -1, -1}; - field2545 = 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]}; + field2579 = new short[]{6798, 8741, 25238, 4626, 4550}; + field2580 = 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}}; + field2584 = new short[]{-10304, 9104, -1, -1, -1}; + field2582 = 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("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZLjava/lang/String;ZI)V", - garbageValue = "-222701931" + signature = "(IB)Lje;", + garbageValue = "-100" ) - static void method4125(String var0, boolean var1, String var2, boolean var3) { - if (var1) { - if (!var3 && Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { - try { - Desktop.getDesktop().browse(new URI(var0)); - return; - } catch (Exception var5) { - } - } - - if (class60.field462.startsWith("win") && !var3) { - WorldMapIcon_0.method306(var0, 0); - return; - } - - if (class60.field462.startsWith("mac")) { - ItemContainer.method1274(var0, 1, var2); - return; - } - - WorldMapIcon_0.method306(var0, 2); + @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 { - WorldMapIcon_0.method306(var0, 3); - } - - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - signature = "(ILce;ZS)I", - garbageValue = "10447" - ) - static int method4124(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; - return 1; - } else { - int 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; - } else { - boolean var13; - if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { - var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (GrandExchangeEvent.grandExchangeEvents != null) { - GrandExchangeEvent.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var13); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { - var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (GrandExchangeEvent.grandExchangeEvents != null) { - GrandExchangeEvent.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 (GrandExchangeEvent.grandExchangeEvents != null) { - Client.GrandExchangeEvents_worldComparator.filterWorlds = var4; - GrandExchangeEvent.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var13); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { - var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (GrandExchangeEvent.grandExchangeEvents != null) { - GrandExchangeEvent.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var13); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { - var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; - if (GrandExchangeEvent.grandExchangeEvents != null) { - GrandExchangeEvent.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var13); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeEvent.grandExchangeEvents == null ? 0 : GrandExchangeEvent.grandExchangeEvents.events.size(); - return 1; - } else { - GrandExchangeEvent var11; - if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)GrandExchangeEvent.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)GrandExchangeEvent.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)GrandExchangeEvent.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)GrandExchangeEvent.grandExchangeEvents.events.get(var3); - long var5 = class217.currentTimeMillis() - TilePaint.field1802 - 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)GrandExchangeEvent.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)GrandExchangeEvent.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)GrandExchangeEvent.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id; - return 1; - } else { - return 2; - } - } + 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; } } } diff --git a/runescape-client/src/main/java/class225.java b/runescape-client/src/main/java/class225.java new file mode 100644 index 0000000000..4899666221 --- /dev/null +++ b/runescape-client/src/main/java/class225.java @@ -0,0 +1,25 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("hw") +public class class225 { + @ObfuscatedName("t") + static String field2587; + @ObfuscatedName("im") + @ObfuscatedGetter( + intValue = 1529364225 + ) + @Export("oculusOrbFocalPointX") + static int oculusOrbFocalPointX; + + @ObfuscatedName("iu") + @ObfuscatedSignature( + signature = "(II)Ljava/lang/String;", + garbageValue = "950917676" + ) + static final String method4182(int var0) { + return var0 < 999999999 ? Integer.toString(var0) : "*"; + } +} diff --git a/runescape-client/src/main/java/class227.java b/runescape-client/src/main/java/class227.java index c71dd1074d..9e963259ff 100644 --- a/runescape-client/src/main/java/class227.java +++ b/runescape-client/src/main/java/class227.java @@ -1,48 +1,10 @@ +import java.util.concurrent.ScheduledExecutorService; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hn") +@ObfuscatedName("hu") public class class227 { - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "Lfs;" - ) - @Export("taskHandler") - protected static TaskHandler taskHandler; - - @ObfuscatedName("p") - @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-673521466" - ) - public static int method4200(int var0) { - if (var0 > 0) { - return 1; - } else { - return var0 < 0 ? -1 : 0; - } - } - - @ObfuscatedName("jd") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "1891530232" - ) - static final void method4184() { - PacketBufferNode var0 = FaceNormal.getPacketBufferNode(ClientPacket.field2245, 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) { - class41.closeInterface(var1, true); - } - } - - if (Client.meslayerContinueWidget != null) { - ItemContainer.invalidateWidget(Client.meslayerContinueWidget); - Client.meslayerContinueWidget = null; - } - - } + @ObfuscatedName("u") + @Export("soundSystemExecutor") + static ScheduledExecutorService soundSystemExecutor; } diff --git a/runescape-client/src/main/java/class228.java b/runescape-client/src/main/java/class228.java index 67ea470546..51f77b12bc 100644 --- a/runescape-client/src/main/java/class228.java +++ b/runescape-client/src/main/java/class228.java @@ -1,62 +1,34 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hu") +@ObfuscatedName("ho") public class class228 { - @ObfuscatedName("dc") + @ObfuscatedName("se") @ObfuscatedSignature( - signature = "Lih;" + signature = "Lma;" ) - @Export("archive8") - static Archive archive8; - - @ObfuscatedName("x") + @Export("worldMap") + static WorldMap worldMap; + @ObfuscatedName("bn") @ObfuscatedSignature( - signature = "(Lmx;I)I", - garbageValue = "-1599704151" + signature = "[Llh;" ) - public static final int method4205(LoginType var0) { - if (var0 == null) { - return 12; - } else { - switch(var0.field4058) { - case 7: - return 20; - default: - return 12; - } - } - } + @Export("worldSelectStars") + static IndexedSprite[] worldSelectStars; + @ObfuscatedName("bc") + @ObfuscatedGetter( + intValue = 1895952065 + ) + static int field2754; - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IB)Lik;", - garbageValue = "2" + signature = "(ILlp;Lig;B)V", + garbageValue = "-8" ) - @Export("VarpDefinition_get") - public static VarpDefinition VarpDefinition_get(int var0) { - VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); - var1 = new VarpDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "(ILlq;Lih;I)V", - garbageValue = "-70206811" - ) - static void method4204(int var0, ArchiveDisk var1, Archive var2) { + static void method4262(int var0, ArchiveDisk var1, Archive var2) { ArchiveDiskAction var3 = new ArchiveDiskAction(); var3.type = 1; var3.key = (long)var0; @@ -67,29 +39,14 @@ public class class228 { } synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { - if (ArchiveDiskActionHandler.field3151 == 0) { - class197.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); - class197.ArchiveDiskActionHandler_thread.setDaemon(true); - class197.ArchiveDiskActionHandler_thread.start(); - class197.ArchiveDiskActionHandler_thread.setPriority(5); + if (ArchiveDiskActionHandler.field3181 == 0) { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); + ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); } - ArchiveDiskActionHandler.field3151 = 600; - } - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(Liy;II)Z", - garbageValue = "-2041528291" - ) - static boolean method4202(AbstractArchive var0, int var1) { - byte[] var2 = var0.takeFileFlat(var1); - if (var2 == null) { - return false; - } else { - MusicPatch.SpriteBuffer_decode(var2); - return true; + ArchiveDiskActionHandler.field3181 = 600; } } } diff --git a/runescape-client/src/main/java/class23.java b/runescape-client/src/main/java/class23.java index 0c2ca2785b..3be773fc5f 100644 --- a/runescape-client/src/main/java/class23.java +++ b/runescape-client/src/main/java/class23.java @@ -1,15 +1,885 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("j") +@ObfuscatedName("b") public class class23 { - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -1564129527 + @ObfuscatedName("eh") + @ObfuscatedSignature( + signature = "(III)V", + garbageValue = "-1074751797" ) - static int field134; - @ObfuscatedName("gm") - @Export("regionMapArchives") - static byte[][] regionMapArchives; + static void method230(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 var9 = var1 - 334; + if (var9 < 0) { + var9 = 0; + } else if (var9 > 100) { + var9 = 100; + } + + int var10 = (Client.zoomWidth - Client.zoomHeight) * var9 / 100 + Client.zoomHeight; + int var8 = var10 * var5 / 256; + var2[var3] = var8 * var7 >> 16; + } + + Scene.Scene_buildVisiblityMap(var2, 500, 800, var0 * 334 / var1, 334); + } + + @ObfuscatedName("ge") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1693964297" + ) + static final void method229() { + class303.method5528(false); + Client.field822 = 0; + boolean var0 = true; + + int var1; + for (var1 = 0; var1 < class90.regionLandArchives.length; ++var1) { + if (StudioGame.regionMapArchiveIds[var1] != -1 && class90.regionLandArchives[var1] == null) { + class90.regionLandArchives[var1] = WorldMapRectangle.archive5.takeFile(StudioGame.regionMapArchiveIds[var1], 0); + if (class90.regionLandArchives[var1] == null) { + var0 = false; + ++Client.field822; + } + } + + if (class52.regionLandArchiveIds[var1] != -1 && class1.regionMapArchives[var1] == null) { + class1.regionMapArchives[var1] = WorldMapRectangle.archive5.takeFileEncrypted(class52.regionLandArchiveIds[var1], 0, WorldMapData_1.xteaKeys[var1]); + if (class1.regionMapArchives[var1] == null) { + var0 = false; + ++Client.field822; + } + } + } + + if (!var0) { + Client.field809 = 1; + } else { + Client.field690 = 0; + var0 = true; + + int var3; + int var4; + for (var1 = 0; var1 < class90.regionLandArchives.length; ++var1) { + byte[] var2 = class1.regionMapArchives[var1]; + if (var2 != null) { + var3 = (class41.regions[var1] >> 8) * 64 - class182.baseX; + var4 = (class41.regions[var1] & 255) * 64 - SecureRandomFuture.baseY; + if (Client.isInInstance) { + var3 = 10; + var4 = 10; + } + + var0 &= class235.method4281(var2, var3, var4); + } + } + + if (!var0) { + Client.field809 = 2; + } else { + if (Client.field809 != 0) { + ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); + } + + Timer.playPcmPlayers(); + UserComparator3.scene.clear(); + + for (var1 = 0; var1 < 4; ++var1) { + Client.collisionMaps[var1].clear(); + } + + int var46; + for (var1 = 0; var1 < 4; ++var1) { + for (var46 = 0; var46 < 104; ++var46) { + for (var3 = 0; var3 < 104; ++var3) { + Tiles.Tiles_renderFlags[var1][var46][var3] = 0; + } + } + } + + Timer.playPcmPlayers(); + Tiles.Tiles_minPlane = 99; + Tiles.field530 = new byte[4][104][104]; + Tiles.field524 = new byte[4][104][104]; + Tiles.field525 = new byte[4][104][104]; + WorldMapLabel.field269 = new byte[4][104][104]; + HealthBarUpdate.field1031 = new int[4][105][105]; + class171.field2036 = new byte[4][105][105]; + Tiles.field526 = new int[105][105]; + BuddyRankComparator.Tiles_hue = new int[104]; + GrandExchangeOfferAgeComparator.Tiles_saturation = new int[104]; + TextureProvider.Tiles_lightness = new int[104]; + class237.Tiles_hueMultiplier = new int[104]; + WorldMapRectangle.field198 = new int[104]; + var1 = class90.regionLandArchives.length; + + for (ObjectSound var60 = (ObjectSound)ObjectSound.objectSounds.last(); var60 != null; var60 = (ObjectSound)ObjectSound.objectSounds.previous()) { + if (var60.stream1 != null) { + class60.pcmStreamMixer.removeSubStream(var60.stream1); + var60.stream1 = null; + } + + if (var60.stream2 != null) { + class60.pcmStreamMixer.removeSubStream(var60.stream2); + var60.stream2 = null; + } + } + + ObjectSound.objectSounds.clear(); + class303.method5528(true); + int var6; + int var7; + int var9; + int var10; + int var11; + int var12; + int[] var10000; + int var48; + if (!Client.isInInstance) { + byte[] var5; + for (var46 = 0; var46 < var1; ++var46) { + var3 = (class41.regions[var46] >> 8) * 64 - class182.baseX; + var4 = (class41.regions[var46] & 255) * 64 - SecureRandomFuture.baseY; + var5 = class90.regionLandArchives[var46]; + if (var5 != null) { + Timer.playPcmPlayers(); + var6 = WorldMapCacheName.field328 * 8 - 48; + var7 = class22.field104 * 8 - 48; + CollisionMap[] var8 = Client.collisionMaps; + + for (var9 = 0; var9 < 4; ++var9) { + for (var10 = 0; var10 < 64; ++var10) { + for (var11 = 0; var11 < 64; ++var11) { + if (var10 + var3 > 0 && var3 + var10 < 103 && var11 + var4 > 0 && var4 + var11 < 103) { + var10000 = var8[var9].flags[var10 + var3]; + var10000[var4 + var11] &= -16777217; + } + } + } + } + + Buffer var47 = new Buffer(var5); + + for (var10 = 0; var10 < 4; ++var10) { + for (var11 = 0; var11 < 64; ++var11) { + for (var12 = 0; var12 < 64; ++var12) { + AbstractArchive.loadTerrain(var47, var10, var3 + var11, var4 + var12, var6, var7, 0); + } + } + } + } + } + + for (var46 = 0; var46 < var1; ++var46) { + var3 = (class41.regions[var46] >> 8) * 64 - class182.baseX; + var4 = (class41.regions[var46] & 255) * 64 - SecureRandomFuture.baseY; + var5 = class90.regionLandArchives[var46]; + if (var5 == null && class22.field104 < 800) { + Timer.playPcmPlayers(); + GrandExchangeEvent.method153(var3, var4, 64, 64); + } + } + + class303.method5528(true); + + for (var46 = 0; var46 < var1; ++var46) { + byte[] var50 = class1.regionMapArchives[var46]; + if (var50 != null) { + var4 = (class41.regions[var46] >> 8) * 64 - class182.baseX; + var48 = (class41.regions[var46] & 255) * 64 - SecureRandomFuture.baseY; + Timer.playPcmPlayers(); + WorldMapRegion.method520(var50, var4, var48, UserComparator3.scene, Client.collisionMaps); + } + } + } + + int var49; + if (Client.isInInstance) { + for (var46 = 0; var46 < 4; ++var46) { + Timer.playPcmPlayers(); + + for (var3 = 0; var3 < 13; ++var3) { + for (var4 = 0; var4 < 13; ++var4) { + boolean var68 = false; + var6 = Client.instanceChunkTemplates[var46][var3][var4]; + if (var6 != -1) { + var7 = var6 >> 24 & 3; + var49 = var6 >> 1 & 3; + var9 = var6 >> 14 & 1023; + var10 = var6 >> 3 & 2047; + var11 = (var9 / 8 << 8) + var10 / 8; + + for (var12 = 0; var12 < class41.regions.length; ++var12) { + if (class41.regions[var12] == var11 && class90.regionLandArchives[var12] != null) { + LoginScreenAnimation.method1879(class90.regionLandArchives[var12], var46, var3 * 8, var4 * 8, var7, (var9 & 7) * 8, (var10 & 7) * 8, var49, Client.collisionMaps); + var68 = true; + break; + } + } + } + + if (!var68) { + var7 = var46; + var49 = var3 * 8; + var9 = var4 * 8; + + for (var10 = 0; var10 < 8; ++var10) { + for (var11 = 0; var11 < 8; ++var11) { + Tiles.Tiles_heights[var7][var49 + var10][var11 + var9] = 0; + } + } + + if (var49 > 0) { + for (var10 = 1; var10 < 8; ++var10) { + Tiles.Tiles_heights[var7][var49][var10 + var9] = Tiles.Tiles_heights[var7][var49 - 1][var10 + var9]; + } + } + + if (var9 > 0) { + for (var10 = 1; var10 < 8; ++var10) { + Tiles.Tiles_heights[var7][var49 + var10][var9] = Tiles.Tiles_heights[var7][var10 + var49][var9 - 1]; + } + } + + if (var49 > 0 && Tiles.Tiles_heights[var7][var49 - 1][var9] != 0) { + Tiles.Tiles_heights[var7][var49][var9] = Tiles.Tiles_heights[var7][var49 - 1][var9]; + } else if (var9 > 0 && Tiles.Tiles_heights[var7][var49][var9 - 1] != 0) { + Tiles.Tiles_heights[var7][var49][var9] = Tiles.Tiles_heights[var7][var49][var9 - 1]; + } else if (var49 > 0 && var9 > 0 && Tiles.Tiles_heights[var7][var49 - 1][var9 - 1] != 0) { + Tiles.Tiles_heights[var7][var49][var9] = Tiles.Tiles_heights[var7][var49 - 1][var9 - 1]; + } + } + } + } + } + + for (var46 = 0; var46 < 13; ++var46) { + for (var3 = 0; var3 < 13; ++var3) { + var4 = Client.instanceChunkTemplates[0][var46][var3]; + if (var4 == -1) { + GrandExchangeEvent.method153(var46 * 8, var3 * 8, 8, 8); + } + } + } + + class303.method5528(true); + + for (var46 = 0; var46 < 4; ++var46) { + Timer.playPcmPlayers(); + + for (var3 = 0; var3 < 13; ++var3) { + for (var4 = 0; var4 < 13; ++var4) { + var48 = Client.instanceChunkTemplates[var46][var3][var4]; + if (var48 != -1) { + var6 = var48 >> 24 & 3; + var7 = var48 >> 1 & 3; + var49 = var48 >> 14 & 1023; + var9 = var48 >> 3 & 2047; + var10 = (var49 / 8 << 8) + var9 / 8; + + for (var11 = 0; var11 < class41.regions.length; ++var11) { + if (class41.regions[var11] == var10 && class1.regionMapArchives[var11] != null) { + WorldMapIcon_1.method365(class1.regionMapArchives[var11], var46, var3 * 8, var4 * 8, var6, (var49 & 7) * 8, (var9 & 7) * 8, var7, UserComparator3.scene, Client.collisionMaps); + break; + } + } + } + } + } + } + } + + class303.method5528(true); + Timer.playPcmPlayers(); + Scene var61 = UserComparator3.scene; + CollisionMap[] var69 = Client.collisionMaps; + + for (var4 = 0; var4 < 4; ++var4) { + for (var48 = 0; var48 < 104; ++var48) { + for (var6 = 0; var6 < 104; ++var6) { + if ((Tiles.Tiles_renderFlags[var4][var48][var6] & 1) == 1) { + var7 = var4; + if ((Tiles.Tiles_renderFlags[1][var48][var6] & 2) == 2) { + var7 = var4 - 1; + } + + if (var7 >= 0) { + var69[var7].setBlockedByFloor(var48, var6); + } + } + } + } + } + + Tiles.field535 += (int)(Math.random() * 5.0D) - 2; + if (Tiles.field535 < -8) { + Tiles.field535 = -8; + } + + if (Tiles.field535 > 8) { + Tiles.field535 = 8; + } + + Tiles.field520 += (int)(Math.random() * 5.0D) - 2; + if (Tiles.field520 < -16) { + Tiles.field520 = -16; + } + + if (Tiles.field520 > 16) { + Tiles.field520 = 16; + } + + int var13; + int var14; + int var15; + int var16; + int var17; + int var18; + int var19; + int var20; + for (var4 = 0; var4 < 4; ++var4) { + byte[][] var62 = class171.field2036[var4]; + var11 = (int)Math.sqrt(5100.0D); + var12 = var11 * 768 >> 8; + + int var21; + int var22; + for (var13 = 1; var13 < 103; ++var13) { + for (var14 = 1; var14 < 103; ++var14) { + var15 = Tiles.Tiles_heights[var4][var14 + 1][var13] - Tiles.Tiles_heights[var4][var14 - 1][var13]; + var16 = Tiles.Tiles_heights[var4][var14][var13 + 1] - Tiles.Tiles_heights[var4][var14][var13 - 1]; + var17 = (int)Math.sqrt((double)(var15 * var15 + var16 * var16 + 65536)); + var18 = (var15 << 8) / var17; + var19 = 65536 / var17; + var20 = (var16 << 8) / var17; + var21 = (var18 * -50 + var20 * -50 + var19 * -10) / var12 + 96; + var22 = (var62[var14 - 1][var13] >> 2) + (var62[var14][var13 - 1] >> 2) + (var62[var14 + 1][var13] >> 3) + (var62[var14][var13 + 1] >> 3) + (var62[var14][var13] >> 1); + Tiles.field526[var14][var13] = var21 - var22; + } + } + + for (var13 = 0; var13 < 104; ++var13) { + BuddyRankComparator.Tiles_hue[var13] = 0; + GrandExchangeOfferAgeComparator.Tiles_saturation[var13] = 0; + TextureProvider.Tiles_lightness[var13] = 0; + class237.Tiles_hueMultiplier[var13] = 0; + WorldMapRectangle.field198[var13] = 0; + } + + for (var13 = -5; var13 < 109; ++var13) { + for (var14 = 0; var14 < 104; ++var14) { + var15 = var13 + 5; + int var10002; + if (var15 >= 0 && var15 < 104) { + var16 = Tiles.field530[var4][var15][var14] & 255; + if (var16 > 0) { + var18 = var16 - 1; + FloorUnderlayDefinition var51 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var18); + FloorUnderlayDefinition var52; + if (var51 != null) { + var52 = var51; + } else { + byte[] var53 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var18); + var51 = new FloorUnderlayDefinition(); + if (var53 != null) { + var51.decode(new Buffer(var53), var18); + } + + var51.postDecode(); + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var51, (long)var18); + var52 = var51; + } + + var10000 = BuddyRankComparator.Tiles_hue; + var10000[var14] += var52.hue; + var10000 = GrandExchangeOfferAgeComparator.Tiles_saturation; + var10000[var14] += var52.saturation; + var10000 = TextureProvider.Tiles_lightness; + var10000[var14] += var52.lightness; + var10000 = class237.Tiles_hueMultiplier; + var10000[var14] += var52.hueMultiplier; + var10002 = WorldMapRectangle.field198[var14]++; + } + } + + var16 = var13 - 5; + if (var16 >= 0 && var16 < 104) { + var17 = Tiles.field530[var4][var16][var14] & 255; + if (var17 > 0) { + var19 = var17 - 1; + FloorUnderlayDefinition var70 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var19); + FloorUnderlayDefinition var54; + if (var70 != null) { + var54 = var70; + } else { + byte[] var59 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var19); + var70 = new FloorUnderlayDefinition(); + if (var59 != null) { + var70.decode(new Buffer(var59), var19); + } + + var70.postDecode(); + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var70, (long)var19); + var54 = var70; + } + + var10000 = BuddyRankComparator.Tiles_hue; + var10000[var14] -= var54.hue; + var10000 = GrandExchangeOfferAgeComparator.Tiles_saturation; + var10000[var14] -= var54.saturation; + var10000 = TextureProvider.Tiles_lightness; + var10000[var14] -= var54.lightness; + var10000 = class237.Tiles_hueMultiplier; + var10000[var14] -= var54.hueMultiplier; + var10002 = WorldMapRectangle.field198[var14]--; + } + } + } + + if (var13 >= 1 && var13 < 103) { + var14 = 0; + var15 = 0; + var16 = 0; + var17 = 0; + var18 = 0; + + for (var19 = -5; var19 < 109; ++var19) { + var20 = var19 + 5; + if (var20 >= 0 && var20 < 104) { + var14 += BuddyRankComparator.Tiles_hue[var20]; + var15 += GrandExchangeOfferAgeComparator.Tiles_saturation[var20]; + var16 += TextureProvider.Tiles_lightness[var20]; + var17 += class237.Tiles_hueMultiplier[var20]; + var18 += WorldMapRectangle.field198[var20]; + } + + var21 = var19 - 5; + if (var21 >= 0 && var21 < 104) { + var14 -= BuddyRankComparator.Tiles_hue[var21]; + var15 -= GrandExchangeOfferAgeComparator.Tiles_saturation[var21]; + var16 -= TextureProvider.Tiles_lightness[var21]; + var17 -= class237.Tiles_hueMultiplier[var21]; + var18 -= WorldMapRectangle.field198[var21]; + } + + if (var19 >= 1 && var19 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var13][var19] & 2) != 0 || (Tiles.Tiles_renderFlags[var4][var13][var19] & 16) == 0)) { + if (var4 < Tiles.Tiles_minPlane) { + Tiles.Tiles_minPlane = var4; + } + + var22 = Tiles.field530[var4][var13][var19] & 255; + int var23 = Tiles.field524[var4][var13][var19] & 255; + if (var22 > 0 || var23 > 0) { + int var24 = Tiles.Tiles_heights[var4][var13][var19]; + int var25 = Tiles.Tiles_heights[var4][var13 + 1][var19]; + int var26 = Tiles.Tiles_heights[var4][var13 + 1][var19 + 1]; + int var27 = Tiles.Tiles_heights[var4][var13][var19 + 1]; + int var28 = Tiles.field526[var13][var19]; + int var29 = Tiles.field526[var13 + 1][var19]; + int var30 = Tiles.field526[var13 + 1][var19 + 1]; + int var31 = Tiles.field526[var13][var19 + 1]; + int var32 = -1; + int var33 = -1; + int var34; + int var35; + int var36; + if (var22 > 0) { + var34 = var14 * 256 / var17; + var35 = var15 / var18; + var36 = var16 / var18; + var32 = DevicePcmPlayerProvider.hslToRgb(var34, var35, var36); + var34 = var34 + Tiles.field535 & 255; + var36 += Tiles.field520; + if (var36 < 0) { + var36 = 0; + } else if (var36 > 255) { + var36 = 255; + } + + var33 = DevicePcmPlayerProvider.hslToRgb(var34, var35, var36); + } + + FloorOverlayDefinition var37; + if (var4 > 0) { + boolean var66 = true; + if (var22 == 0 && Tiles.field525[var4][var13][var19] != 0) { + var66 = false; + } + + if (var23 > 0) { + var36 = var23 - 1; + var37 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var36); + FloorOverlayDefinition var55; + if (var37 != null) { + var55 = var37; + } else { + byte[] var56 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var36); + var37 = new FloorOverlayDefinition(); + if (var56 != null) { + var37.decode(new Buffer(var56), var36); + } + + var37.postDecode(); + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var37, (long)var36); + var55 = var37; + } + + if (!var55.hideUnderlay) { + var66 = false; + } + } + + if (var66 && var25 == var24 && var26 == var24 && var24 == var27) { + var10000 = HealthBarUpdate.field1031[var4][var13]; + var10000[var19] |= 2340; + } + } + + var34 = 0; + if (var33 != -1) { + var34 = Rasterizer3D.Rasterizer3D_colorPalette[class236.method4282(var33, 96)]; + } + + if (var23 == 0) { + var61.addTile(var4, var13, var19, 0, 0, -1, var24, var25, var26, var27, class236.method4282(var32, var28), class236.method4282(var32, var29), class236.method4282(var32, var30), class236.method4282(var32, var31), 0, 0, 0, 0, var34, 0); + } else { + var35 = Tiles.field525[var4][var13][var19] + 1; + byte var67 = WorldMapLabel.field269[var4][var13][var19]; + int var38 = var23 - 1; + FloorOverlayDefinition var39 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var38); + if (var39 != null) { + var37 = var39; + } else { + byte[] var57 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var38); + var39 = new FloorOverlayDefinition(); + if (var57 != null) { + var39.decode(new Buffer(var57), var38); + } + + var39.postDecode(); + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var39, (long)var38); + var37 = var39; + } + + int var40 = var37.texture; + int var41; + int var42; + int var43; + int var44; + if (var40 >= 0) { + var42 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var40); + var41 = -1; + } else if (var37.primaryRgb == 16711935) { + var41 = -2; + var40 = -1; + var42 = -2; + } else { + var41 = DevicePcmPlayerProvider.hslToRgb(var37.hue, var37.saturation, var37.lightness); + var43 = var37.hue + Tiles.field535 & 255; + var44 = var37.lightness + Tiles.field520; + if (var44 < 0) { + var44 = 0; + } else if (var44 > 255) { + var44 = 255; + } + + var42 = DevicePcmPlayerProvider.hslToRgb(var43, var37.saturation, var44); + } + + var43 = 0; + if (var42 != -2) { + var43 = Rasterizer3D.Rasterizer3D_colorPalette[class105.method2414(var42, 96)]; + } + + if (var37.secondaryRgb != -1) { + var44 = var37.secondaryHue + Tiles.field535 & 255; + int var45 = var37.secondaryLightness + Tiles.field520; + if (var45 < 0) { + var45 = 0; + } else if (var45 > 255) { + var45 = 255; + } + + var42 = DevicePcmPlayerProvider.hslToRgb(var44, var37.secondarySaturation, var45); + var43 = Rasterizer3D.Rasterizer3D_colorPalette[class105.method2414(var42, 96)]; + } + + var61.addTile(var4, var13, var19, var35, var67, var40, var24, var25, var26, var27, class236.method4282(var32, var28), class236.method4282(var32, var29), class236.method4282(var32, var30), class236.method4282(var32, var31), class105.method2414(var41, var28), class105.method2414(var41, var29), class105.method2414(var41, var30), class105.method2414(var41, var31), var34, var43); + } + } + } + } + } + } + + for (var13 = 1; var13 < 103; ++var13) { + for (var14 = 1; var14 < 103; ++var14) { + if ((Tiles.Tiles_renderFlags[var4][var14][var13] & 8) != 0) { + var19 = 0; + } else if (var4 > 0 && (Tiles.Tiles_renderFlags[1][var14][var13] & 2) != 0) { + var19 = var4 - 1; + } else { + var19 = var4; + } + + var61.setTileMinPlane(var4, var14, var13, var19); + } + } + + Tiles.field530[var4] = null; + Tiles.field524[var4] = null; + Tiles.field525[var4] = null; + WorldMapLabel.field269[var4] = null; + class171.field2036[var4] = null; + } + + var61.method3222(-50, -10, -50); + + for (var4 = 0; var4 < 104; ++var4) { + for (var48 = 0; var48 < 104; ++var48) { + if ((Tiles.Tiles_renderFlags[1][var4][var48] & 2) == 2) { + var61.setLinkBelow(var4, var48); + } + } + } + + var4 = 1; + var48 = 2; + var6 = 4; + + for (var7 = 0; var7 < 4; ++var7) { + if (var7 > 0) { + var4 <<= 3; + var48 <<= 3; + var6 <<= 3; + } + + for (var49 = 0; var49 <= var7; ++var49) { + for (var9 = 0; var9 <= 104; ++var9) { + for (var10 = 0; var10 <= 104; ++var10) { + short var65; + if ((HealthBarUpdate.field1031[var49][var10][var9] & var4) != 0) { + var11 = var9; + var12 = var9; + var13 = var49; + + for (var14 = var49; var11 > 0 && (HealthBarUpdate.field1031[var49][var10][var11 - 1] & var4) != 0; --var11) { + } + + while (var12 < 104 && (HealthBarUpdate.field1031[var49][var10][var12 + 1] & var4) != 0) { + ++var12; + } + + label863: + while (var13 > 0) { + for (var15 = var11; var15 <= var12; ++var15) { + if ((HealthBarUpdate.field1031[var13 - 1][var10][var15] & var4) == 0) { + break label863; + } + } + + --var13; + } + + label852: + while (var14 < var7) { + for (var15 = var11; var15 <= var12; ++var15) { + if ((HealthBarUpdate.field1031[var14 + 1][var10][var15] & var4) == 0) { + break label852; + } + } + + ++var14; + } + + var15 = (var12 - var11 + 1) * (var14 + 1 - var13); + if (var15 >= 8) { + var65 = 240; + var17 = Tiles.Tiles_heights[var14][var10][var11] - var65; + var18 = Tiles.Tiles_heights[var13][var10][var11]; + Scene.Scene_addOccluder(var7, 1, var10 * 128, var10 * 128, var11 * 128, var12 * 128 + 128, var17, var18); + + for (var19 = var13; var19 <= var14; ++var19) { + for (var20 = var11; var20 <= var12; ++var20) { + var10000 = HealthBarUpdate.field1031[var19][var10]; + var10000[var20] &= ~var4; + } + } + } + } + + if ((HealthBarUpdate.field1031[var49][var10][var9] & var48) != 0) { + var11 = var10; + var12 = var10; + var13 = var49; + + for (var14 = var49; var11 > 0 && (HealthBarUpdate.field1031[var49][var11 - 1][var9] & var48) != 0; --var11) { + } + + while (var12 < 104 && (HealthBarUpdate.field1031[var49][var12 + 1][var9] & var48) != 0) { + ++var12; + } + + label916: + while (var13 > 0) { + for (var15 = var11; var15 <= var12; ++var15) { + if ((HealthBarUpdate.field1031[var13 - 1][var15][var9] & var48) == 0) { + break label916; + } + } + + --var13; + } + + label905: + while (var14 < var7) { + for (var15 = var11; var15 <= var12; ++var15) { + if ((HealthBarUpdate.field1031[var14 + 1][var15][var9] & var48) == 0) { + break label905; + } + } + + ++var14; + } + + var15 = (var14 + 1 - var13) * (var12 - var11 + 1); + if (var15 >= 8) { + var65 = 240; + var17 = Tiles.Tiles_heights[var14][var11][var9] - var65; + var18 = Tiles.Tiles_heights[var13][var11][var9]; + Scene.Scene_addOccluder(var7, 2, var11 * 128, var12 * 128 + 128, var9 * 128, var9 * 128, var17, var18); + + for (var19 = var13; var19 <= var14; ++var19) { + for (var20 = var11; var20 <= var12; ++var20) { + var10000 = HealthBarUpdate.field1031[var19][var20]; + var10000[var9] &= ~var48; + } + } + } + } + + if ((HealthBarUpdate.field1031[var49][var10][var9] & var6) != 0) { + var11 = var10; + var12 = var10; + var13 = var9; + + for (var14 = var9; var13 > 0 && (HealthBarUpdate.field1031[var49][var10][var13 - 1] & var6) != 0; --var13) { + } + + while (var14 < 104 && (HealthBarUpdate.field1031[var49][var10][var14 + 1] & var6) != 0) { + ++var14; + } + + label969: + while (var11 > 0) { + for (var15 = var13; var15 <= var14; ++var15) { + if ((HealthBarUpdate.field1031[var49][var11 - 1][var15] & var6) == 0) { + break label969; + } + } + + --var11; + } + + label958: + while (var12 < 104) { + for (var15 = var13; var15 <= var14; ++var15) { + if ((HealthBarUpdate.field1031[var49][var12 + 1][var15] & var6) == 0) { + break label958; + } + } + + ++var12; + } + + if ((var14 - var13 + 1) * (var12 - var11 + 1) >= 4) { + var15 = Tiles.Tiles_heights[var49][var11][var13]; + Scene.Scene_addOccluder(var7, 4, var11 * 128, var12 * 128 + 128, var13 * 128, var14 * 128 + 128, var15, var15); + + for (var16 = var11; var16 <= var12; ++var16) { + for (var17 = var13; var17 <= var14; ++var17) { + var10000 = HealthBarUpdate.field1031[var49][var16]; + var10000[var17] &= ~var6; + } + } + } + } + } + } + } + } + + class303.method5528(true); + var4 = Tiles.Tiles_minPlane; + if (var4 > TileItemPile.Client_plane) { + var4 = TileItemPile.Client_plane; + } + + if (var4 < TileItemPile.Client_plane - 1) { + var4 = TileItemPile.Client_plane - 1; + } + + if (Client.isLowDetail) { + UserComparator3.scene.init(Tiles.Tiles_minPlane); + } else { + UserComparator3.scene.init(0); + } + + for (var48 = 0; var48 < 104; ++var48) { + for (var6 = 0; var6 < 104; ++var6) { + class41.updateItemPile(var48, var6); + } + } + + Timer.playPcmPlayers(); + + for (PendingSpawn var63 = (PendingSpawn)Client.pendingSpawns.last(); var63 != null; var63 = (PendingSpawn)Client.pendingSpawns.previous()) { + if (var63.hitpoints == -1) { + var63.delay = 0; + MusicPatchNode2.method3819(var63); + } else { + var63.remove(); + } + } + + ObjectDefinition.ObjectDefinition_cachedModelData.clear(); + PacketBufferNode var64; + if (WorldMapSectionType.client.hasFrame()) { + var64 = UserComparator4.getPacketBufferNode(ClientPacket.field2297, Client.packetWriter.isaacCipher); + var64.packetBuffer.writeInt(1057001181); + Client.packetWriter.addNode(var64); + } + + if (!Client.isInInstance) { + var48 = (WorldMapCacheName.field328 - 6) / 8; + var6 = (WorldMapCacheName.field328 + 6) / 8; + var7 = (class22.field104 - 6) / 8; + var49 = (class22.field104 + 6) / 8; + + for (var9 = var48 - 1; var9 <= var6 + 1; ++var9) { + for (var10 = var7 - 1; var10 <= var49 + 1; ++var10) { + if (var9 < var48 || var9 > var6 || var10 < var7 || var10 > var49) { + WorldMapRectangle.archive5.loadRegionFromName("m" + var9 + "_" + var10); + WorldMapRectangle.archive5.loadRegionFromName("l" + var9 + "_" + var10); + } + } + } + } + + ClientPreferences.updateGameState(30); + Timer.playPcmPlayers(); + BoundaryObject.method3390(); + var64 = UserComparator4.getPacketBufferNode(ClientPacket.field2326, Client.packetWriter.isaacCipher); + Client.packetWriter.addNode(var64); + MidiPcmStream.method3905(); + } + } + } } diff --git a/runescape-client/src/main/java/class231.java b/runescape-client/src/main/java/class231.java index 3789fd0896..f8d4b3fae6 100644 --- a/runescape-client/src/main/java/class231.java +++ b/runescape-client/src/main/java/class231.java @@ -1,28 +1,85 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("hr") +@ObfuscatedName("hb") public class class231 { - @ObfuscatedName("m") + @ObfuscatedName("as") @ObfuscatedSignature( - signature = "(IB)Liq;", - garbageValue = "111" + signature = "(ILcs;ZI)I", + garbageValue = "340792557" ) - @Export("getInvDefinition") - public static InvDefinition getInvDefinition(int var0) { - InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + static int method4277(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.GETWINDOWMODE) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = class58.getWindowedMode(); + return 1; } else { - byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); - var1 = new InvDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); + int var3; + if (var0 == ScriptOpcodes.SETWINDOWMODE) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + if (var3 == 1 || var3 == 2) { + ScriptEvent.setWindowedMode(var3); + } + + return 1; + } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = NetSocket.clientPreferences.windowMode; + return 1; + } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { + if (var0 == 5310) { + --UrlRequester.Interpreter_intStackSize; + return 1; + } else { + return 2; + } + } else { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + if (var3 == 1 || var3 == 2) { + NetSocket.clientPreferences.windowMode = var3; + SpriteMask.savePreferences(); + } + + return 1; + } + } + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + signature = "(ILcs;ZI)I", + garbageValue = "1553809797" + ) + static int method4278(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { + UrlRequester.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; + int var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; + if (!Client.isCameraLocked) { + Client.camAngleX = var3; + Client.camAngleY = var4; } - InvDefinition.InvDefinition_cached.put(var1, (long)var0); - return var1; + return 1; + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.camAngleX; + return 1; + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.camAngleY; + return 1; + } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + if (var3 < 0) { + var3 = 0; + } + + Client.camFollowHeight = var3; + return 1; + } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.camFollowHeight; + return 1; + } else { + return 2; } } } diff --git a/runescape-client/src/main/java/class232.java b/runescape-client/src/main/java/class232.java index 0298e1929e..2bf949ad47 100644 --- a/runescape-client/src/main/java/class232.java +++ b/runescape-client/src/main/java/class232.java @@ -1,25 +1,29 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hv") +@ObfuscatedName("hs") public class class232 { - @ObfuscatedName("hh") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "[Lle;" + signature = "(I)[Llh;", + garbageValue = "-1121273391" ) - @Export("scrollBarSprites") - static IndexedSprite[] scrollBarSprites; + static IndexedSprite[] method4279() { + IndexedSprite[] var0 = new IndexedSprite[class335.SpriteBuffer_spriteCount]; - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "1236815068" - ) - static final int method4218(int var0, int var1) { - int var2 = class4.method63(var0 - 1, var1 - 1) + class4.method63(1 + var0, var1 - 1) + class4.method63(var0 - 1, var1 + 1) + class4.method63(var0 + 1, var1 + 1); - int var3 = class4.method63(var0 - 1, var1) + class4.method63(1 + var0, var1) + class4.method63(var0, var1 - 1) + class4.method63(var0, 1 + var1); - int var4 = class4.method63(var0, var1); - return var2 / 16 + var3 / 8 + var4 / 4; + for (int var1 = 0; var1 < class335.SpriteBuffer_spriteCount; ++var1) { + IndexedSprite var2 = var0[var1] = new IndexedSprite(); + var2.width = class335.SpriteBuffer_spriteWidth; + var2.height = UserComparator8.SpriteBuffer_spriteHeight; + var2.xOffset = class335.SpriteBuffer_xOffsets[var1]; + var2.yOffset = NPC.SpriteBuffer_yOffsets[var1]; + var2.subWidth = class335.SpriteBuffer_spriteWidths[var1]; + var2.subHeight = class335.SpriteBuffer_spriteHeights[var1]; + var2.palette = class335.SpriteBuffer_spritePalette; + var2.pixels = ItemDefinition.SpriteBuffer_pixels[var1]; + } + + GrandExchangeEvent.method158(); + return var0; } } diff --git a/runescape-client/src/main/java/class234.java b/runescape-client/src/main/java/class234.java index a0d83c1e42..7043adceeb 100644 --- a/runescape-client/src/main/java/class234.java +++ b/runescape-client/src/main/java/class234.java @@ -2,24 +2,27 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("im") +@ObfuscatedName("ia") public class class234 { - @ObfuscatedName("x") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "([Ljava/lang/String;[SB)V", - garbageValue = "-127" + signature = "Lko;" ) - public static void method4221(String[] var0, short[] var1) { - GrandExchangeOffer.sortItemsByName(var0, var1, 0, var0.length - 1); - } + @Export("ItemDefinition_fontPlain11") + static Font ItemDefinition_fontPlain11; + @ObfuscatedName("s") + static String[] field3096; - @ObfuscatedName("bo") + @ObfuscatedName("jd") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)I", - garbageValue = "-31" + signature = "(Lhd;I)V", + garbageValue = "-750902552" ) - @Export("stringCp1252NullTerminatedByteSize") - public static int stringCp1252NullTerminatedByteSize(String var0) { - return var0.length() + 1; + @Export("invalidateWidget") + static void invalidateWidget(Widget var0) { + if (var0.cycle == Client.field877) { + Client.field813[var0.rootIndex] = true; + } + } } diff --git a/runescape-client/src/main/java/class235.java b/runescape-client/src/main/java/class235.java new file mode 100644 index 0000000000..f683a3b4e1 --- /dev/null +++ b/runescape-client/src/main/java/class235.java @@ -0,0 +1,63 @@ +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("im") +public class class235 { + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "([BIII)Z", + garbageValue = "493872009" + ) + static final boolean method4281(byte[] var0, int var1, int var2) { + boolean var3 = true; + Buffer var4 = new Buffer(var0); + int var5 = -1; + + label70: + while (true) { + int var6 = var4.method5732(); + 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 label70; + } + + 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 = Canvas.getObjectDefinition(var5); + if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { + if (!var15.needsModelFiles()) { + ++Client.field690; + var3 = false; + } + + var8 = true; + } + } + } + + var9 = var4.readUShortSmart(); + if (var9 == 0) { + break; + } + + var4.readUnsignedByte(); + } + } + } +} diff --git a/runescape-client/src/main/java/class236.java b/runescape-client/src/main/java/class236.java index b092e7376a..d6e12ac4ca 100644 --- a/runescape-client/src/main/java/class236.java +++ b/runescape-client/src/main/java/class236.java @@ -1,62 +1,102 @@ -import java.util.Iterator; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ig") +@ObfuscatedName("id") public final class class236 { - @ObfuscatedName("ju") + @ObfuscatedName("c") @ObfuscatedSignature( - signature = "Lhe;" + signature = "(III)I", + garbageValue = "-1064559233" ) - @Export("dragInventoryWidget") - static Widget dragInventoryWidget; - - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "(BI)C", - garbageValue = "-1712005839" - ) - public static char method4223(byte var0) { - int var1 = var0 & 255; - if (var1 == 0) { - throw new IllegalArgumentException("" + Integer.toString(var1, 16)); + static final int method4282(int var0, int var1) { + if (var0 == -1) { + return 12345678; } else { - if (var1 >= 128 && var1 < 160) { - char var2 = class297.cp1252AsciiExtension[var1 - 128]; - if (var2 == 0) { - var2 = '?'; - } - - var1 = var2; + var1 = (var0 & 127) * var1 / 128; + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; } - return (char)var1; + return (var0 & 65408) + var1; } } - @ObfuscatedName("kr") + @ObfuscatedName("h") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "121" + signature = "(Lef;IIII)Z", + garbageValue = "1976024119" ) - @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 final boolean method4283(Model var0, int var1, int var2, int var3) { + boolean var4 = ViewportMouse.ViewportMouse_isInViewport; + if (!var4) { + return false; + } else { + int var5; + int var6; + int var7; + int var8; + int var11; + int var12; + int var13; + int var16; + int var17; + if (!ViewportMouse.ViewportMouse_false0) { + var5 = Scene.Scene_cameraPitchSine; + var6 = Scene.Scene_cameraPitchCosine; + var7 = Scene.Scene_cameraYawSine; + var8 = Scene.Scene_cameraYawCosine; + byte var9 = 50; + short var10 = 3500; + var11 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var9 / Rasterizer3D.Rasterizer3D_zoom; + var12 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var9 / Rasterizer3D.Rasterizer3D_zoom; + var13 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var10 / Rasterizer3D.Rasterizer3D_zoom; + int var14 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var10 / Rasterizer3D.Rasterizer3D_zoom; + int var15 = Rasterizer3D.method3135(var12, var9, var6, var5); + var16 = Rasterizer3D.method3136(var12, var9, var6, var5); + var12 = var15; + var15 = Rasterizer3D.method3135(var14, var10, var6, var5); + var17 = Rasterizer3D.method3136(var14, var10, var6, var5); + var14 = var15; + var15 = Rasterizer3D.method3158(var11, var16, var8, var7); + var16 = Rasterizer3D.method3134(var11, var16, var8, var7); + var11 = var15; + var15 = Rasterizer3D.method3158(var13, var17, var8, var7); + var17 = Rasterizer3D.method3134(var13, var17, var8, var7); + ViewportMouse.field1770 = (var11 + var15) / 2; + class348.field4062 = (var14 + var12) / 2; + SoundSystem.field1466 = (var16 + var17) / 2; + ViewportMouse.field1771 = (var15 - var11) / 2; + ViewportMouse.field1775 = (var14 - var12) / 2; + ViewportMouse.field1773 = (var17 - var16) / 2; + ApproximateRouteStrategy.field630 = Math.abs(ViewportMouse.field1771); + class204.field2422 = Math.abs(ViewportMouse.field1775); + UserComparator7.field2003 = Math.abs(ViewportMouse.field1773); + } + + var5 = var0.xMid + var1; + var6 = var2 + var0.yMid; + var7 = var3 + var0.zMid; + var8 = var0.xMidOffset; + var16 = var0.yMidOffset; + var17 = var0.zMidOffset; + var11 = ViewportMouse.field1770 - var5; + var12 = class348.field4062 - var6; + var13 = SoundSystem.field1466 - var7; + if (Math.abs(var11) > var8 + ApproximateRouteStrategy.field630) { + return false; + } else if (Math.abs(var12) > var16 + class204.field2422) { + return false; + } else if (Math.abs(var13) > var17 + UserComparator7.field2003) { + return false; + } else if (Math.abs(var13 * ViewportMouse.field1775 - var12 * ViewportMouse.field1773) > var16 * UserComparator7.field2003 + var17 * class204.field2422) { + return false; + } else if (Math.abs(var11 * ViewportMouse.field1773 - var13 * ViewportMouse.field1771) > var8 * UserComparator7.field2003 + var17 * ApproximateRouteStrategy.field630) { + return false; + } else { + return Math.abs(var12 * ViewportMouse.field1771 - var11 * ViewportMouse.field1775) <= var8 * class204.field2422 + var16 * ApproximateRouteStrategy.field630; + } } - - Iterator var2 = Messages.Messages_hashTable.iterator(); - - while (var2.hasNext()) { - Message var3 = (Message)var2.next(); - var3.clearIsFromFriend(); - } - - if (InterfaceParent.clanChat != null) { - InterfaceParent.clanChat.clearFriends(); - } - } } diff --git a/runescape-client/src/main/java/class237.java b/runescape-client/src/main/java/class237.java index 99724e9a55..4d39314756 100644 --- a/runescape-client/src/main/java/class237.java +++ b/runescape-client/src/main/java/class237.java @@ -1,442 +1,19 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ic") +@ObfuscatedName("io") public class class237 { + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = 1978205417 + ) + public static int field3113; + @ObfuscatedName("c") + @Export("Tiles_hueMultiplier") + static int[] Tiles_hueMultiplier; + static { Math.sqrt(8192.0D); } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(II)Ljj;", - garbageValue = "386633685" - ) - @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("fd") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1434556827" - ) - @Export("load") - static void load() { - int var0; - if (Client.titleLoadingStage == 0) { - GrandExchangeOfferWorldComparator.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); - - for (var0 = 0; var0 < 4; ++var0) { - Client.collisionMaps[var0] = new CollisionMap(104, 104); - } - - ArchiveDisk.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) { - ArchiveDiskAction.archive0 = ChatChannel.newArchive(0, false, true, true); - DirectByteArrayCopier.archive1 = ChatChannel.newArchive(1, false, true, true); - GrandExchangeOffer.archive2 = ChatChannel.newArchive(2, true, false, true); - WorldMapSprite.archive3 = ChatChannel.newArchive(3, false, true, true); - FontName.archive4 = ChatChannel.newArchive(4, false, true, true); - WorldMapIcon_0.archive5 = ChatChannel.newArchive(5, true, true, true); - AbstractWorldMapIcon.archive6 = ChatChannel.newArchive(6, true, true, true); - AbstractWorldMapIcon.archive7 = ChatChannel.newArchive(7, false, true, true); - class228.archive8 = ChatChannel.newArchive(8, false, true, true); - SecureRandomFuture.archive9 = ChatChannel.newArchive(9, false, true, true); - PlayerAppearance.archive10 = ChatChannel.newArchive(10, false, true, true); - WorldMapRegion.archive11 = ChatChannel.newArchive(11, false, true, true); - class41.archive12 = ChatChannel.newArchive(12, false, true, true); - NPC.archive13 = ChatChannel.newArchive(13, true, false, true); - class224.archive14 = ChatChannel.newArchive(14, false, true, true); - GrandExchangeOfferNameComparator.archive15 = ChatChannel.newArchive(15, false, true, true); - MenuAction.archive17 = ChatChannel.newArchive(17, true, true, true); - UserComparator9.archive18 = ChatChannel.newArchive(18, false, true, true); - class278.archive19 = ChatChannel.newArchive(19, false, true, true); - class25.archive20 = ChatChannel.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 + ArchiveDiskAction.archive0.percentage() * 4 / 100; - var0 += DirectByteArrayCopier.archive1.percentage() * 4 / 100; - var0 += GrandExchangeOffer.archive2.percentage() * 2 / 100; - var0 += WorldMapSprite.archive3.percentage() * 2 / 100; - var0 += FontName.archive4.percentage() * 6 / 100; - var0 += WorldMapIcon_0.archive5.percentage() * 4 / 100; - var0 += AbstractWorldMapIcon.archive6.percentage() * 2 / 100; - var0 += AbstractWorldMapIcon.archive7.percentage() * 56 / 100; - var0 += class228.archive8.percentage() * 2 / 100; - var0 += SecureRandomFuture.archive9.percentage() * 2 / 100; - var0 += PlayerAppearance.archive10.percentage() * 2 / 100; - var0 += WorldMapRegion.archive11.percentage() * 2 / 100; - var0 += class41.archive12.percentage() * 2 / 100; - var0 += NPC.archive13.percentage() * 2 / 100; - var0 += class224.archive14.percentage() * 2 / 100; - var0 += GrandExchangeOfferNameComparator.archive15.percentage() * 2 / 100; - var0 += class278.archive19.percentage() / 100; - var0 += UserComparator9.archive18.percentage() / 100; - var0 += class25.archive20.percentage() / 100; - var0 += MenuAction.archive17.method4343() && MenuAction.archive17.isFullyLoaded() ? 1 : 0; - if (var0 != 100) { - if (var0 != 0) { - Login.Login_loadingText = "Checking for updates - " + var0 + "%"; - } - - Login.Login_loadingPercent = 30; - } else { - GameObject.method3404(ArchiveDiskAction.archive0, "Animations"); - GameObject.method3404(DirectByteArrayCopier.archive1, "Skeletons"); - GameObject.method3404(FontName.archive4, "Sound FX"); - GameObject.method3404(WorldMapIcon_0.archive5, "Maps"); - GameObject.method3404(AbstractWorldMapIcon.archive6, "Music Tracks"); - GameObject.method3404(AbstractWorldMapIcon.archive7, "Models"); - GameObject.method3404(class228.archive8, "Sprites"); - GameObject.method3404(WorldMapRegion.archive11, "Music Jingles"); - GameObject.method3404(class224.archive14, "Music Samples"); - GameObject.method3404(GrandExchangeOfferNameComparator.archive15, "Music Patches"); - GameObject.method3404(class278.archive19, "World Map"); - GameObject.method3404(UserComparator9.archive18, "World Map Geography"); - GameObject.method3404(class25.archive20, "World Map Ground"); - class7.spriteIds = new GraphicsDefaults(); - class7.spriteIds.decode(MenuAction.archive17); - Login.Login_loadingText = "Loaded update list"; - Login.Login_loadingPercent = 30; - Client.titleLoadingStage = 45; - } - } else { - Archive var2; - Archive var3; - Archive var30; - if (Client.titleLoadingStage == 45) { - WorldMapEvent.method867(22050, !Client.isLowDetail, 2); - MidiPcmStream var33 = new MidiPcmStream(); - var33.method3800(9, 128); - WorldMapManager.pcmPlayer0 = Occluder.method3401(class227.taskHandler, 0, 22050); - WorldMapManager.pcmPlayer0.setStream(var33); - var30 = GrandExchangeOfferNameComparator.archive15; - var2 = class224.archive14; - var3 = FontName.archive4; - class58.musicPatchesArchive = var30; - class206.musicSamplesArchive = var2; - class206.soundEffectsArchive = var3; - class206.midiPcmStream = var33; - AbstractWorldMapData.pcmPlayer1 = Occluder.method3401(class227.taskHandler, 1, 2048); - Tiles.pcmStreamMixer = new PcmStreamMixer(); - AbstractWorldMapData.pcmPlayer1.setStream(Tiles.pcmStreamMixer); - class25.decimator = new Decimator(22050, PcmPlayer.field1421); - Login.Login_loadingText = "Prepared sound engine"; - Login.Login_loadingPercent = 35; - Client.titleLoadingStage = 50; - ItemContainer.WorldMapElement_fonts = new Fonts(class228.archive8, NPC.archive13); - } else if (Client.titleLoadingStage == 50) { - var0 = FontName.method5387().length; - Client.fontsMap = ItemContainer.WorldMapElement_fonts.createMap(FontName.method5387()); - if (Client.fontsMap.size() < var0) { - Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var0 + "%"; - Login.Login_loadingPercent = 40; - } else { - Script.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); - WorldMapData_0.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); - TaskHandler.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); - Varcs.platformInfo = Client.platformInfoProvider.get(); - Login.Login_loadingText = "Loaded fonts"; - Login.Login_loadingPercent = 40; - Client.titleLoadingStage = 60; - } - } else { - int var26; - if (Client.titleLoadingStage == 60) { - var0 = class92.method2156(PlayerAppearance.archive10, class228.archive8); - var26 = class7.method98(); - if (var0 < var26) { - Login.Login_loadingText = "Loading title screen - " + var0 * 100 / var26 + "%"; - Login.Login_loadingPercent = 50; - } else { - Login.Login_loadingText = "Loaded title screen"; - Login.Login_loadingPercent = 50; - MouseRecorder.updateGameState(5); - Client.titleLoadingStage = 70; - } - } else if (Client.titleLoadingStage == 70) { - if (!GrandExchangeOffer.archive2.isFullyLoaded()) { - Login.Login_loadingText = "Loading config - " + GrandExchangeOffer.archive2.loadPercent() + "%"; - Login.Login_loadingPercent = 60; - } else { - Archive var32 = GrandExchangeOffer.archive2; - FloorOverlayDefinition.FloorOverlayDefinition_archive = var32; - var30 = GrandExchangeOffer.archive2; - FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var30; - Message.method1319(GrandExchangeOffer.archive2, AbstractWorldMapIcon.archive7); - WorldMapLabelSize.method290(GrandExchangeOffer.archive2, AbstractWorldMapIcon.archive7, Client.isLowDetail); - var2 = GrandExchangeOffer.archive2; - var3 = AbstractWorldMapIcon.archive7; - NPCDefinition.NpcDefinition_archive = var2; - NPCDefinition.NpcDefinition_modelArchive = var3; - KeyHandler.method940(GrandExchangeOffer.archive2); - Archive var29 = GrandExchangeOffer.archive2; - Archive var5 = AbstractWorldMapIcon.archive7; - boolean var6 = Client.isMembersWorld; - Font var7 = Script.fontPlain11; - PrivateChatMode.ItemDefinition_archive = var29; - GrandExchangeOffer.ItemDefinition_modelArchive = var5; - class169.ItemDefinition_inMembersWorld = var6; - class336.ItemDefinition_fileCount = PrivateChatMode.ItemDefinition_archive.getGroupFileCount(10); - WorldMapSection3.ItemDefinition_fontPlain11 = var7; - Archive var8 = GrandExchangeOffer.archive2; - Archive var9 = ArchiveDiskAction.archive0; - Archive var10 = DirectByteArrayCopier.archive1; - Varcs.SequenceDefinition_archive = var8; - GZipDecompressor.SequenceDefinition_animationsArchive = var9; - class92.SequenceDefinition_skeletonsArchive = var10; - Archive var11 = GrandExchangeOffer.archive2; - Archive var12 = AbstractWorldMapIcon.archive7; - SpotAnimationDefinition.SpotAnimationDefinition_archive = var11; - SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var12; - Archive var13 = GrandExchangeOffer.archive2; - VarbitDefinition.VarbitDefinition_archive = var13; - Archive var14 = GrandExchangeOffer.archive2; - VarpDefinition.VarpDefinition_archive = var14; - VarpDefinition.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); - World.method1908(WorldMapSprite.archive3, AbstractWorldMapIcon.archive7, class228.archive8, NPC.archive13); - UserList.method5179(GrandExchangeOffer.archive2); - MouseHandler.method1206(GrandExchangeOffer.archive2); - Players.method2251(GrandExchangeOffer.archive2); - Archive var15 = GrandExchangeOffer.archive2; - ParamDefinition.ParamDefinition_archive = var15; - UserComparator4.varcs = new Varcs(); - Archive var16 = GrandExchangeOffer.archive2; - Archive var17 = class228.archive8; - Archive var18 = NPC.archive13; - HitSplatDefinition.HitSplatDefinition_archive = var16; - HitSplatDefinition.field3322 = var17; - class296.HitSplatDefinition_fontsArchive = var18; - Archive var19 = GrandExchangeOffer.archive2; - Archive var20 = class228.archive8; - HealthBarDefinition.HealthBarDefinition_archive = var19; - UserComparator1.HitSplatDefinition_spritesArchive = var20; - Archive var21 = GrandExchangeOffer.archive2; - Archive var22 = class228.archive8; - WorldMapElement.WorldMapElement_archive = var22; - if (var21.isFullyLoaded()) { - class277.WorldMapElement_count = var21.getGroupFileCount(35); - WorldMapElement.WorldMapElement_cached = new WorldMapElement[class277.WorldMapElement_count]; - - for (int var23 = 0; var23 < class277.WorldMapElement_count; ++var23) { - byte[] var24 = var21.takeFile(35, var23); - WorldMapElement.WorldMapElement_cached[var23] = new WorldMapElement(var23); - if (var24 != null) { - WorldMapElement.WorldMapElement_cached[var23].decode(new Buffer(var24)); - WorldMapElement.WorldMapElement_cached[var23].method4466(); - } - } - } - - Login.Login_loadingText = "Loaded config"; - Login.Login_loadingPercent = 60; - Client.titleLoadingStage = 80; - } - } else if (Client.titleLoadingStage == 80) { - var0 = 0; - if (ChatChannel.compass == null) { - ChatChannel.compass = MusicPatchNode2.SpriteBuffer_getSprite(class228.archive8, class7.spriteIds.compass, 0); - } else { - ++var0; - } - - if (GrandExchangeOfferNameComparator.redHintArrowSprite == null) { - GrandExchangeOfferNameComparator.redHintArrowSprite = MusicPatchNode2.SpriteBuffer_getSprite(class228.archive8, class7.spriteIds.field3824, 0); - } else { - ++var0; - } - - IndexedSprite[] var1; - int var27; - if (class169.mapSceneSprites == null) { - var2 = class228.archive8; - var27 = class7.spriteIds.mapScenes; - if (!UserComparator7.method3516(var2, var27, 0)) { - var1 = null; - } else { - var1 = Skills.method4214(); - } - - class169.mapSceneSprites = var1; - } else { - ++var0; - } - - if (class52.headIconPkSprites == null) { - class52.headIconPkSprites = ClientPacket.method3688(class228.archive8, class7.spriteIds.headIconsPk, 0); - } else { - ++var0; - } - - if (ReflectionCheck.headIconPrayerSprites == null) { - ReflectionCheck.headIconPrayerSprites = ClientPacket.method3688(class228.archive8, class7.spriteIds.field3817, 0); - } else { - ++var0; - } - - if (class4.headIconHintSprites == null) { - class4.headIconHintSprites = ClientPacket.method3688(class228.archive8, class7.spriteIds.field3818, 0); - } else { - ++var0; - } - - if (WorldMapAreaData.mapMarkerSprites == null) { - WorldMapAreaData.mapMarkerSprites = ClientPacket.method3688(class228.archive8, class7.spriteIds.field3819, 0); - } else { - ++var0; - } - - if (class299.crossSprites == null) { - class299.crossSprites = ClientPacket.method3688(class228.archive8, class7.spriteIds.field3820, 0); - } else { - ++var0; - } - - if (VarpDefinition.mapDotSprites == null) { - VarpDefinition.mapDotSprites = ClientPacket.method3688(class228.archive8, class7.spriteIds.field3821, 0); - } else { - ++var0; - } - - if (class232.scrollBarSprites == null) { - var2 = class228.archive8; - var27 = class7.spriteIds.field3822; - if (!UserComparator7.method3516(var2, var27, 0)) { - var1 = null; - } else { - var1 = Skills.method4214(); - } - - class232.scrollBarSprites = var1; - } else { - ++var0; - } - - if (WorldMapID.modIconSprites == null) { - var2 = class228.archive8; - var27 = class7.spriteIds.field3823; - if (!UserComparator7.method3516(var2, var27, 0)) { - var1 = null; - } else { - var1 = Skills.method4214(); - } - - WorldMapID.modIconSprites = var1; - } else { - ++var0; - } - - if (var0 < 11) { - Login.Login_loadingText = "Loading sprites - " + var0 * 100 / 12 + "%"; - Login.Login_loadingPercent = 70; - } else { - AbstractFont.AbstractFont_modIconSprites = WorldMapID.modIconSprites; - GrandExchangeOfferNameComparator.redHintArrowSprite.normalize(); - var26 = (int)(Math.random() * 21.0D) - 10; - int var28 = (int)(Math.random() * 21.0D) - 10; - var27 = (int)(Math.random() * 21.0D) - 10; - int var4 = (int)(Math.random() * 41.0D) - 20; - class169.mapSceneSprites[0].shiftColors(var4 + var26, var4 + var28, var27 + var4); - Login.Login_loadingText = "Loaded sprites"; - Login.Login_loadingPercent = 70; - Client.titleLoadingStage = 90; - } - } else if (Client.titleLoadingStage == 90) { - if (!SecureRandomFuture.archive9.isFullyLoaded()) { - Login.Login_loadingText = "Loading textures - " + "0%"; - Login.Login_loadingPercent = 90; - } else { - class41.textureProvider = new TextureProvider(SecureRandomFuture.archive9, class228.archive8, 20, 0.8D, Client.isLowDetail ? 64 : 128); - Rasterizer3D.Rasterizer3D_setTextureLoader(class41.textureProvider); - Rasterizer3D.Rasterizer3D_setBrightness(0.8D); - Client.titleLoadingStage = 100; - } - } else if (Client.titleLoadingStage == 100) { - var0 = class41.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) { - MidiPcmStream.mouseRecorder = new MouseRecorder(); - class227.taskHandler.newThreadTask(MidiPcmStream.mouseRecorder, 10); - Login.Login_loadingText = "Loaded input handler"; - Login.Login_loadingPercent = 92; - Client.titleLoadingStage = 120; - } else if (Client.titleLoadingStage == 120) { - if (!PlayerAppearance.archive10.tryLoadFileByNames("huffman", "")) { - Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; - Login.Login_loadingPercent = 94; - } else { - Huffman var25 = new Huffman(PlayerAppearance.archive10.takeFileByNames("huffman", "")); - class219.huffman = var25; - Login.Login_loadingText = "Loaded wordpack"; - Login.Login_loadingPercent = 94; - Client.titleLoadingStage = 130; - } - } else if (Client.titleLoadingStage == 130) { - if (!WorldMapSprite.archive3.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + WorldMapSprite.archive3.loadPercent() * 4 / 5 + "%"; - Login.Login_loadingPercent = 96; - } else if (!class41.archive12.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + (80 + class41.archive12.loadPercent() / 6) + "%"; - Login.Login_loadingPercent = 96; - } else if (!NPC.archive13.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + (96 + NPC.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 (!class278.archive19.tryLoadGroupByName(WorldMapCacheName.field339.name)) { - Login.Login_loadingText = "Loading world map - " + class278.archive19.groupLoadPercentByName(WorldMapCacheName.field339.name) / 10 + "%"; - } else { - if (GrandExchangeOfferAgeComparator.worldMap == null) { - GrandExchangeOfferAgeComparator.worldMap = new WorldMap(); - GrandExchangeOfferAgeComparator.worldMap.init(class278.archive19, UserComparator9.archive18, class25.archive20, TaskHandler.fontBold12, Client.fontsMap, class169.mapSceneSprites); - } - - Login.Login_loadingText = "Loaded world map"; - Client.titleLoadingStage = 150; - } - } else if (Client.titleLoadingStage == 150) { - MouseRecorder.updateGameState(10); - } - } - } - } } diff --git a/runescape-client/src/main/java/class247.java b/runescape-client/src/main/java/class247.java index 4af3712faf..c660c6c5f0 100644 --- a/runescape-client/src/main/java/class247.java +++ b/runescape-client/src/main/java/class247.java @@ -4,44 +4,46 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("in") +@ObfuscatedName("ix") public class class247 { - @ObfuscatedName("x") + @ObfuscatedName("a") + static int[] field3220; + @ObfuscatedName("m") @Export("spriteMap") final HashMap spriteMap; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lld;" + signature = "Llv;" ) @Export("bounds") Bounds bounds; - @ObfuscatedName("k") - int[] field3186; - @ObfuscatedName("d") - int[] field3184; - @ObfuscatedName("w") + @ObfuscatedName("q") + int[] field3218; + @ObfuscatedName("j") + int[] field3222; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1540963759 + intValue = -1283374259 ) - int field3188; + int field3219; public class247() { this.spriteMap = new HashMap(); this.bounds = new Bounds(0, 0); - this.field3186 = new int[2048]; - this.field3184 = new int[2048]; - this.field3188 = 0; - class69.method1277(); + this.field3218 = new int[2048]; + this.field3222 = new int[2048]; + this.field3219 = 0; + MouseHandler.method1154(); } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IB)V", - garbageValue = "1" + signature = "(II)V", + garbageValue = "-170659377" ) - void method4411(int var1) { + void method4486(int var1) { int var2 = var1 * 2 + 1; - double[] var3 = class105.method2395(0.0D, (double)((float)var1 / 3.0F), var1); + double[] var3 = MouseRecorder.method1248(0.0D, (double)((float)var1 / 3.0F), var1); double var4 = var3[var1] * var3[var1]; int[] var6 = new int[var2 * var2]; boolean var7 = false; @@ -59,49 +61,49 @@ public class class247 { this.spriteMap.put(var1, var11); } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "(II)Lla;", - garbageValue = "1164975013" + signature = "(II)Llz;", + garbageValue = "-1626397648" ) - Sprite method4402(int var1) { + Sprite method4487(int var1) { if (!this.spriteMap.containsKey(var1)) { - this.method4411(var1); + this.method4486(var1); } return (Sprite)this.spriteMap.get(var1); } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(III)V", - garbageValue = "1687645228" + garbageValue = "-1291742689" ) - public final void method4405(int var1, int var2) { - if (this.field3188 < this.field3186.length) { - this.field3186[this.field3188] = var1; - this.field3184[this.field3188] = var2; - ++this.field3188; + public final void method4504(int var1, int var2) { + if (this.field3219 < this.field3218.length) { + this.field3218[this.field3219] = var1; + this.field3222[this.field3219] = var2; + ++this.field3219; } } - @ObfuscatedName("w") + @ObfuscatedName("p") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "1569288926" + garbageValue = "2033439477" ) - public final void method4406() { - this.field3188 = 0; + public final void method4489() { + this.field3219 = 0; } - @ObfuscatedName("v") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(IILla;FI)V", - garbageValue = "1134396059" + signature = "(IILlz;FI)V", + garbageValue = "-2127559947" ) - public final void method4407(int var1, int var2, Sprite var3, float var4) { + public final void method4490(int var1, int var2, Sprite var3, float var4) { int var5 = (int)(var4 * 18.0F); - Sprite var6 = this.method4402(var5); + Sprite var6 = this.method4487(var5); int var7 = var5 * 2 + 1; Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); Bounds var9 = new Bounds(0, 0); @@ -111,14 +113,14 @@ public class class247 { int var10; int var11; int var12; - for (var10 = 0; var10 < this.field3188; ++var10) { - var11 = this.field3186[var10]; - var12 = this.field3184[var10]; + for (var10 = 0; var10 < this.field3219; ++var10) { + var11 = this.field3218[var10]; + var12 = this.field3222[var10]; int var13 = (int)((float)(var11 - var1) * var4) - var5; int var14 = (int)((float)var3.subHeight - (float)(var12 - var2) * var4) - var5; this.bounds.setLow(var13, var14); - this.bounds.method6047(var8, var9); - this.method4426(var6, var3, var9); + this.bounds.method6202(var8, var9); + this.method4512(var6, var3, var9); } System.nanoTime(); @@ -132,11 +134,11 @@ public class class247 { if (var11 <= 0) { var3.pixels[var10] = -16777216; } else { - if (var11 > IntHashTable.field4034.length) { - var11 = IntHashTable.field4034.length; + if (var11 > field3220.length) { + var11 = field3220.length; } - var12 = IntHashTable.field4034[var11 - 1]; + var12 = field3220[var11 - 1]; var3.pixels[var10] = -16777216 | var12; } } @@ -145,12 +147,12 @@ public class class247 { System.nanoTime(); } - @ObfuscatedName("q") + @ObfuscatedName("n") @ObfuscatedSignature( - signature = "(Lla;Lla;Lld;I)V", - garbageValue = "-1592905794" + signature = "(Llz;Llz;Llv;B)V", + garbageValue = "-113" ) - void method4426(Sprite var1, Sprite var2, Bounds var3) { + void method4512(Sprite var1, Sprite var2, Bounds var3) { if (var3.highX != 0 && var3.highY != 0) { int var4 = 0; int var5 = 0; @@ -178,4 +180,156 @@ public class class247 { } } + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(II)Lil;", + garbageValue = "-125199916" + ) + @Export("getInvDefinition") + public static InvDefinition getInvDefinition(int var0) { + InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); + if (var1 != null) { + return var1; + } else { + byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); + var1 = new InvDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + InvDefinition.InvDefinition_cached.put(var1, (long)var0); + return var1; + } + } + + @ObfuscatedName("fw") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1527669385" + ) + static final void method4496() { + for (int var0 = 0; var0 < Client.npcCount; ++var0) { + int var1 = Client.npcIndices[var0]; + NPC var2 = Client.npcs[var1]; + if (var2 != null) { + TaskHandler.updateActorSequence(var2, var2.definition.size); + } + } + + } + + @ObfuscatedName("hb") + @ObfuscatedSignature( + signature = "(IIIILjava/lang/String;I)V", + garbageValue = "-870187769" + ) + @Export("widgetDefaultMenuAction") + static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { + Widget var5 = WorldMapLabelSize.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; + InterfaceParent.runScriptEvent(var6); + } + + boolean var11 = true; + if (var5.contentType > 0) { + var11 = MilliClock.method3586(var5); + } + + if (var11) { + int var8 = KeyHandler.getWidgetClickMask(var5); + int var9 = var0 - 1; + boolean var7 = (var8 >> var9 + 1 & 1) != 0; + if (var7) { + PacketBufferNode var10; + if (var0 == 1) { + var10 = UserComparator4.getPacketBufferNode(ClientPacket.field2254, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 2) { + var10 = UserComparator4.getPacketBufferNode(ClientPacket.field2318, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 3) { + var10 = UserComparator4.getPacketBufferNode(ClientPacket.field2275, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 4) { + var10 = UserComparator4.getPacketBufferNode(ClientPacket.field2332, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 5) { + var10 = UserComparator4.getPacketBufferNode(ClientPacket.field2291, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 6) { + var10 = UserComparator4.getPacketBufferNode(ClientPacket.field2320, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 7) { + var10 = UserComparator4.getPacketBufferNode(ClientPacket.field2303, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 8) { + var10 = UserComparator4.getPacketBufferNode(ClientPacket.field2264, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 9) { + var10 = UserComparator4.getPacketBufferNode(ClientPacket.field2309, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + if (var0 == 10) { + var10 = UserComparator4.getPacketBufferNode(ClientPacket.field2245, Client.packetWriter.isaacCipher); + var10.packetBuffer.writeInt(var1); + var10.packetBuffer.writeShort(var2); + var10.packetBuffer.writeShort(var3); + Client.packetWriter.addNode(var10); + } + + } + } + } + } } diff --git a/runescape-client/src/main/java/class25.java b/runescape-client/src/main/java/class25.java index 8f3f70db1b..5e69655426 100644 --- a/runescape-client/src/main/java/class25.java +++ b/runescape-client/src/main/java/class25.java @@ -1,259 +1,26 @@ -import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("f") public class class25 { - @ObfuscatedName("qt") + @ObfuscatedName("ns") @ObfuscatedSignature( - signature = "Ldx;" + signature = "[Lhd;" ) - @Export("decimator") - static Decimator decimator; - @ObfuscatedName("et") + static Widget[] field124; + @ObfuscatedName("rs") + @ObfuscatedGetter( + intValue = 2108681749 + ) + static int field122; + + @ObfuscatedName("ke") @ObfuscatedSignature( - signature = "Lih;" + signature = "(II)V", + garbageValue = "-777100102" ) - @Export("archive20") - static Archive archive20; - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(II)Lio;", - garbageValue = "823502327" - ) - @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("x") - @ObfuscatedSignature( - signature = "(II)Z", - garbageValue = "-1245361009" - ) - @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("x") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1853542199" - ) - public static void method277() { - class105.reflectionChecks = new IterableNodeDeque(); - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "(Lkj;IS)V", - garbageValue = "10549" - ) - @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.field670 = false; - } else if (Client.localPlayerIndex == var1) { - throw new RuntimeException(); - } else { - Players.Players_regions[var1] = (var4.plane << 28) + (class89.baseY + var4.pathY[0] >> 13) + (class69.baseX + var4.pathX[0] >> 13 << 14); - if (var4.field1015 != -1) { - Players.Players_orientations[var1] = var4.field1015; - } else { - Players.Players_orientations[var1] = var4.orientation; - } - - Players.Players_targetIndices[var1] = var4.targetIndex; - Client.players[var1] = null; - if (var0.readBits(1) != 0) { - class22.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.field670 = true; - var4.tileX = var6; - var4.tileY = var7; - } else { - var4.field670 = false; - var4.method1339(var6, var7, Players.field1273[var1]); - } - } else { - var4.resetPath(var6, var7); - var4.field670 = 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.field670 = false; - } else if (var2) { - var4.field670 = true; - var4.tileX = var6; - var4.tileY = var7; - } else { - var4.field670 = false; - var4.method1339(var6, var7, Players.field1273[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.field670 = true; - var4.tileX = var10; - var4.tileY = var11; - } else { - var4.field670 = false; - var4.method1339(var10, var11, Players.field1273[var1]); - } - } else { - var4.resetPath(var10, var11); - var4.field670 = false; - } - - var4.plane = (byte)(var7 + var4.plane & 3); - if (Client.localPlayerIndex == var1) { - ScriptEvent.Client_plane = var4.plane; - } - - } else { - var6 = var0.readBits(30); - var7 = var6 >> 28; - var8 = var6 >> 14 & 16383; - var9 = var6 & 16383; - var10 = (var8 + class69.baseX + var4.pathX[0] & 16383) - class69.baseX; - var11 = (var9 + class89.baseY + var4.pathY[0] & 16383) - class89.baseY; - if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { - if (var2) { - var4.field670 = true; - var4.tileX = var10; - var4.tileY = var11; - } else { - var4.field670 = false; - var4.method1339(var10, var11, Players.field1273[var1]); - } - } else { - var4.resetPath(var10, var11); - var4.field670 = false; - } - - var4.plane = (byte)(var7 + var4.plane & 3); - if (Client.localPlayerIndex == var1) { - ScriptEvent.Client_plane = var4.plane; - } - - } - } - } + static void method245(int var0) { + Client.oculusOrbState = var0; } } diff --git a/runescape-client/src/main/java/class257.java b/runescape-client/src/main/java/class257.java index bd1664d57c..de9f27e0a3 100644 --- a/runescape-client/src/main/java/class257.java +++ b/runescape-client/src/main/java/class257.java @@ -1,16 +1,46 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("il") +@ObfuscatedName("iz") public class class257 { - @ObfuscatedName("c") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "1" + signature = "[Lih;" ) - public static void method4558() { - ItemDefinition.ItemDefinition_cached.clear(); - ItemDefinition.ItemDefinition_cachedModels.clear(); - ItemDefinition.ItemDefinition_cachedSprites.clear(); + @Export("WorldMapElement_cached") + public static WorldMapElement[] WorldMapElement_cached; + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(III)V", + garbageValue = "-540216390" + ) + public static void method4679(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; } } diff --git a/runescape-client/src/main/java/class276.java b/runescape-client/src/main/java/class276.java deleted file mode 100644 index 77345186eb..0000000000 --- a/runescape-client/src/main/java/class276.java +++ /dev/null @@ -1,16 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("jo") -public class class276 { - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-894385088" - ) - public static int method5036(int var0) { - long var2 = ViewportMouse.ViewportMouse_entityTags[var0]; - int var1 = (int)(var2 >>> 14 & 3L); - return var1; - } -} diff --git a/runescape-client/src/main/java/class277.java b/runescape-client/src/main/java/class277.java index 137ca1cde4..060ca25643 100644 --- a/runescape-client/src/main/java/class277.java +++ b/runescape-client/src/main/java/class277.java @@ -1,49 +1,27 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ja") +@ObfuscatedName("jv") public class class277 { - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -322995175 - ) - @Export("WorldMapElement_count") - public static int WorldMapElement_count; - - @ObfuscatedName("s") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1950063557" + signature = "([I[II)V", + garbageValue = "805948782" ) - public static void method5038() { - NPCDefinition.NpcDefinition_cached.clear(); - NPCDefinition.NpcDefinition_cachedModels.clear(); - } + public static void method5157(int[] var0, int[] var1) { + if (var0 != null && var1 != null) { + ParamDefinition.ByteArrayPool_alternativeSizes = var0; + VarbitDefinition.ByteArrayPool_altSizeArrayCounts = new int[var0.length]; + Fonts.ByteArrayPool_arrays = new byte[var0.length][][]; - @ObfuscatedName("hz") - @ObfuscatedSignature( - signature = "(IIII)I", - garbageValue = "-1643132942" - ) - @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; + for (int var2 = 0; var2 < ParamDefinition.ByteArrayPool_alternativeSizes.length; ++var2) { + Fonts.ByteArrayPool_arrays[var2] = new byte[var1[var2]][]; } - int var6 = var0 & 127; - int var7 = var1 & 127; - int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4] >> 7; - int var9 = Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) + Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] * var6 >> 7; - return var8 * (128 - var7) + var9 * var7 >> 7; } else { - return 0; + ParamDefinition.ByteArrayPool_alternativeSizes = null; + VarbitDefinition.ByteArrayPool_altSizeArrayCounts = null; + Fonts.ByteArrayPool_arrays = null; } } } diff --git a/runescape-client/src/main/java/class278.java b/runescape-client/src/main/java/class278.java index 76a80b8a20..58340d61a9 100644 --- a/runescape-client/src/main/java/class278.java +++ b/runescape-client/src/main/java/class278.java @@ -1,22 +1,26 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("jp") +@ObfuscatedName("jj") public class class278 { - @ObfuscatedName("ex") + @ObfuscatedName("sb") @ObfuscatedSignature( - signature = "Lih;" + signature = "Lix;" ) - @Export("archive19") - static Archive archive19; + public static class247 field3585; - @ObfuscatedName("av") + @ObfuscatedName("ap") @ObfuscatedSignature( - signature = "(II)I", - garbageValue = "-2135141314" + signature = "(ILcs;ZB)I", + garbageValue = "73" ) - static int method5039(int var0) { - return (int)Math.pow(2.0D, (double)(7.0F + (float)var0 / 256.0F)); + static int method5158(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.LOGOUT) { + Client.logoutTimer = 250; + return 1; + } else { + return 2; + } } } diff --git a/runescape-client/src/main/java/class279.java b/runescape-client/src/main/java/class279.java new file mode 100644 index 0000000000..159552d75f --- /dev/null +++ b/runescape-client/src/main/java/class279.java @@ -0,0 +1,9 @@ +import net.runelite.mapping.ObfuscatedName; + +@ObfuscatedName("jh") +public class class279 { + @ObfuscatedName("p") + public static int method5159(long var0) { + return (int)(var0 >>> 0 & 127L); + } +} diff --git a/runescape-client/src/main/java/class280.java b/runescape-client/src/main/java/class280.java index 7f62788577..64bd17d21b 100644 --- a/runescape-client/src/main/java/class280.java +++ b/runescape-client/src/main/java/class280.java @@ -1,56 +1,101 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jf") +@ObfuscatedName("jb") public class class280 { - @ObfuscatedName("ep") - @ObfuscatedGetter( - intValue = 739756993 - ) - @Export("port3") - static int port3; - - @ObfuscatedName("w") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IZI)Ljava/lang/String;", - garbageValue = "-627751714" + signature = "(Ljava/lang/CharSequence;Lmo;I)Ljava/lang/String;", + garbageValue = "-1896450279" ) - @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; + public static String method5160(CharSequence var0, LoginType var1) { + if (var0 == null) { + return null; + } else { + int var2 = 0; - for (int var5 = var0 / 10; var5 != 0; ++var4) { - var5 /= 10; - } + int var3; + for (var3 = var0.length(); var2 < var3 && DesktopPlatformInfoProvider.method6481(var0.charAt(var2)); ++var2) { + } - char[] var6 = new char[var4]; - var6[0] = '+'; + while (var3 > var2 && DesktopPlatformInfoProvider.method6481(var0.charAt(var3 - 1))) { + --var3; + } - 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); + int var4 = var3 - var2; + if (var4 >= 1) { + byte var6; + if (var1 == null) { + var6 = 12; + } else { + switch(var1.field4060) { + case 4: + var6 = 20; + break; + default: + var6 = 12; } } - var2 = new String(var6); - } else { - var2 = Integer.toString(var0, 10); + 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 (Varps.isAlphaNumeric(var7)) { + var8 = true; + } else { + char[] var9 = class348.field4065; + int var10 = 0; + + label79: + while (true) { + char var11; + if (var10 >= var9.length) { + var9 = class348.field4064; + + for (var10 = 0; var10 < var9.length; ++var10) { + var11 = var9[var10]; + if (var7 == var11) { + var8 = true; + break label79; + } + } + + var8 = false; + break; + } + + var11 = var9[var10]; + if (var11 == var7) { + var8 = true; + break; + } + + ++var10; + } + } + + if (var8) { + char var13 = KitDefinition.method4650(var7); + if (var13 != 0) { + var12.append(var13); + } + } + } + + if (var12.length() == 0) { + return null; + } + + return var12.toString(); + } } - return var2; - } else { - return Integer.toString(var0); + return null; } } } diff --git a/runescape-client/src/main/java/class296.java b/runescape-client/src/main/java/class296.java index 3f7b5168b2..f0625d7037 100644 --- a/runescape-client/src/main/java/class296.java +++ b/runescape-client/src/main/java/class296.java @@ -2,12 +2,42 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kk") +@ObfuscatedName("ks") public class class296 { - @ObfuscatedName("k") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Liy;" + signature = "(CI)C", + garbageValue = "1101109074" ) - @Export("HitSplatDefinition_fontsArchive") - public static AbstractArchive HitSplatDefinition_fontsArchive; + static char method5464(char var0) { + return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "(CI)Z", + garbageValue = "-2022540422" + ) + @Export("isDigit") + public static boolean isDigit(char var0) { + return var0 >= '0' && var0 <= '9'; + } + + @ObfuscatedName("jy") + @ObfuscatedSignature( + signature = "(Lhd;IIII)V", + garbageValue = "-213876459" + ) + @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) { + GrandExchangeOfferNameComparator.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/class297.java b/runescape-client/src/main/java/class297.java index 346e119fbf..7bdc84b380 100644 --- a/runescape-client/src/main/java/class297.java +++ b/runescape-client/src/main/java/class297.java @@ -1,52 +1,13 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kn") +@ObfuscatedName("km") public class class297 { - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("cp1252AsciiExtension") public static final char[] cp1252AsciiExtension; static { cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; } - - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "(II)Ljava/lang/String;", - garbageValue = "930990308" - ) - @Export("colorStartTag") - static String colorStartTag(int var0) { - return ""; - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "-2032356267" - ) - static final int method5332(int var0, int var1) { - if (var0 == -2) { - return 12345678; - } else if (var0 == -1) { - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } - - return var1; - } else { - var1 = (var0 & 127) * var1 / 128; - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } - - return (var0 & 65408) + var1; - } - } } diff --git a/runescape-client/src/main/java/class298.java b/runescape-client/src/main/java/class298.java index 50bb7718dd..ff08d78bc2 100644 --- a/runescape-client/src/main/java/class298.java +++ b/runescape-client/src/main/java/class298.java @@ -2,31 +2,63 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kq") +@ObfuscatedName("kt") public final class class298 { - @ObfuscatedName("x") + @ObfuscatedName("m") @Export("base37Table") static final char[] base37Table; - @ObfuscatedName("m") - static long[] field3643; + @ObfuscatedName("o") + static long[] field3671; 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'}; - field3643 = new long[12]; + field3671 = new long[12]; - for (int var0 = 0; var0 < field3643.length; ++var0) { - field3643[var0] = (long)Math.pow(37.0D, (double)var0); + for (int var0 = 0; var0 < field3671.length; ++var0) { + field3671[var0] = (long)Math.pow(37.0D, (double)var0); } } - @ObfuscatedName("x") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Liy;II)Lhy;", - garbageValue = "16711680" + signature = "(IZI)Ljava/lang/String;", + garbageValue = "-1481741683" ) - static MusicPatch method5343(AbstractArchive var0, int var1) { - byte[] var2 = var0.takeFileFlat(var1); - return var2 == null ? null : new MusicPatch(var2); + @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/class299.java b/runescape-client/src/main/java/class299.java index 7e143d3817..e7c1431785 100644 --- a/runescape-client/src/main/java/class299.java +++ b/runescape-client/src/main/java/class299.java @@ -1,191 +1,89 @@ -import java.io.IOException; -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ks") +@ObfuscatedName("kr") public class class299 { - @ObfuscatedName("x") - static char[] field3646; @ObfuscatedName("m") - static char[] field3647; - @ObfuscatedName("k") - static char[] field3648; - @ObfuscatedName("d") - static int[] field3649; - @ObfuscatedName("hy") - @ObfuscatedSignature( - signature = "[Lla;" - ) - @Export("crossSprites") - static Sprite[] crossSprites; + public static char[] field3677; + @ObfuscatedName("o") + static char[] field3674; + @ObfuscatedName("q") + static char[] field3675; + @ObfuscatedName("j") + static int[] field3673; static { - field3646 = new char[64]; + field3677 = new char[64]; int var0; for (var0 = 0; var0 < 26; ++var0) { - field3646[var0] = (char)(var0 + 65); + field3677[var0] = (char)(var0 + 65); } for (var0 = 26; var0 < 52; ++var0) { - field3646[var0] = (char)(var0 + 97 - 26); + field3677[var0] = (char)(var0 + 97 - 26); } for (var0 = 52; var0 < 62; ++var0) { - field3646[var0] = (char)(var0 + 48 - 52); + field3677[var0] = (char)(var0 + 48 - 52); } - field3646[62] = '+'; - field3646[63] = '/'; - field3647 = new char[64]; + field3677[62] = '+'; + field3677[63] = '/'; + field3674 = new char[64]; for (var0 = 0; var0 < 26; ++var0) { - field3647[var0] = (char)(var0 + 65); + field3674[var0] = (char)(var0 + 65); } for (var0 = 26; var0 < 52; ++var0) { - field3647[var0] = (char)(var0 + 97 - 26); + field3674[var0] = (char)(var0 + 97 - 26); } for (var0 = 52; var0 < 62; ++var0) { - field3647[var0] = (char)(var0 + 48 - 52); + field3674[var0] = (char)(var0 + 48 - 52); } - field3647[62] = '*'; - field3647[63] = '-'; - field3648 = new char[64]; + field3674[62] = '*'; + field3674[63] = '-'; + field3675 = new char[64]; for (var0 = 0; var0 < 26; ++var0) { - field3648[var0] = (char)(var0 + 65); + field3675[var0] = (char)(var0 + 65); } for (var0 = 26; var0 < 52; ++var0) { - field3648[var0] = (char)(var0 + 97 - 26); + field3675[var0] = (char)(var0 + 97 - 26); } for (var0 = 52; var0 < 62; ++var0) { - field3648[var0] = (char)(var0 + 48 - 52); + field3675[var0] = (char)(var0 + 48 - 52); } - field3648[62] = '-'; - field3648[63] = '_'; - field3649 = new int[128]; + field3675[62] = '-'; + field3675[63] = '_'; + field3673 = new int[128]; - for (var0 = 0; var0 < field3649.length; ++var0) { - field3649[var0] = -1; + for (var0 = 0; var0 < field3673.length; ++var0) { + field3673[var0] = -1; } for (var0 = 65; var0 <= 90; ++var0) { - field3649[var0] = var0 - 65; + field3673[var0] = var0 - 65; } for (var0 = 97; var0 <= 122; ++var0) { - field3649[var0] = var0 - 97 + 26; + field3673[var0] = var0 - 97 + 26; } for (var0 = 48; var0 <= 57; ++var0) { - field3649[var0] = var0 - 48 + 52; + field3673[var0] = var0 - 48 + 52; } - int[] var2 = field3649; - field3649[43] = 62; + int[] var2 = field3673; + field3673[43] = 62; var2[42] = 62; - int[] var1 = field3649; - field3649[47] = 63; + int[] var1 = field3673; + field3673[47] = 63; var1[45] = 63; } - - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "(Liy;Liy;ZII)V", - garbageValue = "53757689" - ) - static void method5349(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { - if (Login.clearLoginScreen) { - if (var3 == 4) { - Login.loginIndex = 4; - } - - } else { - Login.loginIndex = var3; - Rasterizer2D.Rasterizer2D_clear(); - byte[] var4 = var0.takeFileByNames("title.jpg", ""); - Login.leftTitleSprite = class200.convertJpgToSprite(var4); - DirectByteArrayCopier.rightTitleSprite = Login.leftTitleSprite.mirrorHorizontally(); - if ((Client.worldProperties & 536870912) != 0) { - class3.logoSprite = class7.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); - } else if ((Client.worldProperties & 1073741824) != 0) { - class3.logoSprite = class7.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); - } else { - class3.logoSprite = class7.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); - } - - ModelData0.titleboxSprite = class7.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); - GrandExchangeOfferOwnWorldComparator.titlebuttonSprite = class7.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); - int var6 = var1.getGroupId("runes"); - int var7 = var1.getFileId(var6, ""); - IndexedSprite[] var8; - if (!UserComparator7.method3516(var1, var6, var7)) { - var8 = null; - } else { - var8 = Skills.method4214(); - } - - Login.runesSprite = var8; - ArchiveDisk.title_muteSprite = Username.method5271(var1, "title_mute", ""); - class4.options_buttons_0Sprite = class7.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); - WorldMapLabelSize.field160 = class7.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); - Login.options_buttons_2Sprite = class7.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); - Login.field1195 = class7.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); - WorldMapLabelSize.field158 = class4.options_buttons_0Sprite.subWidth; - class219.field2515 = class4.options_buttons_0Sprite.subHeight; - MilliClock.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite); - if (var2) { - Login.Login_username = ""; - Login.Login_password = ""; - } - - GraphicsObject.field1141 = 0; - MilliClock.otp = ""; - Login.field1214 = true; - Login.worldSelectOpen = false; - if (!GrandExchangeOfferOwnWorldComparator.clientPreferences.titleMusicDisabled) { - WorldMapArea.method461(2, AbstractWorldMapIcon.archive6, "scape main", "", 255, false); - } else { - class206.field2406 = 1; - class206.musicTrackArchive = null; - class206.musicTrackGroupId = -1; - class206.musicTrackFileId = -1; - class219.musicTrackVolume = 0; - GrandExchangeOfferUnitPriceComparator.musicTrackBoolean = false; - AttackOption.field1187 = 2; - } - - if (NetCache.NetCache_socket != null) { - try { - Buffer var9 = new Buffer(4); - var9.writeByte(3); - var9.writeMedium(0); - NetCache.NetCache_socket.write(var9.array, 0, 4); - } catch (IOException var12) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var11) { - } - - ++NetCache.NetCache_ioExceptions; - NetCache.NetCache_socket = null; - } - } - - Login.clearLoginScreen = true; - Login.xPadding = (WorldMapLabel.canvasWidth - 765) / 2; - Login.loginBoxX = Login.xPadding + 202; - PacketWriter.loginBoxCenter = Login.loginBoxX + 180; - Login.leftTitleSprite.drawAt(Login.xPadding, 0); - DirectByteArrayCopier.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - class3.logoSprite.drawAt(Login.xPadding + 382 - class3.logoSprite.subWidth / 2, 18); - } - } } diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java index e9d1ffed97..f2f8417a09 100644 --- a/runescape-client/src/main/java/class3.java +++ b/runescape-client/src/main/java/class3.java @@ -3,227 +3,212 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("d") +@ObfuscatedName("j") public class class3 implements Enumerated { - @ObfuscatedName("x") + @ObfuscatedName("qs") @ObfuscatedSignature( - signature = "Ld;" + signature = "Llz;" ) - static final class3 field11; + @Export("sceneMinimapSprite") + static Sprite sceneMinimapSprite; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Ld;" + signature = "Lj;" ) - static final class3 field13; - @ObfuscatedName("k") + public static final class3 field10; + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Ld;" + signature = "Lj;" ) - static final class3 field7; - @ObfuscatedName("t") - @ObfuscatedSignature( - signature = "Lle;" - ) - @Export("logoSprite") - static IndexedSprite logoSprite; - @ObfuscatedName("cx") - @ObfuscatedGetter( - intValue = 778706931 - ) - public static int field16; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 1188320115 - ) - final int field8; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 1711821185 - ) - public final int field9; - @ObfuscatedName("v") - final Class field10; + public static final class3 field8; @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lx;" + signature = "Lj;" ) - final class0 field5; + public static final class3 field9; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 1514445555 + ) + final int field14; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -658537441 + ) + public final int field15; + @ObfuscatedName("g") + public final Class field12; + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "Lm;" + ) + public final class0 field13; static { - field11 = new class3(2, 0, Integer.class, new class1()); - field13 = new class3(0, 1, Long.class, new class2()); - field7 = new class3(1, 2, String.class, new class4()); + field10 = new class3(2, 0, Integer.class, new class1()); + field8 = new class3(1, 1, Long.class, new class2()); + field9 = new class3(0, 2, String.class, new class4()); } @ObfuscatedSignature( - signature = "(IILjava/lang/Class;Lx;)V" + signature = "(IILjava/lang/Class;Lm;)V" ) class3(int var1, int var2, Class var3, class0 var4) { - this.field8 = var1; - this.field9 = var2; - this.field10 = var3; - this.field5 = var4; + this.field14 = var1; + this.field15 = var2; + this.field12 = var3; + this.field13 = var4; } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "56" + signature = "(I)I", + garbageValue = "-995092303" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field9; + return this.field15; + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(Lkn;I)Ljava/lang/Object;", + garbageValue = "-1114505867" + ) + public Object method40(Buffer var1) { + return this.field13.vmethod47(var1); + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(I)[Lu;", + garbageValue = "849855680" + ) + public static class7[] method41() { + return new class7[]{class7.field30}; + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(III)Lbr;", + garbageValue = "-1323441814" + ) + @Export("Messages_getByChannelAndID") + static Message Messages_getByChannelAndID(int var0, int var1) { + ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); + return var2.getMessage(var1); + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + signature = "(B)Lch;", + garbageValue = "12" + ) + @Export("getNextWorldListWorld") + static World getNextWorldListWorld() { + return World.World_listCount < World.World_count ? class13.World_worlds[++World.World_listCount - 1] : null; } @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Lkb;B)Ljava/lang/Object;", - garbageValue = "22" + signature = "([BI)V", + garbageValue = "-2060767069" ) - public Object method42(Buffer var1) { - return this.field5.vmethod74(var1); - } + @Export("SpriteBuffer_decode") + public static void SpriteBuffer_decode(byte[] var0) { + Buffer var1 = new Buffer(var0); + var1.offset = var0.length - 2; + class335.SpriteBuffer_spriteCount = var1.readUnsignedShort(); + class335.SpriteBuffer_xOffsets = new int[class335.SpriteBuffer_spriteCount]; + NPC.SpriteBuffer_yOffsets = new int[class335.SpriteBuffer_spriteCount]; + class335.SpriteBuffer_spriteWidths = new int[class335.SpriteBuffer_spriteCount]; + class335.SpriteBuffer_spriteHeights = new int[class335.SpriteBuffer_spriteCount]; + ItemDefinition.SpriteBuffer_pixels = new byte[class335.SpriteBuffer_spriteCount][]; + var1.offset = var0.length - 7 - class335.SpriteBuffer_spriteCount * 8; + class335.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); + UserComparator8.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); + int var2 = (var1.readUnsignedByte() & 255) + 1; - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(I)[Ld;", - garbageValue = "1248290062" - ) - public static class3[] method46() { - return new class3[]{field7, field11, field13}; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "(Lih;II)V", - garbageValue = "-1889898476" - ) - static void method58(Archive var0, int var1) { - if (class13.NetCache_reference != null) { - class13.NetCache_reference.offset = var1 * 8 + 5; - int var2 = class13.NetCache_reference.readInt(); - int var3 = class13.NetCache_reference.readInt(); - var0.loadIndex(var2, var3); - } else { - Frames.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); - NetCache.NetCache_archives[var1] = var0; + int var3; + for (var3 = 0; var3 < class335.SpriteBuffer_spriteCount; ++var3) { + class335.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); } - } - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "(Ljava/lang/Class;I)Ld;", - garbageValue = "-1981111471" - ) - public static class3 method38(Class var0) { - class3[] var1 = method46(); + for (var3 = 0; var3 < class335.SpriteBuffer_spriteCount; ++var3) { + NPC.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); + } - for (int var2 = 0; var2 < var1.length; ++var2) { - class3 var3 = var1[var2]; - if (var3.field10 == var0) { - return var3; + for (var3 = 0; var3 < class335.SpriteBuffer_spriteCount; ++var3) { + class335.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class335.SpriteBuffer_spriteCount; ++var3) { + class335.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); + } + + var1.offset = var0.length - 7 - class335.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; + class335.SpriteBuffer_spritePalette = new int[var2]; + + for (var3 = 1; var3 < var2; ++var3) { + class335.SpriteBuffer_spritePalette[var3] = var1.readMedium(); + if (class335.SpriteBuffer_spritePalette[var3] == 0) { + class335.SpriteBuffer_spritePalette[var3] = 1; } } - return null; - } + var1.offset = 0; - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "(Ljava/lang/Class;I)Lx;", - garbageValue = "-334212288" - ) - public static class0 method40(Class var0) { - class3 var1 = method38(var0); - if (var1 == null) { - throw new IllegalArgumentException(); - } else { - return var1.field5; - } - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "-61779781" - ) - static int method59(int var0, int var1) { - long var2 = (long)((var0 << 16) + var1); - return NetCache.NetCache_currentResponse != null && var2 == NetCache.NetCache_currentResponse.key ? NetCache.NetCache_responseArchiveBuffer.offset * 99 / (NetCache.NetCache_responseArchiveBuffer.array.length - NetCache.NetCache_currentResponse.padding) + 1 : 0; - } - - @ObfuscatedName("ay") - @ObfuscatedSignature( - signature = "(ILhj;ZI)V", - garbageValue = "-728814712" - ) - static void method57(int var0, Coord var1, boolean var2) { - WorldMapArea var3 = class13.getWorldMap().getMapArea(var0); - int var4 = ByteArrayPool.localPlayer.plane; - int var5 = (ByteArrayPool.localPlayer.x >> 7) + class69.baseX; - int var6 = (ByteArrayPool.localPlayer.y >> 7) + class89.baseY; - Coord var7 = new Coord(var4, var5, var6); - class13.getWorldMap().method6588(var3, var7, var1, var2); - } - - @ObfuscatedName("fb") - @ObfuscatedSignature( - signature = "(Lhe;III)V", - garbageValue = "1782995068" - ) - @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 || !class217.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { - SpriteMask var3 = var0.getSpriteMask(true); - if (var3 == null) { - return; + for (var3 = 0; var3 < class335.SpriteBuffer_spriteCount; ++var3) { + int var4 = class335.SpriteBuffer_spriteWidths[var3]; + int var5 = class335.SpriteBuffer_spriteHeights[var3]; + int var6 = var5 * var4; + byte[] var7 = new byte[var6]; + ItemDefinition.SpriteBuffer_pixels[var3] = var7; + int var8 = var1.readUnsignedByte(); + int var9; + if (var8 == 0) { + for (var9 = 0; var9 < var6; ++var9) { + var7[var9] = var1.readByte(); } - - int var4 = MouseHandler.MouseHandler_lastPressedX - var1; - int var5 = MouseHandler.MouseHandler_lastPressedY - var2; - if (var3.contains(var4, var5)) { - var4 -= var3.width / 2; - var5 -= var3.height / 2; - int var6 = Client.camAngleY & 2047; - int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; - int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; - int var9 = var7 * var5 + var4 * var8 >> 11; - int var10 = var8 * var5 - var7 * var4 >> 11; - int var11 = var9 + ByteArrayPool.localPlayer.x >> 7; - int var12 = ByteArrayPool.localPlayer.y - var10 >> 7; - PacketBufferNode var13 = FaceNormal.getPacketBufferNode(ClientPacket.field2207, Client.packetWriter.isaacCipher); - var13.packetBuffer.writeByte(18); - var13.packetBuffer.writeShort(var11 + class69.baseX); - var13.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); - var13.packetBuffer.writeShort(var12 + class89.baseY); - var13.packetBuffer.writeByte(var4); - var13.packetBuffer.writeByte(var5); - var13.packetBuffer.writeShort(Client.camAngleY); - var13.packetBuffer.writeByte(57); - var13.packetBuffer.writeByte(0); - var13.packetBuffer.writeByte(0); - var13.packetBuffer.writeByte(89); - var13.packetBuffer.writeShort(ByteArrayPool.localPlayer.x); - var13.packetBuffer.writeShort(ByteArrayPool.localPlayer.y); - var13.packetBuffer.writeByte(63); - Client.packetWriter.addNode(var13); - Client.destinationX = var11; - Client.destinationY = var12; + } else if (var8 == 1) { + for (var9 = 0; var9 < var4; ++var9) { + for (int var10 = 0; var10 < var5; ++var10) { + var7[var9 + var10 * var4] = var1.readByte(); + } } } - } + } - @ObfuscatedName("lt") + @ObfuscatedName("fg") @ObfuscatedSignature( - signature = "(S)V", - garbageValue = "14702" + signature = "(I)V", + garbageValue = "-2027582422" ) - static void method48() { - if (Client.oculusOrbState == 1) { - Client.field770 = true; + static final void method33() { + 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; + } + } } } diff --git a/runescape-client/src/main/java/class300.java b/runescape-client/src/main/java/class300.java deleted file mode 100644 index dbfa3f9071..0000000000 --- a/runescape-client/src/main/java/class300.java +++ /dev/null @@ -1,21 +0,0 @@ -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("kc") -public final class class300 { - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -528814931 - ) - static int field3653; - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(I)[Llg;", - garbageValue = "1884673735" - ) - static PrivateChatMode[] method5368() { - return new PrivateChatMode[]{PrivateChatMode.field3801, PrivateChatMode.field3803, PrivateChatMode.field3806}; - } -} diff --git a/runescape-client/src/main/java/class303.java b/runescape-client/src/main/java/class303.java index 6f2cffd5d4..26bddb0def 100644 --- a/runescape-client/src/main/java/class303.java +++ b/runescape-client/src/main/java/class303.java @@ -2,29 +2,48 @@ import java.io.IOException; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kg") +@ObfuscatedName("kw") public class class303 { - @ObfuscatedName("hh") + @ObfuscatedName("gi") @ObfuscatedSignature( signature = "(ZI)V", - garbageValue = "83308919" + garbageValue = "-1926493501" ) - static final void method5397(boolean var0) { - ChatChannel.playPcmPlayers(); + static final void method5528(boolean var0) { + Timer.playPcmPlayers(); ++Client.packetWriter.pendingWrites; if (Client.packetWriter.pendingWrites >= 50 || var0) { Client.packetWriter.pendingWrites = 0; - if (!Client.field728 && Client.packetWriter.getSocket() != null) { - PacketBufferNode var1 = FaceNormal.getPacketBufferNode(ClientPacket.field2295, Client.packetWriter.isaacCipher); + if (!Client.field722 && Client.packetWriter.getSocket() != null) { + PacketBufferNode var1 = UserComparator4.getPacketBufferNode(ClientPacket.field2285, Client.packetWriter.isaacCipher); Client.packetWriter.addNode(var1); try { Client.packetWriter.flush(); } catch (IOException var3) { - Client.field728 = true; + Client.field722 = true; } } } } + + @ObfuscatedName("kg") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "-1" + ) + static void method5525() { + if (class278.field3585 != null) { + Client.field942 = Client.cycle; + class278.field3585.method4489(); + + for (int var0 = 0; var0 < Client.players.length; ++var0) { + if (Client.players[var0] != null) { + class278.field3585.method4504((Client.players[var0].x >> 7) + class182.baseX, (Client.players[var0].y >> 7) + SecureRandomFuture.baseY); + } + } + } + + } } diff --git a/runescape-client/src/main/java/class306.java b/runescape-client/src/main/java/class306.java index 83179f4cb0..35374169ea 100644 --- a/runescape-client/src/main/java/class306.java +++ b/runescape-client/src/main/java/class306.java @@ -1,16 +1,16 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("kp") +@ObfuscatedName("kg") public final class class306 { - @ObfuscatedName("x") - @ObfuscatedGetter( - longValue = 6842035399561472051L - ) - static long field3698; @ObfuscatedName("m") @ObfuscatedGetter( - longValue = 1959043589227198219L + longValue = 4078807176419591129L ) - static long field3699; + static long field3723; + @ObfuscatedName("o") + @ObfuscatedGetter( + longValue = 5600259578615977693L + ) + static long field3726; } diff --git a/runescape-client/src/main/java/class307.java b/runescape-client/src/main/java/class307.java new file mode 100644 index 0000000000..d9be3b8722 --- /dev/null +++ b/runescape-client/src/main/java/class307.java @@ -0,0 +1,250 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("ky") +public class class307 { + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(ILcs;ZI)I", + garbageValue = "-549793273" + ) + static int method5650(int var0, Script var1, boolean var2) { + if (var0 < 1000) { + return ArchiveLoader.method1213(var0, var1, var2); + } else if (var0 < 1100) { + return GrandExchangeOfferOwnWorldComparator.method1342(var0, var1, var2); + } else if (var0 < 1200) { + return InvDefinition.method4530(var0, var1, var2); + } else if (var0 < 1300) { + return PlayerType.method4289(var0, var1, var2); + } else if (var0 < 1400) { + return GrandExchangeOfferWorldComparator.method137(var0, var1, var2); + } else if (var0 < 1500) { + return Tiles.method1199(var0, var1, var2); + } else if (var0 < 1600) { + return MusicPatchNode.method3964(var0, var1, var2); + } else if (var0 < 1700) { + return ReflectionCheck.method2418(var0, var1, var2); + } else if (var0 < 1800) { + return PendingSpawn.method1808(var0, var1, var2); + } else if (var0 < 1900) { + return class7.method100(var0, var1, var2); + } else if (var0 < 2000) { + return SoundSystem.method2630(var0, var1, var2); + } else if (var0 < 2100) { + return GrandExchangeOfferOwnWorldComparator.method1342(var0, var1, var2); + } else if (var0 < 2200) { + return InvDefinition.method4530(var0, var1, var2); + } else if (var0 < 2300) { + return PlayerType.method4289(var0, var1, var2); + } else if (var0 < 2400) { + return GrandExchangeOfferWorldComparator.method137(var0, var1, var2); + } else if (var0 < 2500) { + return Tiles.method1199(var0, var1, var2); + } else if (var0 < 2600) { + return Huffman.method4099(var0, var1, var2); + } else if (var0 < 2700) { + return Clock.method3641(var0, var1, var2); + } else if (var0 < 2800) { + return GrandExchangeOffer.method194(var0, var1, var2); + } else if (var0 < 2900) { + return WorldMapManager.method717(var0, var1, var2); + } else if (var0 < 3000) { + return SoundSystem.method2630(var0, var1, var2); + } else if (var0 < 3200) { + return WorldMapEvent.method836(var0, var1, var2); + } else if (var0 < 3300) { + return MusicPatchNode.method3969(var0, var1, var2); + } else if (var0 < 3400) { + return UrlRequester.method3424(var0, var1, var2); + } else if (var0 < 3500) { + return SecureRandomFuture.method2272(var0, var1, var2); + } else if (var0 < 3700) { + return class4.method63(var0, var1, var2); + } else if (var0 < 4000) { + return NPCDefinition.method4922(var0, var1, var2); + } else if (var0 < 4100) { + return SecureRandomCallable.method1203(var0, var1, var2); + } else if (var0 < 4200) { + return TileItemPile.method2902(var0, var1, var2); + } else if (var0 < 4300) { + return TextureProvider.method2888(var0, var1, var2); + } else if (var0 < 5100) { + return Entity.method3376(var0, var1, var2); + } else if (var0 < 5400) { + return class231.method4277(var0, var1, var2); + } else if (var0 < 5600) { + return class231.method4278(var0, var1, var2); + } else if (var0 < 5700) { + return class278.method5158(var0, var1, var2); + } else if (var0 < 6300) { + return AttackOption.method2180(var0, var1, var2); + } else if (var0 < 6600) { + return LoginScreenAnimation.method1883(var0, var1, var2); + } else { + return var0 < 6700 ? WorldMapIcon_0.method265(var0, var1, var2) : 2; + } + } + + @ObfuscatedName("gy") + @ObfuscatedSignature( + signature = "(IIIIIB)V", + garbageValue = "51" + ) + @Export("drawObject") + static final void drawObject(int var0, int var1, int var2, int var3, int var4) { + long var5 = UserComparator3.scene.getBoundaryObjectTag(var0, var1, var2); + int var7; + int var8; + int var9; + int var10; + int var14; + int var26; + if (var5 != 0L) { + var7 = UserComparator3.scene.getObjectFlags(var0, var1, var2, var5); + var8 = var7 >> 6 & 3; + var9 = var7 & 31; + var10 = var3; + boolean var12 = 0L != var5; + if (var12) { + boolean var13 = (int)(var5 >>> 16 & 1L) == 1; + var12 = !var13; + } + + if (var12) { + var10 = var4; + } + + int[] var19 = class3.sceneMinimapSprite.pixels; + var26 = var1 * 4 + (103 - var2) * 2048 + 24624; + var14 = Language.Entity_unpackID(var5); + ObjectDefinition var15 = Canvas.getObjectDefinition(var14); + if (var15.mapSceneId != -1) { + IndexedSprite var16 = UserComparator6.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, (104 - var2 - var15.sizeY) * 4 + var18 + 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 = UserComparator3.scene.getGameObjectTag(var0, var1, var2); + if (var5 != 0L) { + var7 = UserComparator3.scene.getObjectFlags(var0, var1, var2, var5); + var8 = var7 >> 6 & 3; + var9 = var7 & 31; + var10 = Language.Entity_unpackID(var5); + ObjectDefinition var20 = Canvas.getObjectDefinition(var10); + if (var20.mapSceneId != -1) { + IndexedSprite var28 = UserComparator6.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 = class3.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 = UserComparator3.scene.getFloorDecorationTag(var0, var1, var2); + if (0L != var5) { + var7 = Language.Entity_unpackID(var5); + ObjectDefinition var21 = Canvas.getObjectDefinition(var7); + if (var21.mapSceneId != -1) { + IndexedSprite var22 = UserComparator6.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); + } + } + } + + } +} diff --git a/runescape-client/src/main/java/class310.java b/runescape-client/src/main/java/class310.java index 4d56fbdefe..d78ebe3825 100644 --- a/runescape-client/src/main/java/class310.java +++ b/runescape-client/src/main/java/class310.java @@ -1,9 +1,9 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("kd") +@ObfuscatedName("kz") public class class310 { - @ObfuscatedName("x") + @ObfuscatedName("m") @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 class310 { } - @ObfuscatedName("e") + @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/class322.java b/runescape-client/src/main/java/class322.java index 7e0775447f..acf583d1b4 100644 --- a/runescape-client/src/main/java/class322.java +++ b/runescape-client/src/main/java/class322.java @@ -3,71 +3,62 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ly") +@ObfuscatedName("lx") public enum class322 implements Enumerated { - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lly;" - ) - field3825(1, 0), @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lly;" + signature = "Llx;" ) - field3826(2, 2), - @ObfuscatedName("k") + field3841(4, 0), + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Lly;" + signature = "Llx;" ) - field3827(3, 5), - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "Lly;" - ) - field3832(0, 6), - @ObfuscatedName("w") - @ObfuscatedSignature( - signature = "Lly;" - ) - field3829(5, 7), - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "Lly;" - ) - field3830(4, 8); - + field3836(2, 2), @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -1073054417 + @ObfuscatedSignature( + signature = "Llx;" ) - final int field3831; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -1340728697 + field3837(5, 5), + @ObfuscatedName("j") + @ObfuscatedSignature( + signature = "Llx;" ) - final int field3828; + field3838(0, 6), + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "Llx;" + ) + field3839(1, 7), + @ObfuscatedName("g") + @ObfuscatedSignature( + signature = "Llx;" + ) + field3840(3, 8); + + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -970737945 + ) + final int field3835; + @ObfuscatedName("u") + @ObfuscatedGetter( + intValue = -900565137 + ) + final int field3842; class322(int var3, int var4) { - this.field3831 = var3; - this.field3828 = var4; + this.field3835 = var3; + this.field3842 = var4; } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "56" + signature = "(I)I", + garbageValue = "-995092303" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field3828; - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - signature = "(Liy;II)Lle;", - garbageValue = "-1469260030" - ) - public static IndexedSprite method5972(AbstractArchive var0, int var1) { - return !class228.method4202(var0, var1) ? null : AttackOption.method2165(); + return this.field3842; } } diff --git a/runescape-client/src/main/java/class329.java b/runescape-client/src/main/java/class329.java index 1eff12bb6e..e18101c98a 100644 --- a/runescape-client/src/main/java/class329.java +++ b/runescape-client/src/main/java/class329.java @@ -1,18 +1,25 @@ -import java.awt.Component; +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lz") +@ObfuscatedName("lr") public class class329 { - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "(Ljava/awt/Component;B)V", - garbageValue = "1" + @ObfuscatedName("rk") + @ObfuscatedGetter( + intValue = 542004201 ) - static void method6078(Component var0) { - var0.removeMouseListener(MouseHandler.MouseHandler_instance); - var0.removeMouseMotionListener(MouseHandler.MouseHandler_instance); - var0.removeFocusListener(MouseHandler.MouseHandler_instance); - MouseHandler.MouseHandler_currentButtonVolatile = 0; + static int field3867; + + @ObfuscatedName("n") + @ObfuscatedSignature( + signature = "(Lic;Ljava/lang/String;Ljava/lang/String;B)Llh;", + garbageValue = "48" + ) + @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 Buddy.method5355(var0, var3, var4); } } diff --git a/runescape-client/src/main/java/class332.java b/runescape-client/src/main/java/class332.java index a74e6dcc28..2b0d4c4cd9 100644 --- a/runescape-client/src/main/java/class332.java +++ b/runescape-client/src/main/java/class332.java @@ -1,57 +1,109 @@ +import java.io.BufferedReader; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringReader; +import java.io.StringWriter; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lu") +@ObfuscatedName("lw") public enum class332 implements Enumerated { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Llu;" + signature = "Llw;" ) @Export("SOLID") SOLID(0, 0), - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "Llu;" + signature = "Llw;" ) - field3874(1, 1), - @ObfuscatedName("k") + field3880(1, 1), + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Llu;" + signature = "Llw;" ) - field3875(2, 2); + field3881(2, 2); - @ObfuscatedName("e") - @ObfuscatedSignature( - signature = "Ldh;" - ) - @Export("soundSystem") - static SoundSystem soundSystem; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1537098807 + intValue = -1792088277 ) - public final int field3873; - @ObfuscatedName("w") + public final int field3882; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -92633923 + intValue = -1134818825 ) - @Export("id") - final int id; + @Export("index") + final int index; class332(int var3, int var4) { - this.field3873 = var3; - this.id = var4; + this.field3882 = var3; + this.index = var4; } - @ObfuscatedName("d") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "56" + signature = "(I)I", + garbageValue = "-995092303" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; + return this.index; + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(Ljava/lang/Throwable;I)Ljava/lang/String;", + garbageValue = "-353829952" + ) + static String method6316(Throwable var0) throws IOException { + String var1; + if (var0 instanceof RunException) { + RunException var2 = (RunException)var0; + var1 = var2.message + " | "; + var0 = var2.throwable; + } else { + var1 = ""; + } + + StringWriter var12 = new StringWriter(); + PrintWriter var3 = new PrintWriter(var12); + var0.printStackTrace(var3); + var3.close(); + String var4 = var12.toString(); + BufferedReader var5 = new BufferedReader(new StringReader(var4)); + String var6 = var5.readLine(); + + while (true) { + while (true) { + String var7 = var5.readLine(); + if (var7 == null) { + var1 = var1 + "| " + var6; + return var1; + } + + int var8 = var7.indexOf(40); + int var9 = var7.indexOf(41, var8 + 1); + if (var8 >= 0 && var9 >= 0) { + String var10 = var7.substring(var8 + 1, var9); + int var11 = var10.indexOf(".java:"); + if (var11 >= 0) { + var10 = var10.substring(0, var11) + var10.substring(var11 + 5); + var1 = var1 + var10 + ' '; + continue; + } + + var7 = var7.substring(0, var8); + } + + var7 = var7.trim(); + var7 = var7.substring(var7.lastIndexOf(32) + 1); + var7 = var7.substring(var7.lastIndexOf(9) + 1); + var1 = var1 + var7 + ' '; + } + } } } diff --git a/runescape-client/src/main/java/class335.java b/runescape-client/src/main/java/class335.java index 20bc2659e4..2cbcf5c6ef 100644 --- a/runescape-client/src/main/java/class335.java +++ b/runescape-client/src/main/java/class335.java @@ -2,33 +2,30 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ls") +@ObfuscatedName("lg") public class class335 { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 215580169 + intValue = 238852743 ) @Export("SpriteBuffer_spriteCount") static int SpriteBuffer_spriteCount; - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -109825329 + intValue = 1435600367 ) @Export("SpriteBuffer_spriteWidth") static int SpriteBuffer_spriteWidth; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = 1417821821 - ) - @Export("SpriteBuffer_spriteHeight") - static int SpriteBuffer_spriteHeight; - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("SpriteBuffer_xOffsets") static int[] SpriteBuffer_xOffsets; - @ObfuscatedName("v") + @ObfuscatedName("g") @Export("SpriteBuffer_spriteWidths") static int[] SpriteBuffer_spriteWidths; - @ObfuscatedName("q") + @ObfuscatedName("n") @Export("SpriteBuffer_spriteHeights") static int[] SpriteBuffer_spriteHeights; + @ObfuscatedName("u") + @Export("SpriteBuffer_spritePalette") + static int[] SpriteBuffer_spritePalette; } diff --git a/runescape-client/src/main/java/class336.java b/runescape-client/src/main/java/class336.java index 0ed20b4602..fc0fa884ed 100644 --- a/runescape-client/src/main/java/class336.java +++ b/runescape-client/src/main/java/class336.java @@ -1,13 +1,15 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lr") +@ObfuscatedName("ll") public class class336 { - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -1356543079 + @ObfuscatedName("w") + @Export("musicTrackBoolean") + public static boolean musicTrackBoolean; + @ObfuscatedName("y") + @ObfuscatedSignature( + signature = "Llh;" ) - @Export("ItemDefinition_fileCount") - public static int ItemDefinition_fileCount; + static IndexedSprite field3912; } diff --git a/runescape-client/src/main/java/class346.java b/runescape-client/src/main/java/class346.java index af84b78146..30e957c977 100644 --- a/runescape-client/src/main/java/class346.java +++ b/runescape-client/src/main/java/class346.java @@ -1,20 +1,20 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("mc") +@ObfuscatedName("mi") public class class346 { - @ObfuscatedName("e") + @ObfuscatedName("z") static final int[] field4043; - @ObfuscatedName("s") - static final int[] field4047; + @ObfuscatedName("w") + static final int[] field4046; static { field4043 = new int[2048]; - field4047 = new int[2048]; + field4046 = new int[2048]; double var0 = 0.0030679615757712823D; for (int var2 = 0; var2 < 2048; ++var2) { field4043[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2)); - field4047[var2] = (int)(65536.0D * Math.cos((double)var2 * var0)); + field4046[var2] = (int)(65536.0D * Math.cos(var0 * (double)var2)); } } diff --git a/runescape-client/src/main/java/class348.java b/runescape-client/src/main/java/class348.java index 5e1797bceb..eb0da65d37 100644 --- a/runescape-client/src/main/java/class348.java +++ b/runescape-client/src/main/java/class348.java @@ -1,24 +1,20 @@ -import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mr") +@ObfuscatedName("mj") public class class348 { - @ObfuscatedName("k") - public static final char[] field4062; - @ObfuscatedName("d") - public static final char[] field4063; - @ObfuscatedName("w") - static byte[][][] field4061; - @ObfuscatedName("br") - @ObfuscatedSignature( - signature = "[Lle;" + @ObfuscatedName("q") + static final char[] field4065; + @ObfuscatedName("j") + static final char[] field4064; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 270973117 ) - @Export("worldSelectStars") - static IndexedSprite[] worldSelectStars; + static int field4062; static { - field4062 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; - field4063 = new char[]{'[', ']', '#'}; + field4065 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; + field4064 = new char[]{'[', ']', '#'}; } } diff --git a/runescape-client/src/main/java/class349.java b/runescape-client/src/main/java/class349.java new file mode 100644 index 0000000000..0e721cde73 --- /dev/null +++ b/runescape-client/src/main/java/class349.java @@ -0,0 +1,19 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("md") +public class class349 { + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "Lic;" + ) + @Export("EnumDefinition_archive") + static AbstractArchive EnumDefinition_archive; + @ObfuscatedName("w") + @ObfuscatedSignature( + signature = "Lic;" + ) + @Export("Widget_spritesArchive") + static AbstractArchive Widget_spritesArchive; +} diff --git a/runescape-client/src/main/java/class39.java b/runescape-client/src/main/java/class39.java index ae8a9f7757..f0ee184be5 100644 --- a/runescape-client/src/main/java/class39.java +++ b/runescape-client/src/main/java/class39.java @@ -3,135 +3,349 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("aq") +@ObfuscatedName("al") public class class39 { - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Laq;" - ) - static final class39 field300; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Laq;" + signature = "Lal;" ) - static final class39 field297; - @ObfuscatedName("k") + static final class39 field296; + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "Lal;" + ) + static final class39 field293; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1809213565 + intValue = -946944109 ) @Export("value") final int value; static { - field300 = new class39(0); - field297 = new class39(1); + field296 = new class39(0); + field293 = new class39(1); } class39(int var1) { this.value = var1; } - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljava/lang/Object;ZI)[B", - garbageValue = "-185232058" + signature = "(III)Z", + garbageValue = "-1422185207" ) - public static byte[] method644(Object var0, boolean var1) { - if (var0 == null) { - return null; - } else if (var0 instanceof byte[]) { - byte[] var3 = (byte[])((byte[])var0); - return var1 ? HorizontalAlignment.method4782(var3) : var3; - } else if (var0 instanceof AbstractByteArrayCopier) { - AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; - return var2.get(); - } else { - throw new IllegalArgumentException(); - } + static boolean method615(int var0, int var1) { + return var0 != 4 || var1 < 8; } - @ObfuscatedName("x") + @ObfuscatedName("gk") @ObfuscatedSignature( - signature = "(B)[Lcb;", - garbageValue = "-70" + signature = "(Lgl;I)V", + garbageValue = "-980354844" ) - static AttackOption[] method643() { - return new AttackOption[]{AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_hidden, AttackOption.AttackOption_alwaysRightClick}; - } + static final void method616(class194 var0) { + PacketBuffer var1 = Client.packetWriter.packetBuffer; + int var2; + int var4; + int var5; + int var6; + int var7; + int var8; + int var9; + int var10; + int var11; + int var13; + byte var14; + if (class194.field2358 == var0) { + var2 = var1.method5757(); + byte var3 = var1.method5751(); + var4 = var1.method5755(); + var5 = var1.method5748(); + var6 = var5 >> 2; + var7 = var5 & 3; + var8 = Client.field734[var6]; + var9 = var1.method5936(); + var10 = (var9 >> 4 & 7) + Player.field638; + var11 = (var9 & 7) + class41.field302; + byte var12 = var1.method5751(); + var13 = var1.method5757(); + var14 = var1.method5730(); + int var15 = var1.method5867(); + byte var16 = var1.method5750(); + Player var17; + if (var2 == Client.localPlayerIndex) { + var17 = class60.localPlayer; + } else { + var17 = Client.players[var2]; + } - @ObfuscatedName("v") - @ObfuscatedSignature( - signature = "(Liy;Liy;Ljava/lang/String;Ljava/lang/String;I)Lkx;", - garbageValue = "672122156" - ) - public static Font method647(AbstractArchive var0, AbstractArchive var1, String var2, String var3) { - int var4 = var0.getGroupId(var2); - int var5 = var0.getFileId(var4, var3); - Font var6; - if (!UserComparator7.method3516(var0, var4, var5)) { - var6 = null; - } else { - var6 = VertexNormal.method3094(var1.takeFile(var4, var5)); - } - - return var6; - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "-1343024338" - ) - static void method645(int var0) { - Login.loginIndex = 12; - Login.field1201 = var0; - } - - @ObfuscatedName("ig") - @ObfuscatedSignature( - signature = "(ILjava/lang/String;S)V", - garbageValue = "19979" - ) - static void method646(int var0, String var1) { - int var2 = Players.Players_count; - int[] var3 = Players.Players_indices; - boolean var4 = false; - Username var5 = new Username(var1, WorldMapIcon_0.loginType); - - for (int var6 = 0; var6 < var2; ++var6) { - Player var7 = Client.players[var3[var6]]; - if (var7 != null && var7 != ByteArrayPool.localPlayer && var7.username != null && var7.username.equals(var5)) { - PacketBufferNode var8; - if (var0 == 1) { - var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2267, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeByte(0); - var8.packetBuffer.writeIntME(var3[var6]); - Client.packetWriter.addNode(var8); - } else if (var0 == 4) { - var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2282, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var3[var6]); - var8.packetBuffer.method5602(0); - Client.packetWriter.addNode(var8); - } else if (var0 == 6) { - var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2250, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5724(0); - var8.packetBuffer.writeIntME(var3[var6]); - Client.packetWriter.addNode(var8); - } else if (var0 == 7) { - var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2301, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeByte(0); - var8.packetBuffer.writeShort(var3[var6]); - Client.packetWriter.addNode(var8); + if (var17 != null) { + ObjectDefinition var18 = Canvas.getObjectDefinition(var15); + int var19; + int var20; + if (var7 != 1 && var7 != 3) { + var19 = var18.sizeX; + var20 = var18.sizeY; + } else { + var19 = var18.sizeY; + var20 = var18.sizeX; } - var4 = true; - break; + int var21 = var10 + (var19 >> 1); + int var22 = var10 + (var19 + 1 >> 1); + int var23 = var11 + (var20 >> 1); + int var24 = var11 + (var20 + 1 >> 1); + int[][] var25 = Tiles.Tiles_heights[TileItemPile.Client_plane]; + int var26 = var25[var21][var24] + var25[var22][var23] + var25[var21][var23] + var25[var22][var24] >> 2; + int var27 = (var10 << 7) + (var19 << 6); + int var28 = (var11 << 7) + (var20 << 6); + Model var29 = var18.getModel(var6, var7, var25, var27, var26, var28); + if (var29 != null) { + TileItem.updatePendingSpawn(TileItemPile.Client_plane, var10, var11, var8, -1, 0, 0, var13 + 1, var4 + 1); + var17.animationCycleStart = var13 + Client.cycle; + var17.animationCycleEnd = var4 + Client.cycle; + var17.model0 = var29; + var17.field661 = var19 * 64 + var10 * 128; + var17.field653 = var20 * 64 + var11 * 128; + var17.tileHeight2 = var26; + byte var30; + if (var16 > var3) { + var30 = var16; + var16 = var3; + var3 = var30; + } + + if (var12 > var14) { + var30 = var12; + var12 = var14; + var14 = var30; + } + + var17.field648 = var10 + var16; + var17.field650 = var10 + var3; + var17.field649 = var12 + var11; + var17.field651 = var14 + var11; + } } } - if (!var4) { - Skeleton.addGameMessage(4, "", "Unable to find " + var1); - } + int var37; + if (class194.field2357 == var0) { + var2 = var1.method5755(); + var37 = var1.method5755(); + var4 = var1.method5936(); + var5 = (var4 >> 4 & 7) + Player.field638; + var6 = (var4 & 7) + class41.field302; + var7 = var1.method5746(); + if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { + var5 = var5 * 128 + 64; + var6 = var6 * 128 + 64; + GraphicsObject var41 = new GraphicsObject(var37, TileItemPile.Client_plane, var5, var6, Language.getTileHeight(var5, var6, TileItemPile.Client_plane) - var7, var2, Client.cycle); + Client.graphicsObjects.addFirst(var41); + } + } else if (class194.field2355 == var0) { + var2 = var1.readUnsignedByte(); + var37 = (var2 >> 4 & 7) + Player.field638; + var4 = (var2 & 7) + class41.field302; + var5 = var1.method5867(); + var6 = var1.method5746(); + var7 = var6 >> 2; + var8 = var6 & 3; + var9 = Client.field734[var7]; + if (var37 >= 0 && var4 >= 0 && var37 < 104 && var4 < 104) { + TileItem.updatePendingSpawn(TileItemPile.Client_plane, var37, var4, var9, var5, var7, var8, 0, -1); + } + + } else if (class194.field2361 == var0) { + var2 = var1.method5748(); + var37 = (var2 >> 4 & 7) + Player.field638; + var4 = (var2 & 7) + class41.field302; + var5 = var1.method5755(); + var6 = var1.readUnsignedByte(); + var7 = var6 >> 2; + var8 = var6 & 3; + var9 = Client.field734[var7]; + if (var37 >= 0 && var4 >= 0 && var37 < 103 && var4 < 103) { + if (var9 == 0) { + BoundaryObject var32 = UserComparator3.scene.method3213(TileItemPile.Client_plane, var37, var4); + if (var32 != null) { + var11 = Language.Entity_unpackID(var32.tag); + if (var7 == 2) { + var32.entity1 = new DynamicObject(var11, 2, var8 + 4, TileItemPile.Client_plane, var37, var4, var5, false, var32.entity1); + var32.entity2 = new DynamicObject(var11, 2, var8 + 1 & 3, TileItemPile.Client_plane, var37, var4, var5, false, var32.entity2); + } else { + var32.entity1 = new DynamicObject(var11, var7, var8, TileItemPile.Client_plane, var37, var4, var5, false, var32.entity1); + } + } + } + + if (var9 == 1) { + WallDecoration var42 = UserComparator3.scene.method3214(TileItemPile.Client_plane, var37, var4); + if (var42 != null) { + var11 = Language.Entity_unpackID(var42.tag); + if (var7 != 4 && var7 != 5) { + if (var7 == 6) { + var42.entity1 = new DynamicObject(var11, 4, var8 + 4, TileItemPile.Client_plane, var37, var4, var5, false, var42.entity1); + } else if (var7 == 7) { + var42.entity1 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, TileItemPile.Client_plane, var37, var4, var5, false, var42.entity1); + } else if (var7 == 8) { + var42.entity1 = new DynamicObject(var11, 4, var8 + 4, TileItemPile.Client_plane, var37, var4, var5, false, var42.entity1); + var42.entity2 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, TileItemPile.Client_plane, var37, var4, var5, false, var42.entity2); + } + } else { + var42.entity1 = new DynamicObject(var11, 4, var8, TileItemPile.Client_plane, var37, var4, var5, false, var42.entity1); + } + } + } + + if (var9 == 2) { + GameObject var43 = UserComparator3.scene.method3215(TileItemPile.Client_plane, var37, var4); + if (var7 == 11) { + var7 = 10; + } + + if (var43 != null) { + var43.entity = new DynamicObject(Language.Entity_unpackID(var43.tag), var7, var8, TileItemPile.Client_plane, var37, var4, var5, false, var43.entity); + } + } + + if (var9 == 3) { + FloorDecoration var44 = UserComparator3.scene.getFloorDecoration(TileItemPile.Client_plane, var37, var4); + if (var44 != null) { + var44.entity = new DynamicObject(Language.Entity_unpackID(var44.tag), 22, var8, TileItemPile.Client_plane, var37, var4, var5, false, var44.entity); + } + } + } + + } else if (class194.field2353 == var0) { + var2 = var1.method5746(); + var37 = (var2 >> 4 & 7) + Player.field638; + var4 = (var2 & 7) + class41.field302; + var5 = var1.method5746(); + var6 = var5 >> 2; + var7 = var5 & 3; + var8 = Client.field734[var6]; + if (var37 >= 0 && var4 >= 0 && var37 < 104 && var4 < 104) { + TileItem.updatePendingSpawn(TileItemPile.Client_plane, var37, var4, var8, -1, var6, var7, 0, -1); + } + + } else if (class194.field2354 == var0) { + var2 = var1.readUnsignedByte(); + var37 = (var2 >> 4 & 7) + Player.field638; + var4 = (var2 & 7) + class41.field302; + var5 = var1.readUnsignedShort(); + var6 = var1.method5867(); + var7 = var1.method5867(); + if (var37 >= 0 && var4 >= 0 && var37 < 104 && var4 < 104) { + NodeDeque var31 = Client.groundItems[TileItemPile.Client_plane][var37][var4]; + if (var31 != null) { + for (TileItem var33 = (TileItem)var31.last(); var33 != null; var33 = (TileItem)var31.previous()) { + if ((var7 & 32767) == var33.id && var6 == var33.quantity) { + var33.quantity = var5; + break; + } + } + + class41.updateItemPile(var37, var4); + } + } + + } else { + TileItem var34; + if (class194.field2359 == var0) { + var2 = var1.method5757(); + var37 = var1.readUnsignedByte(); + var4 = (var37 >> 4 & 7) + Player.field638; + var5 = (var37 & 7) + class41.field302; + var6 = var1.readUnsignedShort(); + if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { + var34 = new TileItem(); + var34.id = var6; + var34.quantity = var2; + if (Client.groundItems[TileItemPile.Client_plane][var4][var5] == null) { + Client.groundItems[TileItemPile.Client_plane][var4][var5] = new NodeDeque(); + } + + Client.groundItems[TileItemPile.Client_plane][var4][var5].addFirst(var34); + class41.updateItemPile(var4, var5); + } + + } else if (class194.field2360 == var0) { + var2 = var1.method5746(); + var37 = (var2 >> 4 & 7) + Player.field638; + var4 = (var2 & 7) + class41.field302; + byte var38 = var1.method5730(); + var6 = var1.method5746() * 4; + var7 = var1.method5759(); + var8 = var1.method5755(); + var9 = var1.readUnsignedShort(); + var10 = var1.readUnsignedShort(); + var11 = var1.method5748(); + int var39 = var1.readUnsignedByte() * 4; + var13 = var1.method5748(); + var14 = var1.readByte(); + int var40 = var14 + var37; + var5 = var38 + var4; + if (var37 >= 0 && var4 >= 0 && var37 < 104 && var4 < 104 && var40 >= 0 && var5 >= 0 && var40 < 104 && var5 < 104 && var10 != 65535) { + var37 = var37 * 128 + 64; + var4 = var4 * 128 + 64; + var40 = var40 * 128 + 64; + var5 = var5 * 128 + 64; + Projectile var35 = new Projectile(var10, TileItemPile.Client_plane, var37, var4, Language.getTileHeight(var37, var4, TileItemPile.Client_plane) - var39, var9 + Client.cycle, var8 + Client.cycle, var13, var11, var7, var6); + var35.setDestination(var40, var5, Language.getTileHeight(var40, var5, TileItemPile.Client_plane) - var6, var9 + Client.cycle); + Client.projectiles.addFirst(var35); + } + + } else if (class194.field2363 != var0) { + if (class194.field2362 == var0) { + var2 = var1.method5746(); + var37 = var2 >> 4 & 15; + var4 = var2 & 7; + var5 = var1.method5867(); + var6 = var1.method5748(); + var7 = (var6 >> 4 & 7) + Player.field638; + var8 = (var6 & 7) + class41.field302; + var9 = var1.method5746(); + if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { + var10 = var37 + 1; + if (class60.localPlayer.pathX[0] >= var7 - var10 && class60.localPlayer.pathX[0] <= var7 + var10 && class60.localPlayer.pathY[0] >= var8 - var10 && class60.localPlayer.pathY[0] <= var10 + var8 && Client.areaSoundEffectVolume != 0 && var4 > 0 && Client.soundEffectCount < 50) { + Client.soundEffectIds[Client.soundEffectCount] = var5; + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var4; + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var9; + Client.soundEffects[Client.soundEffectCount] = null; + Client.soundLocations[Client.soundEffectCount] = var37 + (var8 << 8) + (var7 << 16); + ++Client.soundEffectCount; + } + } + } + + } else { + var2 = var1.readUnsignedByte(); + var37 = (var2 >> 4 & 7) + Player.field638; + var4 = (var2 & 7) + class41.field302; + var5 = var1.method5755(); + if (var37 >= 0 && var4 >= 0 && var37 < 104 && var4 < 104) { + NodeDeque var36 = Client.groundItems[TileItemPile.Client_plane][var37][var4]; + if (var36 != null) { + for (var34 = (TileItem)var36.last(); var34 != null; var34 = (TileItem)var36.previous()) { + if ((var5 & 32767) == var34.id) { + var34.remove(); + break; + } + } + + if (var36.last() == null) { + Client.groundItems[TileItemPile.Client_plane][var37][var4] = null; + } + + class41.updateItemPile(var37, var4); + } + } + + } + } } } diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index 257d924ff8..f02bb2ef64 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -1,115 +1,608 @@ +import java.io.File; +import java.io.RandomAccessFile; import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("w") +@ObfuscatedName("p") final class class4 implements class0 { - @ObfuscatedName("rv") - @ObfuscatedGetter( - intValue = 213671429 - ) - static int field20; - @ObfuscatedName("t") - @Export("SpriteBuffer_pixels") - static byte[][] SpriteBuffer_pixels; - @ObfuscatedName("s") + @ObfuscatedName("pk") + @Export("ClanChat_inClanChat") + static boolean ClanChat_inClanChat; + @ObfuscatedName("ha") @ObfuscatedSignature( - signature = "Lle;" + signature = "[Llh;" ) - @Export("options_buttons_0Sprite") - static IndexedSprite options_buttons_0Sprite; - @ObfuscatedName("hz") - @ObfuscatedSignature( - signature = "[Lla;" - ) - @Export("headIconHintSprites") - static Sprite[] headIconHintSprites; - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(Ljava/lang/Object;Lkb;B)V", - garbageValue = "3" - ) - public void vmethod64(Object var1, Buffer var2) { - this.method61((String)var1, var2); - } + @Export("modIconSprites") + static IndexedSprite[] modIconSprites; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkb;I)Ljava/lang/Object;", - garbageValue = "-1146837249" + signature = "(Ljava/lang/Object;Lkn;B)V", + garbageValue = "0" ) - public Object vmethod74(Buffer var1) { + public void vmethod59(Object var1, Buffer var2) { + this.method46((String)var1, var2); + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(Lkn;B)Ljava/lang/Object;", + garbageValue = "114" + ) + public Object vmethod47(Buffer var1) { return var1.readStringCp1252NullTerminated(); } - @ObfuscatedName("t") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Ljava/lang/String;Lkb;I)V", - garbageValue = "-1770492713" + signature = "(Ljava/lang/String;Lkn;I)V", + garbageValue = "-1456597328" ) - void method61(String var1, Buffer var2) { + void method46(String var1, Buffer var2) { var2.writeStringCp1252NullTerminated(var1); } @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkj;II)V", - garbageValue = "-1157404679" + signature = "([BIII)Ljava/lang/String;", + garbageValue = "-1273544207" ) - @Export("updatePlayers") - static final void updatePlayers(PacketBuffer var0, int var1) { - int var2 = var0.offset; - Players.Players_pendingUpdateCount = 0; - WorldMapID.method648(var0); + public static String method48(byte[] var0, int var1, int var2) { + char[] var3 = new char[var2]; + int var4 = 0; + int var5 = var1; - 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 & 64) != 0) { - var6 += var0.readUnsignedByte() << 8; + 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); + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(IB)Lie;", + garbageValue = "0" + ) + @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)); } - GrandExchangeOfferNameComparator.method239(var0, var4, var5, var6); - } - - if (var0.offset - var2 != var1) { - throw new RuntimeException(var0.offset - var2 + " " + var1); + SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); + return var1; } } - @ObfuscatedName("s") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(IIB)I", - garbageValue = "-102" + signature = "(IIII)Lcs;", + garbageValue = "-1977243752" ) - static final int method63(int var0, int var1) { - int var2 = var1 * 57 + var0; - var2 ^= var2 << 13; - int var3 = var2 * (var2 * var2 * 15731 + 789221) + 1376312589 & Integer.MAX_VALUE; - return var3 >> 19 & 255; + @Export("getWorldMapScript") + static Script getWorldMapScript(int var0, int var1, int var2) { + int var3 = ViewportMouse.method3091(var1, var0); + Script var4 = VerticalAlignment.method4517(var3, var0); + if (var4 != null) { + return var4; + } else { + int var5 = (var2 + 40000 << 8) + var0; + var4 = VerticalAlignment.method4517(var5, var0); + return var4 != null ? var4 : null; + } } - @ObfuscatedName("jy") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)V", - garbageValue = "989659851" + signature = "([Ljava/lang/String;[SIIB)V", + garbageValue = "-1" ) - @Export("Widget_resetModelFrames") - static final void Widget_resetModelFrames(int var0) { - if (LoginScreenAnimation.loadInterface(var0)) { - Widget[] var1 = Widget.Widget_interfaceComponents[var0]; + @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 var2 = 0; var2 < var1.length; ++var2) { - Widget var3 = var1[var2]; - if (var3 != null) { - var3.modelFrame = 0; - var3.modelFrameCycle = 0; + 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("q") + @ObfuscatedSignature( + signature = "(Ljava/io/File;ZS)Z", + garbageValue = "4093" + ) + static boolean method58(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(); + var0.delete(); + return true; + } catch (Exception var4) { + return false; + } + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + signature = "(ILcs;ZB)I", + garbageValue = "0" + ) + static int method63(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.FRIEND_COUNT) { + if (ModeWhere.friendSystem.field1094 == 0) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -2; + } else if (ModeWhere.friendSystem.field1094 == 1) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ModeWhere.friendSystem.friendsList.getSize(); + } + + return 1; + } else { + int var3; + if (var0 == ScriptOpcodes.FRIEND_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + if (ModeWhere.friendSystem.method1923() && var3 >= 0 && var3 < ModeWhere.friendSystem.friendsList.getSize()) { + Friend var8 = (Friend)ModeWhere.friendSystem.friendsList.get(var3); + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var8.getName(); + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var8.getPreviousName(); + } else { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + if (ModeWhere.friendSystem.method1923() && var3 >= 0 && var3 < ModeWhere.friendSystem.friendsList.getSize()) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ((Buddy)ModeWhere.friendSystem.friendsList.get(var3)).world; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + if (ModeWhere.friendSystem.method1923() && var3 >= 0 && var3 < ModeWhere.friendSystem.friendsList.getSize()) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ((Buddy)ModeWhere.friendSystem.friendsList.get(var3)).rank; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else { + String var5; + if (var0 == ScriptOpcodes.FRIEND_SETRANK) { + var5 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; + int var6 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + class52.method873(var5, var6); + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_ADD) { + var5 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; + ModeWhere.friendSystem.addFriend(var5); + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_DEL) { + var5 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; + ModeWhere.friendSystem.removeFriend(var5); + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_ADD) { + var5 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; + ModeWhere.friendSystem.addIgnore(var5); + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_DEL) { + var5 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; + ModeWhere.friendSystem.removeIgnore(var5); + return 1; + } else if (var0 == ScriptOpcodes.FRIEND_TEST) { + var5 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; + var5 = BuddyRankComparator.method3556(var5); + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ModeWhere.friendSystem.isFriended(new Username(var5, class195.loginType), false) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { + if (ClientPreferences.clanChat != null) { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ClientPreferences.clanChat.name; + } else { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { + if (ClientPreferences.clanChat != null) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ClientPreferences.clanChat.getSize(); + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + if (ClientPreferences.clanChat != null && var3 < ClientPreferences.clanChat.getSize()) { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ClientPreferences.clanChat.get(var3).getUsername().getName(); + } else { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + if (ClientPreferences.clanChat != null && var3 < ClientPreferences.clanChat.getSize()) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ((Buddy)ClientPreferences.clanChat.get(var3)).getWorld(); + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + if (ClientPreferences.clanChat != null && var3 < ClientPreferences.clanChat.getSize()) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ((Buddy)ClientPreferences.clanChat.get(var3)).rank; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ClientPreferences.clanChat != null ? ClientPreferences.clanChat.minKick : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { + var5 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; + class9.clanKickUser(var5); + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ClientPreferences.clanChat != null ? ClientPreferences.clanChat.rank * -1947222095 * 2143365457 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { + var5 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; + Canvas.Clan_joinChat(var5); + return 1; + } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { + GrandExchangeOffer.Clan_leaveChat(); + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { + if (!ModeWhere.friendSystem.method1923()) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ModeWhere.friendSystem.ignoreList.getSize(); + } + + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + if (ModeWhere.friendSystem.method1923() && var3 >= 0 && var3 < ModeWhere.friendSystem.ignoreList.getSize()) { + Ignored var4 = (Ignored)ModeWhere.friendSystem.ignoreList.get(var3); + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var4.getName(); + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var4.getPreviousName(); + } else { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.IGNORE_TEST) { + var5 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; + var5 = BuddyRankComparator.method3556(var5); + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ModeWhere.friendSystem.isIgnored(new Username(var5, class195.loginType)) ? 1 : 0; + return 1; + } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + if (ClientPreferences.clanChat != null && var3 < ClientPreferences.clanChat.getSize() && ClientPreferences.clanChat.get(var3).getUsername().equals(class60.localPlayer.username)) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { + if (ClientPreferences.clanChat != null && ClientPreferences.clanChat.owner != null) { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ClientPreferences.clanChat.owner; + } else { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + if (ClientPreferences.clanChat != null && var3 < ClientPreferences.clanChat.getSize() && ((ClanMate)ClientPreferences.clanChat.get(var3)).isFriend()) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { + if (var0 == 3628) { + ModeWhere.friendSystem.friendsList.removeComparator(); + return 1; + } else { + boolean var7; + if (var0 == 3629) { + var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + ModeWhere.friendSystem.friendsList.addComparator(new UserComparator1(var7)); + return 1; + } else if (var0 == 3630) { + var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + ModeWhere.friendSystem.friendsList.addComparator(new UserComparator2(var7)); + return 1; + } else if (var0 == 3631) { + var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + ModeWhere.friendSystem.friendsList.addComparator(new UserComparator3(var7)); + return 1; + } else if (var0 == 3632) { + var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + ModeWhere.friendSystem.friendsList.addComparator(new UserComparator4(var7)); + return 1; + } else if (var0 == 3633) { + var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + ModeWhere.friendSystem.friendsList.addComparator(new UserComparator5(var7)); + return 1; + } else if (var0 == 3634) { + var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + ModeWhere.friendSystem.friendsList.addComparator(new UserComparator6(var7)); + return 1; + } else if (var0 == 3635) { + var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + ModeWhere.friendSystem.friendsList.addComparator(new UserComparator7(var7)); + return 1; + } else if (var0 == 3636) { + var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + ModeWhere.friendSystem.friendsList.addComparator(new UserComparator8(var7)); + return 1; + } else if (var0 == 3637) { + var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + ModeWhere.friendSystem.friendsList.addComparator(new UserComparator9(var7)); + return 1; + } else if (var0 == 3638) { + var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + ModeWhere.friendSystem.friendsList.addComparator(new UserComparator10(var7)); + return 1; + } else if (var0 == 3639) { + ModeWhere.friendSystem.friendsList.sort(); + return 1; + } else if (var0 == 3640) { + ModeWhere.friendSystem.ignoreList.removeComparator(); + return 1; + } else if (var0 == 3641) { + var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + ModeWhere.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); + return 1; + } else if (var0 == 3642) { + var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + ModeWhere.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); + return 1; + } else if (var0 == 3643) { + ModeWhere.friendSystem.ignoreList.sort(); + return 1; + } else if (var0 == 3644) { + if (ClientPreferences.clanChat != null) { + ClientPreferences.clanChat.removeComparator(); + } + + return 1; + } else if (var0 == 3645) { + var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + if (ClientPreferences.clanChat != null) { + ClientPreferences.clanChat.addComparator(new UserComparator1(var7)); + } + + return 1; + } else if (var0 == 3646) { + var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + if (ClientPreferences.clanChat != null) { + ClientPreferences.clanChat.addComparator(new UserComparator2(var7)); + } + + return 1; + } else if (var0 == 3647) { + var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + if (ClientPreferences.clanChat != null) { + ClientPreferences.clanChat.addComparator(new UserComparator3(var7)); + } + + return 1; + } else if (var0 == 3648) { + var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + if (ClientPreferences.clanChat != null) { + ClientPreferences.clanChat.addComparator(new UserComparator4(var7)); + } + + return 1; + } else if (var0 == 3649) { + var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + if (ClientPreferences.clanChat != null) { + ClientPreferences.clanChat.addComparator(new UserComparator5(var7)); + } + + return 1; + } else if (var0 == 3650) { + var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + if (ClientPreferences.clanChat != null) { + ClientPreferences.clanChat.addComparator(new UserComparator6(var7)); + } + + return 1; + } else if (var0 == 3651) { + var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + if (ClientPreferences.clanChat != null) { + ClientPreferences.clanChat.addComparator(new UserComparator7(var7)); + } + + return 1; + } else if (var0 == 3652) { + var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + if (ClientPreferences.clanChat != null) { + ClientPreferences.clanChat.addComparator(new UserComparator8(var7)); + } + + return 1; + } else if (var0 == 3653) { + var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + if (ClientPreferences.clanChat != null) { + ClientPreferences.clanChat.addComparator(new UserComparator9(var7)); + } + + return 1; + } else if (var0 == 3654) { + var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + if (ClientPreferences.clanChat != null) { + ClientPreferences.clanChat.addComparator(new UserComparator10(var7)); + } + + return 1; + } else if (var0 == 3655) { + if (ClientPreferences.clanChat != null) { + ClientPreferences.clanChat.sort(); + } + + return 1; + } else if (var0 == 3656) { + var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + ModeWhere.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); + return 1; + } else if (var0 == 3657) { + var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; + if (ClientPreferences.clanChat != null) { + ClientPreferences.clanChat.addComparator(new BuddyRankComparator(var7)); + } + + return 1; + } else { + return 2; + } + } + } else { + var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + if (ClientPreferences.clanChat != null && var3 < ClientPreferences.clanChat.getSize() && ((ClanMate)ClientPreferences.clanChat.get(var3)).isIgnored()) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + } + } + } + + @ObfuscatedName("jq") + @ObfuscatedSignature( + signature = "(Lhd;I)V", + garbageValue = "1118535641" + ) + static final void method57(Widget var0) { + int var1 = var0.contentType; + if (var1 == 324) { + if (Client.field868 == -1) { + Client.field868 = var0.spriteId2; + Client.field938 = var0.spriteId; + } + + if (Client.playerAppearance.isFemale) { + var0.spriteId2 = Client.field868; + } else { + var0.spriteId2 = Client.field938; + } + + } else if (var1 == 325) { + if (Client.field868 == -1) { + Client.field868 = var0.spriteId2; + Client.field938 = var0.spriteId; + } + + if (Client.playerAppearance.isFemale) { + var0.spriteId2 = Client.field938; + } else { + var0.spriteId2 = Client.field868; + } + + } 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/class41.java b/runescape-client/src/main/java/class41.java index af3aeb78a5..9db66398fa 100644 --- a/runescape-client/src/main/java/class41.java +++ b/runescape-client/src/main/java/class41.java @@ -1,252 +1,466 @@ +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("ak") +@ObfuscatedName("ac") public class class41 { - @ObfuscatedName("al") - @ObfuscatedSignature( - signature = "Lld;" + @ObfuscatedName("gm") + @Export("regions") + static int[] regions; + @ObfuscatedName("ge") + @ObfuscatedGetter( + intValue = -2009129273 ) - static Bounds field315; - @ObfuscatedName("df") + static int field302; + + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Lih;" + signature = "(ZI)V", + garbageValue = "-1502584802" ) - @Export("archive12") - static Archive archive12; - @ObfuscatedName("jd") - @ObfuscatedSignature( - signature = "Ldi;" - ) - @Export("textureProvider") - static TextureProvider textureProvider; - - @ObfuscatedName("gx") - @ObfuscatedSignature( - signature = "(Lcw;II)V", - garbageValue = "1452661344" - ) - @Export("updateActorSequence") - static final void updateActorSequence(Actor var0, int var1) { - int var2; - int var3; - int var4; - if (var0.field1019 >= Client.cycle) { - var2 = Math.max(1, var0.field1019 - Client.cycle); - var3 = var0.field976 * 64 + var0.field990 * 128; - var4 = var0.field976 * 64 + var0.field1017 * 128; - var0.x += (var3 - var0.x) / var2; - var0.y += (var4 - var0.y) / var2; - var0.field1031 = 0; - var0.orientation = var0.field1021; - } else if (var0.field1020 >= Client.cycle) { - if (var0.field1020 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > SpotAnimationDefinition.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { - var2 = var0.field1020 - var0.field1019; - var3 = Client.cycle - var0.field1019; - var4 = var0.field976 * 64 + var0.field990 * 128; - int var5 = var0.field976 * 64 + var0.field1017 * 128; - int var6 = var0.field976 * 64 + var0.field972 * 128; - int var7 = var0.field976 * 64 + var0.field1018 * 128; - var0.x = (var3 * var6 + var4 * (var2 - var3)) / var2; - var0.y = (var7 * var3 + var5 * (var2 - var3)) / var2; - } - - var0.field1031 = 0; - var0.orientation = var0.field1021; - var0.rotation = var0.orientation; - } else { - ClientPacket.method3686(var0); - } - - if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { - var0.sequence = -1; - var0.spotAnimation = -1; - var0.field1019 = 0; - var0.field1020 = 0; - var0.x = var0.field976 * 64 + var0.pathX[0] * 128; - var0.y = var0.field976 * 64 + var0.pathY[0] * 128; - var0.method1842(); - } - - if (ByteArrayPool.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { - var0.sequence = -1; - var0.spotAnimation = -1; - var0.field1019 = 0; - var0.field1020 = 0; - var0.x = var0.pathX[0] * 128 + var0.field976 * 64; - var0.y = var0.pathY[0] * 128 + var0.field976 * 64; - var0.method1842(); - } - - if (var0.field1026 != 0) { - if (var0.targetIndex != -1) { - Object var8 = null; - if (var0.targetIndex < 32768) { - var8 = Client.npcs[var0.targetIndex]; - } else if (var0.targetIndex >= 32768) { - var8 = Client.players[var0.targetIndex - 32768]; + public static void method624(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) { } - if (var8 != null) { - var3 = var0.x - ((Actor)var8).x; - var4 = var0.y - ((Actor)var8).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; - } + ++NetCache.NetCache_ioExceptions; + NetCache.NetCache_socket = null; } - if (var0.field1015 != -1 && (var0.pathLength == 0 || var0.field1031 > 0)) { - var0.orientation = var0.field1015; - var0.field1015 = -1; - } - - var2 = var0.orientation - var0.rotation & 2047; - if (var2 == 0 && var0.false0) { - var0.targetIndex = -1; - var0.false0 = false; - } - - if (var2 != 0) { - ++var0.field1025; - boolean var10; - if (var2 > 1024) { - var0.rotation -= var0.field1026; - var10 = true; - if (var2 < var0.field1026 || var2 > 2048 - var0.field1026) { - var0.rotation = var0.orientation; - var10 = false; - } - - if (var0.movementSequence == var0.idleSequence && (var0.field1025 > 25 || var10)) { - if (var0.turnLeftSequence != -1) { - var0.movementSequence = var0.turnLeftSequence; - } else { - var0.movementSequence = var0.walkSequence; - } - } - } else { - var0.rotation += var0.field1026; - var10 = true; - if (var2 < var0.field1026 || var2 > 2048 - var0.field1026) { - var0.rotation = var0.orientation; - var10 = false; - } - - if (var0.movementSequence == var0.idleSequence && (var0.field1025 > 25 || var10)) { - if (var0.turnRightSequence != -1) { - var0.movementSequence = var0.turnRightSequence; - } else { - var0.movementSequence = var0.walkSequence; - } - } - } - - var0.rotation &= 2047; - } else { - var0.field1025 = 0; - } } - - var0.isWalking = false; - SequenceDefinition var11; - if (var0.movementSequence != -1) { - var11 = SpotAnimationDefinition.SequenceDefinition_get(var0.movementSequence); - if (var11 != null && var11.frameIds != null) { - ++var0.movementFrameCycle; - if (var0.movementFrame < var11.frameIds.length && var0.movementFrameCycle > var11.frameLengths[var0.movementFrame]) { - var0.movementFrameCycle = 1; - ++var0.movementFrame; - PacketWriter.addSequenceSoundEffect(var11, var0.movementFrame, var0.x, var0.y); - } - - if (var0.movementFrame >= var11.frameIds.length) { - var0.movementFrameCycle = 0; - var0.movementFrame = 0; - PacketWriter.addSequenceSoundEffect(var11, var0.movementFrame, var0.x, var0.y); - } - } else { - var0.movementSequence = -1; - } - } - - if (var0.spotAnimation != -1 && Client.cycle >= var0.field1013) { - if (var0.spotAnimationFrame < 0) { - var0.spotAnimationFrame = 0; - } - - var2 = MouseHandler.SpotAnimationDefinition_get(var0.spotAnimation).sequence; - if (var2 != -1) { - SequenceDefinition var9 = SpotAnimationDefinition.SequenceDefinition_get(var2); - if (var9 != null && var9.frameIds != null) { - ++var0.spotAnimationFrameCycle; - if (var0.spotAnimationFrame < var9.frameIds.length && var0.spotAnimationFrameCycle > var9.frameLengths[var0.spotAnimationFrame]) { - var0.spotAnimationFrameCycle = 1; - ++var0.spotAnimationFrame; - PacketWriter.addSequenceSoundEffect(var9, var0.spotAnimationFrame, var0.x, var0.y); - } - - if (var0.spotAnimationFrame >= var9.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var9.frameIds.length)) { - var0.spotAnimation = -1; - } - } else { - var0.spotAnimation = -1; - } - } else { - var0.spotAnimation = -1; - } - } - - if (var0.sequence != -1 && var0.sequenceDelay <= 1) { - var11 = SpotAnimationDefinition.SequenceDefinition_get(var0.sequence); - if (var11.field3520 == 1 && var0.field1032 > 0 && var0.field1019 <= Client.cycle && var0.field1020 < Client.cycle) { - var0.sequenceDelay = 1; - return; - } - } - - if (var0.sequence != -1 && var0.sequenceDelay == 0) { - var11 = SpotAnimationDefinition.SequenceDefinition_get(var0.sequence); - if (var11 != null && var11.frameIds != null) { - ++var0.sequenceFrameCycle; - if (var0.sequenceFrame < var11.frameIds.length && var0.sequenceFrameCycle > var11.frameLengths[var0.sequenceFrame]) { - var0.sequenceFrameCycle = 1; - ++var0.sequenceFrame; - PacketWriter.addSequenceSoundEffect(var11, var0.sequenceFrame, var0.x, var0.y); - } - - if (var0.sequenceFrame >= var11.frameIds.length) { - var0.sequenceFrame -= var11.frameCount; - ++var0.field1011; - if (var0.field1011 >= var11.field3522) { - var0.sequence = -1; - } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var11.frameIds.length) { - PacketWriter.addSequenceSoundEffect(var11, var0.sequenceFrame, var0.x, var0.y); - } else { - var0.sequence = -1; - } - } - - var0.isWalking = var11.field3518; - } else { - var0.sequence = -1; - } - } - - if (var0.sequenceDelay > 0) { - --var0.sequenceDelay; - } - } - @ObfuscatedName("jb") + @ObfuscatedName("u") @ObfuscatedSignature( - signature = "(Lbm;ZI)V", - garbageValue = "-750063376" + signature = "(IIIIIILem;Lfz;I)V", + garbageValue = "-1774275667" + ) + static final void method623(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 = Canvas.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][var14] + var15[var12][var13] + var15[var11][var13] + var15[var12][var14] >> 2; + int var17 = (var1 << 7) + (var9 << 6); + int var18 = (var2 << 7) + (var10 << 6); + long var19 = class206.calculateTag(var1, var2, 2, var8.int1 == 0, var3); + int var21 = var5 + (var4 << 6); + if (var8.int3 == 1) { + var21 += 256; + } + + if (var8.hasSound()) { + class195.method3747(var0, var1, var2, var8, var4); + } + + Object var22; + if (var5 == 22) { + if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(22, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newFloorDecoration(var0, var1, var2, var16, (Entity)var22, var19, var21); + if (var8.interactType == 1 && var7 != null) { + var7.setBlockedByFloorDec(var1, var2); + } + + } + } else { + int var23; + if (var5 != 10 && var5 != 11) { + int[] var10000; + if (var5 >= 12) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.method3356(var0, var1, var2, var16, 1, 1, (Entity)var22, 0, var19, var21); + if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { + var10000 = HealthBarUpdate.field1031[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) { + var22 = var8.getEntity(0, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var22, (Entity)null, Tiles.field527[var4], 0, var19, var21); + if (var4 == 0) { + if (var8.clipped) { + class171.field2036[var0][var1][var2] = 50; + class171.field2036[var0][var1][var2 + 1] = 50; + } + + if (var8.modelClipped) { + var10000 = HealthBarUpdate.field1031[var0][var1]; + var10000[var2] |= 585; + } + } else if (var4 == 1) { + if (var8.clipped) { + class171.field2036[var0][var1][var2 + 1] = 50; + class171.field2036[var0][var1 + 1][var2 + 1] = 50; + } + + if (var8.modelClipped) { + var10000 = HealthBarUpdate.field1031[var0][var1]; + var10000[1 + var2] |= 1170; + } + } else if (var4 == 2) { + if (var8.clipped) { + class171.field2036[var0][var1 + 1][var2] = 50; + class171.field2036[var0][var1 + 1][var2 + 1] = 50; + } + + if (var8.modelClipped) { + var10000 = HealthBarUpdate.field1031[var0][var1 + 1]; + var10000[var2] |= 585; + } + } else if (var4 == 3) { + if (var8.clipped) { + class171.field2036[var0][var1][var2] = 50; + class171.field2036[var0][var1 + 1][var2] = 50; + } + + if (var8.modelClipped) { + var10000 = HealthBarUpdate.field1031[var0][var1]; + var10000[var2] |= 1170; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method3680(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method3208(var0, var1, var2, var8.int2); + } + + } else if (var5 == 1) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(1, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var22, (Entity)null, Tiles.field528[var4], 0, var19, var21); + if (var8.clipped) { + if (var4 == 0) { + class171.field2036[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { + class171.field2036[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { + class171.field2036[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { + class171.field2036[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method3680(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.field527[var4], Tiles.field527[var28], var19, var21); + if (var8.modelClipped) { + if (var4 == 0) { + var10000 = HealthBarUpdate.field1031[var0][var1]; + var10000[var2] |= 585; + var10000 = HealthBarUpdate.field1031[var0][var1]; + var10000[1 + var2] |= 1170; + } else if (var4 == 1) { + var10000 = HealthBarUpdate.field1031[var0][var1]; + var10000[var2 + 1] |= 1170; + var10000 = HealthBarUpdate.field1031[var0][var1 + 1]; + var10000[var2] |= 585; + } else if (var4 == 2) { + var10000 = HealthBarUpdate.field1031[var0][var1 + 1]; + var10000[var2] |= 585; + var10000 = HealthBarUpdate.field1031[var0][var1]; + var10000[var2] |= 1170; + } else if (var4 == 3) { + var10000 = HealthBarUpdate.field1031[var0][var1]; + var10000[var2] |= 1170; + var10000 = HealthBarUpdate.field1031[var0][var1]; + var10000[var2] |= 585; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method3680(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method3208(var0, var1, var2, var8.int2); + } + + } else if (var5 == 3) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(3, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var22, (Entity)null, Tiles.field528[var4], 0, var19, var21); + if (var8.clipped) { + if (var4 == 0) { + class171.field2036[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { + class171.field2036[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { + class171.field2036[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { + class171.field2036[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.method3680(var1, var2, var5, var4, var8.boolean1); + } + + } else if (var5 == 9) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.method3356(var0, var1, var2, var16, 1, 1, (Entity)var22, 0, var19, var21); + if (var8.interactType != 0 && var7 != null) { + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + if (var8.int2 != 16) { + var6.method3208(var0, var1, var2, var8.int2); + } + + } else if (var5 == 4) { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var22, (Entity)null, Tiles.field527[var4], 0, 0, 0, var19, var21); + } else { + long var31; + Object var33; + if (var5 == 5) { + var28 = 16; + var31 = var6.getBoundaryObjectTag(var0, var1, var2); + if (var31 != 0L) { + var28 = Canvas.getObjectDefinition(Language.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.field527[var4], 0, var28 * Tiles.field523[var4], var28 * Tiles.field529[var4], var19, var21); + } else if (var5 == 6) { + var28 = 8; + var31 = var6.getBoundaryObjectTag(var0, var1, var2); + if (var31 != 0L) { + var28 = Canvas.getObjectDefinition(Language.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.field531[var4], var28 * Tiles.field533[var4], var19, var21); + } else if (var5 == 7) { + var23 = var4 + 2 & 3; + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(4, var23 + 4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 4, var23 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var22, (Entity)null, 256, var23, 0, 0, var19, var21); + } else if (var5 == 8) { + var28 = 8; + var31 = var6.getBoundaryObjectTag(var0, var1, var2); + if (0L != var31) { + var28 = Canvas.getObjectDefinition(Language.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.field531[var4], var28 * Tiles.field533[var4], var19, var21); + } + } + } + } else { + if (var8.animationId == -1 && var8.transforms == null) { + var22 = var8.getEntity(10, var4, var15, var17, var16, var18); + } else { + var22 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, true, (Entity)null); + } + + if (var22 != null && var6.method3356(var0, var1, var2, var16, var9, var10, (Entity)var22, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { + var23 = 15; + if (var22 instanceof Model) { + var23 = ((Model)var22).method2999() / 4; + if (var23 > 30) { + var23 = 30; + } + } + + for (int var24 = 0; var24 <= var9; ++var24) { + for (int var25 = 0; var25 <= var10; ++var25) { + if (var23 > class171.field2036[var0][var24 + var1][var25 + var2]) { + class171.field2036[var0][var24 + var1][var25 + var2] = (byte)var23; + } + } + } + } + + if (var8.interactType != 0 && var7 != null) { + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + } + } + } + } + + @ObfuscatedName("hl") + @ObfuscatedSignature( + signature = "(III)V", + garbageValue = "1829350132" + ) + @Export("updateItemPile") + static final void updateItemPile(int var0, int var1) { + NodeDeque var2 = Client.groundItems[TileItemPile.Client_plane][var0][var1]; + if (var2 == null) { + UserComparator3.scene.removeGroundItemPile(TileItemPile.Client_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 = KitDefinition.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) { + UserComparator3.scene.removeGroundItemPile(TileItemPile.Client_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 = class206.calculateTag(var0, var1, 3, false, 0); + UserComparator3.scene.newGroundItemPile(TileItemPile.Client_plane, var0, var1, Language.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, TileItemPile.Client_plane), var5, var9, var12, var11); + } + } + } + + @ObfuscatedName("jj") + @ObfuscatedSignature( + signature = "(Lbz;ZI)V", + garbageValue = "1167867750" ) @Export("closeInterface") static final void closeInterface(InterfaceParent var0, boolean var1) { @@ -254,47 +468,40 @@ public class class41 { int var3 = (int)var0.key; var0.remove(); if (var1) { - EnumDefinition.method4614(var2); + Tiles.method1200(var2); } - LoginScreenAnimation.method1938(var2); - Widget var4 = MusicPatchNode.getWidget(var3); + PlayerAppearance.method4177(var2); + Widget var4 = WorldMapSprite.getWidget(var3); if (var4 != null) { - ItemContainer.invalidateWidget(var4); + class234.invalidateWidget(var4); } - ChatChannel.method2354(); + 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; + } + } + + WorldMapEvent.method840(class69.menuWidth / 2 + WorldMapRectangle.menuX, Frames.menuY); if (Client.rootInterface != -1) { - class198.runIntfCloseListeners(Client.rootInterface, 1); + Language.runIntfCloseListeners(Client.rootInterface, 1); } } - - @ObfuscatedName("kh") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZI)Ljava/lang/String;", - garbageValue = "961112618" - ) - static String method654(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 (WorldMapData_0.field137 != null) { - var3 = "/p=" + WorldMapData_0.field137; - } - - String var4 = "runescape.com"; - return var2 + var0 + "." + var4 + "/l=" + IgnoreList.clientLanguage + "/a=" + KitDefinition.field3271 + var3 + "/"; - } } diff --git a/runescape-client/src/main/java/class5.java b/runescape-client/src/main/java/class5.java index 1ed99391a7..cbe2f2f779 100644 --- a/runescape-client/src/main/java/class5.java +++ b/runescape-client/src/main/java/class5.java @@ -1,28 +1,28 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("v") +@ObfuscatedName("g") public class class5 implements class12 { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Lkb;)Lkb;" + signature = "(Lkn;)Lkn;" ) - public Buffer vmethod131(Buffer var1) { + public Buffer vmethod133(Buffer var1) { Buffer var2 = new Buffer(100); - this.method81(var1, var2); + this.method65(var1, var2); return var2; } - @ObfuscatedName("m") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(Lkb;Lkb;)V" + signature = "(Lkn;Lkn;)V" ) - void method81(Buffer var1, Buffer var2) { + void method65(Buffer var1, Buffer var2) { class10 var3 = new class10(var1); class6 var4 = new class6(var3); long var5; - for (var5 = 0L; !var4.method83(var3.method127(), var3.method125(), var5); ++var5) { + for (var5 = 0L; !var4.method83(var3.method123(), var3.method126(), var5); ++var5) { } var2.writeLong(var5); diff --git a/runescape-client/src/main/java/class52.java b/runescape-client/src/main/java/class52.java index 290f52f159..4dfde6f305 100644 --- a/runescape-client/src/main/java/class52.java +++ b/runescape-client/src/main/java/class52.java @@ -2,141 +2,42 @@ 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("bf") +@ObfuscatedName("bk") public final class class52 { - @ObfuscatedName("ef") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -508304297 + intValue = 465278289 ) - static int field407; - @ObfuscatedName("gr") - @ObfuscatedSignature( - signature = "[Lla;" - ) - @Export("headIconPkSprites") - static Sprite[] headIconPkSprites; + @Export("canvasHeight") + public static int canvasHeight; + @ObfuscatedName("gn") + @Export("regionLandArchiveIds") + static int[] regionLandArchiveIds; - @ObfuscatedName("d") + @ObfuscatedName("t") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-784307699" + signature = "(Ljava/lang/String;II)V", + garbageValue = "-794896402" ) - public static void method900() { - 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("u") - @ObfuscatedSignature( - signature = "(I)I", - garbageValue = "1874324581" - ) - static final int method905() { - return ViewportMouse.ViewportMouse_x; - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;IB)V", - garbageValue = "7" - ) - static final void method902(String var0, int var1) { - PacketBufferNode var2 = FaceNormal.getPacketBufferNode(ClientPacket.field2259, Client.packetWriter.isaacCipher); - var2.packetBuffer.writeByte(class234.stringCp1252NullTerminatedByteSize(var0) + 1); + static final void method873(String var0, int var1) { + PacketBufferNode var2 = UserComparator4.getPacketBufferNode(ClientPacket.field2329, Client.packetWriter.isaacCipher); + var2.packetBuffer.writeByte(DynamicObject.stringCp1252NullTerminatedByteSize(var0) + 1); var2.packetBuffer.writeStringCp1252NullTerminated(var0); - var2.packetBuffer.method5724(var1); + var2.packetBuffer.method5744(var1); Client.packetWriter.addNode(var2); } - @ObfuscatedName("ap") + @ObfuscatedName("hq") @ObfuscatedSignature( - signature = "(ILce;ZB)I", - garbageValue = "16" + signature = "(III)Lga;", + garbageValue = "-136372501" ) - static int method904(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 = class58.getEnum(var3); - if (var5.outputType != 's') { - } - - 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; - } - } - - if (var5 != null) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.defaultStr; - } - - return 1; - } else if (var0 != ScriptOpcodes.ENUM) { - if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { - var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; - EnumDefinition var10 = class58.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 = class58.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]; - } - - var7 = null; - break; - } - } - - if (var7 != null) { - if (var4 == 115) { - Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.defaultStr; - } else { - Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.defaultInt; - } - } - - 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; - } - } + static RouteStrategy method877(int var0, int var1) { + Client.field905.approxDestinationX = var0; + Client.field905.approxDestinationY = var1; + Client.field905.approxDestinationSizeX = 1; + Client.field905.approxDestinationSizeY = 1; + return Client.field905; } } diff --git a/runescape-client/src/main/java/class56.java b/runescape-client/src/main/java/class56.java index aab3cbe4f4..b59697cf0b 100644 --- a/runescape-client/src/main/java/class56.java +++ b/runescape-client/src/main/java/class56.java @@ -3,14 +3,14 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import netscape.javascript.JSObject; -@ObfuscatedName("bk") +@ObfuscatedName("bf") public class class56 { - @ObfuscatedName("x") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(Ljava/applet/Applet;Ljava/lang/String;B)Ljava/lang/Object;", - garbageValue = "1" + signature = "(Ljava/applet/Applet;Ljava/lang/String;I)V", + garbageValue = "-1802347359" ) - public static Object method950(Applet var0, String var1) throws Throwable { - return JSObject.getWindow(var0).call(var1, (Object[])null); + public static void method919(Applet var0, String var1) throws Throwable { + JSObject.getWindow(var0).eval(var1); } } diff --git a/runescape-client/src/main/java/class58.java b/runescape-client/src/main/java/class58.java index 68e97121a1..4124eba405 100644 --- a/runescape-client/src/main/java/class58.java +++ b/runescape-client/src/main/java/class58.java @@ -1,115 +1,30 @@ import javax.imageio.ImageIO; import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("be") +@ObfuscatedName("bd") public class class58 { - @ObfuscatedName("x") + @ObfuscatedName("qr") @ObfuscatedSignature( - signature = "Liy;" + signature = "Ldt;" ) - @Export("musicPatchesArchive") - public static AbstractArchive musicPatchesArchive; - @ObfuscatedName("dw") - @ObfuscatedGetter( - longValue = 3841945927555236577L - ) - static long field455; + @Export("pcmPlayer1") + static PcmPlayer pcmPlayer1; + @ObfuscatedName("cv") + public static char field442; static { ImageIO.setUseCache(false); } - @ObfuscatedName("x") + @ObfuscatedName("fj") @ObfuscatedSignature( - signature = "(III)I", - garbageValue = "-2115896796" + signature = "(I)I", + garbageValue = "1787909255" ) - public static int method963(int var0, int var1) { - return (var0 + 40000 << 8) + var1; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - signature = "(IB)Lji;", - garbageValue = "-86" - ) - @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("z") - @ObfuscatedSignature( - signature = "(IB)I", - garbageValue = "-91" - ) - @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("ii") - @ObfuscatedSignature( - signature = "(III)V", - garbageValue = "70910120" - ) - @Export("resumePauseWidget") - static void resumePauseWidget(int var0, int var1) { - PacketBufferNode var2 = FaceNormal.getPacketBufferNode(ClientPacket.field2291, Client.packetWriter.isaacCipher); - var2.packetBuffer.writeShortLE(var0); - var2.packetBuffer.method5609(var1); - Client.packetWriter.addNode(var2); - } - - @ObfuscatedName("ja") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "109" - ) - static void method966() { - for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { - int var1 = var0.group; - if (LoginScreenAnimation.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 = MusicPatchNode.getWidget(var4); - if (var5 != null) { - ItemContainer.invalidateWidget(var5); - } - } - } - } - + @Export("getWindowedMode") + static int getWindowedMode() { + return Client.isResizable ? 2 : 1; } } diff --git a/runescape-client/src/main/java/class6.java b/runescape-client/src/main/java/class6.java index b66b3a18da..f74c4edf22 100644 --- a/runescape-client/src/main/java/class6.java +++ b/runescape-client/src/main/java/class6.java @@ -4,41 +4,41 @@ import java.security.NoSuchAlgorithmException; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("q") +@ObfuscatedName("n") public class class6 implements class11 { - @ObfuscatedName("x") - final MessageDigest field27; + @ObfuscatedName("m") + final MessageDigest field24; @ObfuscatedSignature( - signature = "(Ls;)V" + signature = "(Lw;)V" ) class6(class10 var1) { - this.field27 = this.method87(); + this.field24 = this.method77(); } - @ObfuscatedName("x") + @ObfuscatedName("m") boolean method83(int var1, String var2, long var3) { - byte[] var5 = this.method91(var2, var3); - return method97(var5) >= var1; + byte[] var5 = this.method76(var2, var3); + return method74(var5) >= var1; } - @ObfuscatedName("d") - byte[] method91(String var1, long var2) { + @ObfuscatedName("j") + byte[] method76(String var1, long var2) { StringBuilder var4 = new StringBuilder(); var4.append(var1).append(Long.toHexString(var2)); - this.field27.reset(); + this.field24.reset(); try { - this.field27.update(var4.toString().getBytes("UTF-8")); + this.field24.update(var4.toString().getBytes("UTF-8")); } catch (UnsupportedEncodingException var6) { var6.printStackTrace(); } - return this.field27.digest(); + return this.field24.digest(); } - @ObfuscatedName("w") - MessageDigest method87() { + @ObfuscatedName("p") + MessageDigest method77() { try { return MessageDigest.getInstance("SHA-256"); } catch (NoSuchAlgorithmException var2) { @@ -47,14 +47,14 @@ public class class6 implements class11 { } } - @ObfuscatedName("m") - static int method97(byte[] var0) { + @ObfuscatedName("o") + static int method74(byte[] var0) { int var1 = 0; byte[] var2 = var0; for (int var3 = 0; var3 < var2.length; ++var3) { byte var4 = var2[var3]; - int var5 = method85(var4); + int var5 = method75(var4); var1 += var5; if (var5 != 8) { break; @@ -64,8 +64,8 @@ public class class6 implements class11 { return var1; } - @ObfuscatedName("k") - static int method85(byte var0) { + @ObfuscatedName("q") + static int method75(byte var0) { int var1 = 0; if (var0 == 0) { var1 = 8; diff --git a/runescape-client/src/main/java/class60.java b/runescape-client/src/main/java/class60.java index 83092805dd..a6365f4057 100644 --- a/runescape-client/src/main/java/class60.java +++ b/runescape-client/src/main/java/class60.java @@ -1,153 +1,303 @@ import java.applet.Applet; import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bt") +@ObfuscatedName("bw") public class class60 { - @ObfuscatedName("x") - @Export("applet") - public static Applet applet; - @ObfuscatedName("m") - public static String field462; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 200770361 + @ObfuscatedName("qh") + @ObfuscatedSignature( + signature = "Ldd;" ) - @Export("graphicsTickTimeIdx") - static int graphicsTickTimeIdx; + @Export("pcmStreamMixer") + static PcmStreamMixer pcmStreamMixer; + @ObfuscatedName("m") + @Export("applet") + static Applet applet; + @ObfuscatedName("o") + static String field450; + @ObfuscatedName("kf") + @ObfuscatedSignature( + signature = "Lby;" + ) + @Export("localPlayer") + static Player localPlayer; static { applet = null; - field462 = ""; + field450 = ""; } - @ObfuscatedName("x") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(II)Lif;", - garbageValue = "-696554810" + signature = "(Lkb;II)V", + garbageValue = "-220827004" ) - public static FloorUnderlayDefinition method995(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); + @Export("updatePlayers") + static final void updatePlayers(PacketBuffer var0, int var1) { + int var2 = var0.offset; + Players.Players_pendingUpdateCount = 0; + DynamicObject.method2373(var0); + + for (int var3 = 0; var3 < Players.Players_pendingUpdateCount; ++var3) { + int var4 = Players.Players_pendingUpdateIndices[var3]; + Player var5 = Client.players[var4]; + int var6 = var0.readUnsignedByte(); + if ((var6 & 16) != 0) { + var6 += var0.readUnsignedByte() << 8; } - var1.postDecode(); - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); - return var1; + byte var7 = -1; + if ((var6 & 256) != 0) { + var7 = var0.method5750(); + } + + if ((var6 & 64) != 0) { + var5.field992 = var0.readUnsignedShort(); + if (var5.pathLength == 0) { + var5.orientation = var5.field992; + var5.field992 = -1; + } + } + + int var8; + int var9; + if ((var6 & 128) != 0) { + var8 = var0.method5757(); + if (var8 == 65535) { + var8 = -1; + } + + var9 = var0.method5748(); + SecureRandomCallable.performPlayerAnimation(var5, var8, var9); + } + + if ((var6 & 2) != 0) { + var5.overheadText = var0.readStringCp1252NullTerminated(); + if (var5.overheadText.charAt(0) == '~') { + var5.overheadText = var5.overheadText.substring(1); + ObjectSound.addGameMessage(2, var5.username.getName(), var5.overheadText); + } else if (var5 == localPlayer) { + ObjectSound.addGameMessage(2, var5.username.getName(), var5.overheadText); + } + + var5.isAutoChatting = false; + var5.overheadTextColor = 0; + var5.overheadTextEffect = 0; + var5.overheadTextCyclesRemaining = 150; + } + + if ((var6 & 512) != 0) { + var5.field995 = var0.method5750(); + var5.field1008 = var0.method5750(); + var5.field1007 = var0.method5751(); + var5.field1009 = var0.method5730(); + var5.field966 = var0.readUnsignedShort() + Client.cycle; + var5.field1011 = var0.method5755() + Client.cycle; + var5.field1006 = var0.readUnsignedShort(); + if (var5.field659) { + var5.field995 += var5.tileX; + var5.field1008 += var5.tileY; + var5.field1007 += var5.tileX; + var5.field1009 += var5.tileY; + var5.pathLength = 0; + } else { + var5.field995 += var5.pathX[0]; + var5.field1008 += var5.pathY[0]; + var5.field1007 += var5.pathX[0]; + var5.field1009 += var5.pathY[0]; + var5.pathLength = 1; + } + + var5.field1023 = 0; + } + + int var11; + int var12; + int var15; + if ((var6 & 1) != 0) { + var8 = var0.readUnsignedShort(); + PlayerType var16 = (PlayerType)FaceNormal.findEnumerated(VarbitDefinition.PlayerType_values(), var0.method5936()); + boolean var10 = var0.readUnsignedByte() == 1; + var11 = var0.method5746(); + var12 = var0.offset; + if (var5.username != null && var5.appearance != null) { + boolean var13 = false; + if (var16.isUser && ModeWhere.friendSystem.isIgnored(var5.username)) { + var13 = true; + } + + if (!var13 && Client.field787 == 0 && !var5.isHidden) { + Players.field1289.offset = 0; + var0.readBytes(Players.field1289.array, 0, var11); + Players.field1289.offset = 0; + String var14 = AbstractFont.escapeBrackets(TileItemPile.method2903(NPC.method2157(Players.field1289))); + var5.overheadText = var14.trim(); + var5.overheadTextColor = var8 >> 8; + var5.overheadTextEffect = var8 & 255; + var5.overheadTextCyclesRemaining = 150; + var5.isAutoChatting = var10; + var5.field979 = var5 != localPlayer && var16.isUser && "" != Client.field755 && var14.toLowerCase().indexOf(Client.field755) == -1; + if (var16.isPrivileged) { + var15 = var10 ? 91 : 1; + } else { + var15 = var10 ? 90 : 2; + } + + if (var16.modIcon != -1) { + ObjectSound.addGameMessage(var15, WorldMapRegion.method611(var16.modIcon) + var5.username.getName(), var14); + } else { + ObjectSound.addGameMessage(var15, var5.username.getName(), var14); + } + } + } + + var0.offset = var12 + var11; + } + + if ((var6 & 8) != 0) { + var5.targetIndex = var0.readUnsignedShort(); + if (var5.targetIndex == 65535) { + var5.targetIndex = -1; + } + } + + if ((var6 & 4096) != 0) { + var5.spotAnimation = var0.method5757(); + var8 = var0.method5766(); + var5.field1005 = var8 >> 16; + var5.field987 = (var8 & 65535) + Client.cycle; + var5.spotAnimationFrame = 0; + var5.spotAnimationFrameCycle = 0; + if (var5.field987 > Client.cycle) { + var5.spotAnimationFrame = -1; + } + + if (var5.spotAnimation == 65535) { + var5.spotAnimation = -1; + } + } + + if ((var6 & 1024) != 0) { + for (var8 = 0; var8 < 3; ++var8) { + var5.actions[var8] = var0.readStringCp1252NullTerminated(); + } + } + + if ((var6 & 2048) != 0) { + Players.field1278[var4] = var0.method5750(); + } + + if ((var6 & 4) != 0) { + var8 = var0.method5746(); + int var18; + int var19; + int var21; + if (var8 > 0) { + for (var9 = 0; var9 < var8; ++var9) { + var11 = -1; + var12 = -1; + var21 = -1; + var19 = var0.readUShortSmart(); + if (var19 == 32767) { + var19 = var0.readUShortSmart(); + var12 = var0.readUShortSmart(); + var11 = var0.readUShortSmart(); + var21 = var0.readUShortSmart(); + } else if (var19 != 32766) { + var12 = var0.readUShortSmart(); + } else { + var19 = -1; + } + + var18 = var0.readUShortSmart(); + var5.addHitSplat(var19, var12, var11, var21, Client.cycle, var18); + } + } + + var9 = var0.readUnsignedByte(); + if (var9 > 0) { + for (var19 = 0; var19 < var9; ++var19) { + var11 = var0.readUShortSmart(); + var12 = var0.readUShortSmart(); + if (var12 != 32767) { + var21 = var0.readUShortSmart(); + var18 = var0.method5748(); + var15 = var12 > 0 ? var0.method5746() : var18; + var5.addHealthBar(var11, Client.cycle, var12, var21, var18, var15); + } else { + var5.removeHealthBar(var11); + } + } + } + } + + if ((var6 & 32) != 0) { + var8 = var0.method5748(); + byte[] var22 = new byte[var8]; + Buffer var17 = new Buffer(var22); + var0.method5821(var22, 0, var8); + Players.field1279[var4] = var17; + var5.read(var17); + } + + if (var5.field659) { + if (var7 == 127) { + var5.resetPath(var5.tileX, var5.tileY); + } else { + byte var20; + if (var7 != -1) { + var20 = var7; + } else { + var20 = Players.field1278[var4]; + } + + var5.method1300(var5.tileX, var5.tileY, var20); + } + } + } + + if (var0.offset - var2 != var1) { + throw new RuntimeException(var0.offset - var2 + " " + var1); } } - @ObfuscatedName("fm") + @ObfuscatedName("g") @ObfuscatedSignature( - signature = "(Ljava/lang/String;B)V", - garbageValue = "-9" + signature = "(I)V", + garbageValue = "76630753" ) - @Export("doCheat") - static final void doCheat(String var0) { - if (var0.equalsIgnoreCase("toggleroof")) { - GrandExchangeOfferOwnWorldComparator.clientPreferences.roofsHidden = !GrandExchangeOfferOwnWorldComparator.clientPreferences.roofsHidden; - WorldMapArea.savePreferences(); - if (GrandExchangeOfferOwnWorldComparator.clientPreferences.roofsHidden) { - Skeleton.addGameMessage(99, "", "Roofs are now all hidden"); - } else { - Skeleton.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")) { - GrandExchangeOfferAgeComparator.worldMap.showCoord = !GrandExchangeOfferAgeComparator.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")) { - VertexNormal.method3093(); - } - } - - PacketBufferNode var1 = FaceNormal.getPacketBufferNode(ClientPacket.field2246, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(var0.length() + 1); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); + public static void method972() { + SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); + SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); } - @ObfuscatedName("it") + @ObfuscatedName("jc") @ObfuscatedSignature( - signature = "(IIIIIII)V", - garbageValue = "-228702425" + signature = "(Lhd;IIS)V", + garbageValue = "-5579" ) - static final void method997(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; - } + @Export("clickWidget") + static final void clickWidget(Widget var0, int var1, int var2) { + if (Client.clickedWidget == null && !Client.isMenuOpen) { + if (var0 != null && GrandExchangeEvent.method157(var0) != null) { + Client.clickedWidget = var0; + Widget var4 = FriendSystem.method1994(var0); + if (var4 == null) { + var4 = var0.parent; + } + + Client.clickedWidgetParent = var4; + Client.widgetClickX = var1; + Client.widgetClickY = var2; + GrandExchangeOfferAgeComparator.widgetDragDuration = 0; + Client.isDraggingWidget = false; + int var5 = UrlRequester.method3421(); + if (var5 != -1) { + WorldMapSection1.method648(var5); + } - if (var10 != 0) { - int var11 = (var6 << 16) / var10; - int var12 = (var7 << 16) / var10; - if (var12 <= var11) { - var11 = -var11; - } else { - var12 = -var12; } - - int var13 = var5 * var12 >> 17; - int var14 = var5 * var12 + 1 >> 17; - int var15 = var5 * var11 >> 17; - int var16 = var5 * var11 + 1 >> 17; - var0 -= Rasterizer2D.Rasterizer2D_xClipStart; - var1 -= Rasterizer2D.Rasterizer2D_yClipStart; - int var17 = var0 + var13; - int var18 = var0 - var14; - int var19 = var0 + var6 - var14; - int var20 = var0 + var13 + var6; - int var21 = var15 + var1; - int var22 = var1 - var16; - int var23 = var7 + var1 - var16; - int var24 = var7 + var15 + var1; - Rasterizer3D.method3110(var17, var18, var19); - Rasterizer3D.method3107(var21, var22, var23, var17, var18, var19, var4); - Rasterizer3D.method3110(var17, var19, var20); - Rasterizer3D.method3107(var21, var23, var24, var17, var19, var20, var4); } } } diff --git a/runescape-client/src/main/java/class69.java b/runescape-client/src/main/java/class69.java index 692789461e..49cd44cf71 100644 --- a/runescape-client/src/main/java/class69.java +++ b/runescape-client/src/main/java/class69.java @@ -1,141 +1,13 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bp") +@ObfuscatedName("bi") public class class69 { - @ObfuscatedName("bg") - @ObfuscatedSignature( - signature = "[Lla;" - ) - @Export("worldSelectBackSprites") - static Sprite[] worldSelectBackSprites; - @ObfuscatedName("fm") + @ObfuscatedName("lu") @ObfuscatedGetter( - intValue = 731242929 + intValue = 2113683905 ) - @Export("baseX") - static int baseX; - @ObfuscatedName("gx") - @ObfuscatedGetter( - intValue = 471245099 - ) - static int field585; - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "573845052" - ) - static void method1277() { - IntHashTable.field4034 = new int[2000]; - int var0 = 0; - int var1 = 240; - - int var3; - for (byte var2 = 12; var0 < 16; var1 -= var2) { - var3 = NPC.method2146((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)(0.425F * (float)var0 / 16.0F + 0.075F)); - IntHashTable.field4034[var0] = var3; - ++var0; - } - - var1 = 48; - - for (int var5 = var1 / 6; var0 < IntHashTable.field4034.length; var1 -= var5) { - var3 = var0 * 2; - - for (int var4 = NPC.method2146((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var3 && var0 < IntHashTable.field4034.length; ++var0) { - IntHashTable.field4034[var0] = var4; - } - } - - } - - @ObfuscatedName("ir") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "4" - ) - static final void method1275() { - boolean var0 = false; - - while (!var0) { - var0 = true; - - for (int var1 = 0; var1 < Client.menuOptionsCount - 1; ++var1) { - if (Client.menuOpcodes[var1] < 1000 && Client.menuOpcodes[var1 + 1] > 1000) { - String var2 = Client.menuTargets[var1]; - Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; - Client.menuTargets[var1 + 1] = var2; - String var3 = Client.menuActions[var1]; - Client.menuActions[var1] = Client.menuActions[var1 + 1]; - Client.menuActions[var1 + 1] = var3; - int var4 = Client.menuOpcodes[var1]; - Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; - Client.menuOpcodes[var1 + 1] = var4; - var4 = Client.menuArguments1[var1]; - Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; - Client.menuArguments1[var1 + 1] = var4; - var4 = Client.menuArguments2[var1]; - Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; - Client.menuArguments2[var1 + 1] = var4; - var4 = Client.menuIdentifiers[var1]; - Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; - Client.menuIdentifiers[var1 + 1] = var4; - boolean var5 = Client.menuShiftClick[var1]; - Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; - Client.menuShiftClick[var1 + 1] = var5; - var0 = false; - } - } - } - - } - - @ObfuscatedName("kz") - @ObfuscatedSignature( - signature = "(Ljava/lang/String;ZB)V", - garbageValue = "-93" - ) - @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 < class336.ItemDefinition_fileCount; ++var4) { - ItemDefinition var5 = AbstractWorldMapData.ItemDefinition_get(var4); - if ((!var1 || var5.isTradable) && var5.noteTemplate == -1 && var5.name.toLowerCase().indexOf(var0) != -1) { - if (var3 >= 250) { - TextureProvider.foundItemIdCount = -1; - WorldMapEvent.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; - } - } - - WorldMapEvent.foundItemIds = var2; - AbstractWorldMapIcon.foundItemIndex = 0; - TextureProvider.foundItemIdCount = var3; - String[] var8 = new String[TextureProvider.foundItemIdCount]; - - for (int var9 = 0; var9 < TextureProvider.foundItemIdCount; ++var9) { - var8[var9] = AbstractWorldMapData.ItemDefinition_get(var2[var9]).name; - } - - class234.method4221(var8, WorldMapEvent.foundItemIds); - } + @Export("menuWidth") + static int menuWidth; } diff --git a/runescape-client/src/main/java/class7.java b/runescape-client/src/main/java/class7.java index 4c45159576..592b68bd3a 100644 --- a/runescape-client/src/main/java/class7.java +++ b/runescape-client/src/main/java/class7.java @@ -4,152 +4,153 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("z") +@ObfuscatedName("u") public enum class7 implements Enumerated { - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "Lz;" - ) - field34(0, 0); - - @ObfuscatedName("el") - @ObfuscatedSignature( - signature = "Llx;" - ) - @Export("spriteIds") - static GraphicsDefaults spriteIds; - @ObfuscatedName("eu") - @ObfuscatedGetter( - intValue = 1683303309 - ) - static int field33; - @ObfuscatedName("ml") - @ObfuscatedGetter( - intValue = 1709634405 - ) - @Export("selectedSpellWidget") - static int selectedSpellWidget; @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -1301024931 + @ObfuscatedSignature( + signature = "Lu;" ) - public final int field30; - @ObfuscatedName("k") - @ObfuscatedGetter( - intValue = -32487403 + field30(0, 0); + + @ObfuscatedName("ox") + @ObfuscatedSignature( + signature = "Lfv;" ) - @Export("index") - final int index; + @Export("mouseWheel") + static MouseWheel mouseWheel; + @ObfuscatedName("eb") + static int[] field28; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -372916347 + ) + public final int field26; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = 546495013 + ) + final int field27; class7(int var3, int var4) { - this.field30 = var3; - this.index = var4; - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - signature = "(B)I", - garbageValue = "56" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.index; + this.field26 = var3; + this.field27 = var4; } @ObfuscatedName("m") @ObfuscatedSignature( signature = "(I)I", - garbageValue = "-185431723" + garbageValue = "-995092303" ) - static int method98() { - return 12; + @Export("rsOrdinal") + public int rsOrdinal() { + return this.field27; } - @ObfuscatedName("d") + @ObfuscatedName("w") @ObfuscatedSignature( - signature = "(Liy;Ljava/lang/String;Ljava/lang/String;B)Lle;", - garbageValue = "1" + signature = "(Ljava/lang/String;B)V", + garbageValue = "-89" ) - @Export("SpriteBuffer_getIndexedSpriteByName") - public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { - int var3 = var0.getGroupId(var1); - int var4 = var0.getFileId(var3, var2); - IndexedSprite var5; - if (!UserComparator7.method3516(var0, var3, var4)) { - var5 = null; + static final void method95(String var0) { + StringBuilder var10000 = new StringBuilder(); + Object var10001 = null; + var10000 = var10000.append("Please remove ").append(var0); + var10001 = null; + String var1 = var10000.append(" from your ignore list first").toString(); + ObjectSound.addGameMessage(30, "", var1); + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + signature = "(IIS)Z", + garbageValue = "17445" + ) + static final boolean method97(int var0, int var1) { + ObjectDefinition var2 = Canvas.getObjectDefinition(var0); + if (var1 == 11) { + var1 = 10; + } + + if (var1 >= 5 && var1 <= 8) { + var1 = 4; + } + + return var2.method4786(var1); + } + + @ObfuscatedName("r") + @ObfuscatedSignature( + signature = "(ILcs;ZI)I", + garbageValue = "669918470" + ) + static int method100(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? KeyHandler.field407 : SecureRandomCallable.field544; + if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { + Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = WorldMapID.method617(KeyHandler.getWidgetClickMask(var3)); + return 1; + } else if (var0 != ScriptOpcodes.CC_GETOP) { + if (var0 == ScriptOpcodes.CC_GETOPBASE) { + if (var3.dataText == null) { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3.dataText; + } + + return 1; + } else { + return 2; + } } else { - var5 = AttackOption.method2165(); - } + int var4 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; + --var4; + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3.actions[var4]; + } else { + Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; + } - return var5; + return 1; + } } - @ObfuscatedName("v") + @ObfuscatedName("gm") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-1823376013" + signature = "(S)Z", + garbageValue = "255" ) - public static void method104() { - if (NetCache.NetCache_socket != null) { - NetCache.NetCache_socket.close(); - } - + static boolean method98() { + return (Client.drawPlayerNames & 4) != 0; } - @ObfuscatedName("o") + @ObfuscatedName("hv") @ObfuscatedSignature( - signature = "(ILce;ZI)I", - garbageValue = "1393352524" + signature = "(II)Z", + garbageValue = "-1244259463" ) - static int method101(int var0, Script var1, boolean var2) { - Widget var3 = MusicPatchNode.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; + static final boolean method94(int var0) { + if (var0 < 0) { + return false; } else { - return 2; + int var1 = Client.menuOpcodes[var0]; + if (var1 >= 2000) { + var1 -= 2000; + } + + return var1 == 1007; } } + + @ObfuscatedName("jw") + @ObfuscatedSignature( + signature = "(B)V", + garbageValue = "9" + ) + @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.clearIsInClanChat(); + } + + } } diff --git a/runescape-client/src/main/java/class8.java b/runescape-client/src/main/java/class8.java index 2578c5d06b..ebeecb4a65 100644 --- a/runescape-client/src/main/java/class8.java +++ b/runescape-client/src/main/java/class8.java @@ -1,52 +1,192 @@ import java.util.concurrent.Callable; import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("t") +@ObfuscatedName("a") public class class8 implements Callable { - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 878418019 - ) - @Export("cacheGamebuild") - public static int cacheGamebuild; - @ObfuscatedName("x") + @ObfuscatedName("fo") @ObfuscatedSignature( - signature = "Lkb;" + signature = "Llj;" ) - final Buffer field42; + static AbstractSocket field35; @ObfuscatedName("m") @ObfuscatedSignature( - signature = "Ln;" + signature = "Lkn;" ) - final class12 field43; + final Buffer field33; + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "Lc;" + ) + final class12 field31; // $FF: synthetic field @ObfuscatedSignature( - signature = "Le;" + signature = "Lz;" ) final class9 this$0; @ObfuscatedSignature( - signature = "(Le;Lkb;Ln;)V" + signature = "(Lz;Lkn;Lc;)V" ) class8(class9 var1, Buffer var2, class12 var3) { this.this$0 = var1; - this.field42 = var2; - this.field43 = var3; + this.field33 = var2; + this.field31 = var3; } public Object call() { - return this.field43.vmethod131(this.field42); + return this.field31.vmethod133(this.field33); } - @ObfuscatedName("v") + @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "11" + signature = "(Lic;I)V", + garbageValue = "2132474559" ) - public static void method109() { - FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); + public static void method103(AbstractArchive var0) { + class198.ParamDefinition_archive = var0; + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "(III)I", + garbageValue = "1765213617" + ) + public static int method104(int var0, int var1) { + int var2; + for (var2 = 0; var1 > 0; --var1) { + var2 = var2 << 1 | var0 & 1; + var0 >>>= 1; + } + + return var2; + } + + @ObfuscatedName("gh") + @ObfuscatedSignature( + signature = "(ZLkb;I)V", + garbageValue = "-826788637" + ) + @Export("loadRegions") + static final void loadRegions(boolean var0, PacketBuffer var1) { + Client.isInInstance = var0; + int var2; + int var4; + int var5; + int var6; + int var7; + int var8; + if (!Client.isInInstance) { + var2 = var1.method5757(); + int var3 = var1.method5757(); + var4 = var1.readUnsignedShort(); + WorldMapData_1.xteaKeys = new int[var4][4]; + + for (var5 = 0; var5 < var4; ++var5) { + for (var6 = 0; var6 < 4; ++var6) { + WorldMapData_1.xteaKeys[var5][var6] = var1.readInt(); + } + } + + class41.regions = new int[var4]; + StudioGame.regionMapArchiveIds = new int[var4]; + class52.regionLandArchiveIds = new int[var4]; + class90.regionLandArchives = new byte[var4][]; + class1.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)) { + class41.regions[var4] = var8; + StudioGame.regionMapArchiveIds[var4] = WorldMapRectangle.archive5.getGroupId("m" + var6 + "_" + var7); + class52.regionLandArchiveIds[var4] = WorldMapRectangle.archive5.getGroupId("l" + var6 + "_" + var7); + ++var4; + } + } + } + + TextureProvider.method2900(var3, var2, true); + } else { + var2 = var1.method5867(); + boolean var15 = var1.readUnsignedByte() == 1; + var4 = var1.method5757(); + 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(); + WorldMapData_1.xteaKeys = new int[var5][4]; + + for (var6 = 0; var6 < var5; ++var6) { + for (var7 = 0; var7 < 4; ++var7) { + WorldMapData_1.xteaKeys[var6][var7] = var1.readInt(); + } + } + + class41.regions = new int[var5]; + StudioGame.regionMapArchiveIds = new int[var5]; + class52.regionLandArchiveIds = new int[var5]; + class90.regionLandArchives = new byte[var5][]; + class1.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 (class41.regions[var13] == var12) { + var12 = -1; + break; + } + } + + if (var12 != -1) { + class41.regions[var5] = var12; + var13 = var12 >> 8 & 255; + int var14 = var12 & 255; + StudioGame.regionMapArchiveIds[var5] = WorldMapRectangle.archive5.getGroupId("m" + var13 + "_" + var14); + class52.regionLandArchiveIds[var5] = WorldMapRectangle.archive5.getGroupId("l" + var13 + "_" + var14); + ++var5; + } + } + } + } + } + + TextureProvider.method2900(var4, var2, !var15); + } + } } diff --git a/runescape-client/src/main/java/class89.java b/runescape-client/src/main/java/class89.java index 103dee0d85..6d2939afdc 100644 --- a/runescape-client/src/main/java/class89.java +++ b/runescape-client/src/main/java/class89.java @@ -1,23 +1,294 @@ +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStreamWriter; import java.math.BigInteger; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; +import java.net.URL; +import java.net.URLConnection; +import java.util.Random; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cx") +@ObfuscatedName("cp") public class class89 { - @ObfuscatedName("w") - static final BigInteger field1158; - @ObfuscatedName("v") - static final BigInteger field1155; - @ObfuscatedName("gg") - @ObfuscatedGetter( - intValue = 1825982697 - ) - @Export("baseY") - static int baseY; + @ObfuscatedName("p") + static final BigInteger field1161; + @ObfuscatedName("g") + static final BigInteger field1163; static { - field1158 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); - field1155 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); + field1161 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); + field1163 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "735302127" + ) + public static void method2161() { + WorldMapSprite.midiPcmStream.clear(); + class206.field2439 = 1; + Huffman.musicTrackArchive = null; + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "-963420797" + ) + static void method2159() { + Login.Login_username = Login.Login_username.trim(); + if (Login.Login_username.length() == 0) { + MusicPatchPcmStream.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); + } else { + long var1 = WorldMapEvent.method839(); + byte var0; + if (0L == var1) { + 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(field1161, field1163); + var7.writeByte(10); + + for (var9 = 0; var9 < 3; ++var9) { + var7.writeInt(var5.nextInt()); + } + + var7.writeLong(var5.nextLong()); + var7.writeLongMedium(var5.nextLong()); + if (Client.randomDatData != null) { + var7.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); + } else { + byte[] var10 = new byte[24]; + + try { + JagexCache.JagexCache_randomDat.seek(0L); + JagexCache.JagexCache_randomDat.readFully(var10); + + int var11; + for (var11 = 0; var11 < 24 && var10[var11] == 0; ++var11) { + } + + if (var11 >= 24) { + throw new IOException(); + } + } catch (Exception var39) { + for (int var12 = 0; var12 < 24; ++var12) { + var10[var12] = -1; + } + } + + var7.writeBytes(var10, 0, var10.length); + } + + var7.writeLong(var5.nextLong()); + var7.encryptRsa(field1161, field1163); + var9 = DynamicObject.stringCp1252NullTerminatedByteSize(var4); + if (var9 % 8 != 0) { + var9 += 8 - var9 % 8; + } + + Buffer var40 = new Buffer(var9); + var40.writeStringCp1252NullTerminated(var4); + var40.offset = var9; + var40.xteaEncryptAll(var8); + Buffer var28 = new Buffer(var7.offset + var6.offset + var40.offset + 5); + var28.writeByte(2); + var28.writeByte(var6.offset); + var28.writeBytes(var6.array, 0, var6.offset); + var28.writeByte(var7.offset); + var28.writeBytes(var7.array, 0, var7.offset); + var28.writeShort(var40.offset); + var28.writeBytes(var40.array, 0, var40.offset); + byte[] var13 = var28.array; + int var15 = var13.length; + StringBuilder var16 = new StringBuilder(); + + int var20; + for (int var17 = 0; var17 < var15 + 0; var17 += 3) { + int var18 = var13[var17] & 255; + var16.append(class299.field3677[var18 >>> 2]); + if (var17 < var15 - 1) { + int var19 = var13[var17 + 1] & 255; + var16.append(class299.field3677[(var18 & 3) << 4 | var19 >>> 4]); + if (var17 < var15 - 2) { + var20 = var13[var17 + 2] & 255; + var16.append(class299.field3677[(var19 & 15) << 2 | var20 >>> 6]).append(class299.field3677[var20 & 63]); + } else { + var16.append(class299.field3677[(var19 & 15) << 2]).append("="); + } + } else { + var16.append(class299.field3677[(var18 & 3) << 4]).append("=="); + } + } + + String var14 = var16.toString(); + var14 = var14; + + byte var3; + try { + URL var31 = new URL(HealthBarDefinition.method4669("services", false) + "m=accountappeal/login.ws"); + URLConnection var41 = var31.openConnection(); + var41.setDoInput(true); + var41.setDoOutput(true); + var41.setConnectTimeout(5000); + OutputStreamWriter var32 = new OutputStreamWriter(var41.getOutputStream()); + var20 = var14.length(); + StringBuilder var21 = new StringBuilder(var20); + + int var22; + for (var22 = 0; var22 < var20; ++var22) { + char var23 = var14.charAt(var22); + if ((var23 < 'a' || var23 > 'z') && (var23 < 'A' || var23 > 'Z') && (var23 < '0' || var23 > '9') && var23 != '.' && var23 != '-' && var23 != '*' && var23 != '_') { + if (var23 == ' ') { + var21.append('+'); + } else { + byte var24 = UserComparator3.charToByteCp1252(var23); + var21.append('%'); + int var25 = var24 >> 4 & 15; + if (var25 >= 10) { + var21.append((char)(var25 + 55)); + } else { + var21.append((char)(var25 + 48)); + } + + var25 = var24 & 15; + if (var25 >= 10) { + var21.append((char)(var25 + 55)); + } else { + var21.append((char)(var25 + 48)); + } + } + } else { + var21.append(var23); + } + } + + String var34 = var21.toString(); + String var35 = "data2=" + var34 + "&dest="; + var22 = "passwordchoice.ws".length(); + StringBuilder var36 = new StringBuilder(var22); + + for (int var44 = 0; var44 < var22; ++var44) { + char var45 = "passwordchoice.ws".charAt(var44); + if ((var45 < 'a' || var45 > 'z') && (var45 < 'A' || var45 > 'Z') && (var45 < '0' || var45 > '9') && var45 != '.' && var45 != '-' && var45 != '*' && var45 != '_') { + if (var45 == ' ') { + var36.append('+'); + } else { + byte var26 = UserComparator3.charToByteCp1252(var45); + var36.append('%'); + int var27 = var26 >> 4 & 15; + if (var27 >= 10) { + var36.append((char)(var27 + 55)); + } else { + var36.append((char)(var27 + 48)); + } + + var27 = var26 & 15; + if (var27 >= 10) { + var36.append((char)(var27 + 55)); + } else { + var36.append((char)(var27 + 48)); + } + } + } else { + var36.append(var45); + } + } + + String var42 = var36.toString(); + var32.write(var35 + var42); + var32.flush(); + InputStream var37 = var41.getInputStream(); + var28 = new Buffer(new byte[1000]); + + while (true) { + int var43 = var37.read(var28.array, var28.offset, 1000 - var28.offset); + if (var43 == -1) { + var32.close(); + var37.close(); + String var46 = new String(var28.array); + if (var46.startsWith("OFFLINE")) { + var3 = 4; + } else if (var46.startsWith("WRONG")) { + var3 = 7; + } else if (var46.startsWith("RELOAD")) { + var3 = 3; + } else if (var46.startsWith("Not permitted for social network accounts.")) { + var3 = 6; + } else { + var28.xteaDecryptAll(var8); + + while (var28.offset > 0 && var28.array[var28.offset - 1] == 0) { + --var28.offset; + } + + var46 = new String(var28.array, 0, var28.offset); + if (GrandExchangeOfferUnitPriceComparator.method204(var46)) { + WorldMapSectionType.openURL(var46, true, false); + var3 = 2; + } else { + var3 = 5; + } + } + break; + } + + var28.offset += var43; + if (var28.offset >= 1000) { + var3 = 5; + break; + } + } + } catch (Throwable var38) { + var38.printStackTrace(); + var3 = 5; + } + + var0 = var3; + } + + switch(var0) { + case 2: + MusicPatchPcmStream.setLoginResponseString(Strings.field3060, Strings.field3061, Strings.field3062); + Login.loginIndex = 6; + break; + case 3: + MusicPatchPcmStream.setLoginResponseString("", "Error connecting to server.", ""); + break; + case 4: + MusicPatchPcmStream.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); + break; + case 5: + MusicPatchPcmStream.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); + break; + case 6: + MusicPatchPcmStream.setLoginResponseString("", "Error connecting to server.", ""); + break; + case 7: + MusicPatchPcmStream.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."); + } + + } } } diff --git a/runescape-client/src/main/java/class9.java b/runescape-client/src/main/java/class9.java index 83c5008268..fab79f817e 100644 --- a/runescape-client/src/main/java/class9.java +++ b/runescape-client/src/main/java/class9.java @@ -2,112 +2,692 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("e") +@ObfuscatedName("z") public class class9 { - @ObfuscatedName("ls") - @ObfuscatedSignature( - signature = "Lhe;" + @ObfuscatedName("ra") + @ObfuscatedGetter( + intValue = 2090323123 ) - @Export("mousedOverWidgetIf1") - static Widget mousedOverWidgetIf1; - @ObfuscatedName("x") - ExecutorService field49; + static int field42; + @ObfuscatedName("hl") + @ObfuscatedSignature( + signature = "[Llz;" + ) + @Export("mapMarkerSprites") + static Sprite[] mapMarkerSprites; @ObfuscatedName("m") - Future field45; - @ObfuscatedName("k") + ExecutorService field45; + @ObfuscatedName("o") + Future field44; + @ObfuscatedName("q") @ObfuscatedSignature( - signature = "Lkb;" + signature = "Lkn;" ) - final Buffer field44; - @ObfuscatedName("d") + final Buffer field40; + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "Ln;" + signature = "Lc;" ) - final class12 field46; + final class12 field41; @ObfuscatedSignature( - signature = "(Lkb;Ln;)V" + signature = "(Lkn;Lc;)V" ) public class9(Buffer var1, class12 var2) { - this.field49 = Executors.newSingleThreadExecutor(); - this.field44 = var1; - this.field46 = var2; - this.method114(); - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - signature = "(I)Z", - garbageValue = "-1753641099" - ) - public boolean method111() { - return this.field45.isDone(); + this.field45 = Executors.newSingleThreadExecutor(); + this.field40 = var1; + this.field41 = var2; + this.method109(); } @ObfuscatedName("m") @ObfuscatedSignature( - signature = "(I)V", - garbageValue = "-194627920" + signature = "(I)Z", + garbageValue = "1196678116" ) - public void method110() { - this.field49.shutdown(); - this.field49 = null; + public boolean method106() { + return this.field44.isDone(); } - @ObfuscatedName("k") + @ObfuscatedName("o") @ObfuscatedSignature( - signature = "(I)Lkb;", - garbageValue = "357894272" + signature = "(I)V", + garbageValue = "1944585860" ) - public Buffer method113() { + public void method107() { + this.field45.shutdown(); + this.field45 = null; + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + signature = "(I)Lkn;", + garbageValue = "1647170417" + ) + public Buffer method108() { try { - return (Buffer)this.field45.get(); + return (Buffer)this.field44.get(); } catch (Exception var2) { return null; } } - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( signature = "(I)V", - garbageValue = "-2043166937" + garbageValue = "2093000238" ) - void method114() { - this.field45 = this.field49.submit(new class8(this, this.field44, this.field46)); + void method109() { + this.field44 = this.field45.submit(new class8(this, this.field40, this.field41)); } - @ObfuscatedName("m") + @ObfuscatedName("gd") @ObfuscatedSignature( - signature = "(Lln;ILjava/lang/String;S)Ljava/lang/String;", - garbageValue = "171" + signature = "(Lby;ZI)V", + garbageValue = "928487649" ) - static String method122(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; - } - } - - @ObfuscatedName("im") - @ObfuscatedSignature( - signature = "(IS)Z", - garbageValue = "32767" - ) - static final boolean method121(int var0) { - if (var0 < 0) { - return false; - } else { - int var1 = Client.menuOpcodes[var0]; - if (var1 >= 2000) { - var1 -= 2000; + @Export("addPlayerToScene") + static void addPlayerToScene(Player var0, boolean var1) { + if (var0 != null && var0.isVisible() && !var0.isHidden) { + var0.isUnanimated = false; + if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.movementSequence == var0.idleSequence) { + var0.isUnanimated = true; } - return var1 == 1007; + int var2 = var0.x >> 7; + int var3 = var0.y >> 7; + if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { + long var4 = class206.calculateTag(0, 0, 0, false, var0.index); + if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { + var0.isUnanimated = false; + var0.tileHeight = Language.getTileHeight(var0.x, var0.y, TileItemPile.Client_plane); + var0.playerCycle = Client.cycle; + UserComparator3.scene.addNullableObject(TileItemPile.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.field648, var0.field649, var0.field650, var0.field651); + } else { + if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { + if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { + return; + } + + Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; + } + + var0.tileHeight = Language.getTileHeight(var0.x, var0.y, TileItemPile.Client_plane); + var0.playerCycle = Client.cycle; + UserComparator3.scene.drawEntity(TileItemPile.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); + } + } + } + + } + + @ObfuscatedName("jr") + @ObfuscatedSignature( + signature = "([Lhd;IIIIIIII)V", + garbageValue = "-1819097133" + ) + @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 || KeyHandler.getWidgetClickMask(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { + if (var9.isIf3) { + if (Entity.isComponentHidden(var9)) { + continue; + } + } else if (var9.type == 0 && var9 != WorldMapSection1.mousedOverWidgetIf1 && Entity.isComponentHidden(var9)) { + continue; + } + + int var10 = var9.x + var6; + int var11 = var7 + var9.y; + int var12; + int var13; + int var14; + int var15; + int var18; + int var26; + if (var9.type == 2) { + var12 = var2; + var13 = var3; + var14 = var4; + var15 = var5; + } else { + int var16; + if (var9.type == 9) { + var16 = var10; + var26 = var11; + var18 = var10 + var9.width; + int var19 = var11 + var9.height; + if (var18 < var10) { + var16 = var18; + var18 = var10; + } + + if (var19 < var11) { + var26 = var19; + var19 = var11; + } + + ++var18; + ++var19; + var12 = var16 > var2 ? var16 : var2; + var13 = var26 > var3 ? var26 : var3; + var14 = var18 < var4 ? var18 : var4; + var15 = var19 < var5 ? var19 : var5; + } else { + var16 = var10 + var9.width; + var26 = var11 + var9.height; + var12 = var10 > var2 ? var10 : var2; + var13 = var11 > var3 ? var11 : var3; + var14 = var16 < var4 ? var16 : var4; + var15 = var26 < var5 ? var26 : var5; + } + } + + if (var9 == Client.clickedWidget) { + Client.field854 = true; + Client.field855 = var10; + Client.field856 = var11; + } + + boolean var32 = false; + if (var9.field2709) { + switch(Client.field835) { + case 0: + var32 = true; + case 1: + default: + break; + case 2: + if (Client.field671 == var9.id >>> 16) { + var32 = true; + } + break; + case 3: + if (var9.id == Client.field671) { + var32 = true; + } + } + } + + if (var32 || !var9.isIf3 || var12 < var14 && var13 < var15) { + if (var9.isIf3) { + ScriptEvent var17; + if (var9.noClickThrough) { + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + for (var17 = (ScriptEvent)Client.scriptEvents.last(); var17 != null; var17 = (ScriptEvent)Client.scriptEvents.previous()) { + if (var17.isMouseInputEvent) { + var17.remove(); + var17.widget.containsMouse = false; + } + } + + if (GrandExchangeOfferAgeComparator.widgetDragDuration == 0) { + Client.clickedWidget = null; + Client.clickedWidgetParent = null; + } + + if (!Client.isMenuOpen) { + FontName.addCancelMenuEntry(); + } + } + } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + for (var17 = (ScriptEvent)Client.scriptEvents.last(); var17 != null; var17 = (ScriptEvent)Client.scriptEvents.previous()) { + if (var17.isMouseInputEvent && var17.widget.onScroll == var17.args) { + var17.remove(); + } + } + } + } + + var26 = MouseHandler.MouseHandler_x; + var18 = MouseHandler.MouseHandler_y; + if (MouseHandler.MouseHandler_lastButton != 0) { + var26 = MouseHandler.MouseHandler_lastPressedX; + var18 = MouseHandler.MouseHandler_lastPressedY; + } + + boolean var33 = var26 >= var12 && var18 >= var13 && var26 < var14 && var18 < var15; + if (var9.contentType == 1337) { + if (!Client.isLoading && !Client.isMenuOpen && var33) { + WorldMapData_1.addSceneMenuOptions(var26, var18, var12, var13); + } + } else if (var9.contentType == 1338) { + class1.checkIfMinimapClicked(var9, var10, var11); + } else { + if (var9.contentType == 1400) { + class228.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var33, var10, var11, var9.width, var9.height); + } + + if (!Client.isMenuOpen && var33) { + if (var9.contentType == 1400) { + class228.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var26, var18); + } else { + Message.method1283(var9, var26 - var10, var18 - var11); + } + } + + boolean var21; + int var23; + if (var32) { + for (int var20 = 0; var20 < var9.field2647.length; ++var20) { + var21 = false; + boolean var22 = false; + if (!var21 && var9.field2647[var20] != null) { + for (var23 = 0; var23 < var9.field2647[var20].length; ++var23) { + boolean var24 = false; + if (var9.field2723 != null) { + var24 = KeyHandler.KeyHandler_pressedKeys[var9.field2647[var20][var23]]; + } + + if (ArchiveDiskAction.method4302(var9.field2647[var20][var23]) || var24) { + var21 = true; + if (var9.field2723 != null && var9.field2723[var20] > Client.cycle) { + break; + } + + byte var31 = var9.field2678[var20][var23]; + if (var31 == 0 || ((var31 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var31 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var31 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var31 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { + var22 = true; + break; + } + } + } + } + + if (var22) { + if (var20 < 10) { + class247.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); + } else if (var20 == 10) { + GrandExchangeOffer.Widget_runOnTargetLeave(); + AttackOption.selectSpell(var9.id, var9.childIndex, WorldMapID.method617(KeyHandler.getWidgetClickMask(var9)), var9.itemId); + Client.selectedSpellActionName = WorldMapAreaData.method762(var9); + if (Client.selectedSpellActionName == null) { + Client.selectedSpellActionName = "null"; + } + + Client.selectedSpellName = var9.dataText + ItemContainer.colorStartTag(16777215); + } + + var23 = var9.field2679[var20]; + if (var9.field2723 == null) { + var9.field2723 = new int[var9.field2647.length]; + } + + if (var9.field2680 == null) { + var9.field2680 = new int[var9.field2647.length]; + } + + if (var23 != 0) { + if (var9.field2723[var20] == 0) { + var9.field2723[var20] = var23 + Client.cycle + var9.field2680[var20]; + } else { + var9.field2723[var20] = var23 + Client.cycle; + } + } else { + var9.field2723[var20] = Integer.MAX_VALUE; + } + } + + if (!var21 && var9.field2723 != null) { + var9.field2723[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 || !ArchiveLoader.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var33) { + var34 = true; + } + + var21 = false; + if ((MouseHandler.MouseHandler_lastButton == 1 || !ArchiveLoader.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) { + class60.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11); + } + + if (var9.contentType == 1400) { + class228.worldMap.method6693(var26, var18, var33 & var34, var33 & var21); + } + + if (Client.clickedWidget != null && var9 != Client.clickedWidget && var33 && WorldMapScaleHandler.method819(KeyHandler.getWidgetClickMask(var9))) { + Client.draggedOnWidget = var9; + } + + if (var9 == Client.clickedWidgetParent) { + Client.field692 = true; + Client.field852 = var10; + Client.field853 = 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 || KeyHandler.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.field691.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.field691.addFirst(var27); + } + } + + if (var9.onTimer != null) { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onTimer; + Client.field891.addFirst(var27); + } + + ScriptEvent var25; + int var35; + int var36; + if (var9.onVarTransmit != null && Client.field860 > var9.field2736) { + if (var9.varTransmitTriggers != null && Client.field860 - var9.field2736 <= 32) { + label877: + for (var35 = var9.field2736; var35 < Client.field860; ++var35) { + var23 = Client.field859[var35 & 31]; + + for (var36 = 0; var36 < var9.varTransmitTriggers.length; ++var36) { + if (var23 == var9.varTransmitTriggers[var36]) { + var25 = new ScriptEvent(); + var25.widget = var9; + var25.args = var9.onVarTransmit; + Client.scriptEvents.addFirst(var25); + break label877; + } + } + } + } else { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onVarTransmit; + Client.scriptEvents.addFirst(var27); + } + + var9.field2736 = Client.field860; + } + + if (var9.onInvTransmit != null && Client.field878 > var9.field2643) { + if (var9.invTransmitTriggers != null && Client.field878 - var9.field2643 <= 32) { + label853: + for (var35 = var9.field2643; var35 < Client.field878; ++var35) { + var23 = Client.changedItemContainers[var35 & 31]; + + for (var36 = 0; var36 < var9.invTransmitTriggers.length; ++var36) { + if (var23 == var9.invTransmitTriggers[var36]) { + var25 = new ScriptEvent(); + var25.widget = var9; + var25.args = var9.onInvTransmit; + Client.scriptEvents.addFirst(var25); + break label853; + } + } + } + } else { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onInvTransmit; + Client.scriptEvents.addFirst(var27); + } + + var9.field2643 = Client.field878; + } + + if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field2721) { + if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field2721 <= 32) { + label829: + for (var35 = var9.field2721; var35 < Client.changedSkillsCount; ++var35) { + var23 = Client.changedSkills[var35 & 31]; + + for (var36 = 0; var36 < var9.statTransmitTriggers.length; ++var36) { + if (var23 == var9.statTransmitTriggers[var36]) { + var25 = new ScriptEvent(); + var25.widget = var9; + var25.args = var9.onStatTransmit; + Client.scriptEvents.addFirst(var25); + break label829; + } + } + } + } else { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onStatTransmit; + Client.scriptEvents.addFirst(var27); + } + + var9.field2721 = Client.changedSkillsCount; + } + + if (Client.chatCycle > var9.field2735 && var9.onChatTransmit != null) { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onChatTransmit; + Client.scriptEvents.addFirst(var27); + } + + if (Client.field866 > var9.field2735 && var9.onFriendTransmit != null) { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onFriendTransmit; + Client.scriptEvents.addFirst(var27); + } + + if (Client.field943 > var9.field2735 && var9.onClanTransmit != null) { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onClanTransmit; + Client.scriptEvents.addFirst(var27); + } + + if (Client.field818 > var9.field2735 && var9.onStockTransmit != null) { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onStockTransmit; + Client.scriptEvents.addFirst(var27); + } + + if (Client.field869 > var9.field2735 && var9.field2719 != null) { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.field2719; + Client.scriptEvents.addFirst(var27); + } + + if (Client.field870 > var9.field2735 && var9.onMiscTransmit != null) { + var27 = new ScriptEvent(); + var27.widget = var9; + var27.args = var9.onMiscTransmit; + Client.scriptEvents.addFirst(var27); + } + + var9.field2735 = Client.cycleCntr; + if (var9.onKey != null) { + for (var35 = 0; var35 < Client.field894; ++var35) { + ScriptEvent var30 = new ScriptEvent(); + var30.widget = var9; + var30.keyTyped = Client.field896[var35]; + var30.keyPressed = Client.field920[var35]; + var30.args = var9.onKey; + Client.scriptEvents.addFirst(var30); + } + } + } + } + + if (!var9.isIf3) { + if (Client.clickedWidget != null || KeyHandler.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) { + WorldMapSection1.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; + } else { + WorldMapSection1.mousedOverWidgetIf1 = var9; + } + } + + if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { + SecureRandomCallable.field542 = var9; + } + + if (var9.scrollHeight > var9.height) { + Coord.method4135(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 (GrandExchangeOfferAgeComparator.widgetDragDuration == 0) { + Client.clickedWidget = null; + Client.clickedWidgetParent = null; + } + + if (!Client.isMenuOpen) { + FontName.addCancelMenuEntry(); + } + } + + MusicPatchNode.updateRootInterface(var28.group, var12, var13, var14, var15, var10, var11); + } + } + } + } + } + } + + } + + @ObfuscatedName("kc") + @ObfuscatedSignature( + signature = "(Ljava/lang/String;I)V", + garbageValue = "1962834261" + ) + @Export("clanKickUser") + static final void clanKickUser(String var0) { + if (ClientPreferences.clanChat != null) { + PacketBufferNode var1 = UserComparator4.getPacketBufferNode(ClientPacket.field2325, Client.packetWriter.isaacCipher); + var1.packetBuffer.writeByte(DynamicObject.stringCp1252NullTerminatedByteSize(var0)); + var1.packetBuffer.writeStringCp1252NullTerminated(var0); + Client.packetWriter.addNode(var1); } } } diff --git a/runescape-client/src/main/java/class90.java b/runescape-client/src/main/java/class90.java index c09ba92c15..48b5adfa73 100644 --- a/runescape-client/src/main/java/class90.java +++ b/runescape-client/src/main/java/class90.java @@ -1,13 +1,50 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cn") +@ObfuscatedName("ci") public class class90 { - @ObfuscatedName("w") + @ObfuscatedName("bb") @ObfuscatedSignature( - signature = "(Ljava/lang/CharSequence;II[BII)I", - garbageValue = "-879105119" + signature = "[Llz;" + ) + @Export("worldSelectBackSprites") + static Sprite[] worldSelectBackSprites; + @ObfuscatedName("en") + @ObfuscatedGetter( + intValue = -664685957 + ) + @Export("port1") + static int port1; + @ObfuscatedName("gl") + @Export("regionLandArchives") + static byte[][] regionLandArchives; + + @ObfuscatedName("m") + @ObfuscatedSignature( + signature = "(I)V", + garbageValue = "1343662154" + ) + public static void method2164() { + class105.reflectionChecks = new IterableNodeDeque(); + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + signature = "(Llz;IIII)V", + garbageValue = "-1824687226" + ) + static void method2166(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); + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + signature = "(Ljava/lang/CharSequence;II[BIB)I", + garbageValue = "-25" ) @Export("encodeStringCp1252") public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { @@ -78,4 +115,19 @@ public class class90 { return var5; } + + @ObfuscatedName("z") + @ObfuscatedSignature( + signature = "([BI)Lko;", + garbageValue = "166705545" + ) + static Font method2168(byte[] var0) { + if (var0 == null) { + return null; + } else { + Font var1 = new Font(var0, class335.SpriteBuffer_xOffsets, NPC.SpriteBuffer_yOffsets, class335.SpriteBuffer_spriteWidths, class335.SpriteBuffer_spriteHeights, class335.SpriteBuffer_spritePalette, ItemDefinition.SpriteBuffer_pixels); + GrandExchangeEvent.method158(); + return var1; + } + } } diff --git a/runescape-client/src/main/java/class92.java b/runescape-client/src/main/java/class92.java index 975adf93af..c0ac5934dc 100644 --- a/runescape-client/src/main/java/class92.java +++ b/runescape-client/src/main/java/class92.java @@ -1,106 +1,224 @@ -import java.io.File; import java.math.BigInteger; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cz") +@ObfuscatedName("cq") public class class92 { - @ObfuscatedName("x") - static final BigInteger field1181; @ObfuscatedName("m") - static final BigInteger field1178; - @ObfuscatedName("k") - @ObfuscatedSignature( - signature = "Liy;" - ) - @Export("SequenceDefinition_skeletonsArchive") - public static AbstractArchive SequenceDefinition_skeletonsArchive; - @ObfuscatedName("w") - @Export("cacheDir") - public static File cacheDir; - @ObfuscatedName("ba") - @ObfuscatedSignature( - signature = "Lle;" - ) - @Export("worldSelectLeftSprite") - static IndexedSprite worldSelectLeftSprite; + static final BigInteger field1188; + @ObfuscatedName("o") + static final BigInteger field1189; static { - field1181 = new BigInteger("10001", 16); - field1178 = new BigInteger("b9c1060ac8499f373d9882f40e43f340f6412f30973ccc7b9bb633c15d4a925f92027c296efdc543c468986c6193597fb0e999c8f73ded9d5349a8e2e3a2ddea56262dae24e1c26ef213c9dd7b5bd35ecbc26d1286a99e20295e9ab9ec46c5609f15dc2f12d412f3fc027b4677ece3d578af01cebe5e1dbba80c81bcb118f8dd", 16); + field1188 = new BigInteger("10001", 16); + field1189 = new BigInteger("919cad4728c710a807a4355c136224dcaaf09055884c0f64d7c6ed68fa70062efc8449e71ef7d0b47bbe8fe89c56f988451b5459787c721ee76da46f7ce5b08982d0d24bd3ddc839e8da8b81278a27a06c107103c25355b793c60d170853f1205ee212e3b9cc208521e39224d4d87601905024f0ee199333be0b111fecdbfdd9", 16); } - @ObfuscatedName("x") + @ObfuscatedName("j") @ObfuscatedSignature( - signature = "(Liy;Liy;I)I", - garbageValue = "-1982305886" + signature = "(Lkb;II)V", + garbageValue = "213550097" ) - static int method2156(AbstractArchive var0, AbstractArchive var1) { - int var2 = 0; - if (var0.tryLoadFileByNames("title.jpg", "")) { - ++var2; + @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; } - if (var1.tryLoadFileByNames("logo", "")) { - ++var2; + int var3 = var0.readBits(2); + Player var4 = Client.players[var1]; + if (var3 == 0) { + if (var2) { + var4.field659 = false; + } else if (Client.localPlayerIndex == var1) { + throw new RuntimeException(); + } else { + Players.Players_regions[var1] = (var4.plane << 28) + (class182.baseX + var4.pathX[0] >> 13 << 14) + (SecureRandomFuture.baseY + var4.pathY[0] >> 13); + if (var4.field992 != -1) { + Players.Players_orientations[var1] = var4.field992; + } else { + Players.Players_orientations[var1] = var4.orientation; + } + + Players.Players_targetIndices[var1] = var4.targetIndex; + Client.players[var1] = null; + if (var0.readBits(1) != 0) { + ArchiveDiskAction.updateExternalPlayer(var0, var1); + } + + } + } else { + int var5; + int var6; + int var7; + if (var3 == 1) { + var5 = var0.readBits(3); + var6 = var4.pathX[0]; + var7 = var4.pathY[0]; + if (var5 == 0) { + --var6; + --var7; + } else if (var5 == 1) { + --var7; + } else if (var5 == 2) { + ++var6; + --var7; + } else if (var5 == 3) { + --var6; + } else if (var5 == 4) { + ++var6; + } else if (var5 == 5) { + --var6; + ++var7; + } else if (var5 == 6) { + ++var7; + } else if (var5 == 7) { + ++var6; + ++var7; + } + + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { + var4.resetPath(var6, var7); + var4.field659 = false; + } else if (var2) { + var4.field659 = true; + var4.tileX = var6; + var4.tileY = var7; + } else { + var4.field659 = false; + var4.method1300(var6, var7, Players.field1278[var1]); + } + + } else if (var3 == 2) { + var5 = var0.readBits(4); + var6 = var4.pathX[0]; + var7 = var4.pathY[0]; + if (var5 == 0) { + var6 -= 2; + var7 -= 2; + } else if (var5 == 1) { + --var6; + var7 -= 2; + } else if (var5 == 2) { + var7 -= 2; + } else if (var5 == 3) { + ++var6; + var7 -= 2; + } else if (var5 == 4) { + var6 += 2; + var7 -= 2; + } else if (var5 == 5) { + var6 -= 2; + --var7; + } else if (var5 == 6) { + var6 += 2; + --var7; + } else if (var5 == 7) { + var6 -= 2; + } else if (var5 == 8) { + var6 += 2; + } else if (var5 == 9) { + var6 -= 2; + ++var7; + } else if (var5 == 10) { + var6 += 2; + ++var7; + } else if (var5 == 11) { + var6 -= 2; + var7 += 2; + } else if (var5 == 12) { + --var6; + var7 += 2; + } else if (var5 == 13) { + var7 += 2; + } else if (var5 == 14) { + ++var6; + var7 += 2; + } else if (var5 == 15) { + var6 += 2; + var7 += 2; + } + + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { + var4.resetPath(var6, var7); + var4.field659 = false; + } else if (var2) { + var4.field659 = true; + var4.tileX = var6; + var4.tileY = var7; + } else { + var4.field659 = false; + var4.method1300(var6, var7, Players.field1278[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.field659 = true; + var4.tileX = var10; + var4.tileY = var11; + } else { + var4.field659 = false; + var4.method1300(var10, var11, Players.field1278[var1]); + } + } else { + var4.resetPath(var10, var11); + var4.field659 = false; + } + + var4.plane = (byte)(var7 + var4.plane & 3); + if (Client.localPlayerIndex == var1) { + TileItemPile.Client_plane = var4.plane; + } + + } else { + var6 = var0.readBits(30); + var7 = var6 >> 28; + var8 = var6 >> 14 & 16383; + var9 = var6 & 16383; + var10 = (var8 + class182.baseX + var4.pathX[0] & 16383) - class182.baseX; + var11 = (var9 + SecureRandomFuture.baseY + var4.pathY[0] & 16383) - SecureRandomFuture.baseY; + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { + var4.resetPath(var10, var11); + var4.field659 = false; + } else if (var2) { + var4.field659 = true; + var4.tileX = var10; + var4.tileY = var11; + } else { + var4.field659 = false; + var4.method1300(var10, var11, Players.field1278[var1]); + } + + var4.plane = (byte)(var7 + var4.plane & 3); + if (Client.localPlayerIndex == var1) { + TileItemPile.Client_plane = var4.plane; + } + + } + } } - - if (var1.tryLoadFileByNames("logo_deadman_mode", "")) { - ++var2; - } - - if (var1.tryLoadFileByNames("logo_seasonal_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; - } - - @ObfuscatedName("s") - @ObfuscatedSignature( - signature = "(B)V", - garbageValue = "-78" - ) - public static void method2155() { - SequenceDefinition.SequenceDefinition_cached.clear(); - SequenceDefinition.SequenceDefinition_cachedFrames.clear(); } }